diff --git a/com.arm.cmsis.config.tests/.classpath b/com.arm.cmsis.config.tests/.classpath index 336abe9..7931ec2 100644 --- a/com.arm.cmsis.config.tests/.classpath +++ b/com.arm.cmsis.config.tests/.classpath @@ -1,10 +1,20 @@ - + + + + + - + + + + + + + - + diff --git a/com.arm.cmsis.config.tests/META-INF/MANIFEST.MF b/com.arm.cmsis.config.tests/META-INF/MANIFEST.MF index 05ac5f0..32bda31 100644 --- a/com.arm.cmsis.config.tests/META-INF/MANIFEST.MF +++ b/com.arm.cmsis.config.tests/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: Tests Bundle-SymbolicName: com.arm.cmsis.config.tests Automatic-Module-Name: com.arm.cmsis.config.tests -Bundle-Version: 2.9.0.qualifier +Bundle-Version: 2.10.0.qualifier Bundle-Vendor: Arm Limited Fragment-Host: com.arm.cmsis.config Bundle-RequiredExecutionEnvironment: JavaSE-11 diff --git a/com.arm.cmsis.config.tests/pom.xml b/com.arm.cmsis.config.tests/pom.xml index 98f559b..6ef7356 100644 --- a/com.arm.cmsis.config.tests/pom.xml +++ b/com.arm.cmsis.config.tests/pom.xml @@ -8,11 +8,10 @@ com.arm.cmsis com.arm.cmsis.parent - 2.9.0-SNAPSHOT + 2.10.0-SNAPSHOT ../com.arm.cmsis.parent - 2.5.0 UTF-8 @@ -34,7 +33,7 @@ com.arm.cmsis com.arm.cmsis.tests.target - 2.9.0-SNAPSHOT + 2.10.0-SNAPSHOT diff --git a/com.arm.cmsis.config.tests/src/com/arm/cmsis/config/tests/ConfigWizardTest.java b/com.arm.cmsis.config.tests/src/com/arm/cmsis/config/tests/ConfigWizardTest.java index 2390caf..a001101 100644 --- a/com.arm.cmsis.config.tests/src/com/arm/cmsis/config/tests/ConfigWizardTest.java +++ b/com.arm.cmsis.config.tests/src/com/arm/cmsis/config/tests/ConfigWizardTest.java @@ -1,9 +1,11 @@ /******************************************************************************* * Copyright (c) 2016 ARM Ltd. and others * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation diff --git a/com.arm.cmsis.config/.classpath b/com.arm.cmsis.config/.classpath index 875ae63..e6d0a3c 100644 --- a/com.arm.cmsis.config/.classpath +++ b/com.arm.cmsis.config/.classpath @@ -1,9 +1,21 @@ - - - - + + + + + + + + + + + + + + + + + + diff --git a/com.arm.cmsis.config/META-INF/MANIFEST.MF b/com.arm.cmsis.config/META-INF/MANIFEST.MF index 6f446a1..2bb3415 100644 --- a/com.arm.cmsis.config/META-INF/MANIFEST.MF +++ b/com.arm.cmsis.config/META-INF/MANIFEST.MF @@ -1,9 +1,9 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: CMSIS Config -Bundle-SymbolicName: com.arm.cmsis.config;singleton:=true +Bundle-SymbolicName: com.arm.cmsis.config;singleton:=true Automatic-Module-Name: com.arm.cmsis.config -Bundle-Version: 2.9.0.qualifier +Bundle-Version: 2.10.0.qualifier Bundle-Activator: com.arm.cmsis.config.ConfigPlugIn Bundle-Vendor: Arm Limited Require-Bundle: org.eclipse.ui, diff --git a/com.arm.cmsis.config/plugin.xml b/com.arm.cmsis.config/plugin.xml index aa6d48e..8785305 100644 --- a/com.arm.cmsis.config/plugin.xml +++ b/com.arm.cmsis.config/plugin.xml @@ -1,6 +1,5 @@ - diff --git a/com.arm.cmsis.config/pom.xml b/com.arm.cmsis.config/pom.xml index 751b302..1543ab1 100644 --- a/com.arm.cmsis.config/pom.xml +++ b/com.arm.cmsis.config/pom.xml @@ -7,7 +7,7 @@ com.arm.cmsis com.arm.cmsis.parent - 2.9.0-SNAPSHOT + 2.10.0-SNAPSHOT ../com.arm.cmsis.parent \ No newline at end of file diff --git a/com.arm.cmsis.config/src/com/arm/cmsis/config/ConfigPlugIn.java b/com.arm.cmsis.config/src/com/arm/cmsis/config/ConfigPlugIn.java index 178cd78..5790387 100644 --- a/com.arm.cmsis.config/src/com/arm/cmsis/config/ConfigPlugIn.java +++ b/com.arm.cmsis.config/src/com/arm/cmsis/config/ConfigPlugIn.java @@ -1,3 +1,16 @@ +/******************************************************************************* + * Copyright (c) 2021 ARM Ltd. and others + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 + * which accompanies this distribution, and is available at + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * + * Contributors: + * ARM Ltd and ARM Germany GmbH - Initial API and implementation + *******************************************************************************/ + package com.arm.cmsis.config; import org.eclipse.jface.resource.ImageDescriptor; diff --git a/com.arm.cmsis.config/src/com/arm/cmsis/config/IHelpContextIds.java b/com.arm.cmsis.config/src/com/arm/cmsis/config/IHelpContextIds.java index e5e5f33..9f16005 100644 --- a/com.arm.cmsis.config/src/com/arm/cmsis/config/IHelpContextIds.java +++ b/com.arm.cmsis.config/src/com/arm/cmsis/config/IHelpContextIds.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.config/src/com/arm/cmsis/config/Messages.java b/com.arm.cmsis.config/src/com/arm/cmsis/config/Messages.java index c17de68..59d5f7b 100644 --- a/com.arm.cmsis.config/src/com/arm/cmsis/config/Messages.java +++ b/com.arm.cmsis.config/src/com/arm/cmsis/config/Messages.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.config/src/com/arm/cmsis/config/editors/ConfigEditor.java b/com.arm.cmsis.config/src/com/arm/cmsis/config/editors/ConfigEditor.java index c75561f..80f45f7 100644 --- a/com.arm.cmsis.config/src/com/arm/cmsis/config/editors/ConfigEditor.java +++ b/com.arm.cmsis.config/src/com/arm/cmsis/config/editors/ConfigEditor.java @@ -1,9 +1,11 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation diff --git a/com.arm.cmsis.config/src/com/arm/cmsis/config/editors/ConfigEditorContributor.java b/com.arm.cmsis.config/src/com/arm/cmsis/config/editors/ConfigEditorContributor.java index 3e2d9ea..39fea76 100644 --- a/com.arm.cmsis.config/src/com/arm/cmsis/config/editors/ConfigEditorContributor.java +++ b/com.arm.cmsis.config/src/com/arm/cmsis/config/editors/ConfigEditorContributor.java @@ -1,3 +1,16 @@ +/******************************************************************************* + * Copyright (c) 2021 ARM Ltd. and others + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 + * which accompanies this distribution, and is available at + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * + * Contributors: + * ARM Ltd and ARM Germany GmbH - Initial API and implementation + *******************************************************************************/ + package com.arm.cmsis.config.editors; import org.eclipse.jface.action.IAction; @@ -27,7 +40,7 @@ public ConfigEditorContributor() { /** * Returns the action registed with the given text editor. - * + * * @return IAction or null if editor is null. */ protected IAction getAction(ITextEditor editor, String actionID) { diff --git a/com.arm.cmsis.config/src/com/arm/cmsis/config/model/ConfigWizardItem.java b/com.arm.cmsis.config/src/com/arm/cmsis/config/model/ConfigWizardItem.java index 725434d..7b5b604 100644 --- a/com.arm.cmsis.config/src/com/arm/cmsis/config/model/ConfigWizardItem.java +++ b/com.arm.cmsis.config/src/com/arm/cmsis/config/model/ConfigWizardItem.java @@ -1,9 +1,11 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation diff --git a/com.arm.cmsis.config/src/com/arm/cmsis/config/model/IConfigWizardItem.java b/com.arm.cmsis.config/src/com/arm/cmsis/config/model/IConfigWizardItem.java index b3df346..5b2a5f0 100644 --- a/com.arm.cmsis.config/src/com/arm/cmsis/config/model/IConfigWizardItem.java +++ b/com.arm.cmsis.config/src/com/arm/cmsis/config/model/IConfigWizardItem.java @@ -1,9 +1,11 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation diff --git a/com.arm.cmsis.config/src/com/arm/cmsis/parser/CommentRule.java b/com.arm.cmsis.config/src/com/arm/cmsis/parser/CommentRule.java index 065fe1c..7fcbf18 100644 --- a/com.arm.cmsis.config/src/com/arm/cmsis/parser/CommentRule.java +++ b/com.arm.cmsis.config/src/com/arm/cmsis/parser/CommentRule.java @@ -1,3 +1,16 @@ +/******************************************************************************* + * Copyright (c) 2021 ARM Ltd. and others + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 + * which accompanies this distribution, and is available at + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * + * Contributors: + * ARM Ltd and ARM Germany GmbH - Initial API and implementation + *******************************************************************************/ + package com.arm.cmsis.parser; import org.eclipse.jface.text.rules.ICharacterScanner; diff --git a/com.arm.cmsis.config/src/com/arm/cmsis/parser/ConfigWizardParser.java b/com.arm.cmsis.config/src/com/arm/cmsis/parser/ConfigWizardParser.java index 9e8188f..fdb7522 100644 --- a/com.arm.cmsis.config/src/com/arm/cmsis/parser/ConfigWizardParser.java +++ b/com.arm.cmsis.config/src/com/arm/cmsis/parser/ConfigWizardParser.java @@ -1,9 +1,11 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation diff --git a/com.arm.cmsis.config/src/com/arm/cmsis/parser/ConfigWizardScanner.java b/com.arm.cmsis.config/src/com/arm/cmsis/parser/ConfigWizardScanner.java index 857b480..7d94da3 100644 --- a/com.arm.cmsis.config/src/com/arm/cmsis/parser/ConfigWizardScanner.java +++ b/com.arm.cmsis.config/src/com/arm/cmsis/parser/ConfigWizardScanner.java @@ -1,9 +1,11 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation diff --git a/com.arm.cmsis.config/src/com/arm/cmsis/parser/NumberRule.java b/com.arm.cmsis.config/src/com/arm/cmsis/parser/NumberRule.java index ba0da0c..092ef94 100644 --- a/com.arm.cmsis.config/src/com/arm/cmsis/parser/NumberRule.java +++ b/com.arm.cmsis.config/src/com/arm/cmsis/parser/NumberRule.java @@ -1,9 +1,11 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * QNX Software Systems - initial API and implementation diff --git a/com.arm.cmsis.config/src/com/arm/cmsis/parser/TagRule.java b/com.arm.cmsis.config/src/com/arm/cmsis/parser/TagRule.java index 8e61edb..eb6ed19 100644 --- a/com.arm.cmsis.config/src/com/arm/cmsis/parser/TagRule.java +++ b/com.arm.cmsis.config/src/com/arm/cmsis/parser/TagRule.java @@ -1,9 +1,11 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation diff --git a/com.arm.cmsis.config/src/com/arm/cmsis/utils/Utils.java b/com.arm.cmsis.config/src/com/arm/cmsis/utils/Utils.java index 29322bf..3e81648 100644 --- a/com.arm.cmsis.config/src/com/arm/cmsis/utils/Utils.java +++ b/com.arm.cmsis.config/src/com/arm/cmsis/utils/Utils.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.help/META-INF/MANIFEST.MF b/com.arm.cmsis.help/META-INF/MANIFEST.MF index efb9f62..3cf76c1 100644 --- a/com.arm.cmsis.help/META-INF/MANIFEST.MF +++ b/com.arm.cmsis.help/META-INF/MANIFEST.MF @@ -1,9 +1,9 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Help -Bundle-SymbolicName: com.arm.cmsis.help;singleton:=true -Automatic-Module-Name: com.arm.cmsis.help -Bundle-Version: 2.9.0.qualifier +Bundle-SymbolicName: com.arm.cmsis.help;singleton:=true +Automatic-Module-Name: com.arm.cmsis.help +Bundle-Version: 2.10.0.qualifier Bundle-Activator: com.arm.cmsis.help.HelpPlugIn Bundle-Vendor: Arm Limited Require-Bundle: org.eclipse.ui, diff --git a/com.arm.cmsis.help/html/help.js b/com.arm.cmsis.help/html/help.js index 5769130..971197d 100644 --- a/com.arm.cmsis.help/html/help.js +++ b/com.arm.cmsis.help/html/help.js @@ -13,7 +13,7 @@ var collapseImg = "minus.gif"; // these variable are used in the meta header (code below) and in the copyright paragraph - see FixupTagClasses() var auth = "Ltd. and others"; -var copyr = "Copyright © 2021, " + auth + ". All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html" +var copyr = "Copyright © 2021, " + auth + ". All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License 2.0 which accompanies this distribution, and is available at https://www.eclipse.org/legal/epl-2.0/" /*--------------------------------------------------------- The code below executes as soon as this .js file is loaded into a page diff --git a/com.arm.cmsis.help/plugin.xml b/com.arm.cmsis.help/plugin.xml index 85f8b21..970372c 100644 --- a/com.arm.cmsis.help/plugin.xml +++ b/com.arm.cmsis.help/plugin.xml @@ -1,6 +1,5 @@ - diff --git a/com.arm.cmsis.help/pom.xml b/com.arm.cmsis.help/pom.xml index 5ffb117..c2263cb 100644 --- a/com.arm.cmsis.help/pom.xml +++ b/com.arm.cmsis.help/pom.xml @@ -5,7 +5,7 @@ com.arm.cmsis com.arm.cmsis.parent.sign - 2.9.0-SNAPSHOT + 2.10.0-SNAPSHOT ../com.arm.cmsis.parent.sign \ No newline at end of file diff --git a/com.arm.cmsis.help/src/com/arm/cmsis/help/HelpPlugIn.java b/com.arm.cmsis.help/src/com/arm/cmsis/help/HelpPlugIn.java index 9e560de..96fd379 100644 --- a/com.arm.cmsis.help/src/com/arm/cmsis/help/HelpPlugIn.java +++ b/com.arm.cmsis.help/src/com/arm/cmsis/help/HelpPlugIn.java @@ -1,3 +1,16 @@ +/******************************************************************************* + * Copyright (c) 2021 ARM Ltd. and others + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 + * which accompanies this distribution, and is available at + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * + * Contributors: + * ARM Ltd and ARM Germany GmbH - Initial API and implementation + *******************************************************************************/ + package com.arm.cmsis.help; import org.eclipse.jface.resource.ImageDescriptor; diff --git a/com.arm.cmsis.pack.build.armcc/META-INF/MANIFEST.MF b/com.arm.cmsis.pack.build.armcc/META-INF/MANIFEST.MF index f169a59..b765e93 100644 --- a/com.arm.cmsis.pack.build.armcc/META-INF/MANIFEST.MF +++ b/com.arm.cmsis.pack.build.armcc/META-INF/MANIFEST.MF @@ -1,9 +1,9 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Armcc Toolchain Adapter -Bundle-SymbolicName: com.arm.cmsis.pack.build.armcc;singleton:=true -Automatic-Module-Name: com.arm.cmsis.pack.build.armcc -Bundle-Version: 2.9.0.qualifier +Bundle-SymbolicName: com.arm.cmsis.pack.build.armcc;singleton:=true +Automatic-Module-Name: com.arm.cmsis.pack.build.armcc +Bundle-Version: 2.10.0.qualifier Bundle-Activator: com.arm.cmsis.pack.build.armcc.Activator Bundle-Vendor: Arm Limited Require-Bundle: org.eclipse.core.runtime, diff --git a/com.arm.cmsis.pack.build.armcc/plugin.xml b/com.arm.cmsis.pack.build.armcc/plugin.xml index da84157..0869e4d 100644 --- a/com.arm.cmsis.pack.build.armcc/plugin.xml +++ b/com.arm.cmsis.pack.build.armcc/plugin.xml @@ -1,6 +1,5 @@ - diff --git a/com.arm.cmsis.pack.build.armcc/pom.xml b/com.arm.cmsis.pack.build.armcc/pom.xml index caf93dd..1629ee7 100644 --- a/com.arm.cmsis.pack.build.armcc/pom.xml +++ b/com.arm.cmsis.pack.build.armcc/pom.xml @@ -5,7 +5,7 @@ com.arm.cmsis com.arm.cmsis.parent.sign - 2.9.0-SNAPSHOT + 2.10.0-SNAPSHOT ../com.arm.cmsis.parent.sign \ No newline at end of file diff --git a/com.arm.cmsis.pack.build.armcc/src/com/arm/cmsis/pack/build/armcc/Activator.java b/com.arm.cmsis.pack.build.armcc/src/com/arm/cmsis/pack/build/armcc/Activator.java index 38e00e6..c450af4 100644 --- a/com.arm.cmsis.pack.build.armcc/src/com/arm/cmsis/pack/build/armcc/Activator.java +++ b/com.arm.cmsis.pack.build.armcc/src/com/arm/cmsis/pack/build/armcc/Activator.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * Eclipse Project - generation from template * ARM Ltd and ARM Germany GmbH - application-specific implementation diff --git a/com.arm.cmsis.pack.build.armcc/src/com/arm/cmsis/pack/build/armcc/ArmccToolChainAdapter.java b/com.arm.cmsis.pack.build.armcc/src/com/arm/cmsis/pack/build/armcc/ArmccToolChainAdapter.java index 9f142bd..5e68efb 100644 --- a/com.arm.cmsis.pack.build.armcc/src/com/arm/cmsis/pack/build/armcc/ArmccToolChainAdapter.java +++ b/com.arm.cmsis.pack.build.armcc/src/com/arm/cmsis/pack/build/armcc/ArmccToolChainAdapter.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2022 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ @@ -774,10 +776,13 @@ protected String getCpuPrefix(String cpu, String mve) { * @return resulting FPU string */ public String getFpuSuffix(String cpu, String fpu, String dsp, String mve) { + + if (CmsisConstants.FP_MVE.equals(mve)) { + // float MVE required FPU + return "FP16.FP32.FP64"; //$NON-NLS-1$ + } + if (fpu == null || fpu.equals(CmsisConstants.NO_FPU) || !coreHasFpu(cpu)) { - if (CmsisConstants.FP_MVE.equals(mve)) { - return "FP16.FP32"; //$NON-NLS-1$ - } if ("Cortex-M33".equals(cpu) || "Star-MC1".equals(cpu)) { //$NON-NLS-1$ if (!CmsisConstants.DSP.equals(dsp)) { return NoDSP_NoFPU; diff --git a/com.arm.cmsis.pack.build.armcc/src/com/arm/cmsis/pack/build/armcc/ScatterFileGenerator.java b/com.arm.cmsis.pack.build.armcc/src/com/arm/cmsis/pack/build/armcc/ScatterFileGenerator.java index 2a0be2f..ddfb1e3 100644 --- a/com.arm.cmsis.pack.build.armcc/src/com/arm/cmsis/pack/build/armcc/ScatterFileGenerator.java +++ b/com.arm.cmsis.pack.build.armcc/src/com/arm/cmsis/pack/build/armcc/ScatterFileGenerator.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack.build.armgcc/META-INF/MANIFEST.MF b/com.arm.cmsis.pack.build.armgcc/META-INF/MANIFEST.MF index cd783be..d44cf95 100644 --- a/com.arm.cmsis.pack.build.armgcc/META-INF/MANIFEST.MF +++ b/com.arm.cmsis.pack.build.armgcc/META-INF/MANIFEST.MF @@ -1,9 +1,9 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Arm GCC Toolchain Adapter -Bundle-SymbolicName: com.arm.cmsis.pack.build.armgcc;singleton:=true -Automatic-Module-Name: com.arm.cmsis.pack.build.armgcc -Bundle-Version: 2.9.0.qualifier +Bundle-SymbolicName: com.arm.cmsis.pack.build.armgcc;singleton:=true +Automatic-Module-Name: com.arm.cmsis.pack.build.armgcc +Bundle-Version: 2.10.0.qualifier Bundle-Activator: com.arm.cmsis.pack.build.armgcc.Activator Bundle-Vendor: Arm Limited Require-Bundle: org.eclipse.core.runtime, diff --git a/com.arm.cmsis.pack.build.armgcc/plugin.xml b/com.arm.cmsis.pack.build.armgcc/plugin.xml index 284a5d0..557d3e0 100644 --- a/com.arm.cmsis.pack.build.armgcc/plugin.xml +++ b/com.arm.cmsis.pack.build.armgcc/plugin.xml @@ -1,6 +1,5 @@ - diff --git a/com.arm.cmsis.pack.build.armgcc/pom.xml b/com.arm.cmsis.pack.build.armgcc/pom.xml index 2dd5b6c..2395697 100644 --- a/com.arm.cmsis.pack.build.armgcc/pom.xml +++ b/com.arm.cmsis.pack.build.armgcc/pom.xml @@ -5,7 +5,7 @@ com.arm.cmsis com.arm.cmsis.parent.sign - 2.9.0-SNAPSHOT + 2.10.0-SNAPSHOT ../com.arm.cmsis.parent.sign \ No newline at end of file diff --git a/com.arm.cmsis.pack.build.armgcc/src/com/arm/cmsis/pack/build/armgcc/Activator.java b/com.arm.cmsis.pack.build.armgcc/src/com/arm/cmsis/pack/build/armgcc/Activator.java index 23d80bb..bcc276e 100644 --- a/com.arm.cmsis.pack.build.armgcc/src/com/arm/cmsis/pack/build/armgcc/Activator.java +++ b/com.arm.cmsis.pack.build.armgcc/src/com/arm/cmsis/pack/build/armgcc/Activator.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * Eclipse Project - generation from template * ARM Ltd and ARM Germany GmbH - application-specific implementation diff --git a/com.arm.cmsis.pack.build.armgcc/src/com/arm/cmsis/pack/build/armgcc/ArmGccToolChainAdapter.java b/com.arm.cmsis.pack.build.armgcc/src/com/arm/cmsis/pack/build/armgcc/ArmGccToolChainAdapter.java index 382bd38..7cd22ad 100644 --- a/com.arm.cmsis.pack.build.armgcc/src/com/arm/cmsis/pack/build/armgcc/ArmGccToolChainAdapter.java +++ b/com.arm.cmsis.pack.build.armgcc/src/com/arm/cmsis/pack/build/armgcc/ArmGccToolChainAdapter.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack.build.gnuarmeclipse/.classpath b/com.arm.cmsis.pack.build.gnuarmeclipse/.classpath index f656d57..e6d0a3c 100644 --- a/com.arm.cmsis.pack.build.gnuarmeclipse/.classpath +++ b/com.arm.cmsis.pack.build.gnuarmeclipse/.classpath @@ -1,7 +1,21 @@ - + + + + + - + + + + + + + + + + + diff --git a/com.arm.cmsis.pack.build.gnuarmeclipse/META-INF/MANIFEST.MF b/com.arm.cmsis.pack.build.gnuarmeclipse/META-INF/MANIFEST.MF index bf6a514..6ba3ed1 100644 --- a/com.arm.cmsis.pack.build.gnuarmeclipse/META-INF/MANIFEST.MF +++ b/com.arm.cmsis.pack.build.gnuarmeclipse/META-INF/MANIFEST.MF @@ -1,9 +1,9 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Toolchain Adapter for GNU ARM C/C++ Cross Compiler -Bundle-SymbolicName: com.arm.cmsis.pack.build.gnuarmeclipse;singleton:=true -Automatic-Module-Name: com.arm.cmsis.pack.build.gnuarmeclipse -Bundle-Version: 2.9.0.qualifier +Bundle-SymbolicName: com.arm.cmsis.pack.build.gnuarmeclipse;singleton:=true +Automatic-Module-Name: com.arm.cmsis.pack.build.gnuarmeclipse +Bundle-Version: 2.10.0.qualifier Bundle-Activator: com.arm.cmsis.pack.build.gnuarmeclipse.Activator Bundle-Vendor: Arm Limited Require-Bundle: org.eclipse.core.runtime, diff --git a/com.arm.cmsis.pack.build.gnuarmeclipse/plugin.xml b/com.arm.cmsis.pack.build.gnuarmeclipse/plugin.xml index 2f3fef4..9a67099 100644 --- a/com.arm.cmsis.pack.build.gnuarmeclipse/plugin.xml +++ b/com.arm.cmsis.pack.build.gnuarmeclipse/plugin.xml @@ -1,6 +1,5 @@ - diff --git a/com.arm.cmsis.pack.build.gnuarmeclipse/pom.xml b/com.arm.cmsis.pack.build.gnuarmeclipse/pom.xml index 43f5e37..1fae923 100644 --- a/com.arm.cmsis.pack.build.gnuarmeclipse/pom.xml +++ b/com.arm.cmsis.pack.build.gnuarmeclipse/pom.xml @@ -5,7 +5,7 @@ com.arm.cmsis com.arm.cmsis.parent.sign - 2.9.0-SNAPSHOT + 2.10.0-SNAPSHOT ../com.arm.cmsis.parent.sign \ No newline at end of file diff --git a/com.arm.cmsis.pack.build.gnuarmeclipse/src/com/arm/cmsis/pack/build/gnuarmeclipse/Activator.java b/com.arm.cmsis.pack.build.gnuarmeclipse/src/com/arm/cmsis/pack/build/gnuarmeclipse/Activator.java index 0d4a0b4..5b094e7 100644 --- a/com.arm.cmsis.pack.build.gnuarmeclipse/src/com/arm/cmsis/pack/build/gnuarmeclipse/Activator.java +++ b/com.arm.cmsis.pack.build.gnuarmeclipse/src/com/arm/cmsis/pack/build/gnuarmeclipse/Activator.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * Eclipse Project - generation from template * ARM Ltd and ARM Germany GmbH - Initial API and implementation diff --git a/com.arm.cmsis.pack.build.gnuarmeclipse/src/com/arm/cmsis/pack/build/gnuarmeclipse/GnuarmeclipseToolChainAdapter.java b/com.arm.cmsis.pack.build.gnuarmeclipse/src/com/arm/cmsis/pack/build/gnuarmeclipse/GnuarmeclipseToolChainAdapter.java index 23c82fd..18c604a 100644 --- a/com.arm.cmsis.pack.build.gnuarmeclipse/src/com/arm/cmsis/pack/build/gnuarmeclipse/GnuarmeclipseToolChainAdapter.java +++ b/com.arm.cmsis.pack.build.gnuarmeclipse/src/com/arm/cmsis/pack/build/gnuarmeclipse/GnuarmeclipseToolChainAdapter.java @@ -1,9 +1,11 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation diff --git a/com.arm.cmsis.pack.build.settings/.classpath b/com.arm.cmsis.pack.build.settings/.classpath index bc435fa..8e5045a 100644 --- a/com.arm.cmsis.pack.build.settings/.classpath +++ b/com.arm.cmsis.pack.build.settings/.classpath @@ -1,7 +1,21 @@ - + + + + + - + + + + + + + + + + + diff --git a/com.arm.cmsis.pack.build.settings/META-INF/MANIFEST.MF b/com.arm.cmsis.pack.build.settings/META-INF/MANIFEST.MF index 856ceca..5e5a141 100644 --- a/com.arm.cmsis.pack.build.settings/META-INF/MANIFEST.MF +++ b/com.arm.cmsis.pack.build.settings/META-INF/MANIFEST.MF @@ -1,9 +1,9 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Build settings and toolchain integration support -Bundle-SymbolicName: com.arm.cmsis.pack.build.settings;singleton:=true -Automatic-Module-Name: com.arm.cmsis.pack.build.settings -Bundle-Version: 2.9.0.qualifier +Bundle-SymbolicName: com.arm.cmsis.pack.build.settings;singleton:=true +Automatic-Module-Name: com.arm.cmsis.pack.build.settings +Bundle-Version: 2.10.0.qualifier Bundle-Activator: com.arm.cmsis.pack.build.settings.Activator Bundle-Vendor: Arm Limited Require-Bundle: org.eclipse.core.runtime, diff --git a/com.arm.cmsis.pack.build.settings/plugin.xml b/com.arm.cmsis.pack.build.settings/plugin.xml index 63a8835..6d02a1e 100644 --- a/com.arm.cmsis.pack.build.settings/plugin.xml +++ b/com.arm.cmsis.pack.build.settings/plugin.xml @@ -1,6 +1,5 @@ - diff --git a/com.arm.cmsis.pack.build.settings/pom.xml b/com.arm.cmsis.pack.build.settings/pom.xml index 3809f2e..a362fb9 100644 --- a/com.arm.cmsis.pack.build.settings/pom.xml +++ b/com.arm.cmsis.pack.build.settings/pom.xml @@ -5,7 +5,7 @@ com.arm.cmsis com.arm.cmsis.parent.sign - 2.9.0-SNAPSHOT + 2.10.0-SNAPSHOT ../com.arm.cmsis.parent.sign \ No newline at end of file diff --git a/com.arm.cmsis.pack.build.settings/schema/ToolChainAdapter.exsd b/com.arm.cmsis.pack.build.settings/schema/ToolChainAdapter.exsd index 3d5f0f1..eb2b6b3 100644 --- a/com.arm.cmsis.pack.build.settings/schema/ToolChainAdapter.exsd +++ b/com.arm.cmsis.pack.build.settings/schema/ToolChainAdapter.exsd @@ -191,9 +191,9 @@ If not specified, the user should select the family in new project wizard. Copyright (c) 2015 ARM Inc. All rights reserved. This program and the accompanying materials are made available under the terms -of the Eclipse Public License v1.0 which accompanies this distribution, +of the Eclipse Public License 2.0 which accompanies this distribution, and is available at -http://www.eclipse.org/legal/epl-v10.html +https://www.eclipse.org/legal/epl-2.0/ diff --git a/com.arm.cmsis.pack.build.settings/schema/ToolChainAdapterAssociation.exsd b/com.arm.cmsis.pack.build.settings/schema/ToolChainAdapterAssociation.exsd index 87c055d..279510c 100644 --- a/com.arm.cmsis.pack.build.settings/schema/ToolChainAdapterAssociation.exsd +++ b/com.arm.cmsis.pack.build.settings/schema/ToolChainAdapterAssociation.exsd @@ -126,9 +126,9 @@ Copyright (c) 2015 ARM Inc. All rights reserved. This program and the accompanying materials are made available under the terms -of the Eclipse Public License v1.0 which accompanies this distribution, +of the Eclipse Public License 2.0 which accompanies this distribution, and is available at -http://www.eclipse.org/legal/epl-v10.html +https://www.eclipse.org/legal/epl-2.0/ diff --git a/com.arm.cmsis.pack.build.settings/src/com/arm/cmsis/pack/build/settings/Activator.java b/com.arm.cmsis.pack.build.settings/src/com/arm/cmsis/pack/build/settings/Activator.java index 3586c1c..e47e169 100644 --- a/com.arm.cmsis.pack.build.settings/src/com/arm/cmsis/pack/build/settings/Activator.java +++ b/com.arm.cmsis.pack.build.settings/src/com/arm/cmsis/pack/build/settings/Activator.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * Eclipse Project - generation from template * ARM Ltd and ARM Germany GmbH - application-specific implementation diff --git a/com.arm.cmsis.pack.build.settings/src/com/arm/cmsis/pack/build/settings/ILinkerScriptGenerator.java b/com.arm.cmsis.pack.build.settings/src/com/arm/cmsis/pack/build/settings/ILinkerScriptGenerator.java index a4b5e59..53a6662 100644 --- a/com.arm.cmsis.pack.build.settings/src/com/arm/cmsis/pack/build/settings/ILinkerScriptGenerator.java +++ b/com.arm.cmsis.pack.build.settings/src/com/arm/cmsis/pack/build/settings/ILinkerScriptGenerator.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack.build.settings/src/com/arm/cmsis/pack/build/settings/IRteToolChainAdapter.java b/com.arm.cmsis.pack.build.settings/src/com/arm/cmsis/pack/build/settings/IRteToolChainAdapter.java index c0de04d..4fec94d 100644 --- a/com.arm.cmsis.pack.build.settings/src/com/arm/cmsis/pack/build/settings/IRteToolChainAdapter.java +++ b/com.arm.cmsis.pack.build.settings/src/com/arm/cmsis/pack/build/settings/IRteToolChainAdapter.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack.build.settings/src/com/arm/cmsis/pack/build/settings/RteToolChainAdapter.java b/com.arm.cmsis.pack.build.settings/src/com/arm/cmsis/pack/build/settings/RteToolChainAdapter.java index cd00b54..d0c2965 100644 --- a/com.arm.cmsis.pack.build.settings/src/com/arm/cmsis/pack/build/settings/RteToolChainAdapter.java +++ b/com.arm.cmsis.pack.build.settings/src/com/arm/cmsis/pack/build/settings/RteToolChainAdapter.java @@ -1,9 +1,11 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation diff --git a/com.arm.cmsis.pack.build.settings/src/com/arm/cmsis/pack/build/settings/RteToolChainAdapterFactory.java b/com.arm.cmsis.pack.build.settings/src/com/arm/cmsis/pack/build/settings/RteToolChainAdapterFactory.java index 6ff0a4f..e1a47fe 100644 --- a/com.arm.cmsis.pack.build.settings/src/com/arm/cmsis/pack/build/settings/RteToolChainAdapterFactory.java +++ b/com.arm.cmsis.pack.build.settings/src/com/arm/cmsis/pack/build/settings/RteToolChainAdapterFactory.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack.build.settings/src/com/arm/cmsis/pack/build/settings/RteToolChainAdapterInfo.java b/com.arm.cmsis.pack.build.settings/src/com/arm/cmsis/pack/build/settings/RteToolChainAdapterInfo.java index 8069748..0138472 100644 --- a/com.arm.cmsis.pack.build.settings/src/com/arm/cmsis/pack/build/settings/RteToolChainAdapterInfo.java +++ b/com.arm.cmsis.pack.build.settings/src/com/arm/cmsis/pack/build/settings/RteToolChainAdapterInfo.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack.common.tests/.classpath b/com.arm.cmsis.pack.common.tests/.classpath index 3b3f47c..e6d0a3c 100644 --- a/com.arm.cmsis.pack.common.tests/.classpath +++ b/com.arm.cmsis.pack.common.tests/.classpath @@ -1,10 +1,20 @@ - + + + + + - + + + + + + + - + diff --git a/com.arm.cmsis.pack.common.tests/META-INF/MANIFEST.MF b/com.arm.cmsis.pack.common.tests/META-INF/MANIFEST.MF index 586579d..0c95b87 100644 --- a/com.arm.cmsis.pack.common.tests/META-INF/MANIFEST.MF +++ b/com.arm.cmsis.pack.common.tests/META-INF/MANIFEST.MF @@ -2,9 +2,9 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Tests Bundle-SymbolicName: com.arm.cmsis.pack.common.tests -Bundle-Version: 2.9.0.qualifier +Bundle-Version: 2.10.0.qualifier Bundle-Vendor: Arm Limited Automatic-Module-Name: com.arm.cmsis.pack.common.tests Bundle-RequiredExecutionEnvironment: JavaSE-11 -Require-Bundle: com.arm.cmsis.pack.common;bundle-version="2.9.0", +Require-Bundle: com.arm.cmsis.pack.common;bundle-version="2.10.0", org.junit;bundle-version="4.12.0" diff --git a/com.arm.cmsis.pack.common.tests/pom.xml b/com.arm.cmsis.pack.common.tests/pom.xml index 1c7e9ea..58bc044 100644 --- a/com.arm.cmsis.pack.common.tests/pom.xml +++ b/com.arm.cmsis.pack.common.tests/pom.xml @@ -1,12 +1,11 @@ 4.0.0 - com.arm.cmsis.pack.common.tests com.arm.cmsis.pack.common.tests eclipse-test-plugin com.arm.cmsis com.arm.cmsis.parent - 2.9.0-SNAPSHOT + 2.10.0-SNAPSHOT ../com.arm.cmsis.parent diff --git a/com.arm.cmsis.pack.common.tests/src/com/arm/cmsis/pack/generic/AttributesTest.java b/com.arm.cmsis.pack.common.tests/src/com/arm/cmsis/pack/generic/AttributesTest.java index 0a92259..8cb811e 100644 --- a/com.arm.cmsis.pack.common.tests/src/com/arm/cmsis/pack/generic/AttributesTest.java +++ b/com.arm.cmsis.pack.common.tests/src/com/arm/cmsis/pack/generic/AttributesTest.java @@ -1,9 +1,11 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd and others. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation diff --git a/com.arm.cmsis.pack.common.tests/src/com/arm/cmsis/pack/utils/AlnumComparatorTest.java b/com.arm.cmsis.pack.common.tests/src/com/arm/cmsis/pack/utils/AlnumComparatorTest.java index a9ed4d8..a91f208 100644 --- a/com.arm.cmsis.pack.common.tests/src/com/arm/cmsis/pack/utils/AlnumComparatorTest.java +++ b/com.arm.cmsis.pack.common.tests/src/com/arm/cmsis/pack/utils/AlnumComparatorTest.java @@ -1,9 +1,11 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd and others. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation diff --git a/com.arm.cmsis.pack.common.tests/src/com/arm/cmsis/pack/utils/VersionComparatorTest.java b/com.arm.cmsis.pack.common.tests/src/com/arm/cmsis/pack/utils/VersionComparatorTest.java index 6ffe80d..3bdcdab 100644 --- a/com.arm.cmsis.pack.common.tests/src/com/arm/cmsis/pack/utils/VersionComparatorTest.java +++ b/com.arm.cmsis.pack.common.tests/src/com/arm/cmsis/pack/utils/VersionComparatorTest.java @@ -1,9 +1,11 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd and others. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation diff --git a/com.arm.cmsis.pack.common.tests/src/com/arm/cmsis/pack/utils/WildCardsTest.java b/com.arm.cmsis.pack.common.tests/src/com/arm/cmsis/pack/utils/WildCardsTest.java index 416f106..9cae9ab 100644 --- a/com.arm.cmsis.pack.common.tests/src/com/arm/cmsis/pack/utils/WildCardsTest.java +++ b/com.arm.cmsis.pack.common.tests/src/com/arm/cmsis/pack/utils/WildCardsTest.java @@ -1,9 +1,11 @@ /******************************************************************************* * Copyright (c) 2022 ARM Ltd and others. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation diff --git a/com.arm.cmsis.pack.common/.classpath b/com.arm.cmsis.pack.common/.classpath index f656d57..e6d0a3c 100644 --- a/com.arm.cmsis.pack.common/.classpath +++ b/com.arm.cmsis.pack.common/.classpath @@ -1,7 +1,21 @@ - + + + + + - + + + + + + + + + + + diff --git a/com.arm.cmsis.pack.common/META-INF/MANIFEST.MF b/com.arm.cmsis.pack.common/META-INF/MANIFEST.MF index 3c0b6c7..f37a549 100644 --- a/com.arm.cmsis.pack.common/META-INF/MANIFEST.MF +++ b/com.arm.cmsis.pack.common/META-INF/MANIFEST.MF @@ -1,9 +1,9 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Common -Bundle-SymbolicName: com.arm.cmsis.pack.common -Automatic-Module-Name: com.arm.cmsis.pack.common -Bundle-Version: 2.9.0.qualifier +Bundle-SymbolicName: com.arm.cmsis.pack.common +Automatic-Module-Name: com.arm.cmsis.pack.common +Bundle-Version: 2.10.0.qualifier Bundle-Vendor: Arm Limited Bundle-RequiredExecutionEnvironment: JavaSE-11 Export-Package: com.arm.cmsis.pack.common, diff --git a/com.arm.cmsis.pack.common/pom.xml b/com.arm.cmsis.pack.common/pom.xml index d368d76..be407ec 100644 --- a/com.arm.cmsis.pack.common/pom.xml +++ b/com.arm.cmsis.pack.common/pom.xml @@ -5,7 +5,7 @@ com.arm.cmsis com.arm.cmsis.parent.sign - 2.9.0-SNAPSHOT + 2.10.0-SNAPSHOT ../com.arm.cmsis.parent.sign \ No newline at end of file diff --git a/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/common/CmsisConstants.java b/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/common/CmsisConstants.java index 7625e7f..2a8d1c8 100644 --- a/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/common/CmsisConstants.java +++ b/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/common/CmsisConstants.java @@ -1,9 +1,11 @@ /******************************************************************************* * Copyright (c) 2022 ARM Ltd. and others * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation @@ -76,6 +78,8 @@ public class CmsisConstants { public static final String DOC = "doc"; //$NON-NLS-1$ public static final String DESCRIPTION = "description"; //$NON-NLS-1$ public static final String FILE_NAME = "filename"; //$NON-NLS-1$ + public static final String AT = "@"; //$NON-NLS-1$ + public static final String AND = "&"; //$NON-NLS-1$ // condition expressions public static final String ACCEPT = "accept"; //$NON-NLS-1$ @@ -203,6 +207,16 @@ public class CmsisConstants { public static final String DEPRECATED = "deprecated"; //$NON-NLS-1$ public static final String REPLACEMENT = "replacement"; //$NON-NLS-1$ + public static final String CBUILD = "cbuild"; //$NON-NLS-1$ + public static final String CBUILDS = "cbuilds"; //$NON-NLS-1$ + public static final String COMPILER = "compiler"; //$NON-NLS-1$ + public static final String CONTEXT = "context"; //$NON-NLS-1$ + public static final String CONTEXTS = "contexts"; //$NON-NLS-1$ + public static final String YML = "yml"; //$NON-NLS-1$ + public static final String ELF = "elf"; //$NON-NLS-1$ + + public static final String IS_SELECTED = "is-selected"; //$NON-NLS-1$ + // attribute values public static final String DATE = "date"; //$NON-NLS-1$ @@ -262,6 +276,16 @@ public class CmsisConstants { public static final String EXAMPLE_TAG = "example"; //$NON-NLS-1$ public static final String EXAMPLES_TAG = "examples"; //$NON-NLS-1$ public static final String REQUIREMENTS_TAG = "requirements"; //$NON-NLS-1$ + public static final String BUILD_IDX_TAG = "build-idx"; //$NON-NLS-1$ + public static final String BUILD_TAG = "build"; //$NON-NLS-1$ + public static final String CBUILD_SET_TAG = "cbuild-set"; //$NON-NLS-1$ + public static final String CONSTRUCTED_FILES = "constructed-files"; //$NON-NLS-1$ + public static final String GROUPS_TAG = "groups"; //$NON-NLS-1$ + public static final String OUTPUT_TAG = "output"; //$NON-NLS-1$ + public static final String OUTPUT_DIRS_TAG = "output-dirs"; //$NON-NLS-1$ + public static final String OUTDIR_TAG = "outdir"; //$NON-NLS-1$ + public static final String PACKS_TAG = "packs"; //$NON-NLS-1$ + public static final String FROM_PACK_TAG = "from-pack"; //$NON-NLS-1$ public static final String TEXT = "text"; //$NON-NLS-1$ @@ -443,6 +467,7 @@ public class CmsisConstants { public static final String DEVICE_TITLE = "Device"; //$NON-NLS-1$ public static final String BOARD_TITLE = "Board"; //$NON-NLS-1$ public static final String SUMMARY_TITLE = "Summary"; //$NON-NLS-1$ + public static final String IMPORT_TITLE = "Import"; //$NON-NLS-1$ public static final long DEFAULT_DEBUG_CLOCK = 10000000L; public static final long DEFAULT_DATAPATCH_MASK = 0xFFFFFFFFFFFFFFFFL; @@ -455,6 +480,12 @@ public class CmsisConstants { public static final String EXT_CPROJECT = ".cproject"; //$NON-NLS-1$ public static final String EXT_SCT = ".sct"; //$NON-NLS-1$ public static final String EXT_SCVD = ".scvd"; //$NON-NLS-1$ + public static final String EXT_CBUILD_IDX = ".cbuild-idx.yml"; //$NON-NLS-1$ + public static final String EXT_CBUILD_SET = ".cbuild-set.yml"; //$NON-NLS-1$ + public static final String EXT_CBUILD_YML = ".cbuild.yml"; //$NON-NLS-1$ + public static final String EXT_CSOLUTION_YML = ".csolution.yml"; //$NON-NLS-1$ + + public static final String CBUILD_YML = "cbuild_yml"; //$NON-NLS-1$ // repository constants public static final String REPO_PACK_TYPE = "CMSIS-Pack"; //$NON-NLS-1$ diff --git a/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/enums/EComponentAttribute.java b/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/enums/EComponentAttribute.java index 397b4e2..17abbef 100644 --- a/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/enums/EComponentAttribute.java +++ b/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/enums/EComponentAttribute.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/enums/ECoreArchitecture.java b/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/enums/ECoreArchitecture.java index 13509df..138dbd1 100644 --- a/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/enums/ECoreArchitecture.java +++ b/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/enums/ECoreArchitecture.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2022 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/enums/EDataPatchAccessType.java b/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/enums/EDataPatchAccessType.java index a8f5e74..51da33b 100644 --- a/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/enums/EDataPatchAccessType.java +++ b/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/enums/EDataPatchAccessType.java @@ -5,9 +5,11 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd and others. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation diff --git a/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/enums/EDebugProtocolType.java b/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/enums/EDebugProtocolType.java index c8322f8..8a7e088 100644 --- a/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/enums/EDebugProtocolType.java +++ b/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/enums/EDebugProtocolType.java @@ -5,9 +5,11 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd and others. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation diff --git a/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/enums/EDeviceHierarchyLevel.java b/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/enums/EDeviceHierarchyLevel.java index 1ac8c21..f2f9cd6 100644 --- a/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/enums/EDeviceHierarchyLevel.java +++ b/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/enums/EDeviceHierarchyLevel.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/enums/EEvaluationResult.java b/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/enums/EEvaluationResult.java index 9a97f92..616b294 100644 --- a/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/enums/EEvaluationResult.java +++ b/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/enums/EEvaluationResult.java @@ -1,9 +1,11 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation diff --git a/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/enums/EFileCategory.java b/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/enums/EFileCategory.java index 2b7b01b..7667cf7 100644 --- a/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/enums/EFileCategory.java +++ b/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/enums/EFileCategory.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/enums/EFileRole.java b/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/enums/EFileRole.java index 7324af3..51dd20b 100644 --- a/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/enums/EFileRole.java +++ b/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/enums/EFileRole.java @@ -5,9 +5,11 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd and others. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation diff --git a/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/enums/EMemoryOverlap.java b/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/enums/EMemoryOverlap.java index c8caa95..4da6eb3 100644 --- a/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/enums/EMemoryOverlap.java +++ b/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/enums/EMemoryOverlap.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/enums/EMemoryPrivilege.java b/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/enums/EMemoryPrivilege.java index 57e2400..1cd7a7d 100644 --- a/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/enums/EMemoryPrivilege.java +++ b/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/enums/EMemoryPrivilege.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/enums/EMemorySecurity.java b/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/enums/EMemorySecurity.java index 07882b1..5c8ecb0 100644 --- a/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/enums/EMemorySecurity.java +++ b/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/enums/EMemorySecurity.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/enums/EMemoryType.java b/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/enums/EMemoryType.java index 05e7916..040c196 100644 --- a/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/enums/EMemoryType.java +++ b/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/enums/EMemoryType.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/enums/ESequenceControlType.java b/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/enums/ESequenceControlType.java index ccc7c52..50edfee 100644 --- a/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/enums/ESequenceControlType.java +++ b/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/enums/ESequenceControlType.java @@ -5,9 +5,11 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd and others. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation diff --git a/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/enums/ESeverity.java b/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/enums/ESeverity.java index f0855a6..09f1fbe 100644 --- a/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/enums/ESeverity.java +++ b/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/enums/ESeverity.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/enums/EVersionMatchMode.java b/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/enums/EVersionMatchMode.java index c955cc6..950d588 100644 --- a/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/enums/EVersionMatchMode.java +++ b/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/enums/EVersionMatchMode.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/enums/IEvaluationResult.java b/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/enums/IEvaluationResult.java index b46714d..6e1f012 100644 --- a/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/enums/IEvaluationResult.java +++ b/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/enums/IEvaluationResult.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/error/CmsisConsoleStrategy.java b/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/error/CmsisConsoleStrategy.java index 1ac8539..9e7aec0 100644 --- a/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/error/CmsisConsoleStrategy.java +++ b/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/error/CmsisConsoleStrategy.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/error/CmsisError.java b/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/error/CmsisError.java index 08cbf98..8a00292 100644 --- a/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/error/CmsisError.java +++ b/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/error/CmsisError.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/error/CmsisErrorCollection.java b/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/error/CmsisErrorCollection.java index 2ef4730..a81beab 100644 --- a/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/error/CmsisErrorCollection.java +++ b/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/error/CmsisErrorCollection.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/error/ICmsisConsole.java b/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/error/ICmsisConsole.java index e6e77ac..9bacdfb 100644 --- a/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/error/ICmsisConsole.java +++ b/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/error/ICmsisConsole.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/error/ICmsisConsoleStrategy.java b/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/error/ICmsisConsoleStrategy.java index 063be07..607c9f6 100644 --- a/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/error/ICmsisConsoleStrategy.java +++ b/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/error/ICmsisConsoleStrategy.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/error/ICmsisError.java b/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/error/ICmsisError.java index 007bc56..8319e56 100644 --- a/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/error/ICmsisError.java +++ b/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/error/ICmsisError.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/error/ICmsisErrorCollection.java b/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/error/ICmsisErrorCollection.java index 27716dd..50c6d07 100644 --- a/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/error/ICmsisErrorCollection.java +++ b/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/error/ICmsisErrorCollection.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/error/ICmsisErrorItem.java b/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/error/ICmsisErrorItem.java index c78c065..aa8711c 100644 --- a/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/error/ICmsisErrorItem.java +++ b/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/error/ICmsisErrorItem.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/generic/AttributedItem.java b/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/generic/AttributedItem.java index c4539bf..8a1d3ab 100644 --- a/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/generic/AttributedItem.java +++ b/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/generic/AttributedItem.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/generic/Attributes.java b/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/generic/Attributes.java index 91afb25..3b2f1c3 100644 --- a/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/generic/Attributes.java +++ b/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/generic/Attributes.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/generic/GenericListenerList.java b/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/generic/GenericListenerList.java index 69c471f..9313e7a 100644 --- a/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/generic/GenericListenerList.java +++ b/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/generic/GenericListenerList.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/generic/IAttributedItem.java b/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/generic/IAttributedItem.java index e74e4eb..b5dc329 100644 --- a/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/generic/IAttributedItem.java +++ b/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/generic/IAttributedItem.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/generic/IAttributes.java b/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/generic/IAttributes.java index 2f235cb..646ad0c 100644 --- a/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/generic/IAttributes.java +++ b/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/generic/IAttributes.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/generic/ICommitable.java b/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/generic/ICommitable.java index e185ee7..f2b14fc 100644 --- a/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/generic/ICommitable.java +++ b/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/generic/ICommitable.java @@ -1,10 +1,12 @@ /******************************************************************************* -* Copyright (c) 2021 ARM Ltd. and others +* Copyright (c) 2021-2024 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ @@ -12,7 +14,7 @@ package com.arm.cmsis.pack.generic; /** - * This interface defines an editable object where changes should be commit + * This interface defines an editable object where changes should be committed * before save */ public interface ICommitable { @@ -29,4 +31,20 @@ public interface ICommitable { */ boolean isModified(); + /** + * Check is the object is read-only + * + * @return true if read-only + */ + default boolean isReadOnly() { + return false; + } + + /** + * Sets the read-only flag + * + * @param bReadOnly read-only flag + */ + default void setReadOnly(boolean bReadOnly) { + } } diff --git a/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/generic/IGenericListener.java b/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/generic/IGenericListener.java index 86f25e4..1adf890 100644 --- a/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/generic/IGenericListener.java +++ b/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/generic/IGenericListener.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/generic/IGenericListenerList.java b/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/generic/IGenericListenerList.java index ba2454d..1ce7b3b 100644 --- a/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/generic/IGenericListenerList.java +++ b/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/generic/IGenericListenerList.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/generic/IRunnableWithResult.java b/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/generic/IRunnableWithResult.java index d341a30..770b070 100644 --- a/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/generic/IRunnableWithResult.java +++ b/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/generic/IRunnableWithResult.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/generic/ITreeItem.java b/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/generic/ITreeItem.java index c32f15d..d09d8be 100644 --- a/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/generic/ITreeItem.java +++ b/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/generic/ITreeItem.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/generic/ITreeMapItem.java b/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/generic/ITreeMapItem.java index 86970be..a3efeec 100644 --- a/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/generic/ITreeMapItem.java +++ b/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/generic/ITreeMapItem.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/generic/ITreeObject.java b/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/generic/ITreeObject.java index 2b00077..f11c833 100644 --- a/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/generic/ITreeObject.java +++ b/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/generic/ITreeObject.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/generic/ItemSelector.java b/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/generic/ItemSelector.java index 59d36e3..152fd13 100644 --- a/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/generic/ItemSelector.java +++ b/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/generic/ItemSelector.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/generic/RunnableWithIntResult.java b/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/generic/RunnableWithIntResult.java index fb7e628..dfd20b2 100644 --- a/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/generic/RunnableWithIntResult.java +++ b/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/generic/RunnableWithIntResult.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/generic/RunnableWithResult.java b/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/generic/RunnableWithResult.java index 57da1ab..b61be74 100644 --- a/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/generic/RunnableWithResult.java +++ b/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/generic/RunnableWithResult.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/item/CmsisItem.java b/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/item/CmsisItem.java index 1936480..3bba757 100644 --- a/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/item/CmsisItem.java +++ b/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/item/CmsisItem.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/item/CmsisMapItem.java b/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/item/CmsisMapItem.java index a445eae..9450028 100644 --- a/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/item/CmsisMapItem.java +++ b/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/item/CmsisMapItem.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/item/CmsisTreeItem.java b/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/item/CmsisTreeItem.java index 9d2107d..5f91060 100644 --- a/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/item/CmsisTreeItem.java +++ b/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/item/CmsisTreeItem.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/item/ICmsisItem.java b/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/item/ICmsisItem.java index 33e1390..61da18e 100644 --- a/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/item/ICmsisItem.java +++ b/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/item/ICmsisItem.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/item/ICmsisMapItem.java b/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/item/ICmsisMapItem.java index a415dd1..4a17da8 100644 --- a/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/item/ICmsisMapItem.java +++ b/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/item/ICmsisMapItem.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/item/ICmsisTreeItem.java b/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/item/ICmsisTreeItem.java index a545b09..2c90021 100644 --- a/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/item/ICmsisTreeItem.java +++ b/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/item/ICmsisTreeItem.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/item/ICmsisVisitor.java b/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/item/ICmsisVisitor.java index d3e5e60..a1c2e54 100644 --- a/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/item/ICmsisVisitor.java +++ b/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/item/ICmsisVisitor.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/permissions/IMemoryAccess.java b/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/permissions/IMemoryAccess.java index 5c480aa..885ad5d 100644 --- a/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/permissions/IMemoryAccess.java +++ b/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/permissions/IMemoryAccess.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/permissions/IMemoryPermissions.java b/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/permissions/IMemoryPermissions.java index 2ba9d5d..5ff3c51 100644 --- a/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/permissions/IMemoryPermissions.java +++ b/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/permissions/IMemoryPermissions.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/permissions/IMemoryPriviledge.java b/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/permissions/IMemoryPriviledge.java index 9a2cbab..e04233a 100644 --- a/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/permissions/IMemoryPriviledge.java +++ b/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/permissions/IMemoryPriviledge.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/permissions/IMemorySecurity.java b/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/permissions/IMemorySecurity.java index 95a0600..1b430fb 100644 --- a/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/permissions/IMemorySecurity.java +++ b/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/permissions/IMemorySecurity.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/permissions/MemoryAccess.java b/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/permissions/MemoryAccess.java index 2b5e72c..44c6162 100644 --- a/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/permissions/MemoryAccess.java +++ b/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/permissions/MemoryAccess.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/permissions/MemoryPermissions.java b/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/permissions/MemoryPermissions.java index 7262739..2eb444f 100644 --- a/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/permissions/MemoryPermissions.java +++ b/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/permissions/MemoryPermissions.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/utils/AlnumComparator.java b/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/utils/AlnumComparator.java index fc25fba..60f83f3 100644 --- a/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/utils/AlnumComparator.java +++ b/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/utils/AlnumComparator.java @@ -1,9 +1,11 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd and others. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation diff --git a/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/utils/DeviceVendor.java b/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/utils/DeviceVendor.java index d32f19d..b05302d 100644 --- a/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/utils/DeviceVendor.java +++ b/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/utils/DeviceVendor.java @@ -1,9 +1,11 @@ /******************************************************************************* * Copyright (c) 2022 ARM Ltd and others. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation diff --git a/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/utils/Encryptor.java b/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/utils/Encryptor.java index ec93146..290a4b5 100644 --- a/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/utils/Encryptor.java +++ b/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/utils/Encryptor.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/utils/FileChangeWatcher.java b/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/utils/FileChangeWatcher.java index eef66a9..0a08433 100644 --- a/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/utils/FileChangeWatcher.java +++ b/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/utils/FileChangeWatcher.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/utils/FullDeviceName.java b/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/utils/FullDeviceName.java index 65ef772..af8c649 100644 --- a/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/utils/FullDeviceName.java +++ b/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/utils/FullDeviceName.java @@ -1,9 +1,11 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd and others. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation diff --git a/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/utils/Utils.java b/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/utils/Utils.java index d1e2341..5faa76c 100644 --- a/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/utils/Utils.java +++ b/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/utils/Utils.java @@ -1,9 +1,11 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation @@ -802,4 +804,49 @@ public static String getCurrentTimeStamp() { long startTime = System.currentTimeMillis(); return new SimpleDateFormat("HH:mm:ss").format(new Date(startTime)); //$NON-NLS-1$ } + + /** + * Returns suffix of string with given delimiter + * + * @param string s + * @param delimiter determines how to split string + * @return suffix or null if no delimiter is found + */ + public static String getSuffix(String s, String delimiter) { + int index = s.indexOf(delimiter); + if (index == -1) { + return null; + } + return s.substring(index + delimiter.length()); + } + + /** + * Returns prefix of string with given delimiter + * + * @param string s + * @param delimiter determines how to split string + * @return prefix or null if no delimiter is found + */ + public static String getPrefix(String s, String delimiter) { + int index = s.indexOf(delimiter); + if (index == -1) { + return null; + } + return s.substring(0, index); + } + + /** + * Strips prefix if present + * + * @param string s + * @param delimiter + * @return suffix or same string if delimiter not found + */ + public static String stripPrefix(String s, String delimiter) { + String suffix = getSuffix(s, delimiter); + if (suffix == null) { + return s; + } + return suffix; + } } diff --git a/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/utils/VersionComparator.java b/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/utils/VersionComparator.java index adf1d2a..d68389c 100644 --- a/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/utils/VersionComparator.java +++ b/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/utils/VersionComparator.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/utils/WildCards.java b/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/utils/WildCards.java index 0d50839..ca33a65 100644 --- a/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/utils/WildCards.java +++ b/com.arm.cmsis.pack.common/src/com/arm/cmsis/pack/utils/WildCards.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2022 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack.data.tests/.classpath b/com.arm.cmsis.pack.data.tests/.classpath new file mode 100644 index 0000000..5050774 --- /dev/null +++ b/com.arm.cmsis.pack.data.tests/.classpath @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/com.arm.cmsis.pack.data.tests/.gitignore b/com.arm.cmsis.pack.data.tests/.gitignore new file mode 100644 index 0000000..b83d222 --- /dev/null +++ b/com.arm.cmsis.pack.data.tests/.gitignore @@ -0,0 +1 @@ +/target/ diff --git a/com.arm.cmsis.pack.data.tests/.project b/com.arm.cmsis.pack.data.tests/.project new file mode 100644 index 0000000..5479c09 --- /dev/null +++ b/com.arm.cmsis.pack.data.tests/.project @@ -0,0 +1,34 @@ + + + com.arm.cmsis.pack.data.tests + + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.pde.ManifestBuilder + + + + + org.eclipse.pde.SchemaBuilder + + + + + org.eclipse.m2e.core.maven2Builder + + + + + + org.eclipse.m2e.core.maven2Nature + org.eclipse.pde.PluginNature + org.eclipse.jdt.core.javanature + + diff --git a/com.arm.cmsis.pack.data.tests/.settings/org.eclipse.jdt.core.prefs b/com.arm.cmsis.pack.data.tests/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 0000000..052ee6e --- /dev/null +++ b/com.arm.cmsis.pack.data.tests/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,10 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning +org.eclipse.jdt.core.compiler.release=enabled +org.eclipse.jdt.core.compiler.source=11 diff --git a/com.arm.cmsis.pack.data.tests/.settings/org.eclipse.m2e.core.prefs b/com.arm.cmsis.pack.data.tests/.settings/org.eclipse.m2e.core.prefs new file mode 100644 index 0000000..f897a7f --- /dev/null +++ b/com.arm.cmsis.pack.data.tests/.settings/org.eclipse.m2e.core.prefs @@ -0,0 +1,4 @@ +activeProfiles= +eclipse.preferences.version=1 +resolveWorkspaceProjects=true +version=1 diff --git a/com.arm.cmsis.pack.data.tests/META-INF/MANIFEST.MF b/com.arm.cmsis.pack.data.tests/META-INF/MANIFEST.MF new file mode 100644 index 0000000..2066269 --- /dev/null +++ b/com.arm.cmsis.pack.data.tests/META-INF/MANIFEST.MF @@ -0,0 +1,11 @@ +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Name: Tests +Bundle-SymbolicName: com.arm.cmsis.pack.data.tests +Bundle-Version: 2.10.0.qualifier +Require-Bundle: com.arm.cmsis.pack.common;bundle-version="2.10.0", + com.arm.cmsis.pack.data, + org.junit;bundle-version="4.12.0" +Bundle-Vendor: ARM +Automatic-Module-Name: com.arm.cmsis.pack.data.tests +Bundle-RequiredExecutionEnvironment: JavaSE-11 diff --git a/com.arm.cmsis.pack.data.tests/build.properties b/com.arm.cmsis.pack.data.tests/build.properties new file mode 100644 index 0000000..b9f1158 --- /dev/null +++ b/com.arm.cmsis.pack.data.tests/build.properties @@ -0,0 +1,5 @@ +source.. = src/ +output.. = target/classes/ +bin.includes = META-INF/,\ + .,\ + resources/ diff --git a/com.arm.cmsis.pack.data.tests/pom.xml b/com.arm.cmsis.pack.data.tests/pom.xml new file mode 100644 index 0000000..733343c --- /dev/null +++ b/com.arm.cmsis.pack.data.tests/pom.xml @@ -0,0 +1,31 @@ + + 4.0.0 + com.arm.cmsis.pack.data.tests + eclipse-test-plugin + + com.arm.cmsis + com.arm.cmsis.parent + 2.10.0-SNAPSHOT + ../com.arm.cmsis.parent + + + src + + + resources + + **/*.java + + + + + + maven-compiler-plugin + 3.8.1 + + 11 + + + + + diff --git a/com.arm.cmsis.pack.data.tests/resources/SimpleInputXml.xml b/com.arm.cmsis.pack.data.tests/resources/SimpleInputXml.xml new file mode 100644 index 0000000..efd5346 --- /dev/null +++ b/com.arm.cmsis.pack.data.tests/resources/SimpleInputXml.xml @@ -0,0 +1,20 @@ + + + + XmlTest + + Foo + Bar + + Today + + + + YmlTest + + + + + + + \ No newline at end of file diff --git a/com.arm.cmsis.pack.data.tests/src/com/arm/cmsis/pack/data/tests/XmlParserTest.java b/com.arm.cmsis.pack.data.tests/src/com/arm/cmsis/pack/data/tests/XmlParserTest.java new file mode 100644 index 0000000..d0e5957 --- /dev/null +++ b/com.arm.cmsis.pack.data.tests/src/com/arm/cmsis/pack/data/tests/XmlParserTest.java @@ -0,0 +1,110 @@ +/******************************************************************************* +* Copyright (c) 2023 ARM Ltd. and others +* All rights reserved. This program and the accompanying materials +* are made available under the terms of the Eclipse Public License 2.0 +* which accompanies this distribution, and is available at + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * +* Contributors: +* ARM Ltd and ARM Germany GmbH - Initial API and implementation +*******************************************************************************/ + +package com.arm.cmsis.pack.data.tests; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotEquals; +import static org.junit.Assert.fail; + +import java.io.BufferedReader; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.util.stream.Collectors; + +import org.junit.BeforeClass; +import org.junit.Test; + +import com.arm.cmsis.pack.data.ICpItem; +import com.arm.cmsis.pack.parser.CpXmlParser; + +/** + * Test cases for CpXmlParser + */ +public class XmlParserTest { + + private static CpXmlParser parser = new CpXmlParser(); + private static ICpItem root; + private static ICpItem firstChild; + private static ICpItem secondChild; + private static ICpItem thirdChild; + + @BeforeClass + public static void readFile() { + String fileContent = ""; //$NON-NLS-1$ + try (InputStream inputStream = XmlParserTest.class.getClassLoader().getResourceAsStream("SimpleInputXml.xml"); //$NON-NLS-1$ + BufferedReader in = new BufferedReader(new InputStreamReader(inputStream))) { // $NON-NLS-1$ + fileContent = in.lines().collect(Collectors.joining()); + } catch (Exception e) { + fail("Failed to read XML file : " + e.getMessage()); //$NON-NLS-1$ + e.printStackTrace(); + } + + try { + root = parser.parseXmlString(fileContent); + firstChild = root.getFirstChild(); + secondChild = root.getChildren().stream().skip(1).findFirst().orElse(null); + thirdChild = root.getFirstChild("compilers"); //$NON-NLS-1$ + } catch (Exception e) { + fail("Parser failed to parse file content: " + fileContent + ", threw exception with message " //$NON-NLS-1$ + + e.getMessage()); + e.printStackTrace(); + } + } + + @Test + public void testRoot() { + assertNotEquals(null, root); + + assertEquals(null, root.attributes().getAttributesAsMap()); + assertEquals("mytests", root.getTag()); //$NON-NLS-1$ + assertEquals(3, root.getChildCount()); + + } + + @Test + public void testFirstChild() { + assertNotEquals(null, firstChild); + + assertEquals(1, firstChild.attributes().getAttributesAsMap().size()); + assertEquals("t1", firstChild.getAttribute("id")); //$NON-NLS-1$ //$NON-NLS-2$ + assertEquals(3, firstChild.getChildCount()); + assertEquals(2, firstChild.getGrandChildren("authors").size()); //$NON-NLS-1$ + assertEquals("XmlTest", firstChild.getFirstChildText("name")); //$NON-NLS-1$ //$NON-NLS-2$ + } + + @Test + public void testSecondChild() { + assertNotEquals(null, secondChild); + + assertEquals(1, secondChild.attributes().getAttributesAsMap().size()); + assertEquals("t2", secondChild.getAttribute("id")); //$NON-NLS-1$ //$NON-NLS-2$ + assertEquals("YmlTest", secondChild.getFirstChildText("name")); //$NON-NLS-1$ //$NON-NLS-2$ + assertEquals(1, secondChild.attributes().getAttributesAsMap().size()); + assertEquals(1, secondChild.getChildCount()); + } + + @Test + public void testThirdChild() { + assertNotEquals(null, thirdChild); + + assertEquals(null, thirdChild.attributes().getAttributesAsMap()); + assertEquals(1, thirdChild.getChildCount()); + + ICpItem grandChild = thirdChild.getFirstChild(); + + assertEquals(0, grandChild.getChildCount()); + assertEquals("AC6", grandChild.getName()); //$NON-NLS-1$ + assertEquals("6.20.0", grandChild.getVersion()); //$NON-NLS-1$ + } +} diff --git a/com.arm.cmsis.pack.data/.classpath b/com.arm.cmsis.pack.data/.classpath index f656d57..e6d0a3c 100644 --- a/com.arm.cmsis.pack.data/.classpath +++ b/com.arm.cmsis.pack.data/.classpath @@ -1,7 +1,21 @@ - + + + + + - + + + + + + + + + + + diff --git a/com.arm.cmsis.pack.data/META-INF/MANIFEST.MF b/com.arm.cmsis.pack.data/META-INF/MANIFEST.MF index f0e67d7..52a6009 100644 --- a/com.arm.cmsis.pack.data/META-INF/MANIFEST.MF +++ b/com.arm.cmsis.pack.data/META-INF/MANIFEST.MF @@ -1,9 +1,9 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: CMSIS data types -Bundle-SymbolicName: com.arm.cmsis.pack.data -Automatic-Module-Name: com.arm.cmsis.pack.data -Bundle-Version: 2.9.0.qualifier +Bundle-SymbolicName: com.arm.cmsis.pack.data +Automatic-Module-Name: com.arm.cmsis.pack.data +Bundle-Version: 2.10.0.qualifier Bundle-Vendor: Arm Limited Bundle-RequiredExecutionEnvironment: JavaSE-11 Export-Package: com.arm.cmsis.pack.build, diff --git a/com.arm.cmsis.pack.data/pom.xml b/com.arm.cmsis.pack.data/pom.xml index 697844c..40203dc 100644 --- a/com.arm.cmsis.pack.data/pom.xml +++ b/com.arm.cmsis.pack.data/pom.xml @@ -1,11 +1,12 @@ 4.0.0 + com.arm.cmsis.pack.data eclipse-plugin com.arm.cmsis com.arm.cmsis.parent.sign - 2.9.0-SNAPSHOT + 2.10.0-SNAPSHOT ../com.arm.cmsis.parent.sign \ No newline at end of file diff --git a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/build/BuildSettings.java b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/build/BuildSettings.java index 72320fb..0a890d1 100644 --- a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/build/BuildSettings.java +++ b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/build/BuildSettings.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/build/IBuildSettings.java b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/build/IBuildSettings.java index a7ee950..7597664 100644 --- a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/build/IBuildSettings.java +++ b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/build/IBuildSettings.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/build/IMemorySettings.java b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/build/IMemorySettings.java index c19f9a9..3de7e5c 100644 --- a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/build/IMemorySettings.java +++ b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/build/IMemorySettings.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/build/MemorySettings.java b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/build/MemorySettings.java index 9e3fb6f..0018596 100644 --- a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/build/MemorySettings.java +++ b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/build/MemorySettings.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/CpAlgorithm.java b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/CpAlgorithm.java index 2e0ebcd..8bb9d9c 100644 --- a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/CpAlgorithm.java +++ b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/CpAlgorithm.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/CpAttributes.java b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/CpAttributes.java index 1b61724..0b4f40e 100644 --- a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/CpAttributes.java +++ b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/CpAttributes.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/CpBoard.java b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/CpBoard.java index 7022f3e..dafda0d 100644 --- a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/CpBoard.java +++ b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/CpBoard.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/CpCodeTemplate.java b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/CpCodeTemplate.java index 1a2d324..741dce7 100644 --- a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/CpCodeTemplate.java +++ b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/CpCodeTemplate.java @@ -1,9 +1,11 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation diff --git a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/CpComponent.java b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/CpComponent.java index 0290974..57ae135 100644 --- a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/CpComponent.java +++ b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/CpComponent.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ @@ -75,29 +77,7 @@ public String constructId() { @Override protected String constructName() { - String name = CmsisConstants.EMPTY_STRING; - if (!isApi()) { - name = getVendor(); - } - if (hasAttribute(CmsisConstants.CBUNDLE)) { - name += "."; //$NON-NLS-1$ - name += getAttribute(CmsisConstants.CBUNDLE); - } - name += CmsisConstants.DOUBLE_COLON; - - name += getAttribute(CmsisConstants.CCLASS); - name += "."; //$NON-NLS-1$ - - name += getAttribute(CmsisConstants.CGROUP); - if (hasAttribute(CmsisConstants.CSUB)) { - name += "."; //$NON-NLS-1$ - name += getAttribute(CmsisConstants.CSUB); - } - if (hasAttribute(CmsisConstants.CVARIANT)) { - name += "."; //$NON-NLS-1$ - name += getAttribute(CmsisConstants.CVARIANT); - } - return name; + return ICpComponent.constructComponentName(this); } @Override diff --git a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/CpCondition.java b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/CpCondition.java index b426c63..4e405b7 100644 --- a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/CpCondition.java +++ b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/CpCondition.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/CpConditionContext.java b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/CpConditionContext.java index 66bc509..46c1327 100644 --- a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/CpConditionContext.java +++ b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/CpConditionContext.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/CpDataPatch.java b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/CpDataPatch.java index 7eea055..3a11820 100644 --- a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/CpDataPatch.java +++ b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/CpDataPatch.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/CpDebug.java b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/CpDebug.java index b6bb87e..dc22369 100644 --- a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/CpDebug.java +++ b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/CpDebug.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/CpDebugConfiguration.java b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/CpDebugConfiguration.java index 0202e5b..14f6ce7 100644 --- a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/CpDebugConfiguration.java +++ b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/CpDebugConfiguration.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/CpDebugPort.java b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/CpDebugPort.java index c70999e..e47a109 100644 --- a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/CpDebugPort.java +++ b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/CpDebugPort.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/CpDebugProtocol.java b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/CpDebugProtocol.java index a3168b3..8a78499 100644 --- a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/CpDebugProtocol.java +++ b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/CpDebugProtocol.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/CpDebugVars.java b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/CpDebugVars.java index fe197e6..fa0a339 100644 --- a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/CpDebugVars.java +++ b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/CpDebugVars.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/CpDenyExpresion.java b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/CpDenyExpresion.java index de6e0fb..c625863 100644 --- a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/CpDenyExpresion.java +++ b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/CpDenyExpresion.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/CpDeviceItem.java b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/CpDeviceItem.java index 39ff71e..59ec009 100644 --- a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/CpDeviceItem.java +++ b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/CpDeviceItem.java @@ -1,9 +1,11 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd and others. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation diff --git a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/CpDeviceItemContainer.java b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/CpDeviceItemContainer.java index 7f61722..391c695 100644 --- a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/CpDeviceItemContainer.java +++ b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/CpDeviceItemContainer.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/CpDeviceProperty.java b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/CpDeviceProperty.java index f2002dd..74fd11a 100644 --- a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/CpDeviceProperty.java +++ b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/CpDeviceProperty.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/CpExample.java b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/CpExample.java index 028c360..cfef264 100644 --- a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/CpExample.java +++ b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/CpExample.java @@ -1,9 +1,11 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation diff --git a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/CpExpression.java b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/CpExpression.java index fb5e7a8..0b31e07 100644 --- a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/CpExpression.java +++ b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/CpExpression.java @@ -1,9 +1,11 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd and others. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation diff --git a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/CpFile.java b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/CpFile.java index 820906b..c84c98e 100644 --- a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/CpFile.java +++ b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/CpFile.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/CpGenerator.java b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/CpGenerator.java index ec9c114..d7a3d11 100644 --- a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/CpGenerator.java +++ b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/CpGenerator.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/CpItem.java b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/CpItem.java index d286210..ba1a712 100644 --- a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/CpItem.java +++ b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/CpItem.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/CpMemory.java b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/CpMemory.java index b3bafe4..3cb68f2 100644 --- a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/CpMemory.java +++ b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/CpMemory.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/CpPack.java b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/CpPack.java index 2ce0796..4a4caac 100644 --- a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/CpPack.java +++ b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/CpPack.java @@ -1,9 +1,11 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation @@ -20,6 +22,7 @@ import java.util.Set; import com.arm.cmsis.pack.common.CmsisConstants; +import com.arm.cmsis.pack.generic.IAttributes; import com.arm.cmsis.pack.utils.VersionComparator; /** @@ -254,6 +257,20 @@ public static String versionFromId(final String id) { return CmsisConstants.EMPTY_STRING; } + /** + * Create pack attributes from id string + * + * @param id Pack ID string + * @return IAttributes object + */ + public static IAttributes attributesFromId(final String id) { + CpAttributes packAttributes = new CpAttributes(); + packAttributes.setAttribute(CmsisConstants.NAME, nameFromId(id)); + packAttributes.setAttribute(CmsisConstants.VENDOR, vendorFromId(id)); + packAttributes.setAttribute(CmsisConstants.VERSION, versionFromId(id)); + return packAttributes; + } + /** * Returns Pack family ID : pack ID without version, i.e. the form Vendor.Name * diff --git a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/CpPackCollection.java b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/CpPackCollection.java index ed06d1e..e88fe03 100644 --- a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/CpPackCollection.java +++ b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/CpPackCollection.java @@ -1,9 +1,11 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation diff --git a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/CpPackComparator.java b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/CpPackComparator.java index 5f8a9f2..39dbc87 100644 --- a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/CpPackComparator.java +++ b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/CpPackComparator.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/CpPackFamily.java b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/CpPackFamily.java index 19008cd..b1d4d5b 100644 --- a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/CpPackFamily.java +++ b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/CpPackFamily.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/CpPackFilter.java b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/CpPackFilter.java index 19c7cb2..7f03943 100644 --- a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/CpPackFilter.java +++ b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/CpPackFilter.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/CpPackIdComparator.java b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/CpPackIdComparator.java index da570fe..2d8a7e5 100644 --- a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/CpPackIdComparator.java +++ b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/CpPackIdComparator.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/CpRootItem.java b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/CpRootItem.java index 584fe5f..a782e5e 100644 --- a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/CpRootItem.java +++ b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/CpRootItem.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/CpSequence.java b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/CpSequence.java index fb1bd1e..0824044 100644 --- a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/CpSequence.java +++ b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/CpSequence.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/CpSequenceControl.java b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/CpSequenceControl.java index 6af279b..d1406ab 100644 --- a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/CpSequenceControl.java +++ b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/CpSequenceControl.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/CpTaxonomy.java b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/CpTaxonomy.java index eb2bc02..686a0a3 100644 --- a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/CpTaxonomy.java +++ b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/CpTaxonomy.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/CpTaxonomyContainer.java b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/CpTaxonomyContainer.java index 6160479..3cacf30 100644 --- a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/CpTaxonomyContainer.java +++ b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/CpTaxonomyContainer.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/CpTrace.java b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/CpTrace.java index 087ab10..7967a3f 100644 --- a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/CpTrace.java +++ b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/CpTrace.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/IAllDeviceNames.java b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/IAllDeviceNames.java index 373851f..f933715 100644 --- a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/IAllDeviceNames.java +++ b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/IAllDeviceNames.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/ICpAlgorithm.java b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/ICpAlgorithm.java index a4bf065..558ad82 100644 --- a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/ICpAlgorithm.java +++ b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/ICpAlgorithm.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/ICpBoard.java b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/ICpBoard.java index 20134de..d40e061 100644 --- a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/ICpBoard.java +++ b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/ICpBoard.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/ICpCodeTemplate.java b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/ICpCodeTemplate.java index eb9db5a..c1773e6 100644 --- a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/ICpCodeTemplate.java +++ b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/ICpCodeTemplate.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/ICpComponent.java b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/ICpComponent.java index 80b6971..b6e79ae 100644 --- a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/ICpComponent.java +++ b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/ICpComponent.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/ICpCondition.java b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/ICpCondition.java index 92476f9..046855d 100644 --- a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/ICpCondition.java +++ b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/ICpCondition.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/ICpConditionContext.java b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/ICpConditionContext.java index af93593..5a2734b 100644 --- a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/ICpConditionContext.java +++ b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/ICpConditionContext.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/ICpDataPatch.java b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/ICpDataPatch.java index 755ec97..2dd0ffa 100644 --- a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/ICpDataPatch.java +++ b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/ICpDataPatch.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/ICpDebug.java b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/ICpDebug.java index fa90136..4da91ac 100644 --- a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/ICpDebug.java +++ b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/ICpDebug.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/ICpDebugConfiguration.java b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/ICpDebugConfiguration.java index 0982fc8..a0c88ad 100644 --- a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/ICpDebugConfiguration.java +++ b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/ICpDebugConfiguration.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/ICpDebugPort.java b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/ICpDebugPort.java index 5f06895..eeec9b8 100644 --- a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/ICpDebugPort.java +++ b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/ICpDebugPort.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/ICpDebugProtocol.java b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/ICpDebugProtocol.java index c3513e1..22614bf 100644 --- a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/ICpDebugProtocol.java +++ b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/ICpDebugProtocol.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/ICpDebugVars.java b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/ICpDebugVars.java index 81c51d4..6cc465e 100644 --- a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/ICpDebugVars.java +++ b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/ICpDebugVars.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/ICpDeviceItem.java b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/ICpDeviceItem.java index e76c8da..d35e3eb 100644 --- a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/ICpDeviceItem.java +++ b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/ICpDeviceItem.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/ICpDeviceProperty.java b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/ICpDeviceProperty.java index 984218c..b4372be 100644 --- a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/ICpDeviceProperty.java +++ b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/ICpDeviceProperty.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/ICpExample.java b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/ICpExample.java index 8913c00..422caab 100644 --- a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/ICpExample.java +++ b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/ICpExample.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/ICpExpression.java b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/ICpExpression.java index 3334645..2bf03f8 100644 --- a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/ICpExpression.java +++ b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/ICpExpression.java @@ -1,9 +1,11 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd and others. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation diff --git a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/ICpFile.java b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/ICpFile.java index 6501598..8ae32e8 100644 --- a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/ICpFile.java +++ b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/ICpFile.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/ICpGenerator.java b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/ICpGenerator.java index 68fbaa4..a4cf1d6 100644 --- a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/ICpGenerator.java +++ b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/ICpGenerator.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/ICpItem.java b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/ICpItem.java index 5b25a6a..920178c 100644 --- a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/ICpItem.java +++ b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/ICpItem.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/ICpItemFactory.java b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/ICpItemFactory.java index d58575f..d29806f 100644 --- a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/ICpItemFactory.java +++ b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/ICpItemFactory.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/ICpMemory.java b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/ICpMemory.java index bdb31ae..e15be8b 100644 --- a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/ICpMemory.java +++ b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/ICpMemory.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/ICpPack.java b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/ICpPack.java index 03f9d99..166c67a 100644 --- a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/ICpPack.java +++ b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/ICpPack.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/ICpPackCollection.java b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/ICpPackCollection.java index 9852139..de5db29 100644 --- a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/ICpPackCollection.java +++ b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/ICpPackCollection.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/ICpPackFamily.java b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/ICpPackFamily.java index b8c9b8c..828970b 100644 --- a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/ICpPackFamily.java +++ b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/ICpPackFamily.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/ICpPackFilter.java b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/ICpPackFilter.java index 17f8778..6fe9d73 100644 --- a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/ICpPackFilter.java +++ b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/ICpPackFilter.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/ICpPackGroup.java b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/ICpPackGroup.java index 88f1713..faac4f2 100644 --- a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/ICpPackGroup.java +++ b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/ICpPackGroup.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/ICpRootItem.java b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/ICpRootItem.java index 7edd069..fd0ec19 100644 --- a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/ICpRootItem.java +++ b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/ICpRootItem.java @@ -3,9 +3,11 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation diff --git a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/ICpSequence.java b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/ICpSequence.java index d7192b1..42960bb 100644 --- a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/ICpSequence.java +++ b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/ICpSequence.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/ICpSequenceControl.java b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/ICpSequenceControl.java index 7a0dbd8..5570706 100644 --- a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/ICpSequenceControl.java +++ b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/ICpSequenceControl.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/ICpStringExpander.java b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/ICpStringExpander.java index 81f6656..db02c00 100644 --- a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/ICpStringExpander.java +++ b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/ICpStringExpander.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/ICpTaxonomy.java b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/ICpTaxonomy.java index ff4639d..322a6cb 100644 --- a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/ICpTaxonomy.java +++ b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/ICpTaxonomy.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/ICpTrace.java b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/ICpTrace.java index 62d41a8..020fcb3 100644 --- a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/ICpTrace.java +++ b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/ICpTrace.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/MemoryOffsetComparator.java b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/MemoryOffsetComparator.java index da911eb..ff535d2 100644 --- a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/MemoryOffsetComparator.java +++ b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/MemoryOffsetComparator.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/MemorySizeComparator.java b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/MemorySizeComparator.java index 23130e6..8681250 100644 --- a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/MemorySizeComparator.java +++ b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/MemorySizeComparator.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/MemoryStartComparator.java b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/MemoryStartComparator.java index f6d7734..0d777df 100644 --- a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/MemoryStartComparator.java +++ b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/data/MemoryStartComparator.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/dsq/DsqCommand.java b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/dsq/DsqCommand.java index c280067..74bf6d3 100644 --- a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/dsq/DsqCommand.java +++ b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/dsq/DsqCommand.java @@ -1,9 +1,11 @@ /** * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation diff --git a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/dsq/DsqContext.java b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/dsq/DsqContext.java index 7286c32..68f2887 100644 --- a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/dsq/DsqContext.java +++ b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/dsq/DsqContext.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/dsq/DsqException.java b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/dsq/DsqException.java index 5195565..c636c9c 100644 --- a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/dsq/DsqException.java +++ b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/dsq/DsqException.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/dsq/DsqSequence.java b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/dsq/DsqSequence.java index d9d6c90..8ec03d4 100644 --- a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/dsq/DsqSequence.java +++ b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/dsq/DsqSequence.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/dsq/IDsqApiVersion.java b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/dsq/IDsqApiVersion.java index df15909..b4bddda 100644 --- a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/dsq/IDsqApiVersion.java +++ b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/dsq/IDsqApiVersion.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/dsq/IDsqClient.java b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/dsq/IDsqClient.java index 6d955cf..c03e8ed 100644 --- a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/dsq/IDsqClient.java +++ b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/dsq/IDsqClient.java @@ -1,9 +1,11 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation diff --git a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/dsq/IDsqCommand.java b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/dsq/IDsqCommand.java index b785d46..77d5123 100644 --- a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/dsq/IDsqCommand.java +++ b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/dsq/IDsqCommand.java @@ -1,9 +1,11 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation diff --git a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/dsq/IDsqContext.java b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/dsq/IDsqContext.java index fbe35b2..046e5a2 100644 --- a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/dsq/IDsqContext.java +++ b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/dsq/IDsqContext.java @@ -1,9 +1,11 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation diff --git a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/dsq/IDsqEngine.java b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/dsq/IDsqEngine.java index 823c385..52f06ec 100644 --- a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/dsq/IDsqEngine.java +++ b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/dsq/IDsqEngine.java @@ -1,9 +1,11 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation diff --git a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/dsq/IDsqEngineFactory.java b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/dsq/IDsqEngineFactory.java index 2262f44..d0911cf 100644 --- a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/dsq/IDsqEngineFactory.java +++ b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/dsq/IDsqEngineFactory.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/dsq/IDsqGeneratorInfo.java b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/dsq/IDsqGeneratorInfo.java index e27b302..789a2f8 100644 --- a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/dsq/IDsqGeneratorInfo.java +++ b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/dsq/IDsqGeneratorInfo.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/dsq/IDsqLogger.java b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/dsq/IDsqLogger.java index b091728..dad1fcc 100644 --- a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/dsq/IDsqLogger.java +++ b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/dsq/IDsqLogger.java @@ -1,9 +1,11 @@ /** * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation */ diff --git a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/dsq/IDsqSequence.java b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/dsq/IDsqSequence.java index 67a2a77..638b21a 100644 --- a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/dsq/IDsqSequence.java +++ b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/dsq/IDsqSequence.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/events/IRteController.java b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/events/IRteController.java index 4d4c5be..8a5e383 100644 --- a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/events/IRteController.java +++ b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/events/IRteController.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/events/IRteEventListener.java b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/events/IRteEventListener.java index 2d7dd90..3d25525 100644 --- a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/events/IRteEventListener.java +++ b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/events/IRteEventListener.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/events/IRteEventProxy.java b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/events/IRteEventProxy.java index 108a74c..5858395 100644 --- a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/events/IRteEventProxy.java +++ b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/events/IRteEventProxy.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/events/RteEvent.java b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/events/RteEvent.java index 3340b87..3a69b41 100644 --- a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/events/RteEvent.java +++ b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/events/RteEvent.java @@ -1,9 +1,11 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation diff --git a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/events/RteEventListener.java b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/events/RteEventListener.java index 61b6ef2..672e804 100644 --- a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/events/RteEventListener.java +++ b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/events/RteEventListener.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/events/RteEventProxy.java b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/events/RteEventProxy.java index a6531fd..7e01b5b 100644 --- a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/events/RteEventProxy.java +++ b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/events/RteEventProxy.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/info/CpBoardInfo.java b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/info/CpBoardInfo.java index 6e6c468..62731c3 100644 --- a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/info/CpBoardInfo.java +++ b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/info/CpBoardInfo.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/info/CpComponentInfo.java b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/info/CpComponentInfo.java index bf64ac2..e67adcd 100644 --- a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/info/CpComponentInfo.java +++ b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/info/CpComponentInfo.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ @@ -20,6 +22,8 @@ import com.arm.cmsis.pack.data.ICpItem; import com.arm.cmsis.pack.data.ICpPack; import com.arm.cmsis.pack.enums.EEvaluationResult; +import com.arm.cmsis.pack.enums.EVersionMatchMode; +import com.arm.cmsis.pack.utils.Utils; /** * Default implementation of ICpComponentInfo interface @@ -234,4 +238,46 @@ public String getWorkingDir() { return gpdscItem.getAttribute(CmsisConstants.WORKING_DIR_TAG); } -} + @Override + public void setAttributesFromComponentId(String componentId) { + String cVersion = Utils.getSuffix(componentId, CmsisConstants.AT); + String cVendor = Utils.getPrefix(componentId, CmsisConstants.DOUBLE_COLON); + + String componentName = componentId; + if (cVersion != null) { + setAttribute(CmsisConstants.CVERSION, cVersion); + setVersionMatchMode(EVersionMatchMode.FIXED); + componentName = Utils.getPrefix(componentName, CmsisConstants.AT); + } + if (cVendor != null) { + setAttribute(CmsisConstants.CVENDOR, cVendor); + componentName = Utils.getSuffix(componentName, CmsisConstants.DOUBLE_COLON); + } + String[] componentSplitted = componentName.split(CmsisConstants.COLON); + + for (String component : componentSplitted) { + if (getAttribute(CmsisConstants.CCLASS).isEmpty()) { + if (component.contains(CmsisConstants.AND)) { + setAttribute(CmsisConstants.CCLASS, Utils.getPrefix(component, CmsisConstants.AND)); + setAttribute(CmsisConstants.CBUNDLE, Utils.getSuffix(component, CmsisConstants.AND)); + } else { + setAttribute(CmsisConstants.CCLASS, component); + } + } else if (getAttribute(CmsisConstants.CGROUP).isEmpty()) { + if (component.contains(CmsisConstants.AND)) { + setAttribute(CmsisConstants.CGROUP, Utils.getPrefix(component, CmsisConstants.AND)); + setAttribute(CmsisConstants.CVARIANT, Utils.getSuffix(component, CmsisConstants.AND)); + } else { + setAttribute(CmsisConstants.CGROUP, component); + } + } else if (getAttribute(CmsisConstants.CSUB).isEmpty()) { + if (component.contains(CmsisConstants.AND)) { + setAttribute(CmsisConstants.CSUB, Utils.getPrefix(component, CmsisConstants.AND)); + setAttribute(CmsisConstants.CVARIANT, Utils.getSuffix(component, CmsisConstants.AND)); + } else { + setAttribute(CmsisConstants.CSUB, component); + } + } + } + } +} \ No newline at end of file diff --git a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/info/CpConfigurationInfo.java b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/info/CpConfigurationInfo.java index 3367a86..f3db73b 100644 --- a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/info/CpConfigurationInfo.java +++ b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/info/CpConfigurationInfo.java @@ -1,9 +1,11 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation diff --git a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/info/CpDebugVarsInfo.java b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/info/CpDebugVarsInfo.java index a2bcc44..3ed31e0 100644 --- a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/info/CpDebugVarsInfo.java +++ b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/info/CpDebugVarsInfo.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/info/CpDeviceInfo.java b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/info/CpDeviceInfo.java index 977915f..e197c94 100644 --- a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/info/CpDeviceInfo.java +++ b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/info/CpDeviceInfo.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/info/CpFileInfo.java b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/info/CpFileInfo.java index 82427fd..2e2beea 100644 --- a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/info/CpFileInfo.java +++ b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/info/CpFileInfo.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/info/CpItemInfo.java b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/info/CpItemInfo.java index d1dfabe..d954e34 100644 --- a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/info/CpItemInfo.java +++ b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/info/CpItemInfo.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/info/CpPackFilterInfo.java b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/info/CpPackFilterInfo.java index 6f3e866..d65f775 100644 --- a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/info/CpPackFilterInfo.java +++ b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/info/CpPackFilterInfo.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/info/CpPackInfo.java b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/info/CpPackInfo.java index 1a628a4..43c35db 100644 --- a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/info/CpPackInfo.java +++ b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/info/CpPackInfo.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/info/ICpBoardInfo.java b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/info/ICpBoardInfo.java index 6564f4e..86210a2 100644 --- a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/info/ICpBoardInfo.java +++ b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/info/ICpBoardInfo.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/info/ICpComponentInfo.java b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/info/ICpComponentInfo.java index 97de533..a3503ed 100644 --- a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/info/ICpComponentInfo.java +++ b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/info/ICpComponentInfo.java @@ -1,9 +1,11 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd and others. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation @@ -73,4 +75,12 @@ public interface ICpComponentInfo extends ICpComponent, ICpItemInfo, IEvaluation * @return working directory attribute or null */ String getWorkingDir(); + + /** + * Sets attributes of a ICpComponentInfo based on the attributes present in the + * component ID + * + * @return ICpComponentInfo with attributes + */ + void setAttributesFromComponentId(String componentId); } diff --git a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/info/ICpConfigurationInfo.java b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/info/ICpConfigurationInfo.java index b829123..30ca757 100644 --- a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/info/ICpConfigurationInfo.java +++ b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/info/ICpConfigurationInfo.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/info/ICpDeviceInfo.java b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/info/ICpDeviceInfo.java index d332985..1405e4f 100644 --- a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/info/ICpDeviceInfo.java +++ b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/info/ICpDeviceInfo.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/info/ICpFileInfo.java b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/info/ICpFileInfo.java index b3d3e7c..f9d36f8 100644 --- a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/info/ICpFileInfo.java +++ b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/info/ICpFileInfo.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/info/ICpItemInfo.java b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/info/ICpItemInfo.java index 13d3941..54feee9 100644 --- a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/info/ICpItemInfo.java +++ b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/info/ICpItemInfo.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/info/ICpPackFilterInfo.java b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/info/ICpPackFilterInfo.java index d62e062..ddea1a6 100644 --- a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/info/ICpPackFilterInfo.java +++ b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/info/ICpPackFilterInfo.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/info/ICpPackInfo.java b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/info/ICpPackInfo.java index b2fda81..fbd2c6b 100644 --- a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/info/ICpPackInfo.java +++ b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/info/ICpPackInfo.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/parser/CpConfigParser.java b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/parser/CpConfigParser.java index b873098..cf7965b 100644 --- a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/parser/CpConfigParser.java +++ b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/parser/CpConfigParser.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ @@ -42,7 +44,7 @@ public ICpItem createItem(ICpItem parent, String tag) { @Override public ICpItem createRootItem(String tag) { - return new CpConfigurationInfo(tag, xmlFile); + return new CpConfigurationInfo(tag, file); } @Override diff --git a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/parser/CpParser.java b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/parser/CpParser.java new file mode 100644 index 0000000..3c67d35 --- /dev/null +++ b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/parser/CpParser.java @@ -0,0 +1,44 @@ +/******************************************************************************* +* Copyright (c) 2023 ARM Ltd. and others +* All rights reserved. This program and the accompanying materials +* are made available under the terms of the Eclipse Public License 2.0 +* which accompanies this distribution, and is available at + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * +* Contributors: +* ARM Ltd and ARM Germany GmbH - Initial API and implementation +*******************************************************************************/ + +package com.arm.cmsis.pack.parser; + +import com.arm.cmsis.pack.data.CpRootItem; +import com.arm.cmsis.pack.data.ICpItem; +import com.arm.cmsis.pack.error.CmsisErrorCollection; + +/** + * + */ +public abstract class CpParser extends CmsisErrorCollection implements ICpParser { + + protected ICpItem rootItem = null; // represents top-level item being constructed + protected String file = null; // current file + + @Override + public ICpItem createItem(ICpItem parent, String tag) { + if (parent != null) { + return parent.createItem(parent, tag); + } + if (rootItem == null) { + rootItem = createRootItem(tag); + } + return rootItem; + } + + @Override + public ICpItem createRootItem(String tag) { + return new CpRootItem(tag, file); + } + +} diff --git a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/parser/CpPidxParser.java b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/parser/CpPidxParser.java index a85e102..ae682d5 100644 --- a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/parser/CpPidxParser.java +++ b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/parser/CpPidxParser.java @@ -1,9 +1,11 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation diff --git a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/parser/CpXmlParser.java b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/parser/CpXmlParser.java index fc03473..da6a263 100644 --- a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/parser/CpXmlParser.java +++ b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/parser/CpXmlParser.java @@ -1,9 +1,11 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation @@ -55,20 +57,17 @@ import com.arm.cmsis.pack.data.ICpRootItem; import com.arm.cmsis.pack.enums.ESeverity; import com.arm.cmsis.pack.error.CmsisError; -import com.arm.cmsis.pack.error.CmsisErrorCollection; /** * Base class to parse CMSIS-Pack-related files */ -public class CpXmlParser extends CmsisErrorCollection implements ICpXmlParser, ErrorHandler { +public class CpXmlParser extends CpParser implements ICpXmlParser, ErrorHandler { public static final String SCHEMAVERSION = "schemaVersion"; //$NON-NLS-1$ public static final String SCHEMAINSTANCE = "http://www.w3.org/2001/XMLSchema-instance"; //$NON-NLS-1$ public static final String SCHEMALOCATION = "xs:noNamespaceSchemaLocation"; //$NON-NLS-1$ public static final String DATETIMEFORMAT = "yyyy-MM-dd'T'HH:mm:ss"; //$NON-NLS-1$ - protected ICpItem rootItem = null; // represents top-level item being constructed - protected String xmlFile = null; // current XML file protected String xmlString = null; // current XML string protected String xsdFile = null; // schema file with absolute path @@ -90,7 +89,7 @@ public CpXmlParser(String xsdFile) { public void clear() { if (!bExplicitRoot) rootItem = null; - xmlFile = null; + file = null; xmlString = null; clearErrors(); if (docBuilder != null) { @@ -117,7 +116,7 @@ public void setXsdFile(String xsdFile) { * @return the xmlFile */ public String getXmlFile() { - return xmlFile; + return file; } @Override @@ -159,17 +158,6 @@ protected boolean isItemIgnored(ICpItem item) { return isTagIgnored(item.getTag()); } - @Override - public ICpItem createItem(ICpItem parent, String tag) { - if (parent != null) { - return parent.createItem(parent, tag); - } - if (rootItem == null) { - rootItem = createRootItem(tag); - } - return rootItem; - } - // from ErrorHandler @Override public void error(SAXParseException arg0) throws SAXException { @@ -189,7 +177,7 @@ public void warning(SAXParseException arg0) throws SAXException { } protected void addError(SAXParseException e, String id, ESeverity severity) { - CmsisError err = new CpXmlParserError(xmlFile, id, severity, null, e); + CmsisError err = new CpXmlParserError(file, id, severity, null, e); addError(err); } @@ -245,7 +233,7 @@ public ICpItem parseXmlString(String xml) { InputSource is = new InputSource(sr); domDoc = docBuilder.parse(is); } catch (SAXException | IOException e) { - CmsisError err = new CpXmlParserError(xmlFile, CpXmlParserError.X402, ESeverity.Error, "Error parsing file", //$NON-NLS-1$ + CmsisError err = new CpXmlParserError(file, CpXmlParserError.X402, ESeverity.Error, "Error parsing file", //$NON-NLS-1$ e); addError(err); } @@ -269,17 +257,17 @@ public ICpItem parseXmlString(String xml) { @Override public ICpItem parseFile(String file) { clear(); - this.xmlFile = file; + this.file = file; if (!init()) { return null; } Document domDoc = null; - try (InputStream sr = new FileInputStream(xmlFile);) { + try (InputStream sr = new FileInputStream(file);) { domDoc = docBuilder.parse(sr); } catch (SAXException | IOException e) { - CmsisError err = new CpXmlParserError(xmlFile, CpXmlParserError.X402, ESeverity.Error, "Error parsing file", //$NON-NLS-1$ + CmsisError err = new CpXmlParserError(file, CpXmlParserError.X402, ESeverity.Error, "Error parsing file", //$NON-NLS-1$ e); addError(err); } @@ -457,7 +445,7 @@ public boolean writeToXmlFile(ICpItem root, String file) { if (xml == null) { return false; } - this.xmlFile = file; + this.file = file; File outputFile = new File(file); try (FileWriter fw = new FileWriter(outputFile);) { @@ -480,7 +468,7 @@ public boolean writeToXmlFile(ICpItem root, String file) { public String writeToXmlString(ICpItem root) { String xml = null; clear(); - this.xmlFile = null; + this.file = null; if (!init()) { return xml; } @@ -599,4 +587,19 @@ public static boolean saveXmlToFile(String xml, String absFileName) { return true; } + @Override + public ICpItem parseString(String input) { + return this.parseXmlString(input); + } + + @Override + public boolean writeToFile(ICpItem root, String filePath) { + return this.writeToXmlFile(root, filePath); + } + + @Override + public String writeToString(ICpItem root) { + return this.writeToXmlString(root); + } + } diff --git a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/parser/CpXmlParserError.java b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/parser/CpXmlParserError.java index 42d93cf..549151e 100644 --- a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/parser/CpXmlParserError.java +++ b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/parser/CpXmlParserError.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/parser/CpYmlParserError.java b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/parser/CpYmlParserError.java new file mode 100644 index 0000000..de50c9e --- /dev/null +++ b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/parser/CpYmlParserError.java @@ -0,0 +1,33 @@ +/******************************************************************************* +* Copyright (c) 2023 ARM Ltd. and others +* All rights reserved. This program and the accompanying materials +* are made available under the terms of the Eclipse Public License 2.0 +* which accompanies this distribution, and is available at + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * +* Contributors: +* ARM Ltd and ARM Germany GmbH - Initial API and implementation +*******************************************************************************/ + +package com.arm.cmsis.pack.parser; + +import com.arm.cmsis.pack.enums.ESeverity; +import com.arm.cmsis.pack.error.CmsisError; + +/** + * + */ +public class CpYmlParserError extends CmsisError { + + private static final long serialVersionUID = 1L; + + public static final String Y401 = "Y401"; // Error //$NON-NLS-1$ + public static final String Y402 = "Y402"; //$NON-NLS-1$ + public static final String Y403 = "Y403"; //$NON-NLS-1$ + + public CpYmlParserError(String file, String id, ESeverity severity, String message, Throwable e) { + super(e, severity, id, message); + } +} diff --git a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/parser/ICpParser.java b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/parser/ICpParser.java new file mode 100644 index 0000000..4f1920e --- /dev/null +++ b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/parser/ICpParser.java @@ -0,0 +1,82 @@ +/******************************************************************************* +* Copyright (c) 2023 ARM Ltd. and others +* All rights reserved. This program and the accompanying materials +* are made available under the terms of the Eclipse Public License 2.0 +* which accompanies this distribution, and is available at + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * +* Contributors: +* ARM Ltd and ARM Germany GmbH - Initial API and implementation +*******************************************************************************/ + +package com.arm.cmsis.pack.parser; + +import com.arm.cmsis.pack.data.CpItem; +import com.arm.cmsis.pack.data.ICpItem; +import com.arm.cmsis.pack.data.ICpItemFactory; +import com.arm.cmsis.pack.error.ICmsisErrorCollection; + +/** + * An abstract format free parser interface + */ +public interface ICpParser extends ICpItemFactory, ICmsisErrorCollection { + + /** + * Initializes the parser + * + * @return true if successful + */ + boolean init(); + + /** + * Clears internal data, error strings and resets builder + */ + void clear(); + + /** + * Factory method to create ICpItem-derived root instance + * + * @param tag tag for the item + * @return created ICpItem + */ + default ICpItem createRootItem(String tag) { + return new CpItem(null, tag); + } + + /** + * Parses supplied file + * + * @param filePath path of file to parse + * @return root ICpItem object + */ + ICpItem parseFile(String filePath); + + /** + * Parses supplied string in appropriate format + * + * @param input string to parse + * @return root ICpItem object + */ + ICpItem parseString(String input); + + /** + * Generates text out of ICpItem and saves it to a file in the appropriate + * format + * + * @param root ICpItem to save + * @param filePath path to file where the generated output should be saved + * @return true if successful + */ + boolean writeToFile(ICpItem root, String filePath); + + /** + * Generates text out of ICpItem and returns it as a string + * + * @param root ICpItem to write + * @return generate text if successful, null otherwise + */ + String writeToString(ICpItem root); + +} diff --git a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/parser/ICpXmlParser.java b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/parser/ICpXmlParser.java index 4bde7ea..65ab4e6 100644 --- a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/parser/ICpXmlParser.java +++ b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/parser/ICpXmlParser.java @@ -1,9 +1,11 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation @@ -15,27 +17,12 @@ import java.util.HashSet; import java.util.Set; -import com.arm.cmsis.pack.data.CpItem; import com.arm.cmsis.pack.data.ICpItem; -import com.arm.cmsis.pack.data.ICpItemFactory; -import com.arm.cmsis.pack.error.ICmsisErrorCollection; /** * Interface to CMSIS-Pack description file (*.pdsc) parser */ -public interface ICpXmlParser extends ICpItemFactory, ICmsisErrorCollection { - - /** - * Initializes the parser - * - * @return true if successful - */ - boolean init(); - - /** - * Clears internal data, error strings and resets builder - */ - void clear(); +public interface ICpXmlParser extends ICpParser { /** * Sets schema file to use by the parser @@ -88,24 +75,6 @@ default void setIgnoreTagsFromArray(String[] ignoreTags) { */ String adjustAttributeValue(String key, String value); - /** - * Factory method to create ICpItem-derived root instance - * - * @param tag XML tag for the item - * @return created ICpItem - */ - default ICpItem createRootItem(String tag) { - return new CpItem(null, tag); - } - - /** - * Parses supplied XML file - * - * @param file XML file to parse - * @return root ICpItem object - */ - ICpItem parseFile(String file); - /** * Parses supplied string in XML format * diff --git a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/parser/PdscParser.java b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/parser/PdscParser.java index 8239f48..f524a7b 100644 --- a/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/parser/PdscParser.java +++ b/com.arm.cmsis.pack.data/src/com/arm/cmsis/pack/parser/PdscParser.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ @@ -28,6 +30,6 @@ public PdscParser(String xsdFile) { @Override public ICpItem createRootItem(String tag) { - return new CpPack(tag, xmlFile); + return new CpPack(tag, file); } } diff --git a/com.arm.cmsis.pack.feature/feature.properties b/com.arm.cmsis.pack.feature/feature.properties index 35b718e..9d8e60c 100644 --- a/com.arm.cmsis.pack.feature/feature.properties +++ b/com.arm.cmsis.pack.feature/feature.properties @@ -1,10 +1,13 @@ featureName=CMSIS-Pack Eclipse plug-ins providerName=ARM Limited description=Eclipse plug-ins for CMSIS-Pack support -copyright=Copyright (c) 2015-2023 ARM Limited. and others \n\ -Licensed under Eclipse Public License v1.0 +copyright=Copyright (c) 2015-2024 ARM Limited. and others \n\ +Licensed under Eclipse Public License 2.0 \n\ +SPDX-License-Identifier: EPL-2.0 license=This program and the accompanying materials are made\n\ -available under the terms of the Eclipse Public License v1.0\n\ +available under the terms of the Eclipse Public License 2.0\n\ which accompanies this distribution. The complete license text\n\ -is here http://www.eclipse.org/legal/epl-v10.html\n\n\ -licenseURL=http://www.eclipse.org/legal/epl-v10.html +is here https://www.eclipse.org/legal/epl-2.0/\n\\n +SPDX-License-Identifier: EPL-2.0\n +licenseURL=https://www.eclipse.org/legal/epl-2.0/ + diff --git a/com.arm.cmsis.pack.feature/feature.xml b/com.arm.cmsis.pack.feature/feature.xml index 43cec0e..2399576 100644 --- a/com.arm.cmsis.pack.feature/feature.xml +++ b/com.arm.cmsis.pack.feature/feature.xml @@ -2,7 +2,7 @@ @@ -142,4 +142,11 @@ install-size="0" version="0.0.0"/> + + diff --git a/com.arm.cmsis.pack.feature/pom.xml b/com.arm.cmsis.pack.feature/pom.xml index 5d27642..7a05f4e 100644 --- a/com.arm.cmsis.pack.feature/pom.xml +++ b/com.arm.cmsis.pack.feature/pom.xml @@ -5,7 +5,7 @@ com.arm.cmsis com.arm.cmsis.parent.sign - 2.9.0-SNAPSHOT + 2.10.0-SNAPSHOT ../com.arm.cmsis.parent.sign diff --git a/com.arm.cmsis.pack.feature/sourceTemplateFeature/feature.properties b/com.arm.cmsis.pack.feature/sourceTemplateFeature/feature.properties index 51047a4..9bc2014 100644 --- a/com.arm.cmsis.pack.feature/sourceTemplateFeature/feature.properties +++ b/com.arm.cmsis.pack.feature/sourceTemplateFeature/feature.properties @@ -2,9 +2,9 @@ featureName=CMSIS-Pack Eclipse plug-ins (source code) providerName=ARM Limited description=Source code for CMSIS-Pack Eclipse plug-ins copyright=Copyright (c) 2015-2022 ARM Limited. and others \n\ -Licensed under Eclipse Public License v1.0 +Licensed under Eclipse Public License 2.0 license=This program and the accompanying materials\n\ -are made available under the terms of the Eclipse Public License v1.0\n\ +are made available under the terms of the Eclipse Public License 2.0\n\ which accompanies this distribution, and is available at\n\ -http://www.eclipse.org/legal/epl-v10.html -licenseURL=http://www.eclipse.org/legal/epl-v10.html +https://www.eclipse.org/legal/epl-2.0/ +licenseURL=https://www.eclipse.org/legal/epl-2.0/ diff --git a/com.arm.cmsis.pack.installer.ui/.classpath b/com.arm.cmsis.pack.installer.ui/.classpath index f656d57..e6d0a3c 100644 --- a/com.arm.cmsis.pack.installer.ui/.classpath +++ b/com.arm.cmsis.pack.installer.ui/.classpath @@ -1,7 +1,21 @@ - + + + + + - + + + + + + + + + + + diff --git a/com.arm.cmsis.pack.installer.ui/META-INF/MANIFEST.MF b/com.arm.cmsis.pack.installer.ui/META-INF/MANIFEST.MF index ccf18cc..9a237fe 100644 --- a/com.arm.cmsis.pack.installer.ui/META-INF/MANIFEST.MF +++ b/com.arm.cmsis.pack.installer.ui/META-INF/MANIFEST.MF @@ -1,9 +1,9 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: CMSIS-Pack Installer UI -Bundle-SymbolicName: com.arm.cmsis.pack.installer.ui;singleton:=true -Automatic-Module-Name: com.arm.cmsis.pack.installer.ui -Bundle-Version: 2.9.0.qualifier +Bundle-SymbolicName: com.arm.cmsis.pack.installer.ui;singleton:=true +Automatic-Module-Name: com.arm.cmsis.pack.installer.ui +Bundle-Version: 2.10.0.qualifier Bundle-Activator: com.arm.cmsis.pack.installer.ui.CpInstallerPlugInUI Bundle-Vendor: Arm Limited Require-Bundle: org.eclipse.ui, diff --git a/com.arm.cmsis.pack.installer.ui/plugin.xml b/com.arm.cmsis.pack.installer.ui/plugin.xml index 6f51790..f5e96d8 100644 --- a/com.arm.cmsis.pack.installer.ui/plugin.xml +++ b/com.arm.cmsis.pack.installer.ui/plugin.xml @@ -1,6 +1,5 @@ - diff --git a/com.arm.cmsis.pack.installer.ui/pom.xml b/com.arm.cmsis.pack.installer.ui/pom.xml index 3c64867..654ce44 100644 --- a/com.arm.cmsis.pack.installer.ui/pom.xml +++ b/com.arm.cmsis.pack.installer.ui/pom.xml @@ -5,7 +5,7 @@ com.arm.cmsis com.arm.cmsis.parent.sign - 2.9.0-SNAPSHOT + 2.10.0-SNAPSHOT ../com.arm.cmsis.parent.sign \ No newline at end of file diff --git a/com.arm.cmsis.pack.installer.ui/src/com/arm/cmsis/pack/installer/ui/CpInstallerPlugInUI.java b/com.arm.cmsis.pack.installer.ui/src/com/arm/cmsis/pack/installer/ui/CpInstallerPlugInUI.java index acb84a0..0684781 100644 --- a/com.arm.cmsis.pack.installer.ui/src/com/arm/cmsis/pack/installer/ui/CpInstallerPlugInUI.java +++ b/com.arm.cmsis.pack.installer.ui/src/com/arm/cmsis/pack/installer/ui/CpInstallerPlugInUI.java @@ -1,9 +1,11 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Eclipse Project - generation from template diff --git a/com.arm.cmsis.pack.installer.ui/src/com/arm/cmsis/pack/installer/ui/IHelpContextIds.java b/com.arm.cmsis.pack.installer.ui/src/com/arm/cmsis/pack/installer/ui/IHelpContextIds.java index d3fe988..bceb831 100644 --- a/com.arm.cmsis.pack.installer.ui/src/com/arm/cmsis/pack/installer/ui/IHelpContextIds.java +++ b/com.arm.cmsis.pack.installer.ui/src/com/arm/cmsis/pack/installer/ui/IHelpContextIds.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack.installer.ui/src/com/arm/cmsis/pack/installer/ui/Messages.java b/com.arm.cmsis.pack.installer.ui/src/com/arm/cmsis/pack/installer/ui/Messages.java index 4c01de4..4bbf693 100644 --- a/com.arm.cmsis.pack.installer.ui/src/com/arm/cmsis/pack/installer/ui/Messages.java +++ b/com.arm.cmsis.pack.installer.ui/src/com/arm/cmsis/pack/installer/ui/Messages.java @@ -1,9 +1,11 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation diff --git a/com.arm.cmsis.pack.installer.ui/src/com/arm/cmsis/pack/installer/ui/PackInstallerViewController.java b/com.arm.cmsis.pack.installer.ui/src/com/arm/cmsis/pack/installer/ui/PackInstallerViewController.java index 853162b..4fa58c0 100644 --- a/com.arm.cmsis.pack.installer.ui/src/com/arm/cmsis/pack/installer/ui/PackInstallerViewController.java +++ b/com.arm.cmsis.pack.installer.ui/src/com/arm/cmsis/pack/installer/ui/PackInstallerViewController.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack.installer.ui/src/com/arm/cmsis/pack/installer/ui/PackInstallerViewFilter.java b/com.arm.cmsis.pack.installer.ui/src/com/arm/cmsis/pack/installer/ui/PackInstallerViewFilter.java index 9e371b4..e8bc81d 100644 --- a/com.arm.cmsis.pack.installer.ui/src/com/arm/cmsis/pack/installer/ui/PackInstallerViewFilter.java +++ b/com.arm.cmsis.pack.installer.ui/src/com/arm/cmsis/pack/installer/ui/PackInstallerViewFilter.java @@ -1,9 +1,11 @@ /******************************************************************************* * Copyright (c) 2022 ARM Ltd. and others * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation diff --git a/com.arm.cmsis.pack.installer.ui/src/com/arm/cmsis/pack/installer/ui/handlers/ImportFolderPacksHandler.java b/com.arm.cmsis.pack.installer.ui/src/com/arm/cmsis/pack/installer/ui/handlers/ImportFolderPacksHandler.java index 366e2aa..d6661a5 100644 --- a/com.arm.cmsis.pack.installer.ui/src/com/arm/cmsis/pack/installer/ui/handlers/ImportFolderPacksHandler.java +++ b/com.arm.cmsis.pack.installer.ui/src/com/arm/cmsis/pack/installer/ui/handlers/ImportFolderPacksHandler.java @@ -1,9 +1,11 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Eclipse Project - generation from template diff --git a/com.arm.cmsis.pack.installer.ui/src/com/arm/cmsis/pack/installer/ui/handlers/ImportPacksHandler.java b/com.arm.cmsis.pack.installer.ui/src/com/arm/cmsis/pack/installer/ui/handlers/ImportPacksHandler.java index 029afc2..5d3b7a5 100644 --- a/com.arm.cmsis.pack.installer.ui/src/com/arm/cmsis/pack/installer/ui/handlers/ImportPacksHandler.java +++ b/com.arm.cmsis.pack.installer.ui/src/com/arm/cmsis/pack/installer/ui/handlers/ImportPacksHandler.java @@ -1,9 +1,11 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation diff --git a/com.arm.cmsis.pack.installer.ui/src/com/arm/cmsis/pack/installer/ui/handlers/ReloadPacksHandler.java b/com.arm.cmsis.pack.installer.ui/src/com/arm/cmsis/pack/installer/ui/handlers/ReloadPacksHandler.java index 47b55e6..55261f8 100644 --- a/com.arm.cmsis.pack.installer.ui/src/com/arm/cmsis/pack/installer/ui/handlers/ReloadPacksHandler.java +++ b/com.arm.cmsis.pack.installer.ui/src/com/arm/cmsis/pack/installer/ui/handlers/ReloadPacksHandler.java @@ -1,9 +1,11 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation diff --git a/com.arm.cmsis.pack.installer.ui/src/com/arm/cmsis/pack/installer/ui/handlers/UpdatePacksHandler.java b/com.arm.cmsis.pack.installer.ui/src/com/arm/cmsis/pack/installer/ui/handlers/UpdatePacksHandler.java index 37542b4..187a95f 100644 --- a/com.arm.cmsis.pack.installer.ui/src/com/arm/cmsis/pack/installer/ui/handlers/UpdatePacksHandler.java +++ b/com.arm.cmsis.pack.installer.ui/src/com/arm/cmsis/pack/installer/ui/handlers/UpdatePacksHandler.java @@ -1,9 +1,11 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd, ARM Germany GmbH and others. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Liviu Ionescu - initial implementation. diff --git a/com.arm.cmsis.pack.installer.ui/src/com/arm/cmsis/pack/installer/ui/perspectives/PackManagerPerspective.java b/com.arm.cmsis.pack.installer.ui/src/com/arm/cmsis/pack/installer/ui/perspectives/PackManagerPerspective.java index 4c390af..d0bc529 100644 --- a/com.arm.cmsis.pack.installer.ui/src/com/arm/cmsis/pack/installer/ui/perspectives/PackManagerPerspective.java +++ b/com.arm.cmsis.pack.installer.ui/src/com/arm/cmsis/pack/installer/ui/perspectives/PackManagerPerspective.java @@ -1,9 +1,11 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Eclipse Project - generation from template diff --git a/com.arm.cmsis.pack.installer.ui/src/com/arm/cmsis/pack/installer/ui/views/BoardsView.java b/com.arm.cmsis.pack.installer.ui/src/com/arm/cmsis/pack/installer/ui/views/BoardsView.java index 335562b..8df296d 100644 --- a/com.arm.cmsis.pack.installer.ui/src/com/arm/cmsis/pack/installer/ui/views/BoardsView.java +++ b/com.arm.cmsis.pack.installer.ui/src/com/arm/cmsis/pack/installer/ui/views/BoardsView.java @@ -1,9 +1,11 @@ /******************************************************************************* * Copyright (c) 2022 ARM Ltd. and others * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation diff --git a/com.arm.cmsis.pack.installer.ui/src/com/arm/cmsis/pack/installer/ui/views/DevicesView.java b/com.arm.cmsis.pack.installer.ui/src/com/arm/cmsis/pack/installer/ui/views/DevicesView.java index fdc5506..efd1918 100644 --- a/com.arm.cmsis.pack.installer.ui/src/com/arm/cmsis/pack/installer/ui/views/DevicesView.java +++ b/com.arm.cmsis.pack.installer.ui/src/com/arm/cmsis/pack/installer/ui/views/DevicesView.java @@ -1,9 +1,11 @@ /******************************************************************************* * Copyright (c) 2022 ARM Ltd. and others * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation diff --git a/com.arm.cmsis.pack.installer.ui/src/com/arm/cmsis/pack/installer/ui/views/ExamplesView.java b/com.arm.cmsis.pack.installer.ui/src/com/arm/cmsis/pack/installer/ui/views/ExamplesView.java index 2ac5b0c..7e93d31 100644 --- a/com.arm.cmsis.pack.installer.ui/src/com/arm/cmsis/pack/installer/ui/views/ExamplesView.java +++ b/com.arm.cmsis.pack.installer.ui/src/com/arm/cmsis/pack/installer/ui/views/ExamplesView.java @@ -1,9 +1,11 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation diff --git a/com.arm.cmsis.pack.installer.ui/src/com/arm/cmsis/pack/installer/ui/views/PackInstallerTreeColumnComparator.java b/com.arm.cmsis.pack.installer.ui/src/com/arm/cmsis/pack/installer/ui/views/PackInstallerTreeColumnComparator.java index 77be485..8305db6 100644 --- a/com.arm.cmsis.pack.installer.ui/src/com/arm/cmsis/pack/installer/ui/views/PackInstallerTreeColumnComparator.java +++ b/com.arm.cmsis.pack.installer.ui/src/com/arm/cmsis/pack/installer/ui/views/PackInstallerTreeColumnComparator.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * Ivor Williams - Initial API and implementation: https://dzone.com/articles/javaswt-click-table-column * ARM Ltd and ARM Germany GmbH - application-specific implementation diff --git a/com.arm.cmsis.pack.installer.ui/src/com/arm/cmsis/pack/installer/ui/views/PackInstallerView.java b/com.arm.cmsis.pack.installer.ui/src/com/arm/cmsis/pack/installer/ui/views/PackInstallerView.java index a158540..3d17fb4 100644 --- a/com.arm.cmsis.pack.installer.ui/src/com/arm/cmsis/pack/installer/ui/views/PackInstallerView.java +++ b/com.arm.cmsis.pack.installer.ui/src/com/arm/cmsis/pack/installer/ui/views/PackInstallerView.java @@ -1,9 +1,11 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation diff --git a/com.arm.cmsis.pack.installer.ui/src/com/arm/cmsis/pack/installer/ui/views/PackInstallerViewUtils.java b/com.arm.cmsis.pack.installer.ui/src/com/arm/cmsis/pack/installer/ui/views/PackInstallerViewUtils.java index e977fc7..4aaf2f5 100644 --- a/com.arm.cmsis.pack.installer.ui/src/com/arm/cmsis/pack/installer/ui/views/PackInstallerViewUtils.java +++ b/com.arm.cmsis.pack.installer.ui/src/com/arm/cmsis/pack/installer/ui/views/PackInstallerViewUtils.java @@ -1,9 +1,11 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation diff --git a/com.arm.cmsis.pack.installer.ui/src/com/arm/cmsis/pack/installer/ui/views/PackPropertyView.java b/com.arm.cmsis.pack.installer.ui/src/com/arm/cmsis/pack/installer/ui/views/PackPropertyView.java index dcad37e..086dfcc 100644 --- a/com.arm.cmsis.pack.installer.ui/src/com/arm/cmsis/pack/installer/ui/views/PackPropertyView.java +++ b/com.arm.cmsis.pack.installer.ui/src/com/arm/cmsis/pack/installer/ui/views/PackPropertyView.java @@ -1,9 +1,11 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation diff --git a/com.arm.cmsis.pack.installer.ui/src/com/arm/cmsis/pack/installer/ui/views/PacksView.java b/com.arm.cmsis.pack.installer.ui/src/com/arm/cmsis/pack/installer/ui/views/PacksView.java index d84c462..5178864 100644 --- a/com.arm.cmsis.pack.installer.ui/src/com/arm/cmsis/pack/installer/ui/views/PacksView.java +++ b/com.arm.cmsis.pack.installer.ui/src/com/arm/cmsis/pack/installer/ui/views/PacksView.java @@ -1,9 +1,11 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation diff --git a/com.arm.cmsis.pack.installer/.classpath b/com.arm.cmsis.pack.installer/.classpath index f656d57..e6d0a3c 100644 --- a/com.arm.cmsis.pack.installer/.classpath +++ b/com.arm.cmsis.pack.installer/.classpath @@ -1,7 +1,21 @@ - + + + + + - + + + + + + + + + + + diff --git a/com.arm.cmsis.pack.installer/META-INF/MANIFEST.MF b/com.arm.cmsis.pack.installer/META-INF/MANIFEST.MF index 7078eb3..bbf9119 100644 --- a/com.arm.cmsis.pack.installer/META-INF/MANIFEST.MF +++ b/com.arm.cmsis.pack.installer/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: CMSIS-Pack Installer Bundle-SymbolicName: com.arm.cmsis.pack.installer;singleton:=true Automatic-Module-Name: com.arm.cmsis.pack.installer -Bundle-Version: 2.9.0.qualifier +Bundle-Version: 2.10.0.qualifier Bundle-Activator: com.arm.cmsis.pack.installer.CpInstallerPlugIn Bundle-Vendor: Arm Limited Require-Bundle: org.eclipse.core.runtime, diff --git a/com.arm.cmsis.pack.installer/plugin.xml b/com.arm.cmsis.pack.installer/plugin.xml index aeda8ae..8f64b00 100644 --- a/com.arm.cmsis.pack.installer/plugin.xml +++ b/com.arm.cmsis.pack.installer/plugin.xml @@ -1,6 +1,5 @@ - diff --git a/com.arm.cmsis.pack.installer/pom.xml b/com.arm.cmsis.pack.installer/pom.xml index 01a54ba..2deb5b9 100644 --- a/com.arm.cmsis.pack.installer/pom.xml +++ b/com.arm.cmsis.pack.installer/pom.xml @@ -5,7 +5,7 @@ com.arm.cmsis com.arm.cmsis.parent.sign - 2.9.0-SNAPSHOT + 2.10.0-SNAPSHOT ../com.arm.cmsis.parent.sign \ No newline at end of file diff --git a/com.arm.cmsis.pack.installer/src/com/arm/cmsis/pack/installer/ClPackInstaller.java b/com.arm.cmsis.pack.installer/src/com/arm/cmsis/pack/installer/ClPackInstaller.java index a02c4ff..a2aa2a0 100644 --- a/com.arm.cmsis.pack.installer/src/com/arm/cmsis/pack/installer/ClPackInstaller.java +++ b/com.arm.cmsis.pack.installer/src/com/arm/cmsis/pack/installer/ClPackInstaller.java @@ -1,9 +1,11 @@ /******************************************************************************* * Copyright (c) 2023 Analog Devices, Inc. and others * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Analog Devices - command line pack installer application diff --git a/com.arm.cmsis.pack.installer/src/com/arm/cmsis/pack/installer/CpInstallerPlugIn.java b/com.arm.cmsis.pack.installer/src/com/arm/cmsis/pack/installer/CpInstallerPlugIn.java index fc1fda8..36d654f 100644 --- a/com.arm.cmsis.pack.installer/src/com/arm/cmsis/pack/installer/CpInstallerPlugIn.java +++ b/com.arm.cmsis.pack.installer/src/com/arm/cmsis/pack/installer/CpInstallerPlugIn.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * Eclipse Project - generation from template * ARM Ltd and ARM Germany GmbH - application-specific implementation diff --git a/com.arm.cmsis.pack.installer/src/com/arm/cmsis/pack/installer/CpPackInstaller.java b/com.arm.cmsis.pack.installer/src/com/arm/cmsis/pack/installer/CpPackInstaller.java index 5842320..14d1f90 100644 --- a/com.arm.cmsis.pack.installer/src/com/arm/cmsis/pack/installer/CpPackInstaller.java +++ b/com.arm.cmsis.pack.installer/src/com/arm/cmsis/pack/installer/CpPackInstaller.java @@ -1,9 +1,11 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Eclipse Project - generation from template diff --git a/com.arm.cmsis.pack.installer/src/com/arm/cmsis/pack/installer/CpRepoServiceProvider.java b/com.arm.cmsis.pack.installer/src/com/arm/cmsis/pack/installer/CpRepoServiceProvider.java index a16d694..1c00775 100644 --- a/com.arm.cmsis.pack.installer/src/com/arm/cmsis/pack/installer/CpRepoServiceProvider.java +++ b/com.arm.cmsis.pack.installer/src/com/arm/cmsis/pack/installer/CpRepoServiceProvider.java @@ -1,9 +1,11 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation diff --git a/com.arm.cmsis.pack.installer/src/com/arm/cmsis/pack/installer/Messages.java b/com.arm.cmsis.pack.installer/src/com/arm/cmsis/pack/installer/Messages.java index b60df2d..2ecea98 100644 --- a/com.arm.cmsis.pack.installer/src/com/arm/cmsis/pack/installer/Messages.java +++ b/com.arm.cmsis.pack.installer/src/com/arm/cmsis/pack/installer/Messages.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation * Analog Devices, Inc - Extension and implementation diff --git a/com.arm.cmsis.pack.installer/src/com/arm/cmsis/pack/installer/jobs/CpPackImportFolderJob.java b/com.arm.cmsis.pack.installer/src/com/arm/cmsis/pack/installer/jobs/CpPackImportFolderJob.java index 13ec1e5..141668f 100644 --- a/com.arm.cmsis.pack.installer/src/com/arm/cmsis/pack/installer/jobs/CpPackImportFolderJob.java +++ b/com.arm.cmsis.pack.installer/src/com/arm/cmsis/pack/installer/jobs/CpPackImportFolderJob.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack.installer/src/com/arm/cmsis/pack/installer/jobs/CpPackImportJob.java b/com.arm.cmsis.pack.installer/src/com/arm/cmsis/pack/installer/jobs/CpPackImportJob.java index 432ee49..4c96dbb 100644 --- a/com.arm.cmsis.pack.installer/src/com/arm/cmsis/pack/installer/jobs/CpPackImportJob.java +++ b/com.arm.cmsis.pack.installer/src/com/arm/cmsis/pack/installer/jobs/CpPackImportJob.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack.installer/src/com/arm/cmsis/pack/installer/jobs/CpPackInstallJob.java b/com.arm.cmsis.pack.installer/src/com/arm/cmsis/pack/installer/jobs/CpPackInstallJob.java index f014f79..b6a2c79 100644 --- a/com.arm.cmsis.pack.installer/src/com/arm/cmsis/pack/installer/jobs/CpPackInstallJob.java +++ b/com.arm.cmsis.pack.installer/src/com/arm/cmsis/pack/installer/jobs/CpPackInstallJob.java @@ -1,9 +1,11 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation diff --git a/com.arm.cmsis.pack.installer/src/com/arm/cmsis/pack/installer/jobs/CpPackJob.java b/com.arm.cmsis.pack.installer/src/com/arm/cmsis/pack/installer/jobs/CpPackJob.java index e5aa6d6..3d148f7 100644 --- a/com.arm.cmsis.pack.installer/src/com/arm/cmsis/pack/installer/jobs/CpPackJob.java +++ b/com.arm.cmsis.pack.installer/src/com/arm/cmsis/pack/installer/jobs/CpPackJob.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack.installer/src/com/arm/cmsis/pack/installer/jobs/CpPackRemoveJob.java b/com.arm.cmsis.pack.installer/src/com/arm/cmsis/pack/installer/jobs/CpPackRemoveJob.java index 538d459..965b9e9 100644 --- a/com.arm.cmsis.pack.installer/src/com/arm/cmsis/pack/installer/jobs/CpPackRemoveJob.java +++ b/com.arm.cmsis.pack.installer/src/com/arm/cmsis/pack/installer/jobs/CpPackRemoveJob.java @@ -1,9 +1,11 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation diff --git a/com.arm.cmsis.pack.installer/src/com/arm/cmsis/pack/installer/jobs/CpPackUnpackJob.java b/com.arm.cmsis.pack.installer/src/com/arm/cmsis/pack/installer/jobs/CpPackUnpackJob.java index c42011a..a75a389 100644 --- a/com.arm.cmsis.pack.installer/src/com/arm/cmsis/pack/installer/jobs/CpPackUnpackJob.java +++ b/com.arm.cmsis.pack.installer/src/com/arm/cmsis/pack/installer/jobs/CpPackUnpackJob.java @@ -1,9 +1,11 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation @@ -17,8 +19,8 @@ import java.nio.charset.Charset; import java.nio.file.Files; import java.nio.file.Paths; -import java.util.Collection; import java.util.ArrayList; +import java.util.Collection; import javax.swing.text.BadLocationException; import javax.swing.text.Document; @@ -181,7 +183,7 @@ private boolean unzip(IProgressMonitor monitor) { // convert pack to installed pack.setPackState(PackState.INSTALLED); - pdscFile = fDestPath.append(Utils.extractBaseFileName(pdscFile)).toString(); + pdscFile = fDestPath.append(Utils.extractFileName(pdscFile)).toString(); pack.setFileName(pdscFile); // set successful result fResult.setPack(pack); diff --git a/com.arm.cmsis.pack.installer/src/com/arm/cmsis/pack/installer/jobs/CpUpdatePacksJob.java b/com.arm.cmsis.pack.installer/src/com/arm/cmsis/pack/installer/jobs/CpUpdatePacksJob.java index 64ac640..8549114 100644 --- a/com.arm.cmsis.pack.installer/src/com/arm/cmsis/pack/installer/jobs/CpUpdatePacksJob.java +++ b/com.arm.cmsis.pack.installer/src/com/arm/cmsis/pack/installer/jobs/CpUpdatePacksJob.java @@ -1,9 +1,11 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation diff --git a/com.arm.cmsis.pack.installer/src/com/arm/cmsis/pack/installer/jobs/LicenseDialog.java b/com.arm.cmsis.pack.installer/src/com/arm/cmsis/pack/installer/jobs/LicenseDialog.java index 0fe11a5..13e84e3 100644 --- a/com.arm.cmsis.pack.installer/src/com/arm/cmsis/pack/installer/jobs/LicenseDialog.java +++ b/com.arm.cmsis.pack.installer/src/com/arm/cmsis/pack/installer/jobs/LicenseDialog.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2022 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack.installer/src/com/arm/cmsis/pack/installer/utils/PackInstallerUtils.java b/com.arm.cmsis.pack.installer/src/com/arm/cmsis/pack/installer/utils/PackInstallerUtils.java index 4849926..9f1b8bc 100644 --- a/com.arm.cmsis.pack.installer/src/com/arm/cmsis/pack/installer/utils/PackInstallerUtils.java +++ b/com.arm.cmsis.pack.installer/src/com/arm/cmsis/pack/installer/utils/PackInstallerUtils.java @@ -1,9 +1,11 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation diff --git a/com.arm.cmsis.pack.parser.yml.tests/.classpath b/com.arm.cmsis.pack.parser.yml.tests/.classpath new file mode 100644 index 0000000..d4128ff --- /dev/null +++ b/com.arm.cmsis.pack.parser.yml.tests/.classpath @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/com.arm.cmsis.pack.parser.yml.tests/.gitignore b/com.arm.cmsis.pack.parser.yml.tests/.gitignore new file mode 100644 index 0000000..b83d222 --- /dev/null +++ b/com.arm.cmsis.pack.parser.yml.tests/.gitignore @@ -0,0 +1 @@ +/target/ diff --git a/com.arm.cmsis.pack.parser.yml.tests/.project b/com.arm.cmsis.pack.parser.yml.tests/.project new file mode 100644 index 0000000..6196727 --- /dev/null +++ b/com.arm.cmsis.pack.parser.yml.tests/.project @@ -0,0 +1,34 @@ + + + com.arm.cmsis.pack.parser.yml.tests + + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.pde.ManifestBuilder + + + + + org.eclipse.pde.SchemaBuilder + + + + + org.eclipse.m2e.core.maven2Builder + + + + + + org.eclipse.m2e.core.maven2Nature + org.eclipse.pde.PluginNature + org.eclipse.jdt.core.javanature + + diff --git a/com.arm.cmsis.pack.parser.yml.tests/.settings/org.eclipse.core.resources.prefs b/com.arm.cmsis.pack.parser.yml.tests/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 0000000..99f26c0 --- /dev/null +++ b/com.arm.cmsis.pack.parser.yml.tests/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +encoding/=UTF-8 diff --git a/com.arm.cmsis.pack.parser.yml.tests/.settings/org.eclipse.jdt.core.prefs b/com.arm.cmsis.pack.parser.yml.tests/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 0000000..052ee6e --- /dev/null +++ b/com.arm.cmsis.pack.parser.yml.tests/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,10 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning +org.eclipse.jdt.core.compiler.release=enabled +org.eclipse.jdt.core.compiler.source=11 diff --git a/com.arm.cmsis.pack.parser.yml.tests/.settings/org.eclipse.m2e.core.prefs b/com.arm.cmsis.pack.parser.yml.tests/.settings/org.eclipse.m2e.core.prefs new file mode 100644 index 0000000..f897a7f --- /dev/null +++ b/com.arm.cmsis.pack.parser.yml.tests/.settings/org.eclipse.m2e.core.prefs @@ -0,0 +1,4 @@ +activeProfiles= +eclipse.preferences.version=1 +resolveWorkspaceProjects=true +version=1 diff --git a/com.arm.cmsis.pack.parser.yml.tests/META-INF/MANIFEST.MF b/com.arm.cmsis.pack.parser.yml.tests/META-INF/MANIFEST.MF new file mode 100644 index 0000000..150d4c8 --- /dev/null +++ b/com.arm.cmsis.pack.parser.yml.tests/META-INF/MANIFEST.MF @@ -0,0 +1,12 @@ +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Name: Tests +Bundle-SymbolicName: com.arm.cmsis.pack.parser.yml.tests +Bundle-Version: 2.10.0.qualifier +Require-Bundle: org.junit, + com.arm.cmsis.pack.common, + com.arm.cmsis.pack.data, + com.arm.cmsis.pack.parser.yml +Bundle-Vendor: ARM +Automatic-Module-Name: com.arm.cmsis.pack.parser.yml.tests +Bundle-RequiredExecutionEnvironment: JavaSE-11 diff --git a/com.arm.cmsis.pack.parser.yml.tests/build.properties b/com.arm.cmsis.pack.parser.yml.tests/build.properties new file mode 100644 index 0000000..85f7b12 --- /dev/null +++ b/com.arm.cmsis.pack.parser.yml.tests/build.properties @@ -0,0 +1,4 @@ +source.. = src/ +output.. = target/classes/ +bin.includes = META-INF/,\ + .,\ diff --git a/com.arm.cmsis.pack.parser.yml.tests/pom.xml b/com.arm.cmsis.pack.parser.yml.tests/pom.xml new file mode 100644 index 0000000..4c77705 --- /dev/null +++ b/com.arm.cmsis.pack.parser.yml.tests/pom.xml @@ -0,0 +1,11 @@ + + 4.0.0 + com.arm.cmsis.pack.parser.yml.tests + eclipse-test-plugin + + com.arm.cmsis + com.arm.cmsis.parent + 2.10.0-SNAPSHOT + ../com.arm.cmsis.parent + + diff --git a/com.arm.cmsis.pack.parser.yml.tests/src/com/arm/cmsis/pack/parser/yml/tests/YmlParserTest.java b/com.arm.cmsis.pack.parser.yml.tests/src/com/arm/cmsis/pack/parser/yml/tests/YmlParserTest.java new file mode 100644 index 0000000..7a8eaf7 --- /dev/null +++ b/com.arm.cmsis.pack.parser.yml.tests/src/com/arm/cmsis/pack/parser/yml/tests/YmlParserTest.java @@ -0,0 +1,136 @@ +/******************************************************************************* +* Copyright (c) 2024 ARM Ltd. and others +* All rights reserved. This program and the accompanying materials +* are made available under the terms of the Eclipse Public License 2.0 +* which accompanies this distribution, and is available at +* https://www.eclipse.org/legal/epl-2.0/ +* +* SPDX-License-Identifier: EPL-2.0 +* +* Contributors: +* ARM Ltd and ARM Germany GmbH - Initial API and implementation +*******************************************************************************/ + +package com.arm.cmsis.pack.parser.yml.tests; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotEquals; +import static org.junit.Assert.fail; + +import java.io.BufferedWriter; +import java.io.File; +import java.io.FileWriter; +import org.junit.BeforeClass; +import org.junit.Test; + +import com.arm.cmsis.pack.data.ICpItem; +import com.arm.cmsis.pack.parser.yml.CpYmlParser; + +/* + * Test cases for CpYmlParser + */ + +public class YmlParserTest { + + private static CpYmlParser parser = new CpYmlParser(); + private static final String input = + "nested:\n one: 1\n two: 2\n three:\n s_one: 3.1\n s_two: 3.2\n fourth-node:\n - 4.1\n - 4.2.a: a\n 4.2.b: b\n"; //$NON-NLS-1$ + private static ICpItem root; + private static ICpItem child; + private static ICpItem firstGrandChild; + private static ICpItem secondGrandChild; + + @BeforeClass + public static void parseInput() { + try { + root = parser.parseString(input); + child = root.getFirstChild(); + firstGrandChild = child.getFirstChild("three"); //$NON-NLS-1$ + secondGrandChild = child.getFirstChild("fourth-node"); //$NON-NLS-1$ + } catch (Exception e) { + fail("Parser failed to parse file content: " + input + ", threw exception with message " //$NON-NLS-1$ //$NON-NLS-2$ + + e.getMessage()); + e.printStackTrace(); + } + } + + @Test + public void testRoot() { + assertNotEquals(null, root); + + assertEquals(1, root.getChildCount()); + assertEquals(child, root.getFirstChild("nested")); //$NON-NLS-1$ + assertEquals(null, root.attributes().getAttributesAsMap()); + } + + @Test + public void testChild() { + assertNotEquals(null, child); + + assertEquals(2, child.getChildCount()); + assertEquals(firstGrandChild, child.getFirstChild("three")); //$NON-NLS-1$ + assertEquals(secondGrandChild, child.getFirstChild("fourth-node")); //$NON-NLS-1$ + assertEquals(2, child.attributes().getAttributesAsMap().size()); + assertEquals("1", child.getAttribute("one")); //$NON-NLS-1$ //$NON-NLS-2$ + assertEquals("2", child.getAttribute("two")); //$NON-NLS-1$ //$NON-NLS-2$ + } + + @Test + public void testFirstGrandChild() { + assertNotEquals(null, firstGrandChild); + + assertEquals(0, firstGrandChild.getChildCount()); + assertEquals(2, firstGrandChild.attributes().getAttributesAsMap().size()); + assertEquals("3.1", firstGrandChild.getAttribute("s_one")); //$NON-NLS-1$ //$NON-NLS-2$ + assertEquals("3.2", firstGrandChild.getAttribute("s_two")); //$NON-NLS-1$ //$NON-NLS-2$ + } + + @Test + public void testSecondGrandChild() { + assertNotEquals(null, secondGrandChild); + + assertEquals(2, secondGrandChild.getChildCount()); + assertEquals(null, secondGrandChild.attributes().getAttributesAsMap()); + + ICpItem sequenceChild1 = secondGrandChild.getFirstChild(); + ICpItem sequenceChild2 = secondGrandChild.getChildren().stream().skip(1).findFirst().orElse(null); + + assertEquals("-", sequenceChild1.getTag()); //$NON-NLS-1$ + assertEquals("4.1", sequenceChild1.getText()); //$NON-NLS-1$ + assertEquals("-", sequenceChild2.getTag()); //$NON-NLS-1$ + assertEquals(2, sequenceChild2.attributes().getAttributesAsMap().size()); + assertEquals("a", sequenceChild2.getAttribute("4.2.a")); //$NON-NLS-1$ //$NON-NLS-2$ + assertEquals("b", sequenceChild2.getAttribute("4.2.b")); //$NON-NLS-1$ //$NON-NLS-2$ + } + + @Test + public void testOutput() { + assertEquals(input, parser.writeToString(root)); + } + + @Test + public void testParseFile() { + File temporaryFile = null; + String filename = null; + try { + temporaryFile = File.createTempFile("temp", ".yml"); //$NON-NLS-1$ //$NON-NLS-2$ + filename = temporaryFile.getCanonicalPath().toString(); + BufferedWriter writer = new BufferedWriter(new FileWriter(filename)); + writer.write(input); + writer.close(); + } catch (Exception e) { + fail("Failed to create a temporary file for testParseFile"); //$NON-NLS-1$ + return; + } + try { + ICpItem item = parser.parseFile(filename); + assertNotEquals(null, item); + String output = parser.writeToString(item); + assertEquals(input, output); + temporaryFile.deleteOnExit(); + } catch (Exception e) { + fail("Failed to execute parseFile correctly"); //$NON-NLS-1$ + e.printStackTrace(); + } + } +} diff --git a/com.arm.cmsis.pack.parser.yml/.classpath b/com.arm.cmsis.pack.parser.yml/.classpath new file mode 100644 index 0000000..2a13b14 --- /dev/null +++ b/com.arm.cmsis.pack.parser.yml/.classpath @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/com.arm.cmsis.pack.parser.yml/.gitignore b/com.arm.cmsis.pack.parser.yml/.gitignore new file mode 100644 index 0000000..b83d222 --- /dev/null +++ b/com.arm.cmsis.pack.parser.yml/.gitignore @@ -0,0 +1 @@ +/target/ diff --git a/com.arm.cmsis.pack.parser.yml/.project b/com.arm.cmsis.pack.parser.yml/.project new file mode 100644 index 0000000..8cab57e --- /dev/null +++ b/com.arm.cmsis.pack.parser.yml/.project @@ -0,0 +1,34 @@ + + + com.arm.cmsis.pack.parser.yml + + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.pde.ManifestBuilder + + + + + org.eclipse.pde.SchemaBuilder + + + + + org.eclipse.m2e.core.maven2Builder + + + + + + org.eclipse.m2e.core.maven2Nature + org.eclipse.pde.PluginNature + org.eclipse.jdt.core.javanature + + diff --git a/com.arm.cmsis.pack.parser.yml/.settings/org.eclipse.core.resources.prefs b/com.arm.cmsis.pack.parser.yml/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 0000000..99f26c0 --- /dev/null +++ b/com.arm.cmsis.pack.parser.yml/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +encoding/=UTF-8 diff --git a/com.arm.cmsis.pack.parser.yml/.settings/org.eclipse.jdt.core.prefs b/com.arm.cmsis.pack.parser.yml/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 0000000..052ee6e --- /dev/null +++ b/com.arm.cmsis.pack.parser.yml/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,10 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning +org.eclipse.jdt.core.compiler.release=enabled +org.eclipse.jdt.core.compiler.source=11 diff --git a/com.arm.cmsis.pack.parser.yml/.settings/org.eclipse.m2e.core.prefs b/com.arm.cmsis.pack.parser.yml/.settings/org.eclipse.m2e.core.prefs new file mode 100644 index 0000000..f897a7f --- /dev/null +++ b/com.arm.cmsis.pack.parser.yml/.settings/org.eclipse.m2e.core.prefs @@ -0,0 +1,4 @@ +activeProfiles= +eclipse.preferences.version=1 +resolveWorkspaceProjects=true +version=1 diff --git a/com.arm.cmsis.pack.parser.yml/META-INF/MANIFEST.MF b/com.arm.cmsis.pack.parser.yml/META-INF/MANIFEST.MF new file mode 100644 index 0000000..ce92741 --- /dev/null +++ b/com.arm.cmsis.pack.parser.yml/META-INF/MANIFEST.MF @@ -0,0 +1,16 @@ +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Name: Yml +Bundle-SymbolicName: com.arm.cmsis.pack.parser.yml;singleton:=true +Bundle-Version: 2.10.0.qualifier +Require-Bundle: com.arm.cmsis.pack.common;bundle-version="2.10.0", + com.arm.cmsis.pack.data;bundle-version="2.10.0" +Bundle-Vendor: ARM +Automatic-Module-Name: com.arm.cmsis.pack.parser.yml +Bundle-ClassPath: ., + lib/eo-yaml-7.0.9.jar +Bundle-RequiredExecutionEnvironment: JavaSE-11 +Export-Package: com.amihaiemil.eoyaml, + com.amihaiemil.eoyaml.exceptions, + com.amihaiemil.eoyaml.extensions, + com.arm.cmsis.pack.parser.yml diff --git a/com.arm.cmsis.pack.parser.yml/build.properties b/com.arm.cmsis.pack.parser.yml/build.properties new file mode 100644 index 0000000..4efda4f --- /dev/null +++ b/com.arm.cmsis.pack.parser.yml/build.properties @@ -0,0 +1,6 @@ +source.. = src/ +output.. = target/classes/ +bin.includes = META-INF/,\ + .,\ + lib/eo-yaml-7.0.9.jar + diff --git a/com.arm.cmsis.pack.parser.yml/lib/eo-yaml-7.0.9.jar b/com.arm.cmsis.pack.parser.yml/lib/eo-yaml-7.0.9.jar new file mode 100644 index 0000000..d2b8eac Binary files /dev/null and b/com.arm.cmsis.pack.parser.yml/lib/eo-yaml-7.0.9.jar differ diff --git a/com.arm.cmsis.pack.parser.yml/pom.xml b/com.arm.cmsis.pack.parser.yml/pom.xml new file mode 100644 index 0000000..33a58e5 --- /dev/null +++ b/com.arm.cmsis.pack.parser.yml/pom.xml @@ -0,0 +1,11 @@ + + 4.0.0 + com.arm.cmsis.pack.parser.yml + eclipse-plugin + + com.arm.cmsis + com.arm.cmsis.parent + 2.10.0-SNAPSHOT + ../com.arm.cmsis.parent + + diff --git a/com.arm.cmsis.pack.parser.yml/src/com/arm/cmsis/pack/parser/yml/CpYmlParser.java b/com.arm.cmsis.pack.parser.yml/src/com/arm/cmsis/pack/parser/yml/CpYmlParser.java new file mode 100644 index 0000000..6d70216 --- /dev/null +++ b/com.arm.cmsis.pack.parser.yml/src/com/arm/cmsis/pack/parser/yml/CpYmlParser.java @@ -0,0 +1,209 @@ +/******************************************************************************* +* Copyright (c) 2024 ARM Ltd. and others +* All rights reserved. This program and the accompanying materials +* are made available under the terms of the Eclipse Public License 2.0 +* which accompanies this distribution, and is available at + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * +* SPDX-License-Identifier: EPL-2.0 +* +* Contributors: +* ARM Ltd and ARM Germany GmbH - Initial API and implementation +*******************************************************************************/ + +package com.arm.cmsis.pack.parser.yml; + +import java.io.File; +import java.io.FileWriter; +import java.io.IOException; +import java.util.Map; + +import com.amihaiemil.eoyaml.Node; +import com.amihaiemil.eoyaml.Yaml; +import com.amihaiemil.eoyaml.YamlMapping; +import com.amihaiemil.eoyaml.YamlNode; +import com.amihaiemil.eoyaml.YamlSequence; +import com.arm.cmsis.pack.common.CmsisConstants; +import com.arm.cmsis.pack.data.ICpItem; +import com.arm.cmsis.pack.data.ICpRootItem; +import com.arm.cmsis.pack.enums.ESeverity; +import com.arm.cmsis.pack.error.CmsisError; +import com.arm.cmsis.pack.parser.CpParser; +import com.arm.cmsis.pack.parser.CpYmlParserError; + +public class CpYmlParser extends CpParser { + + private StringBuilder builder = new StringBuilder(); // builds output string + + private YamlMapping rootYmlMapping = null; + + @Override + public ICpItem parseFile(String filePath) { + clear(); + this.file = filePath; + init(); + try { + this.rootYmlMapping = Yaml.createYamlInput(new File(filePath)).readYamlMapping(); + parseMapping(rootItem, rootYmlMapping); + } catch (IOException e) { + CmsisError err = new CpYmlParserError(file, CpYmlParserError.Y401, ESeverity.Error, "Error parsing file", //$NON-NLS-1$ + e); + addError(err); + rootItem = null; + e.printStackTrace(); + } + return rootItem; + } + + @Override + public ICpItem parseString(String input) { + clear(); + init(); + try { + this.rootYmlMapping = Yaml.createYamlInput(input).readYamlMapping(); + parseMapping(rootItem, rootYmlMapping); + } catch (IOException e) { + CmsisError err = new CpYmlParserError(file, CpYmlParserError.Y402, ESeverity.Error, "Error parsing string", //$NON-NLS-1$ + e); + addError(err); + e.printStackTrace(); + } + return rootItem; + } + + @Override + public boolean writeToFile(ICpItem root, String file) { + clear(); + String ymlOutput = writeToString(root); + File outputFile = new File(file); + this.file = file; + + try (FileWriter fw = new FileWriter(outputFile);) { + fw.write(ymlOutput); + if (root instanceof ICpRootItem) { + ((ICpRootItem) root).setFileName(file); + } + } catch (IOException e) { + CmsisError err = new CpYmlParserError(file, CpYmlParserError.Y403, ESeverity.Error, "Error writing to file", //$NON-NLS-1$ + e); + addError(err); + e.printStackTrace(); + return false; + } + return true; + } + + @Override + public String writeToString(ICpItem root) { + clear(); + writeItem(rootItem, 0); + return builder.toString(); + } + + @Override + public boolean init() { + rootItem = createRootItem(CmsisConstants.EMPTY_STRING); + return true; + } + + @Override + public void clear() { + builder.delete(0, builder.length()); + this.file = null; + } + + /** + * Traverses passed YamlMapping and populates ICpItem parent + * + * @param parent ICpItem used to represent the parent item + * @param map YamlMapping to parse + */ + private void parseMapping(ICpItem parent, YamlMapping map) { + for (YamlNode key : map.keys()) { + YamlNode valueNode = map.value(key); + if (valueNode.type() == Node.SCALAR) { + parent.setAttribute(key.asScalar().value(), valueNode.asScalar().value()); + } else if (valueNode.type() == Node.SEQUENCE) { + ICpItem child = createItem(parent, key.asScalar().value()); + parent.addChild(child); + parseSequence(child, valueNode.asSequence()); + } else if (valueNode.type() == Node.MAPPING) { + ICpItem child = createItem(parent, key.asScalar().value()); + parent.addChild(child); + parseMapping(child, valueNode.asMapping()); + } + } + } + + /** + * Traverses passed YamlSequence and populates ICpItem parent + * + * @param parent ICpItem used to represent the parent item + * @param sequence YamlSequence to parse + */ + protected void parseSequence(ICpItem parent, YamlSequence sequence) { + for (YamlNode node : sequence) { + ICpItem child = createItem(parent, CmsisConstants.MINUS); + parent.addChild(child); + if (node.type() == Node.SCALAR) { + child.setText(node.asScalar().value()); + } else if (node.type() == Node.SEQUENCE) { + parseSequence(child, node.asSequence()); + } else if (node.type() == Node.MAPPING) { + parseMapping(child, node.asMapping()); + } + } + } + + /** + * Traverses passed ICpItem item and populates string builder + * + * @param item ICpItem item to traverse + * @param indent specify starting indent + */ + private void writeItem(ICpItem item, int indent) { + if (item == null) { + return; + } + + if (!item.equals(rootItem)) { + if (!item.getTag().equals(CmsisConstants.MINUS)) { + builder.append(CmsisConstants.SPACE.repeat(indent)); + builder.append(item.getTag() + CmsisConstants.COLON); // $NON-NLS-1$ + if (!item.getText().isEmpty()) { + builder.append(CmsisConstants.SPACE + item.getText()); + } + } else { + builder.append(CmsisConstants.SPACE.repeat(indent)); + builder.append(item.getTag() + CmsisConstants.SPACE); + builder.append(item.getText()); + } + + boolean isSequence = item.getTag().equals(CmsisConstants.MINUS) && item.getText().isEmpty(); + if (!isSequence) { + builder.append("\n"); //$NON-NLS-1$ + } + boolean isFirstElement = true; + Map attributesMap = item.attributes().getAttributesAsMap(); + if (attributesMap != null) { + for (String key : item.attributes().getAttributesAsMap().keySet()) { + if (isSequence && isFirstElement) { + isFirstElement = false; + } else { + builder.append(CmsisConstants.SPACE.repeat(indent + 2)); + } + builder.append(key); + builder.append(CmsisConstants.COLON + CmsisConstants.SPACE); + builder.append(item.attributes().getAttribute(key)); + builder.append("\n"); //$NON-NLS-1$ + } + } + } + + for (ICpItem child : item.getChildren()) { + writeItem(child, item.equals(rootItem) ? 0 : indent + 2); + } + } +} diff --git a/com.arm.cmsis.pack.project/.classpath b/com.arm.cmsis.pack.project/.classpath index bc435fa..8e5045a 100644 --- a/com.arm.cmsis.pack.project/.classpath +++ b/com.arm.cmsis.pack.project/.classpath @@ -1,7 +1,21 @@ - + + + + + - + + + + + + + + + + + diff --git a/com.arm.cmsis.pack.project/META-INF/MANIFEST.MF b/com.arm.cmsis.pack.project/META-INF/MANIFEST.MF index ad51ffa..eaae395 100644 --- a/com.arm.cmsis.pack.project/META-INF/MANIFEST.MF +++ b/com.arm.cmsis.pack.project/META-INF/MANIFEST.MF @@ -1,9 +1,9 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: CMSIS-Pack Project -Bundle-SymbolicName: com.arm.cmsis.pack.project;singleton:=true -Automatic-Module-Name: com.arm.cmsis.pack.project -Bundle-Version: 2.9.0.qualifier +Bundle-SymbolicName: com.arm.cmsis.pack.project;singleton:=true +Automatic-Module-Name: com.arm.cmsis.pack.project +Bundle-Version: 2.10.0.qualifier Bundle-Activator: com.arm.cmsis.pack.project.CpProjectPlugIn Bundle-Vendor: Arm Limited Require-Bundle: org.eclipse.core.runtime, @@ -27,14 +27,18 @@ Require-Bundle: org.eclipse.core.runtime, com.arm.cmsis.pack, com.arm.cmsis.pack.ui, com.arm.cmsis.pack.build.settings, - org.eclipse.debug.core + org.eclipse.debug.core, + com.arm.cmsis.pack.parser.yml, + org.eclipse.swt Bundle-RequiredExecutionEnvironment: JavaSE-11 Bundle-ActivationPolicy: lazy Export-Package: com.arm.cmsis.pack.configuration, com.arm.cmsis.pack.project, + com.arm.cmsis.pack.project.csolution, com.arm.cmsis.pack.project.importer, com.arm.cmsis.pack.project.template, com.arm.cmsis.pack.project.ui, com.arm.cmsis.pack.project.ui.handlers, com.arm.cmsis.pack.project.utils, com.arm.cmsis.pack.project.wizards +Import-Package: com.arm.cmsis.pack.parser.yml diff --git a/com.arm.cmsis.pack.project/plugin.xml b/com.arm.cmsis.pack.project/plugin.xml index 2dd51bf..78c27b5 100644 --- a/com.arm.cmsis.pack.project/plugin.xml +++ b/com.arm.cmsis.pack.project/plugin.xml @@ -1,6 +1,5 @@ - + + + + Import projects specified by cbuild-idx.yml file into workspace for debugging + + + + + diff --git a/com.arm.cmsis.pack.project/pom.xml b/com.arm.cmsis.pack.project/pom.xml index c8239d4..92ecb5b 100644 --- a/com.arm.cmsis.pack.project/pom.xml +++ b/com.arm.cmsis.pack.project/pom.xml @@ -5,7 +5,7 @@ com.arm.cmsis com.arm.cmsis.parent.sign - 2.9.0-SNAPSHOT + 2.10.0-SNAPSHOT ../com.arm.cmsis.parent.sign \ No newline at end of file diff --git a/com.arm.cmsis.pack.project/src/com/arm/cmsis/pack/configuration/IRteConfiguration.java b/com.arm.cmsis.pack.project/src/com/arm/cmsis/pack/configuration/IRteConfiguration.java index aa5a492..e767fbd 100644 --- a/com.arm.cmsis.pack.project/src/com/arm/cmsis/pack/configuration/IRteConfiguration.java +++ b/com.arm.cmsis.pack.project/src/com/arm/cmsis/pack/configuration/IRteConfiguration.java @@ -1,9 +1,11 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation diff --git a/com.arm.cmsis.pack.project/src/com/arm/cmsis/pack/configuration/RteConfiguration.java b/com.arm.cmsis.pack.project/src/com/arm/cmsis/pack/configuration/RteConfiguration.java index bc656b2..99d859c 100644 --- a/com.arm.cmsis.pack.project/src/com/arm/cmsis/pack/configuration/RteConfiguration.java +++ b/com.arm.cmsis.pack.project/src/com/arm/cmsis/pack/configuration/RteConfiguration.java @@ -1,9 +1,11 @@ /******************************************************************************* * Copyright (c) 2022 ARM Ltd. and others * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation @@ -102,6 +104,8 @@ public class RteConfiguration extends PlatformObject implements IRteConfiguratio protected ICpComponentInfo deviceStartupComponent = null; protected ICpComponentInfo cmsisCoreComponent = null; protected ICpComponentInfo cmsisRtosComponent = null; + protected Map components = new HashMap<>(); + // device header name without path protected String deviceHeader = null; @@ -128,6 +132,7 @@ protected void clear() { deviceStartupComponent = null; cmsisCoreComponent = null; cmsisRtosComponent = null; + components.clear(); valid = true; fMissingPacks.clear(); @@ -371,6 +376,9 @@ protected void collectComponentSettings(ICpComponentInfo ci) { cmsisRtosComponent = ci; rteBuildSettings.setAttribute(CmsisConstants.CMSIS_RTOS, true); } + String name = ICpComponent.constructComponentName(ci); + components.put(name, ci); + ICpComponent c = ci.getComponent(); int count = ci.getInstanceCount(); if (c != null) { diff --git a/com.arm.cmsis.pack.project/src/com/arm/cmsis/pack/project/CmsisHeadlessBuilder.java b/com.arm.cmsis.pack.project/src/com/arm/cmsis/pack/project/CmsisHeadlessBuilder.java index fbb2b2b..9cc77c3 100644 --- a/com.arm.cmsis.pack.project/src/com/arm/cmsis/pack/project/CmsisHeadlessBuilder.java +++ b/com.arm.cmsis.pack.project/src/com/arm/cmsis/pack/project/CmsisHeadlessBuilder.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2023 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack.project/src/com/arm/cmsis/pack/project/CmsisProjectNature.java b/com.arm.cmsis.pack.project/src/com/arm/cmsis/pack/project/CmsisProjectNature.java index ff6e0b5..c1cb2f4 100644 --- a/com.arm.cmsis.pack.project/src/com/arm/cmsis/pack/project/CmsisProjectNature.java +++ b/com.arm.cmsis.pack.project/src/com/arm/cmsis/pack/project/CmsisProjectNature.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack.project/src/com/arm/cmsis/pack/project/CpProjectPlugIn.java b/com.arm.cmsis.pack.project/src/com/arm/cmsis/pack/project/CpProjectPlugIn.java index 4c691f2..098ec72 100644 --- a/com.arm.cmsis.pack.project/src/com/arm/cmsis/pack/project/CpProjectPlugIn.java +++ b/com.arm.cmsis.pack.project/src/com/arm/cmsis/pack/project/CpProjectPlugIn.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * Eclipse Project - generation from template * ARM Ltd and ARM Germany GmbH - application-specific implementation diff --git a/com.arm.cmsis.pack.project/src/com/arm/cmsis/pack/project/CpVariableResolver.java b/com.arm.cmsis.pack.project/src/com/arm/cmsis/pack/project/CpVariableResolver.java index cba1e7a..cd013c8 100644 --- a/com.arm.cmsis.pack.project/src/com/arm/cmsis/pack/project/CpVariableResolver.java +++ b/com.arm.cmsis.pack.project/src/com/arm/cmsis/pack/project/CpVariableResolver.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ @@ -140,7 +142,7 @@ public static String expandCmsisRootVariable(String path) { if (path == null || path.isEmpty()) return path; - if (path.startsWith(CmsisConstants.CMSIS_PACK_ROOT_VAR)) { + if (path.toLowerCase().startsWith(CmsisConstants.CMSIS_PACK_ROOT_VAR)) { String root = getCmsisPackRoot(); if (root != null && !root.isEmpty()) { String result = root + path.substring(CmsisConstants.CMSIS_PACK_ROOT_VAR.length()); diff --git a/com.arm.cmsis.pack.project/src/com/arm/cmsis/pack/project/IHelpContextIds.java b/com.arm.cmsis.pack.project/src/com/arm/cmsis/pack/project/IHelpContextIds.java index eb77a51..71ea5e1 100644 --- a/com.arm.cmsis.pack.project/src/com/arm/cmsis/pack/project/IHelpContextIds.java +++ b/com.arm.cmsis.pack.project/src/com/arm/cmsis/pack/project/IHelpContextIds.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack.project/src/com/arm/cmsis/pack/project/IRteProject.java b/com.arm.cmsis.pack.project/src/com/arm/cmsis/pack/project/IRteProject.java index 09694a8..ce1daea 100644 --- a/com.arm.cmsis.pack.project/src/com/arm/cmsis/pack/project/IRteProject.java +++ b/com.arm.cmsis.pack.project/src/com/arm/cmsis/pack/project/IRteProject.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack.project/src/com/arm/cmsis/pack/project/Messages.java b/com.arm.cmsis.pack.project/src/com/arm/cmsis/pack/project/Messages.java index 68b0397..718b5c9 100644 --- a/com.arm.cmsis.pack.project/src/com/arm/cmsis/pack/project/Messages.java +++ b/com.arm.cmsis.pack.project/src/com/arm/cmsis/pack/project/Messages.java @@ -1,9 +1,11 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation @@ -156,6 +158,22 @@ public class Messages extends NLS { public static String RteProjectImporter_Importing_Example; public static String RteProjectImporter_Importing_File; + public static String CsolutionProjectImporter_Window; + public static String CsolutionProjectImporter_ProjectTitle; + public static String CsolutionProjectImporter_SelectFile; + public static String CsolutionProjectImporter_Description; + public static String CsolutionProjectImport_CbuildName; + public static String CsolutionProjectImport_CbuildDetails; + public static String CsolutionProjectImport_ErrorFileFieldEmpty; + public static String CsolutionProjectImport_ErrorFileTypeIncorrect; + public static String CsolutionProjectImport_ErrorWorkspacePathNotAllowed; + public static String CsolutionProjectImport_ErrorDeviceNotFound; + public static String CsolutionProjectImport_ErrorCbuildNotBuilt; + public static String CsolutionProjectImport_ErrorOutputFileNotPresent; + public static String CsolutionProjectImport_ErrorNotCsolutionFile; + public static String CsolutionProjectImport_ErrorCsolutionNotExist; + public static String CsolutionProjectImport_ErrorNoCbuildSetAndCbuildIndex; + static { // initialize resource bundle NLS.initializeMessages(BUNDLE_NAME, Messages.class); diff --git a/com.arm.cmsis.pack.project/src/com/arm/cmsis/pack/project/RteProject.java b/com.arm.cmsis.pack.project/src/com/arm/cmsis/pack/project/RteProject.java index 65ac712..604c270 100644 --- a/com.arm.cmsis.pack.project/src/com/arm/cmsis/pack/project/RteProject.java +++ b/com.arm.cmsis.pack.project/src/com/arm/cmsis/pack/project/RteProject.java @@ -1,9 +1,11 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation diff --git a/com.arm.cmsis.pack.project/src/com/arm/cmsis/pack/project/RteProjectManager.java b/com.arm.cmsis.pack.project/src/com/arm/cmsis/pack/project/RteProjectManager.java index 8777664..43499aa 100644 --- a/com.arm.cmsis.pack.project/src/com/arm/cmsis/pack/project/RteProjectManager.java +++ b/com.arm.cmsis.pack.project/src/com/arm/cmsis/pack/project/RteProjectManager.java @@ -1,9 +1,11 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation diff --git a/com.arm.cmsis.pack.project/src/com/arm/cmsis/pack/project/RteProjectNature.java b/com.arm.cmsis.pack.project/src/com/arm/cmsis/pack/project/RteProjectNature.java index 14dbe0d..54058c9 100644 --- a/com.arm.cmsis.pack.project/src/com/arm/cmsis/pack/project/RteProjectNature.java +++ b/com.arm.cmsis.pack.project/src/com/arm/cmsis/pack/project/RteProjectNature.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack.project/src/com/arm/cmsis/pack/project/RteProjectStorage.java b/com.arm.cmsis.pack.project/src/com/arm/cmsis/pack/project/RteProjectStorage.java index 5cb648f..ad55b61 100644 --- a/com.arm.cmsis.pack.project/src/com/arm/cmsis/pack/project/RteProjectStorage.java +++ b/com.arm.cmsis.pack.project/src/com/arm/cmsis/pack/project/RteProjectStorage.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack.project/src/com/arm/cmsis/pack/project/RteProjectUpdater.java b/com.arm.cmsis.pack.project/src/com/arm/cmsis/pack/project/RteProjectUpdater.java index 7415c28..4b879b4 100644 --- a/com.arm.cmsis.pack.project/src/com/arm/cmsis/pack/project/RteProjectUpdater.java +++ b/com.arm.cmsis.pack.project/src/com/arm/cmsis/pack/project/RteProjectUpdater.java @@ -177,18 +177,23 @@ public IStatus runInWorkspace(IProgressMonitor monitor) { if (bLoadConfigs) { res = loadConfigFile(); } - addResources(); - removeResources(); - updateGeneratedHeaders(); + IRteConfiguration rteConf = rteProject.getRteConfiguration(); + ICpConfigurationInfo configInfo = rteConf != null ? rteConf.getConfigurationInfo() : null; + if (configInfo != null && !configInfo.hasAttribute(CmsisConstants.CBUILD_YML)) { + addResources(); + removeResources(); + + updateGeneratedHeaders(); - updateBuildSettings(bForceUpdateToolchain); + updateBuildSettings(bForceUpdateToolchain); - if (bSaveProject) { - rteProject.save(); + if (bSaveProject) { + rteProject.save(); + } + project.refreshLocal(IResource.DEPTH_INFINITE, monitor); + updateIndex(); } - project.refreshLocal(IResource.DEPTH_INFINITE, monitor); - updateIndex(); } catch (CoreException e) { status = new Status(e.getStatus().getSeverity(), CpPlugInUI.PLUGIN_ID, @@ -287,11 +292,10 @@ protected String getCauseMessage() { protected void collectErrors(Collection errors) throws CoreException { IFile rteFile = rteProject.getProject().getFile(rteProject.getName() + CmsisConstants.DOT_RTECONFIG); - rteFile.deleteMarkers(RTE_PROBLEM_MARKER, true, IResource.DEPTH_INFINITE); if (!rteFile.exists()) { return; } - + rteFile.deleteMarkers(RTE_PROBLEM_MARKER, true, IResource.DEPTH_INFINITE); if (errors == null || errors.isEmpty()) { return; } @@ -388,22 +392,19 @@ protected IRteConfiguration loadRteConfiguration(String savedRteConfigName) thro String rteConfigName = project.getName() + CmsisConstants.DOT_RTECONFIG; // moving project can still left the old file + if (!rteConfigName.equalsIgnoreCase(savedRteConfigName)) { + rteConfigName = savedRteConfigName; + } + IFile iFile = project.getFile(rteConfigName); - if (!iFile.exists() || iFile.getLocation() == null) { - // ensure file has the project name (e.g. after rename) - if (!rteConfigName.equalsIgnoreCase(savedRteConfigName)) { - iFile = project.getFile(savedRteConfigName); - if (!iFile.exists() || iFile.getLocation() == null) { - String msg = Messages.RteProjectUpdater_ErrorLoadinConfigFile + " '" + savedRteConfigName + "' " + //$NON-NLS-1$//$NON-NLS-2$ - Messages.RteProjectUpdater_ErrorConfigFileNotExist; - Status status = new Status(IStatus.ERROR, CpPlugInUI.PLUGIN_ID, msg); - throw new CoreException(status); - } - rteConfigName = savedRteConfigName; - } + File file = (iFile.exists() && iFile.getLocation() != null) ? iFile.getLocation().toFile() : null; + if (file == null || !file.exists()) { + String msg = Messages.RteProjectUpdater_ErrorLoadinConfigFile + " '" + rteConfigName + "' " + //$NON-NLS-1$//$NON-NLS-2$ + Messages.RteProjectUpdater_ErrorConfigFileNotExist; + Status status = new Status(IStatus.ERROR, CpPlugInUI.PLUGIN_ID, msg); + throw new CoreException(status); } - File file = iFile.getLocation().toFile(); CpConfigParser confParser = new CpConfigParser(); ICpItem root = confParser.parseFile(file.getAbsolutePath()); IRteConfiguration rteConf = null; @@ -426,6 +427,7 @@ protected IRteConfiguration loadRteConfiguration(String savedRteConfigName) thro } else { String msg = Messages.RteProjectUpdater_ErrorLoadinConfigFile + " '" + rteConfigName + "' " + //$NON-NLS-1$//$NON-NLS-2$ Messages.RteProjectUpdater_ErrorParsingFailed; + Status status = new Status(IStatus.ERROR, CpPlugInUI.PLUGIN_ID, msg); throw new CoreException(status); } diff --git a/com.arm.cmsis.pack.project/src/com/arm/cmsis/pack/project/RteSetupHook.java b/com.arm.cmsis.pack.project/src/com/arm/cmsis/pack/project/RteSetupHook.java index 8d2cae5..c30b951 100644 --- a/com.arm.cmsis.pack.project/src/com/arm/cmsis/pack/project/RteSetupHook.java +++ b/com.arm.cmsis.pack.project/src/com/arm/cmsis/pack/project/RteSetupHook.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack.project/src/com/arm/cmsis/pack/project/RteSetupParticipant.java b/com.arm.cmsis.pack.project/src/com/arm/cmsis/pack/project/RteSetupParticipant.java index 59b53b5..292f193 100644 --- a/com.arm.cmsis.pack.project/src/com/arm/cmsis/pack/project/RteSetupParticipant.java +++ b/com.arm.cmsis.pack.project/src/com/arm/cmsis/pack/project/RteSetupParticipant.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack.project/src/com/arm/cmsis/pack/project/csolution/CsolutionProjectImporter.java b/com.arm.cmsis.pack.project/src/com/arm/cmsis/pack/project/csolution/CsolutionProjectImporter.java new file mode 100644 index 0000000..3d2e4bb --- /dev/null +++ b/com.arm.cmsis.pack.project/src/com/arm/cmsis/pack/project/csolution/CsolutionProjectImporter.java @@ -0,0 +1,507 @@ +/******************************************************************************* +* Copyright (c) 2024 ARM Ltd. and others +* All rights reserved. This program and the accompanying materials +* are made available under the terms of the Eclipse Public License 2.0 +* which accompanies this distribution, and is available at + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * +* Contributors: +* ARM Ltd and ARM Germany GmbH - Initial API and implementation +*******************************************************************************/ + +package com.arm.cmsis.pack.project.csolution; + +import java.io.File; +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashMap; +import java.util.HashSet; +import java.util.stream.Collectors; + +import org.eclipse.core.resources.IFile; +import org.eclipse.core.resources.IResource; +import org.eclipse.core.resources.ResourceAttributes; +import org.eclipse.core.resources.ResourcesPlugin; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IPath; +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.core.runtime.OperationCanceledException; +import org.eclipse.core.runtime.Path; + +import com.arm.cmsis.pack.CpPlugIn; +import com.arm.cmsis.pack.common.CmsisConstants; +import com.arm.cmsis.pack.data.CpPack; +import com.arm.cmsis.pack.data.CpRootItem; +import com.arm.cmsis.pack.data.ICpItem; +import com.arm.cmsis.pack.data.ICpPackCollection; +import com.arm.cmsis.pack.enums.EVersionMatchMode; +import com.arm.cmsis.pack.generic.IAttributes; +import com.arm.cmsis.pack.info.CpComponentInfo; +import com.arm.cmsis.pack.info.CpDeviceInfo; +import com.arm.cmsis.pack.info.CpPackInfo; +import com.arm.cmsis.pack.info.ICpConfigurationInfo; +import com.arm.cmsis.pack.info.ICpDeviceInfo; +import com.arm.cmsis.pack.info.ICpPackFilterInfo; +import com.arm.cmsis.pack.info.ICpPackInfo; +import com.arm.cmsis.pack.parser.yml.CpYmlParser; +import com.arm.cmsis.pack.project.CpVariableResolver; +import com.arm.cmsis.pack.project.IRteProject; +import com.arm.cmsis.pack.project.Messages; +import com.arm.cmsis.pack.project.importer.IRteProjectImporter; +import com.arm.cmsis.pack.project.importer.RteProjectImporter; +import com.arm.cmsis.pack.project.utils.CDTUtils; +import com.arm.cmsis.pack.project.utils.ProjectUtils; +import com.arm.cmsis.pack.rte.devices.IRteDeviceItem; +import com.arm.cmsis.pack.utils.Utils; + +/** + * + */ +public class CsolutionProjectImporter extends RteProjectImporter implements IRteProjectImporter { + + private CpYmlParser parser; + private HashMap> cbuildFileRootToPacks; + + /** + * Imports Csolution Project i.e. *.cbuild-idx.yml file + */ + public CsolutionProjectImporter() { + super(); + parser = new CpYmlParser(); + cbuildFileRootToPacks = new HashMap<>(); + } + + public void readAndSaveFiles() throws OperationCanceledException { + validateProjectFile(); + + ICpItem fileRoot = parser.parseFile(getSourceProjectFile()); + Collection cbuilds; + boolean isCbuildIdxFile = fileRoot.getFirstChild(CmsisConstants.BUILD_IDX_TAG) != null; + if (!isCbuildIdxFile) { + // cbuild-set file + cbuilds = fileRoot.getFirstChild(CmsisConstants.CBUILD_SET_TAG).getGrandChildren(CmsisConstants.CONTEXTS); + } else { + cbuilds = fileRoot.getFirstChild(CmsisConstants.BUILD_IDX_TAG).getGrandChildren(CmsisConstants.CBUILDS); + } + + String rootPath = fileRoot.getRootDir(true); + cbuildFileRootToPacks.clear(); + for (ICpItem cbuild : cbuilds) { + String fileName; + if (isCbuildIdxFile) { + fileName = cbuild.getAttribute(CmsisConstants.CBUILD); + } else { + fileName = cbuild.getAttribute(CmsisConstants.CONTEXT) + CmsisConstants.EXT_CBUILD_YML; + } + + String cbuildFilePath = rootPath + fileName; + ICpItem cbuildFileRoot = parser.parseFile(cbuildFilePath); + if (cbuildFileRoot == null) { + cbuildFileRoot = new CpRootItem(CmsisConstants.EMPTY_STRING, fileName); + } + cbuildFileRoot.setAttribute(CmsisConstants.NAME, Utils.getPrefix(fileName, CmsisConstants.EXT_CBUILD_YML)); + cbuildFileRootToPacks.put(cbuildFileRoot, new ArrayList<>()); + } + validate(); + } + + @Override + protected void doImportProject(IProgressMonitor monitor) throws OperationCanceledException, CoreException { + validateProjectFile(); + + Collection selectedCbuildFileRoots = cbuildFileRootToPacks.keySet().stream() + .filter(item -> item.getAttributeAsBoolean(CmsisConstants.IS_SELECTED, false)) + .collect(Collectors.toList()); + + for (ICpItem cbuildFileRoot : selectedCbuildFileRoots) { + try { + doImportProject(cbuildFileRoot, monitor); + } catch (OperationCanceledException | CoreException e) { + e.printStackTrace(); + deleteProject(); + String errorMsg = e.getMessage(); + getCmsisConsole().outputError(errorMsg); + throw e; + } + } + } + + /** + * Parse *.cbuild.yml file, download required packs and create the project + * appropriately + * + * @param cbuild ICpItem node containing the + * @param monitor + * @throws OperationCanceledException + * @throws CoreException + */ + protected void doImportProject(ICpItem cbuildFileRoot, IProgressMonitor monitor) + throws OperationCanceledException, CoreException { + ICpItem buildItem = cbuildFileRoot.getFirstChild(CmsisConstants.BUILD_TAG); + progress(1, monitor); + + String contextName = buildItem.getAttribute(CmsisConstants.CONTEXT); + fProject = CDTUtils.createCProject(contextName, monitor); + fCreatedProjects.add(contextName); + progress(1, monitor); + + // Search devices and get DeviceInfo + IRteDeviceItem device = searchDevices(buildItem); + String deviceAttributeValue = buildItem.getAttribute(CmsisConstants.DEVICE_TAG); + + ICpDeviceInfo deviceInfo = new CpDeviceInfo(null); + if (device != null) { + deviceInfo.setDevice(device.getDevice(), + Utils.stripPrefix(deviceAttributeValue, CmsisConstants.DOUBLE_COLON)); + // Defaults + if (deviceInfo.getAttribute(CmsisConstants.DENDIAN).equals(CmsisConstants.CONFIGENDIAN)) { + deviceInfo.setAttribute(CmsisConstants.DENDIAN, CmsisConstants.LITTLENDIAN); + } + if (deviceInfo.getAttribute(CmsisConstants.DSECURE).isEmpty()) { + deviceInfo.setAttribute(CmsisConstants.DSECURE, CmsisConstants.TZ_DISABLED); + } + } else { + throw createErrorException(Messages.CsolutionProjectImport_ErrorDeviceNotFound); + } + + createRteProject(cbuildFileRoot, deviceInfo, monitor); + progress(1, monitor); + + createComponentLinks(buildItem, monitor); + createOutputLinks(buildItem, monitor); + createGroupLinks(buildItem.getFirstChild(CmsisConstants.GROUPS_TAG), CmsisConstants.EMPTY_STRING, monitor); + createFileLinks(buildItem.getFirstChild(CmsisConstants.CONSTRUCTED_FILES), CmsisConstants.CONSTRUCTED_FILES, + monitor); + progress(1, monitor); + } + + /** + * Searches through stored devices and returns device item + * + * @param buildItem item that represents the child with tag "build" inside the + * *.cbuild.yml file + * @return found item + */ + private IRteDeviceItem searchDevices(ICpItem buildItem) { + IRteDeviceItem device = null; + String deviceAttributeValue = buildItem.getAttribute(CmsisConstants.DEVICE_TAG); + IRteDeviceItem devices = CpPlugIn.getPackManager().getDevices(); + + if (devices != null) { + String vendor = Utils.getPrefix(deviceAttributeValue, CmsisConstants.DOUBLE_COLON); + if (vendor != null && !vendor.isEmpty()) { + device = devices.findItem(Utils.getSuffix(deviceAttributeValue, CmsisConstants.DOUBLE_COLON), vendor, + true); + } else { + device = devices.findItem(deviceAttributeValue, null, true); + } + } + return device; + } + + /** + * Create virtual links to files in the components + * + * @param buildItem "build" tag node of the root file item + * @param monitor progress monitor + */ + private void createComponentLinks(ICpItem buildItem, IProgressMonitor monitor) throws CoreException { + for (ICpItem component : buildItem.getGrandChildren(CmsisConstants.COMPONENTS_TAG)) { + String directoryName = CmsisConstants.RTE + File.separatorChar + + component.getAttribute(CmsisConstants.COMPONENT_TAG).replaceAll(":+", //$NON-NLS-1$ + CmsisConstants.DOT); // ; + for (ICpItem file : component.getGrandChildren(CmsisConstants.FILES_TAG)) { + if (CmsisConstants.TEMPLATE.equals(file.getAttribute(CmsisConstants.ATTR)) + || CmsisConstants.INCLUDE.equals(file.getAttribute(CmsisConstants.CATEGORY))) { + continue; // skip + } + File path = new File( + CpVariableResolver.expandCmsisRootVariable(file.getAttribute(CmsisConstants.FILE_TAG))); + String virtualDestinationPath = directoryName + File.separatorChar + + Utils.extractFileName(path.toString()); + + String existingLinkPath; + if (!path.isAbsolute()) { + existingLinkPath = buildItem.getParent().getAbsolutePath(path.toString()); + } else { + existingLinkPath = path.toString(); + } + ProjectUtils.createLink(fProject, existingLinkPath, virtualDestinationPath, false, monitor); + } + } + } + + /** + * Create virtual links to output directory + * + * @param buildItem "build" tag node of the root file item + * @param monitor progress monitor + */ + private void createOutputLinks(ICpItem buildItem, IProgressMonitor monitor) throws CoreException { + ICpItem outputDirs = buildItem.getFirstChild(CmsisConstants.OUTPUT_DIRS_TAG); + ICpItem output = buildItem.getFirstChild(CmsisConstants.OUTPUT_TAG); + if (outputDirs == null || output == null) { + return; + } + String outputDir = outputDirs.getAttribute(CmsisConstants.OUTDIR_TAG); + String outputFile = null; + for (ICpItem child : output.getChildren()) { + if (CmsisConstants.ELF.equals(child.getAttribute(CmsisConstants.TYPE))) { + outputFile = child.getAttribute(CmsisConstants.FILE_TAG); + break; + } + } + if (outputFile == null) { + return; + } + String srcFile = buildItem.getAbsolutePath(outputDir) + File.separatorChar + outputFile; + String dstFile = outputDir + File.separatorChar + outputFile; + ProjectUtils.createLink(fProject, srcFile, dstFile, false, monitor); + // create additional link to the executable at the project root level + IFile file = fProject.getFile(outputFile); + IPath path = new Path(srcFile); + file.createLink(path, IResource.REPLACE, monitor); + } + + /** + * Create project hierarchy based on "groups" tag via virtual links + * + * @param groupsItem group container item + * @param parentGroupName parent hierarchical group name + * @param monitor progress monitor + */ + private void createGroupLinks(ICpItem groupsItem, String parentGroupName, IProgressMonitor monitor) + throws CoreException { + if (groupsItem == null) { + return; + } + + for (ICpItem group : groupsItem.getChildren()) { + String groupName = parentGroupName; + if (!groupName.isEmpty()) { + groupName += File.separatorChar; + } + groupName += Utils.wildCardsToX(group.getAttribute(CmsisConstants.GROUP)); + + // add files + createFileLinks(group.getFirstChild(CmsisConstants.FILES_TAG), groupName, monitor); + // add subgroups + for (ICpItem subGroup : group.getGrandChildren(CmsisConstants.GROUPS_TAG)) { + createGroupLinks(subGroup, groupName, monitor); + } + } + } + + /** + * Create project hierarchy based on "groups" tag via virtual links + * + * @param container file container : "files" or "constructed-files" + * @param group name + * @param monitor progress monitor + */ + private void createFileLinks(ICpItem container, String groupName, IProgressMonitor monitor) throws CoreException { + if (container == null) { + return; + } + + // add files + for (ICpItem file : container.getChildren()) { + String filePath = file.getAttribute(CmsisConstants.FILE_TAG); + String fileName = Utils.extractFileName(filePath); + String absPath = file.getAbsolutePath(filePath); + ProjectUtils.createLink(fProject, absPath, groupName + File.separatorChar + fileName, false, monitor); + } + } + + /** + * Creates RteProject, .rteconfig and saves .rteconfig persistently + * + * @param cbuildFileRoot + * @param deviceInfo + * @param monitor + * @throws CoreException + */ + + private void createRteProject(ICpItem cbuildFileRoot, ICpDeviceInfo deviceInfo, IProgressMonitor monitor) + throws CoreException { + ICpItem buildItem = cbuildFileRoot.getFirstChild(CmsisConstants.BUILD_TAG); + + String compiler = decodeCompiler(buildItem.getAttribute(CmsisConstants.COMPILER)); + IRteProject rteProject = ProjectUtils.createRteProject(getProject(), + buildItem.getAttribute(CmsisConstants.CONTEXT), deviceInfo, compiler, CmsisConstants.EXE, + "com.arm.cmsis.pack.GenericToolChainAdapter"); //$NON-NLS-1$ + if (rteProject == null) { + throw createErrorException("Error creating RTE Project"); //$NON-NLS-1$ + } + + updateConfigurationInfo(cbuildFileRoot, rteProject.getRteConfiguration().getConfigurationInfo()); + + IFile createdFile = ProjectUtils.createRteFile(getProject(), rteProject.getRteConfigurationName(), + rteProject.getRteConfiguration(), monitor); + createdFile.refreshLocal(IResource.DEPTH_ONE, null); + + // Make .rteconfig read-only + ResourceAttributes readOnlyAttributes = new ResourceAttributes(); + readOnlyAttributes.setReadOnly(true); + createdFile.setResourceAttributes(readOnlyAttributes); + + rteProject.save(); + } + + private void updateConfigurationInfo(ICpItem cbuildFileRoot, ICpConfigurationInfo configurationInfo) { + ICpPackFilterInfo packFilterInfo = configurationInfo.getPackFilterInfo(); + ICpPackCollection installedPacks = CpPlugIn.getPackManager().getInstalledPacks(); + + // Add packs to configuration info + for (String packId : cbuildFileRootToPacks.get(cbuildFileRoot)) { + IAttributes packAttributes = CpPack.attributesFromId(packId); + + ICpPackInfo packInfo = new CpPackInfo(null, packAttributes); + packInfo.setPack(installedPacks.getPack(packId)); + packFilterInfo.addChild(packInfo); + if (packInfo.getVersion() == null) { + packInfo.setVersionMatchMode(EVersionMatchMode.LATEST); + } else { + packInfo.setVersionMatchMode(EVersionMatchMode.FIXED); + if (packFilterInfo.isUseAllLatestPacks()) { + packFilterInfo.setUseAllLatestPacks(false); + } + } + } + String cbuildYmlAttributeKey = CmsisConstants.CBUILD + CmsisConstants.UNDERSCORE + CmsisConstants.YML; + configurationInfo.setAttribute(cbuildYmlAttributeKey, cbuildFileRoot.getRootFileName()); + + // Add components to configuration info + ICpItem componentsItem = configurationInfo.getComponentsItem(); + ICpItem buildItem = cbuildFileRoot.getFirstChild(); + for (ICpItem entry : buildItem.getGrandChildren(CmsisConstants.COMPONENTS_TAG)) { + CpComponentInfo component = new CpComponentInfo(componentsItem, CmsisConstants.COMPONENT_TAG); + String tag = entry.getAttribute(CmsisConstants.COMPONENT_TAG); + component.setAttributesFromComponentId(tag); + + String packId = getValidPackname(entry.getAttribute(CmsisConstants.FROM_PACK_TAG)); + IAttributes packAttributes = CpPack.attributesFromId(packId); + + CpPackInfo packInfo = new CpPackInfo(component, packAttributes); + packInfo.setPack(installedPacks.getPack(packId)); + component.addChild(packInfo); + componentsItem.addChild(component); + } + } + + @Override + public void installRequiredPacks(IProgressMonitor monitor) throws OperationCanceledException, InterruptedException { + super.installRequiredPacks(monitor); + CpPlugIn.getPackManager().getInstalledPacks(); // trigger loading of packs + } + + @Override + public Collection getRequiredPackIDs() { + HashSet requiredPacks = new HashSet<>(); + for (ICpItem rootItem : cbuildFileRootToPacks.keySet()) { + ICpItem buildItem = rootItem.getFirstChild(CmsisConstants.BUILD_TAG); + if (buildItem == null) { + continue; + } + Collection allPacks = buildItem.getFirstChild(CmsisConstants.PACKS_TAG).getChildren(); + for (ICpItem packNode : allPacks) { + String packId = getValidPackname(packNode.getAttribute(CmsisConstants.PACK)); + requiredPacks.add(packId); + cbuildFileRootToPacks.get(rootItem).add(packId); + } + } + return requiredPacks; + } + + public String validateProjectFile() { + String projectFile = getSourceProjectFile(); + File workspacePath = new File(ResourcesPlugin.getWorkspace().getRoot().getLocation().toString()); + String messageStatus = null; + if (projectFile == null || projectFile.isEmpty()) { + messageStatus = Messages.CsolutionProjectImport_ErrorFileFieldEmpty; + } else if (!projectFile.endsWith(CmsisConstants.EXT_CBUILD_IDX) + && !projectFile.endsWith(CmsisConstants.EXT_CBUILD_SET) + && !projectFile.endsWith(CmsisConstants.EXT_CSOLUTION_YML)) { + messageStatus = Messages.CsolutionProjectImport_ErrorFileTypeIncorrect; + } + clear(); + + File f = new File(projectFile); + if (!f.exists()) { + messageStatus = projectFile + CmsisConstants.SPACE + Messages.RteProjectUpdater_ErrorConfigFileNotExist; + } else if (f.toPath().startsWith(workspacePath.getPath())) { + messageStatus = Messages.CsolutionProjectImport_ErrorWorkspacePathNotAllowed; + } + return messageStatus; + } + + @Override + public String validate() { + String errorProjectFile = validateProjectFile(); + if (errorProjectFile == null) { + String errorCbuilds = validateCbuilds(); + return errorCbuilds; + } + return errorProjectFile; + } + + /** + * Format packName correctly so that the Eclipse Pack Installer can identify the + * pack e.g. ARM::V2M_MPS3_SSE_300_BSP@1.2.0 ---> ARM.V2M_MPS3_SSE_300_BSP.1.2.0 + * + * @param packName + * @return formatted packName + */ + private static String getValidPackname(String packName) { + return packName.replaceAll("@|::", CmsisConstants.DOT); //$NON-NLS-1$ + } + + private String decodeCompiler(String compiler) { + if (compiler.equals("AC6") || compiler.equals("AC5")) { //$NON-NLS-1$ //$NON-NLS-2$ + return CmsisConstants.ARMCC; + } + return compiler; + } + + public HashMap> getCbuildFileRootToPacks() { + return cbuildFileRootToPacks; + } + + public String setSourceFileFromCsolutionYmlFile(String filePath) { + String folderPath = Utils.extractPath(filePath, true); + String projectName = Utils.getPrefix(Utils.extractFileName(filePath), CmsisConstants.EXT_CSOLUTION_YML); + File cbuildSet = new File(folderPath + projectName + CmsisConstants.EXT_CBUILD_SET); + File cbuildIdx = new File(folderPath + projectName + CmsisConstants.EXT_CBUILD_IDX); + if (cbuildSet.exists()) { + setSourceProjectFile(cbuildSet.getPath()); + } else if (cbuildIdx.exists()) { + setSourceProjectFile(cbuildIdx.getPath()); + } else { + return Messages.CsolutionProjectImport_ErrorNoCbuildSetAndCbuildIndex; + } + return null; + } + + private String validateCbuilds() { + Collection cbuildFileRoots = getCbuildFileRootToPacks().keySet(); + String messageStatus = null; + for (ICpItem cbuildFile : cbuildFileRoots) { + ICpItem buildItem = cbuildFile.getFirstChild(CmsisConstants.BUILD_TAG); + if (buildItem == null) { + cbuildFile.setValid(false); + cbuildFile.setAttribute(CmsisConstants.INFO, Messages.CsolutionProjectImport_ErrorCbuildNotBuilt); + messageStatus = Messages.CsolutionProjectImport_ErrorCbuildNotBuilt; + } else if (buildItem.getFirstChild(CmsisConstants.OUTPUT_TAG) == null) { + cbuildFile.setValid(false); + cbuildFile.setAttribute(CmsisConstants.INFO, Messages.CsolutionProjectImport_ErrorOutputFileNotPresent); + messageStatus = Messages.CsolutionProjectImport_ErrorOutputFileNotPresent; + } else { + cbuildFile.setValid(true); + cbuildFile.setAttribute(CmsisConstants.IS_SELECTED, true); + } + } + return messageStatus; + } +} diff --git a/com.arm.cmsis.pack.project/src/com/arm/cmsis/pack/project/importer/CopyExampleDialog.java b/com.arm.cmsis.pack.project/src/com/arm/cmsis/pack/project/importer/CopyExampleDialog.java index 1a38d5e..205e0e5 100644 --- a/com.arm.cmsis.pack.project/src/com/arm/cmsis/pack/project/importer/CopyExampleDialog.java +++ b/com.arm.cmsis.pack.project/src/com/arm/cmsis/pack/project/importer/CopyExampleDialog.java @@ -1,9 +1,11 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation diff --git a/com.arm.cmsis.pack.project/src/com/arm/cmsis/pack/project/importer/CpEclipseExampleImporter.java b/com.arm.cmsis.pack.project/src/com/arm/cmsis/pack/project/importer/CpEclipseExampleImporter.java index 0640437..cad6b3a 100644 --- a/com.arm.cmsis.pack.project/src/com/arm/cmsis/pack/project/importer/CpEclipseExampleImporter.java +++ b/com.arm.cmsis.pack.project/src/com/arm/cmsis/pack/project/importer/CpEclipseExampleImporter.java @@ -1,9 +1,11 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation diff --git a/com.arm.cmsis.pack.project/src/com/arm/cmsis/pack/project/importer/CpExampleImporter.java b/com.arm.cmsis.pack.project/src/com/arm/cmsis/pack/project/importer/CpExampleImporter.java index 93126b5..28bdcfb 100644 --- a/com.arm.cmsis.pack.project/src/com/arm/cmsis/pack/project/importer/CpExampleImporter.java +++ b/com.arm.cmsis.pack.project/src/com/arm/cmsis/pack/project/importer/CpExampleImporter.java @@ -1,9 +1,11 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation diff --git a/com.arm.cmsis.pack.project/src/com/arm/cmsis/pack/project/importer/IRteProjectImporter.java b/com.arm.cmsis.pack.project/src/com/arm/cmsis/pack/project/importer/IRteProjectImporter.java index 12accab..6f86fa2 100644 --- a/com.arm.cmsis.pack.project/src/com/arm/cmsis/pack/project/importer/IRteProjectImporter.java +++ b/com.arm.cmsis.pack.project/src/com/arm/cmsis/pack/project/importer/IRteProjectImporter.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack.project/src/com/arm/cmsis/pack/project/importer/OverwriteQuery.java b/com.arm.cmsis.pack.project/src/com/arm/cmsis/pack/project/importer/OverwriteQuery.java index 6b8318c..127c143 100644 --- a/com.arm.cmsis.pack.project/src/com/arm/cmsis/pack/project/importer/OverwriteQuery.java +++ b/com.arm.cmsis.pack.project/src/com/arm/cmsis/pack/project/importer/OverwriteQuery.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * IBM Corporation - initial API and implementation * ARM Ltd and ARM Germany GmbH - application-specific implementation diff --git a/com.arm.cmsis.pack.project/src/com/arm/cmsis/pack/project/importer/RteProjectImporter.java b/com.arm.cmsis.pack.project/src/com/arm/cmsis/pack/project/importer/RteProjectImporter.java index a3c316b..da52e44 100644 --- a/com.arm.cmsis.pack.project/src/com/arm/cmsis/pack/project/importer/RteProjectImporter.java +++ b/com.arm.cmsis.pack.project/src/com/arm/cmsis/pack/project/importer/RteProjectImporter.java @@ -1,9 +1,11 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation @@ -111,15 +113,7 @@ public IStatus runInWorkspace(IProgressMonitor monitor) { installRequiredPacks(monitor); doImportProject(monitor); } catch (OperationCanceledException | InterruptedException e) { - ICpPackInstaller packInstaller = CpPlugIn.getPackManager().getPackInstaller(); - if (packInstaller != null) { - packInstaller.reset(); // cancel all pending install jobs - } - - String msgCancel = e.getMessage(); - status = new Status(IStatus.CANCEL, CpProjectPlugIn.PLUGIN_ID, msgCancel, e); - getCmsisConsole().outputInfo(msgCancel); - + status = handlePackInstallerException(e); } catch (CoreException e) { e.printStackTrace(); status = new Status(e.getStatus().getSeverity(), CpProjectPlugIn.PLUGIN_ID, e.getMessage(), e); @@ -199,19 +193,21 @@ protected void notifyImportCompleted() { abstract protected void doImportProject(IProgressMonitor monitor) throws OperationCanceledException, CoreException; /** - * Creates CDT project with RTE nature + * Creates a project with RTE nature * * @param destinationProjectName * @param destinationURI * @param toolchainID * @param projectType * @param monitor + * @param createCDT TODO * @return created project * @throws OperationCanceledException * @throws CoreException */ protected IProject createProject(String destinationProjectName, URI destinationURI, String toolchainID, - String projectType, IProgressMonitor monitor) throws OperationCanceledException, CoreException { + String projectType, IProgressMonitor monitor, boolean createCDT) + throws OperationCanceledException, CoreException { // Create project in workspace IProject project = CDTUtils.createProject(destinationProjectName, destinationURI, monitor); if (project == null) { @@ -226,11 +222,12 @@ protected IProject createProject(String destinationProjectName, URI destinationU } progress(1, monitor); - - // Create CDT project - project = CDTUtils.createCDTProject(project, toolchainID, projectType, monitor); - if (project == null) { - throw createErrorException(Messages.RteProjectImporter_ErrorCDTProjectCreation); + if (createCDT) { + // Create CDT project + project = CDTUtils.createCDTProject(project, toolchainID, projectType, monitor); + if (project == null) { + throw createErrorException(Messages.RteProjectImporter_ErrorCDTProjectCreation); + } } return project; } @@ -398,6 +395,22 @@ protected void deleteExistingProject(IProject project) { } } + /** + * Handle the exception thrown by the pack installer + * + * @param exception + */ + protected IStatus handlePackInstallerException(Exception exception) { + ICpPackInstaller packInstaller = CpPlugIn.getPackManager().getPackInstaller(); + if (packInstaller != null) { + packInstaller.reset(); // cancel all pending install jobs + } + + String msgCancel = exception.getMessage(); + getCmsisConsole().outputInfo(msgCancel); + return new Status(IStatus.CANCEL, CpProjectPlugIn.PLUGIN_ID, msgCancel, exception); + } + @Override public IAdaptable importExample(ICpExample example) { setCmsisConsole(RteConsole.openGlobalConsole()); diff --git a/com.arm.cmsis.pack.project/src/com/arm/cmsis/pack/project/messages.properties b/com.arm.cmsis.pack.project/src/com/arm/cmsis/pack/project/messages.properties index fb90470..21b499f 100644 --- a/com.arm.cmsis.pack.project/src/com/arm/cmsis/pack/project/messages.properties +++ b/com.arm.cmsis.pack.project/src/com/arm/cmsis/pack/project/messages.properties @@ -159,4 +159,19 @@ CommandLineUsage=Usage: {0} -data -application {1} [ OPTIONS ]\n\ \ Tool option values are parsed as a string, comma separated list of strings or a boolean based on the option''s type\n\ \ -cmsisRoot {path} CMSIS-Packs root directory\n\ \ -help prints the list of arguments\n\ -' \ No newline at end of file +' +CsolutionProjectImporter_Window=Import Csolution Project +CsolutionProjectImporter_ProjectTitle=Csolution Project +CsolutionProjectImporter_SelectFile=Select a *.csolution.yml file +CsolutionProjectImporter_Description=This wizard looks for a project's *.cbuild-set.yml or *.cbuild-idx.yml file to import +CsolutionProjectImport_ErrorFileFieldEmpty=No file was chosen +CsolutionProjectImport_ErrorFileTypeIncorrect=File must be of type *.cbuild-idx.yml +CsolutionProjectImport_ErrorWorkspacePathNotAllowed=File must not be in the Eclipse workspace +CsolutionProjectImport_ErrorDeviceNotFound=Device not found +CsolutionProjectImport_ErrorCbuildNotBuilt=The *.cbuild.yml file was not built. Please run the following command and restart the import: cbuild setup .csolution.yml --context-set --update-rte --packs +CsolutionProjectImport_ErrorOutputFileNotPresent=Output *.axf file does not exist +CsolutionProjectImport_ErrorNotCsolutionFile=Chosen file was not of type *.csolution.yml +CsolutionProjectImport_ErrorCsolutionNotExist=Chosen *.csolution.yml file does not exist +CsolutionProjectImport_ErrorNoCbuildSetAndCbuildIndex=Neither *.cbuild-idx.yml not *.cbuild-set.yml found +CsolutionProjectImport_CbuildName=cbuild names +CsolutionProjectImport_CbuildDetails=cbuild details \ No newline at end of file diff --git a/com.arm.cmsis.pack.project/src/com/arm/cmsis/pack/project/template/CreateRteProject.java b/com.arm.cmsis.pack.project/src/com/arm/cmsis/pack/project/template/CreateRteProject.java index 230aec4..b7362d9 100644 --- a/com.arm.cmsis.pack.project/src/com/arm/cmsis/pack/project/template/CreateRteProject.java +++ b/com.arm.cmsis.pack.project/src/com/arm/cmsis/pack/project/template/CreateRteProject.java @@ -1,9 +1,11 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation diff --git a/com.arm.cmsis.pack.project/src/com/arm/cmsis/pack/project/template/IDeviceInfoProvider.java b/com.arm.cmsis.pack.project/src/com/arm/cmsis/pack/project/template/IDeviceInfoProvider.java index de48454..6c0b995 100644 --- a/com.arm.cmsis.pack.project/src/com/arm/cmsis/pack/project/template/IDeviceInfoProvider.java +++ b/com.arm.cmsis.pack.project/src/com/arm/cmsis/pack/project/template/IDeviceInfoProvider.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack.project/src/com/arm/cmsis/pack/project/template/InstallDeviceAndBoardPacks.java b/com.arm.cmsis.pack.project/src/com/arm/cmsis/pack/project/template/InstallDeviceAndBoardPacks.java index f887175..7e537b6 100644 --- a/com.arm.cmsis.pack.project/src/com/arm/cmsis/pack/project/template/InstallDeviceAndBoardPacks.java +++ b/com.arm.cmsis.pack.project/src/com/arm/cmsis/pack/project/template/InstallDeviceAndBoardPacks.java @@ -1,9 +1,11 @@ /******************************************************************************* * Copyright (c) 2022 ARM Ltd. and others * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation diff --git a/com.arm.cmsis.pack.project/src/com/arm/cmsis/pack/project/template/RteProjectTemplate.java b/com.arm.cmsis.pack.project/src/com/arm/cmsis/pack/project/template/RteProjectTemplate.java index e89fe22..5779d0e 100644 --- a/com.arm.cmsis.pack.project/src/com/arm/cmsis/pack/project/template/RteProjectTemplate.java +++ b/com.arm.cmsis.pack.project/src/com/arm/cmsis/pack/project/template/RteProjectTemplate.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack.project/src/com/arm/cmsis/pack/project/template/RteTemplateCmsisProjectPage.java b/com.arm.cmsis.pack.project/src/com/arm/cmsis/pack/project/template/RteTemplateCmsisProjectPage.java index 2196e98..3c65743 100644 --- a/com.arm.cmsis.pack.project/src/com/arm/cmsis/pack/project/template/RteTemplateCmsisProjectPage.java +++ b/com.arm.cmsis.pack.project/src/com/arm/cmsis/pack/project/template/RteTemplateCmsisProjectPage.java @@ -1,9 +1,11 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation diff --git a/com.arm.cmsis.pack.project/src/com/arm/cmsis/pack/project/template/RteTemplateDeviceSelectorPage.java b/com.arm.cmsis.pack.project/src/com/arm/cmsis/pack/project/template/RteTemplateDeviceSelectorPage.java index 7ff6b40..a0a86bd 100644 --- a/com.arm.cmsis.pack.project/src/com/arm/cmsis/pack/project/template/RteTemplateDeviceSelectorPage.java +++ b/com.arm.cmsis.pack.project/src/com/arm/cmsis/pack/project/template/RteTemplateDeviceSelectorPage.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2022 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack.project/src/com/arm/cmsis/pack/project/template/RteToolChainAdapterSelector.java b/com.arm.cmsis.pack.project/src/com/arm/cmsis/pack/project/template/RteToolChainAdapterSelector.java index a000494..9bbf617 100644 --- a/com.arm.cmsis.pack.project/src/com/arm/cmsis/pack/project/template/RteToolChainAdapterSelector.java +++ b/com.arm.cmsis.pack.project/src/com/arm/cmsis/pack/project/template/RteToolChainAdapterSelector.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack.project/src/com/arm/cmsis/pack/project/ui/RenameResourceAfterProjectChange.java b/com.arm.cmsis.pack.project/src/com/arm/cmsis/pack/project/ui/RenameResourceAfterProjectChange.java index c0223f6..d796be8 100644 --- a/com.arm.cmsis.pack.project/src/com/arm/cmsis/pack/project/ui/RenameResourceAfterProjectChange.java +++ b/com.arm.cmsis.pack.project/src/com/arm/cmsis/pack/project/ui/RenameResourceAfterProjectChange.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack.project/src/com/arm/cmsis/pack/project/ui/RteProjectDecorator.java b/com.arm.cmsis.pack.project/src/com/arm/cmsis/pack/project/ui/RteProjectDecorator.java index c829a9d..3485fe5 100644 --- a/com.arm.cmsis.pack.project/src/com/arm/cmsis/pack/project/ui/RteProjectDecorator.java +++ b/com.arm.cmsis.pack.project/src/com/arm/cmsis/pack/project/ui/RteProjectDecorator.java @@ -1,9 +1,11 @@ /******************************************************************************* * Copyright (c) 2021 IBM Corporation and others. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * IBM Corporation - initial API and implementation @@ -60,27 +62,33 @@ public void decorate(Object element, IDecoration decoration) { if (rteProject == null) { return; } + IRteConfiguration rteConf = rteProject.getRteConfiguration(); + boolean bValidConfiguration = rteConf != null && rteConf.isValid(); - String ext = resource.getFileExtension(); - if (type == IResource.FOLDER || (ext != null && ext.equals(CmsisConstants.RTECONFIG))) { + if (type == IResource.FOLDER) { if (path.segmentCount() == 1) { // RTE folder itself - IRteConfiguration rteConf = rteProject.getRteConfiguration(); - if (rteConf == null || !rteConf.isValid()) { + if (!bValidConfiguration) { addOverlay(decoration, CpPlugInUI.ICON_RTE_ERROR_OVR); - } else if (type == IResource.FOLDER) { + } else { addOverlay(decoration, CpPlugInUI.ICON_RTE_OVR); } - } else if (type == IResource.FOLDER) { + } else { int overlayType = getOverlayType(rteProject, path); if (overlayType == -1) { addOverlay(decoration, CpPlugInUI.ICON_RTE_ERROR_OVR); } else if (overlayType == 0) { addOverlay(decoration, CpPlugInUI.ICON_RTE_WARNING_OVR); + } else { + addOverlay(decoration, CpPlugInUI.ICON_RTE_OVR); } } } if (type == IResource.FILE) { + if (!bValidConfiguration && CmsisConstants.RTECONFIG.equals(resource.getFileExtension())) { + addOverlay(decoration, CpPlugInUI.ICON_RTE_ERROR_OVR); + } + ICpFileInfo fi = rteProject.getProjectFileInfo(path.toString()); if (fi == null) return; diff --git a/com.arm.cmsis.pack.project/src/com/arm/cmsis/pack/project/ui/RteProjectRenameParticipant.java b/com.arm.cmsis.pack.project/src/com/arm/cmsis/pack/project/ui/RteProjectRenameParticipant.java index e3f0c68..31a0a4a 100644 --- a/com.arm.cmsis.pack.project/src/com/arm/cmsis/pack/project/ui/RteProjectRenameParticipant.java +++ b/com.arm.cmsis.pack.project/src/com/arm/cmsis/pack/project/ui/RteProjectRenameParticipant.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack.project/src/com/arm/cmsis/pack/project/ui/RtePropertyPage.java b/com.arm.cmsis.pack.project/src/com/arm/cmsis/pack/project/ui/RtePropertyPage.java index f29f72a..9d6e3be 100644 --- a/com.arm.cmsis.pack.project/src/com/arm/cmsis/pack/project/ui/RtePropertyPage.java +++ b/com.arm.cmsis.pack.project/src/com/arm/cmsis/pack/project/ui/RtePropertyPage.java @@ -1,9 +1,11 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation diff --git a/com.arm.cmsis.pack.project/src/com/arm/cmsis/pack/project/ui/RtePropertyTester.java b/com.arm.cmsis.pack.project/src/com/arm/cmsis/pack/project/ui/RtePropertyTester.java index 7e7debb..eec3d1a 100644 --- a/com.arm.cmsis.pack.project/src/com/arm/cmsis/pack/project/ui/RtePropertyTester.java +++ b/com.arm.cmsis.pack.project/src/com/arm/cmsis/pack/project/ui/RtePropertyTester.java @@ -1,9 +1,11 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation diff --git a/com.arm.cmsis.pack.project/src/com/arm/cmsis/pack/project/ui/RteUpdateConfigFileTester.java b/com.arm.cmsis.pack.project/src/com/arm/cmsis/pack/project/ui/RteUpdateConfigFileTester.java index 893c16f..f9ed26e 100644 --- a/com.arm.cmsis.pack.project/src/com/arm/cmsis/pack/project/ui/RteUpdateConfigFileTester.java +++ b/com.arm.cmsis.pack.project/src/com/arm/cmsis/pack/project/ui/RteUpdateConfigFileTester.java @@ -1,9 +1,11 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation diff --git a/com.arm.cmsis.pack.project/src/com/arm/cmsis/pack/project/ui/handlers/CleanupHandler.java b/com.arm.cmsis.pack.project/src/com/arm/cmsis/pack/project/ui/handlers/CleanupHandler.java index 3eea030..ff935da 100644 --- a/com.arm.cmsis.pack.project/src/com/arm/cmsis/pack/project/ui/handlers/CleanupHandler.java +++ b/com.arm.cmsis.pack.project/src/com/arm/cmsis/pack/project/ui/handlers/CleanupHandler.java @@ -1,9 +1,11 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation diff --git a/com.arm.cmsis.pack.project/src/com/arm/cmsis/pack/project/ui/handlers/MergeConfigFileHandler.java b/com.arm.cmsis.pack.project/src/com/arm/cmsis/pack/project/ui/handlers/MergeConfigFileHandler.java index 52d0e9d..1f41093 100644 --- a/com.arm.cmsis.pack.project/src/com/arm/cmsis/pack/project/ui/handlers/MergeConfigFileHandler.java +++ b/com.arm.cmsis.pack.project/src/com/arm/cmsis/pack/project/ui/handlers/MergeConfigFileHandler.java @@ -1,9 +1,11 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation diff --git a/com.arm.cmsis.pack.project/src/com/arm/cmsis/pack/project/ui/handlers/ResetBuildSettingsHandler.java b/com.arm.cmsis.pack.project/src/com/arm/cmsis/pack/project/ui/handlers/ResetBuildSettingsHandler.java index 4e1664f..c16a9fd 100644 --- a/com.arm.cmsis.pack.project/src/com/arm/cmsis/pack/project/ui/handlers/ResetBuildSettingsHandler.java +++ b/com.arm.cmsis.pack.project/src/com/arm/cmsis/pack/project/ui/handlers/ResetBuildSettingsHandler.java @@ -1,9 +1,11 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation diff --git a/com.arm.cmsis.pack.project/src/com/arm/cmsis/pack/project/ui/handlers/UpdateConfigFileHandler.java b/com.arm.cmsis.pack.project/src/com/arm/cmsis/pack/project/ui/handlers/UpdateConfigFileHandler.java index 9c08e4f..b44ccc2 100644 --- a/com.arm.cmsis.pack.project/src/com/arm/cmsis/pack/project/ui/handlers/UpdateConfigFileHandler.java +++ b/com.arm.cmsis.pack.project/src/com/arm/cmsis/pack/project/ui/handlers/UpdateConfigFileHandler.java @@ -1,9 +1,11 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation diff --git a/com.arm.cmsis.pack.project/src/com/arm/cmsis/pack/project/utils/CDTUtils.java b/com.arm.cmsis.pack.project/src/com/arm/cmsis/pack/project/utils/CDTUtils.java index a0aba30..e70ceef 100644 --- a/com.arm.cmsis.pack.project/src/com/arm/cmsis/pack/project/utils/CDTUtils.java +++ b/com.arm.cmsis.pack.project/src/com/arm/cmsis/pack/project/utils/CDTUtils.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * Intel Corporation - initial API and implementation * IBM Corporation @@ -38,6 +40,9 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.OperationCanceledException; +import org.eclipse.core.runtime.Status; + +import com.arm.cmsis.pack.project.RteProjectNature; /** * Class to create a CDT project @@ -81,6 +86,28 @@ public static IProject createCDTProject(IProject project, String toolchainID, St return project; } + /** + * Create C Project like in AbstractImportExecutableWizard + * + * @param projectName + * @param monitor + * + * @return IProject + * @throws OperationCanceledException + * @throws CoreException + */ + + public static IProject createCProject(String projectName, IProgressMonitor monitor) + throws OperationCanceledException, CoreException { + IProject projectHandle = ResourcesPlugin.getWorkspace().getRoot().getProject(projectName); + IProject project = CCorePlugin.getDefault().createCProject(null, projectHandle, monitor, projectName); + String msgAddRteNature = RteProjectNature.addRteNature(project, monitor); + if (!msgAddRteNature.isEmpty()) { + throw new CoreException(Status.error(msgAddRteNature)); + } + return project; + } + /** * Creates a project * diff --git a/com.arm.cmsis.pack.project/src/com/arm/cmsis/pack/project/utils/CPreprocessorDefineOptionsParser.java b/com.arm.cmsis.pack.project/src/com/arm/cmsis/pack/project/utils/CPreprocessorDefineOptionsParser.java index a76218a..dd7acad 100644 --- a/com.arm.cmsis.pack.project/src/com/arm/cmsis/pack/project/utils/CPreprocessorDefineOptionsParser.java +++ b/com.arm.cmsis.pack.project/src/com/arm/cmsis/pack/project/utils/CPreprocessorDefineOptionsParser.java @@ -1,9 +1,11 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation diff --git a/com.arm.cmsis.pack.project/src/com/arm/cmsis/pack/project/utils/ProjectUtils.java b/com.arm.cmsis.pack.project/src/com/arm/cmsis/pack/project/utils/ProjectUtils.java index 5632f5b..6e96290 100644 --- a/com.arm.cmsis.pack.project/src/com/arm/cmsis/pack/project/utils/ProjectUtils.java +++ b/com.arm.cmsis.pack.project/src/com/arm/cmsis/pack/project/utils/ProjectUtils.java @@ -1,9 +1,11 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation @@ -17,9 +19,9 @@ import java.io.FileReader; import java.io.IOException; import java.io.PrintWriter; +import java.util.ArrayList; import java.util.Collection; import java.util.Iterator; -import java.util.ArrayList; import java.util.List; import java.util.Map; import java.util.Optional; @@ -73,6 +75,7 @@ import com.arm.cmsis.pack.info.ICpDeviceInfo; import com.arm.cmsis.pack.info.ICpFileInfo; import com.arm.cmsis.pack.parser.CpConfigParser; +import com.arm.cmsis.pack.parser.yml.CpYmlParser; import com.arm.cmsis.pack.project.CpProjectPlugIn; import com.arm.cmsis.pack.project.IRteProject; import com.arm.cmsis.pack.project.Messages; @@ -85,6 +88,11 @@ */ public class ProjectUtils { + public static ICpItem parseYmlFile(String fileName) { + CpYmlParser parser = new CpYmlParser(); + return parser.parseFile(fileName); + } + /** * Returns ICpProject for given IProject if such exists * @@ -333,16 +341,32 @@ public static void createLink(String projectName, String srcFile, String dstFile */ public static void createLink(IProject project, String srcFile, String dstFile, IProgressMonitor monitor) throws CoreException { + createLink(project, srcFile, dstFile, true, monitor); + } + /** + * Create a link in a local or virtual folder if folder has to be created. + * + * @param srcFile source file which is to be linked, may not be relative. + * @param project parent IProject + * @param dstFile destination file in a virtual project folder. Folder(s) are + * created if not existing. + * @param isLocal a flag to create local folder + * @param monitor IProgressMonitor + * @throws CoreException + */ + public static void createLink(IProject project, String srcFile, String dstFile, boolean isLocal, + IProgressMonitor monitor) throws CoreException { // create folder if not existing String folder = removeLastPathSegment(dstFile); // retrieve only folder name - createProjectFolder(project, folder, monitor); + createProjectFolder(project, folder, isLocal, monitor); // create link IFile file = project.getFile(dstFile); IPath path = new Path(srcFile); file.createLink(path, IResource.REPLACE, monitor); + } /** @@ -372,7 +396,11 @@ public static void createProjectFolder(String projectName, String projectFolder, */ public static void createProjectFolder(IProject project, String projectFolder, IProgressMonitor monitor) throws CoreException { + createProjectFolder(project, projectFolder, true, monitor); + } + public static void createProjectFolder(IProject project, String projectFolder, boolean isLocal, + IProgressMonitor monitor) throws CoreException { if (projectFolder.isEmpty()) { return; } @@ -389,7 +417,7 @@ public static void createProjectFolder(IProject project, String projectFolder, I for (int i = 1; i <= path.segmentCount(); i++) { IFolder subfolder = project.getFolder(path.uptoSegment(i)); if (!subfolder.exists()) { - subfolder.create(true, true, monitor); + subfolder.create(true, isLocal, monitor); } } } @@ -549,28 +577,17 @@ public static IResource getRteResource(Object obj) { if (r == null) { return null; } - - IProject project = r.getProject(); - if (!RteProjectNature.hasRteNature(project)) { - return null; - } if (r.getType() == IResource.PROJECT) { - return r; + return RteProjectNature.hasRteNature(r.getProject()) ? r : null; } IPath path = r.getProjectRelativePath(); if (path == null || path.isEmpty()) { return null; } - if (r.getType() == IResource.FILE && path.segmentCount() == 1) { - if (CmsisConstants.RTECONFIG.equals(r.getFileExtension())) { - return r; - } - } - if (!path.segment(0).startsWith(CmsisConstants.RTE)) { - return null; + if (path.segment(0).startsWith(CmsisConstants.RTE) || CmsisConstants.RTECONFIG.equals(r.getFileExtension())) { + return r; } - - return r; + return null; } /** diff --git a/com.arm.cmsis.pack.project/src/com/arm/cmsis/pack/project/utils/RtePathComparator.java b/com.arm.cmsis.pack.project/src/com/arm/cmsis/pack/project/utils/RtePathComparator.java index 807b780..d14aeae 100644 --- a/com.arm.cmsis.pack.project/src/com/arm/cmsis/pack/project/utils/RtePathComparator.java +++ b/com.arm.cmsis.pack.project/src/com/arm/cmsis/pack/project/utils/RtePathComparator.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack.project/src/com/arm/cmsis/pack/project/wizards/CmsisCodeTemplateNewWizard.java b/com.arm.cmsis.pack.project/src/com/arm/cmsis/pack/project/wizards/CmsisCodeTemplateNewWizard.java index e47560b..e94d62c 100644 --- a/com.arm.cmsis.pack.project/src/com/arm/cmsis/pack/project/wizards/CmsisCodeTemplateNewWizard.java +++ b/com.arm.cmsis.pack.project/src/com/arm/cmsis/pack/project/wizards/CmsisCodeTemplateNewWizard.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack.project/src/com/arm/cmsis/pack/project/wizards/CmsisCodeTemplateNewWizardPage.java b/com.arm.cmsis.pack.project/src/com/arm/cmsis/pack/project/wizards/CmsisCodeTemplateNewWizardPage.java index b4dba64..175a0f9 100644 --- a/com.arm.cmsis.pack.project/src/com/arm/cmsis/pack/project/wizards/CmsisCodeTemplateNewWizardPage.java +++ b/com.arm.cmsis.pack.project/src/com/arm/cmsis/pack/project/wizards/CmsisCodeTemplateNewWizardPage.java @@ -1,9 +1,11 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation diff --git a/com.arm.cmsis.pack.project/src/com/arm/cmsis/pack/project/wizards/CsolutionImportWizard.java b/com.arm.cmsis.pack.project/src/com/arm/cmsis/pack/project/wizards/CsolutionImportWizard.java new file mode 100644 index 0000000..d12fc66 --- /dev/null +++ b/com.arm.cmsis.pack.project/src/com/arm/cmsis/pack/project/wizards/CsolutionImportWizard.java @@ -0,0 +1,80 @@ +/******************************************************************************* +* Copyright (c) 2023 ARM Ltd. and others +* All rights reserved. This program and the accompanying materials +* are made available under the terms of the Eclipse Public License 2.0 +* which accompanies this distribution, and is available at + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * +* Contributors: +* ARM Ltd and ARM Germany GmbH - Initial API and implementation +*******************************************************************************/ + +package com.arm.cmsis.pack.project.wizards; + +import org.eclipse.jface.viewers.IStructuredSelection; +import org.eclipse.jface.wizard.Wizard; +import org.eclipse.ui.IImportWizard; +import org.eclipse.ui.IWorkbench; + +import com.arm.cmsis.pack.common.CmsisConstants; +import com.arm.cmsis.pack.project.Messages; +import com.arm.cmsis.pack.project.csolution.CsolutionProjectImporter; + +/** + * + */ +public class CsolutionImportWizard extends Wizard implements IImportWizard { + + private CsolutionProjectImporter projectImporter; + private CsolutionImportWizardPage csolutionImporterMainPage; + private String pageTitle; + + public CsolutionImportWizard() { + this(null, Messages.CsolutionProjectImporter_ProjectTitle); + } + + /** + * Create Csolution Import Wizard + * + * @param projectImporter + * @param pageTitle + */ + public CsolutionImportWizard(CsolutionProjectImporter projectImporter, String pageTitle) { + super(); + this.pageTitle = pageTitle; + setNeedsProgressMonitor(true); + this.projectImporter = projectImporter; + if (this.projectImporter == null) { + this.projectImporter = new CsolutionProjectImporter(); + } + } + + @Override + public String getWindowTitle() { + return Messages.CsolutionProjectImporter_Window; + } + + @Override + public void init(IWorkbench workbench, IStructuredSelection selection) { + // + } + + @Override + public boolean performFinish() { + return projectImporter.importProject(); + } + + /** + * Adding main page to the wizard. + */ + @Override + public void addPages() { + csolutionImporterMainPage = new CsolutionImportWizardPage(projectImporter, CmsisConstants.IMPORT_TITLE, + pageTitle); + addPage(csolutionImporterMainPage); + pageTitle = Messages.CsolutionProjectImporter_ProjectTitle; + + } +} diff --git a/com.arm.cmsis.pack.project/src/com/arm/cmsis/pack/project/wizards/CsolutionImportWizardPage.java b/com.arm.cmsis.pack.project/src/com/arm/cmsis/pack/project/wizards/CsolutionImportWizardPage.java new file mode 100644 index 0000000..35321b4 --- /dev/null +++ b/com.arm.cmsis.pack.project/src/com/arm/cmsis/pack/project/wizards/CsolutionImportWizardPage.java @@ -0,0 +1,316 @@ +/******************************************************************************* +* Copyright (c) 2023 ARM Ltd. and others +* All rights reserved. This program and the accompanying materials +* are made available under the terms of the Eclipse Public License 2.0 +* which accompanies this distribution, and is available at + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * +* Contributors: +* ARM Ltd and ARM Germany GmbH - Initial API and implementation +*******************************************************************************/ + +package com.arm.cmsis.pack.project.wizards; + +import java.io.File; +import java.util.Collection; + +import org.eclipse.jface.preference.FileFieldEditor; +import org.eclipse.jface.viewers.ColumnViewer; +import org.eclipse.jface.viewers.TreeViewer; +import org.eclipse.jface.viewers.TreeViewerColumn; +import org.eclipse.jface.wizard.WizardPage; +import org.eclipse.swt.SWT; +import org.eclipse.swt.events.ModifyEvent; +import org.eclipse.swt.events.ModifyListener; +import org.eclipse.swt.layout.GridData; +import org.eclipse.swt.layout.GridLayout; +import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.Event; +import org.eclipse.swt.widgets.Group; +import org.eclipse.swt.widgets.Label; +import org.eclipse.swt.widgets.Tree; +import org.eclipse.swt.widgets.TreeColumn; + +import com.arm.cmsis.pack.common.CmsisConstants; +import com.arm.cmsis.pack.data.ICpItem; +import com.arm.cmsis.pack.data.ICpRootItem; +import com.arm.cmsis.pack.generic.ITreeObject; +import com.arm.cmsis.pack.project.Messages; +import com.arm.cmsis.pack.project.csolution.CsolutionProjectImporter; +import com.arm.cmsis.pack.ui.tree.AdvisedCellLabelProvider; +import com.arm.cmsis.pack.ui.tree.AdvisedEditingSupport; +import com.arm.cmsis.pack.ui.tree.ColumnAdvisor; +import com.arm.cmsis.pack.ui.tree.TreeObjectContentProvider; + +/** + * + */ +public class CsolutionImportWizardPage extends WizardPage { + + private Composite container; + private CsolutionProjectImporter projectImporter; + final static private String[] allowedFileExtensions = new String[] { + CmsisConstants.ASTERISK + CmsisConstants.EXT_CSOLUTION_YML }; + public TreeViewer treeViewer; + private ICpRootItem target; + + protected CsolutionImportWizardPage(CsolutionProjectImporter projectImporter, String pageName, String pageTitle) { + super(pageName); + this.projectImporter = projectImporter; + setTitle(pageTitle); + setDescription(Messages.CsolutionProjectImporter_Description); + this.setPageComplete(false); + } + + @Override + public void createControl(Composite parent) { + container = new Composite(parent, SWT.NONE); + container.setLayout(new GridLayout()); + container.setLayoutData(new GridData(GridData.FILL_BOTH)); + setControl(container); + + Label selectedFile = new Label(container, SWT.None); + selectedFile.setText(Messages.CsolutionProjectImporter_SelectFile); + + Group fileSelectionArea = new Group(container, SWT.NONE); + fileSelectionArea.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 4, 1)); + + // Create a file field editor widget to select a correct YAML files + FileFieldEditor fileEditor = new FileFieldEditor("fileSelect", //$NON-NLS-1$ + CmsisConstants.EMPTY_STRING, fileSelectionArea); + WizardPage currentPage = this; + fileEditor.getTextControl(fileSelectionArea).addModifyListener(new ModifyListener() { + @Override + public void modifyText(ModifyEvent e) { + String path = fileEditor.getStringValue(); + String errorStatus = isValidCsolutionFile(path); + if (errorStatus == null) { + String res = projectImporter.setSourceFileFromCsolutionYmlFile(path); + setErrorMessage(res); + + // triggers reading of file using its ContentProvider + treeViewer.refresh(); + treeViewer.expandAll(); + emitModifyEvent(); + + boolean valid = validatePage(); + currentPage.setPageComplete(valid); + } else { + setErrorMessage(errorStatus); + } + } + }); + fileEditor.setFileExtensions(allowedFileExtensions); + + // Target selector + // Create tree Viewer widget + treeViewer = new TreeViewer(fileSelectionArea, SWT.FULL_SELECTION | SWT.BORDER | SWT.SINGLE | SWT.V_SCROLL); + Tree tree = treeViewer.getTree(); + tree.setLinesVisible(true); + tree.setHeaderVisible(true); + GridData gd_tree = new GridData(SWT.FILL, SWT.FILL, true, true, 4, 1); + gd_tree.heightHint = 100; + tree.setLayoutData(gd_tree); + + CsolutionTargetColumnAdvisor columnAdvisor = new CsolutionTargetColumnAdvisor(treeViewer); + // Create column1: target name + TreeViewerColumn treeViewerColumn = new TreeViewerColumn(treeViewer, SWT.LEFT); + TreeColumn trclmnTargetName = treeViewerColumn.getColumn(); + trclmnTargetName.setWidth(200); + trclmnTargetName.setText(Messages.CsolutionProjectImport_CbuildName); + treeViewerColumn.setLabelProvider(new AdvisedCellLabelProvider(columnAdvisor, 0)); + treeViewerColumn.setEditingSupport(new AdvisedEditingSupport(treeViewer, columnAdvisor, 0)); + + // Create column2: target' details + TreeViewerColumn treeViewerColumn_1 = new TreeViewerColumn(treeViewer, SWT.LEFT); + TreeColumn trclmnNewColumn = treeViewerColumn_1.getColumn(); + trclmnNewColumn.setWidth(256); + trclmnNewColumn.setText(Messages.CsolutionProjectImport_CbuildDetails); + treeViewerColumn_1.setLabelProvider(new AdvisedCellLabelProvider(columnAdvisor, 1)); + + // Set the content provider used by this TreeViewer + treeViewer.setContentProvider(new CbuildIdxContentProvider()); + treeViewer.setInput(projectImporter); + treeViewer.expandAll(); + if (fileEditor != null) { + fileEditor.setFocus(); + } + } + + public class CsolutionTargetColumnAdvisor extends ColumnAdvisor { + + public CsolutionTargetColumnAdvisor(ColumnViewer columnViewer) { + super(columnViewer); + } + + @Override + public String getString(Object obj, int columnIndex) { + CsolutionProjectImporter project = getProjectImporter(obj); + if (project != null) { + switch (columnIndex) { + case 0: + return project.getSourceProjectFile(); + default: + return null; + } + } + target = getRootItem(obj); + + if (target == null) + return null; + switch (columnIndex) { + case 0: + return target.getName(); + case 1: + return target.getInfo(); + default: + break; + } + return null; + } + + @Override + public CellControlType getCellControlType(Object obj, int columnIndex) { + if (columnIndex == 0) { + if (getRootItem(obj) != null) + return CellControlType.INPLACE_CHECK; + } + return CellControlType.TEXT; + } + + @Override + public boolean getCheck(Object obj, int columnIndex) { + if (columnIndex != 0) + return false; + target = getRootItem(obj); + if (target == null) + return false; + + return target.isValid() && target.getAttributeAsBoolean(CmsisConstants.IS_SELECTED, true); + } + + @Override + public boolean isEnabled(Object obj, int columnIndex) { + + return isValid(obj, columnIndex); + } + + @Override + public boolean isValid(Object obj, int columnIndex) { + if (columnIndex != 0) + return true; + target = getRootItem(obj); + + if (target != null) { + return target.isValid(); + } + return true; + } + + @Override + public void setCheck(Object element, int columnIndex, boolean newVal) { + target = getRootItem(element); + if (target == null || !target.isValid()) + return; + + target.setAttribute(CmsisConstants.IS_SELECTED, newVal); + getTreeViewer().refresh(element); + + emitModifyEvent(); + } + + @Override + public boolean canEdit(Object obj, int columnIndex) { + if (columnIndex != 0) + return false; + target = getRootItem(obj); + if (target == null) + return false; + return target.isValid(); + } + } + + /** + * Class to manage cbuild index files + */ + class CbuildIdxContentProvider extends TreeObjectContentProvider { + + @Override + public Object[] getChildren(Object parentElement) { + CsolutionProjectImporter importer = getProjectImporter(parentElement); + if (importer != null && !importer.getSourceProjectFile().isEmpty()) { + importer.readAndSaveFiles(); + Collection cbuilds = importer.getCbuildFileRootToPacks().keySet(); + return cbuilds.toArray(new ICpItem[cbuilds.size()]); + } + return ITreeObject.EMPTY_OBJECT_ARRAY; + } + + @Override + public boolean hasChildren(Object element) { + return false; + } + + } + + CsolutionProjectImporter getProjectImporter(Object obj) { + if (obj == null) { + return null; + } + if (obj == projectImporter) { + return projectImporter; + } + return ITreeObject.castTo(obj, CsolutionProjectImporter.class); + } + + ICpRootItem getRootItem(Object obj) { + return ITreeObject.castTo(obj, ICpRootItem.class); + + } + + /** + * Emits modify event every time that user selects data from either target or + * toolchain combo widget + */ + public void emitModifyEvent() { + Event e = new Event(); + e.data = CmsisConstants.EMPTY_STRING; + e.display = container.getDisplay(); + e.widget = container; + container.notifyListeners(SWT.Modify, e); + } + + protected String isValidCsolutionFile(String fileName) { + String messageStatus = null; + boolean isFileTypeValid = fileName.endsWith(CmsisConstants.EXT_CSOLUTION_YML); + if (isFileTypeValid) { + File f = new File(fileName); + if (!f.exists()) { + messageStatus = Messages.CsolutionProjectImport_ErrorCsolutionNotExist; + } + } else { + messageStatus = Messages.CsolutionProjectImport_ErrorNotCsolutionFile; + } + return messageStatus; + } + + protected boolean validatePage() { + if (projectImporter == null) { + return false; + } + String projectFile = projectImporter.getSourceProjectFile(); + if (projectFile == null || projectFile.isEmpty()) { + return false; + } + + String msg = projectImporter.validate(); + if (msg != null) { + setErrorMessage(msg); + return false; + } + + return true; + } +} diff --git a/com.arm.cmsis.pack.project/src/com/arm/cmsis/pack/project/wizards/ProjectSelectionDialog.java b/com.arm.cmsis.pack.project/src/com/arm/cmsis/pack/project/wizards/ProjectSelectionDialog.java index 4c70037..09de96f 100644 --- a/com.arm.cmsis.pack.project/src/com/arm/cmsis/pack/project/wizards/ProjectSelectionDialog.java +++ b/com.arm.cmsis.pack.project/src/com/arm/cmsis/pack/project/wizards/ProjectSelectionDialog.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * IBM Corporation - initial API and implementation * Anton Leherbauer (Wind River Systems) diff --git a/com.arm.cmsis.pack.project/templates/cmsis_project/main.c b/com.arm.cmsis.pack.project/templates/cmsis_project/main.c index e52be27..adecd3d 100644 --- a/com.arm.cmsis.pack.project/templates/cmsis_project/main.c +++ b/com.arm.cmsis.pack.project/templates/cmsis_project/main.c @@ -8,10 +8,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - file template *******************************************************************************/ diff --git a/com.arm.cmsis.pack.project/templates/cmsis_project/template.properties b/com.arm.cmsis.pack.project/templates/cmsis_project/template.properties index aa50670..129601f 100644 --- a/com.arm.cmsis.pack.project/templates/cmsis_project/template.properties +++ b/com.arm.cmsis.pack.project/templates/cmsis_project/template.properties @@ -1,9 +1,9 @@ ############################################################################### # Copyright (c) 2021 ARM Ltd # All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 +# are made available under the terms of the Eclipse Public License 2.0 # which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html +# https://www.eclipse.org/legal/epl-2.0/ # # Contributors: # ARM Ltd - initial implementation diff --git a/com.arm.cmsis.pack.project/templates/cmsis_project/template.xml b/com.arm.cmsis.pack.project/templates/cmsis_project/template.xml index 3cc4058..da8fac5 100644 --- a/com.arm.cmsis.pack.project/templates/cmsis_project/template.xml +++ b/com.arm.cmsis.pack.project/templates/cmsis_project/template.xml @@ -3,8 +3,8 @@ revision="1.0" author="ARM Inc" copyright="Copyright (c) 2021 ARM Ltd. and others. All rights reserved.\ This program and the accompanying materials are made available under the terms \ -of the Eclipse Public License v1.0 which accompanies this distribution, \ -and is available at http://www.eclipse.org/legal/epl-v10.html" +of the Eclipse Public License 2.0 which accompanies this distribution, \ +and is available at https://www.eclipse.org/legal/epl-2.0/" id="CMSIS_Project" label="%CMSIS.template.label" description="%CMSIS.template.description" help="help.html"> diff --git a/com.arm.cmsis.pack.refclient/.gitignore b/com.arm.cmsis.pack.refclient/.gitignore new file mode 100644 index 0000000..b83d222 --- /dev/null +++ b/com.arm.cmsis.pack.refclient/.gitignore @@ -0,0 +1 @@ +/target/ diff --git a/com.arm.cmsis.pack.refclient/META-INF/MANIFEST.MF b/com.arm.cmsis.pack.refclient/META-INF/MANIFEST.MF index 27c7b05..67b79fe 100644 --- a/com.arm.cmsis.pack.refclient/META-INF/MANIFEST.MF +++ b/com.arm.cmsis.pack.refclient/META-INF/MANIFEST.MF @@ -1,9 +1,9 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Refclient -Bundle-SymbolicName: com.arm.cmsis.pack.refclient;singleton:=true -Automatic-Module-Name: com.arm.cmsis.pack.refclient -Bundle-Version: 2.8.0.qualifier +Bundle-SymbolicName: com.arm.cmsis.pack.refclient;singleton:=true +Automatic-Module-Name: com.arm.cmsis.pack.refclient +Bundle-Version: 2.10.0.qualifier Bundle-Activator: com.arm.cmsis.pack.refclient.Activator Bundle-Vendor: Arm Limited Require-Bundle: org.eclipse.ui, diff --git a/com.arm.cmsis.pack.refclient/plugin.xml b/com.arm.cmsis.pack.refclient/plugin.xml index 5db7d25..b211d3a 100644 --- a/com.arm.cmsis.pack.refclient/plugin.xml +++ b/com.arm.cmsis.pack.refclient/plugin.xml @@ -1,6 +1,5 @@ - diff --git a/com.arm.cmsis.pack.refclient/pom.xml b/com.arm.cmsis.pack.refclient/pom.xml new file mode 100644 index 0000000..d363e02 --- /dev/null +++ b/com.arm.cmsis.pack.refclient/pom.xml @@ -0,0 +1,11 @@ + + 4.0.0 + com.arm.cmsis.pack.refclient + eclipse-plugin + + com.arm.cmsis + com.arm.cmsis.parent + 2.10.0-SNAPSHOT + ../com.arm.cmsis.parent + + diff --git a/com.arm.cmsis.pack.refclient/src/com/arm/cmsis/pack/refclient/RefClientEnvironmentProvider.java b/com.arm.cmsis.pack.refclient/src/com/arm/cmsis/pack/refclient/RefClientEnvironmentProvider.java index 156f1c9..def031b 100644 --- a/com.arm.cmsis.pack.refclient/src/com/arm/cmsis/pack/refclient/RefClientEnvironmentProvider.java +++ b/com.arm.cmsis.pack.refclient/src/com/arm/cmsis/pack/refclient/RefClientEnvironmentProvider.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack.refclient/src/com/arm/cmsis/pack/refclient/RefClientGeneratorLauncher.java b/com.arm.cmsis.pack.refclient/src/com/arm/cmsis/pack/refclient/RefClientGeneratorLauncher.java index c4a4d2b..28f935c 100644 --- a/com.arm.cmsis.pack.refclient/src/com/arm/cmsis/pack/refclient/RefClientGeneratorLauncher.java +++ b/com.arm.cmsis.pack.refclient/src/com/arm/cmsis/pack/refclient/RefClientGeneratorLauncher.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack.refclient/src/com/arm/cmsis/pack/refclient/RefClientPackInstaller.java b/com.arm.cmsis.pack.refclient/src/com/arm/cmsis/pack/refclient/RefClientPackInstaller.java index 66fc393..49b0cc7 100644 --- a/com.arm.cmsis.pack.refclient/src/com/arm/cmsis/pack/refclient/RefClientPackInstaller.java +++ b/com.arm.cmsis.pack.refclient/src/com/arm/cmsis/pack/refclient/RefClientPackInstaller.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack.refclient/src/com/arm/cmsis/pack/refclient/RefDebugSeqClient.java b/com.arm.cmsis.pack.refclient/src/com/arm/cmsis/pack/refclient/RefDebugSeqClient.java index 9da8c2e..e87f7d1 100644 --- a/com.arm.cmsis.pack.refclient/src/com/arm/cmsis/pack/refclient/RefDebugSeqClient.java +++ b/com.arm.cmsis.pack.refclient/src/com/arm/cmsis/pack/refclient/RefDebugSeqClient.java @@ -1,9 +1,11 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation diff --git a/com.arm.cmsis.pack.refclient/src/com/arm/cmsis/pack/refclient/ui/ConfigView.java b/com.arm.cmsis.pack.refclient/src/com/arm/cmsis/pack/refclient/ui/ConfigView.java index a09c3a6..b64ed0c 100644 --- a/com.arm.cmsis.pack.refclient/src/com/arm/cmsis/pack/refclient/ui/ConfigView.java +++ b/com.arm.cmsis.pack.refclient/src/com/arm/cmsis/pack/refclient/ui/ConfigView.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * Eclipse Project - generation from template * ARM Ltd and ARM Germany GmbH - application-specific implementation diff --git a/com.arm.cmsis.pack.refclient/src/com/arm/cmsis/pack/refclient/ui/DeviceTreeView.java b/com.arm.cmsis.pack.refclient/src/com/arm/cmsis/pack/refclient/ui/DeviceTreeView.java index 937391f..06fa7d5 100644 --- a/com.arm.cmsis.pack.refclient/src/com/arm/cmsis/pack/refclient/ui/DeviceTreeView.java +++ b/com.arm.cmsis.pack.refclient/src/com/arm/cmsis/pack/refclient/ui/DeviceTreeView.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * Eclipse Project - generation from template * ARM Ltd and ARM Germany GmbH - application-specific implementation diff --git a/com.arm.cmsis.pack.refclient/src/com/arm/cmsis/pack/refclient/ui/PackView.java b/com.arm.cmsis.pack.refclient/src/com/arm/cmsis/pack/refclient/ui/PackView.java index 8513112..0b6a769 100644 --- a/com.arm.cmsis.pack.refclient/src/com/arm/cmsis/pack/refclient/ui/PackView.java +++ b/com.arm.cmsis.pack.refclient/src/com/arm/cmsis/pack/refclient/ui/PackView.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * Eclipse Project - generation from template * ARM Ltd and ARM Germany GmbH - application-specific implementation diff --git a/com.arm.cmsis.pack.refclient/src/com/arm/cmsis/pack/refclient/ui/console/SequenceConsole.java b/com.arm.cmsis.pack.refclient/src/com/arm/cmsis/pack/refclient/ui/console/SequenceConsole.java index 39d4613..39a8711 100644 --- a/com.arm.cmsis.pack.refclient/src/com/arm/cmsis/pack/refclient/ui/console/SequenceConsole.java +++ b/com.arm.cmsis.pack.refclient/src/com/arm/cmsis/pack/refclient/ui/console/SequenceConsole.java @@ -1,9 +1,11 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation diff --git a/com.arm.cmsis.pack.refclient/src/com/arm/cmsis/pack/refclient/ui/console/SequenceConsoleFactory.java b/com.arm.cmsis.pack.refclient/src/com/arm/cmsis/pack/refclient/ui/console/SequenceConsoleFactory.java index f64eda9..503e01c 100644 --- a/com.arm.cmsis.pack.refclient/src/com/arm/cmsis/pack/refclient/ui/console/SequenceConsoleFactory.java +++ b/com.arm.cmsis.pack.refclient/src/com/arm/cmsis/pack/refclient/ui/console/SequenceConsoleFactory.java @@ -1,9 +1,11 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation diff --git a/com.arm.cmsis.pack.refclient/src/com/arm/cmsis/pack/refclient/ui/console/SequenceLogger.java b/com.arm.cmsis.pack.refclient/src/com/arm/cmsis/pack/refclient/ui/console/SequenceLogger.java index 2364604..05faac8 100644 --- a/com.arm.cmsis.pack.refclient/src/com/arm/cmsis/pack/refclient/ui/console/SequenceLogger.java +++ b/com.arm.cmsis.pack.refclient/src/com/arm/cmsis/pack/refclient/ui/console/SequenceLogger.java @@ -1,9 +1,11 @@ /******************************************************************************* * Copyright (c) 2016 ARM Ltd. and others * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation diff --git a/com.arm.cmsis.pack.ui/.classpath b/com.arm.cmsis.pack.ui/.classpath index f656d57..e6d0a3c 100644 --- a/com.arm.cmsis.pack.ui/.classpath +++ b/com.arm.cmsis.pack.ui/.classpath @@ -1,7 +1,21 @@ - + + + + + - + + + + + + + + + + + diff --git a/com.arm.cmsis.pack.ui/META-INF/MANIFEST.MF b/com.arm.cmsis.pack.ui/META-INF/MANIFEST.MF index 0f43e75..306d33a 100644 --- a/com.arm.cmsis.pack.ui/META-INF/MANIFEST.MF +++ b/com.arm.cmsis.pack.ui/META-INF/MANIFEST.MF @@ -1,9 +1,9 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: CMSIS-Pack UI -Bundle-SymbolicName: com.arm.cmsis.pack.ui;singleton:=true -Automatic-Module-Name: com.arm.cmsis.pack.ui -Bundle-Version: 2.9.0.qualifier +Bundle-SymbolicName: com.arm.cmsis.pack.ui;singleton:=true +Automatic-Module-Name: com.arm.cmsis.pack.ui +Bundle-Version: 2.10.0.qualifier Bundle-Activator: com.arm.cmsis.pack.ui.CpPlugInUI Bundle-Vendor: Arm Limited Bundle-RequiredExecutionEnvironment: JavaSE-11 diff --git a/com.arm.cmsis.pack.ui/plugin.xml b/com.arm.cmsis.pack.ui/plugin.xml index 7b257c4..ed6d876 100644 --- a/com.arm.cmsis.pack.ui/plugin.xml +++ b/com.arm.cmsis.pack.ui/plugin.xml @@ -1,6 +1,5 @@ - diff --git a/com.arm.cmsis.pack.ui/pom.xml b/com.arm.cmsis.pack.ui/pom.xml index b339036..ec1ffa2 100644 --- a/com.arm.cmsis.pack.ui/pom.xml +++ b/com.arm.cmsis.pack.ui/pom.xml @@ -5,7 +5,7 @@ com.arm.cmsis com.arm.cmsis.parent.sign - 2.9.0-SNAPSHOT + 2.10.0-SNAPSHOT ../com.arm.cmsis.parent.sign \ No newline at end of file diff --git a/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/ColorConstants.java b/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/ColorConstants.java index 8562959..735ed2f 100644 --- a/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/ColorConstants.java +++ b/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/ColorConstants.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/CpPlugInUI.java b/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/CpPlugInUI.java index 6ab2711..8474b62 100644 --- a/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/CpPlugInUI.java +++ b/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/CpPlugInUI.java @@ -1,9 +1,11 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Eclipse Project - generation from template diff --git a/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/IHelpContextIds.java b/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/IHelpContextIds.java index 22d8bc4..f83bc56 100644 --- a/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/IHelpContextIds.java +++ b/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/IHelpContextIds.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/IOpenURL.java b/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/IOpenURL.java index 7f63ec1..63a7d76 100644 --- a/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/IOpenURL.java +++ b/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/IOpenURL.java @@ -2,10 +2,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/IStatusMessageListener.java b/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/IStatusMessageListener.java index 59ab954..8c2943c 100644 --- a/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/IStatusMessageListener.java +++ b/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/IStatusMessageListener.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/LaunchGenerator.java b/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/LaunchGenerator.java index 90ee3e2..77b0469 100644 --- a/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/LaunchGenerator.java +++ b/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/LaunchGenerator.java @@ -1,9 +1,11 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation diff --git a/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/OpenURL.java b/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/OpenURL.java index b7b936f..6a27fc0 100644 --- a/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/OpenURL.java +++ b/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/OpenURL.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/StatusMessageListerenList.java b/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/StatusMessageListerenList.java index ac51662..aea12de 100644 --- a/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/StatusMessageListerenList.java +++ b/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/StatusMessageListerenList.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/console/RteConsole.java b/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/console/RteConsole.java index 78d31b4..21a27d4 100644 --- a/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/console/RteConsole.java +++ b/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/console/RteConsole.java @@ -1,9 +1,11 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation diff --git a/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/console/RteConsoleFactory.java b/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/console/RteConsoleFactory.java index 96b5c33..cb37d22 100644 --- a/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/console/RteConsoleFactory.java +++ b/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/console/RteConsoleFactory.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/console/RteErrorCollection.java b/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/console/RteErrorCollection.java index 9b33c19..4b7e32b 100644 --- a/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/console/RteErrorCollection.java +++ b/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/console/RteErrorCollection.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/editors/RteComponentPage.java b/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/editors/RteComponentPage.java index 91b2429..9b48740 100644 --- a/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/editors/RteComponentPage.java +++ b/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/editors/RteComponentPage.java @@ -1,9 +1,11 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation @@ -69,8 +71,8 @@ public void handle(RteEvent event) { @Override public void updateActions() { if (getModelController() != null) { - EEvaluationResult res = getModelController().getEvaluationResult(); - resolveAction.setEnabled(res == EEvaluationResult.SELECTABLE); + resolveAction.setEnabled(!getModelController().isReadOnly() + && getModelController().getEvaluationResult() == EEvaluationResult.SELECTABLE); } super.updateActions(); } diff --git a/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/editors/RteDevicePage.java b/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/editors/RteDevicePage.java index 3a35095..6180050 100644 --- a/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/editors/RteDevicePage.java +++ b/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/editors/RteDevicePage.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2022 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ @@ -101,7 +103,7 @@ public void updateActions() { protected void changeDevice() { IRteModelController model = getModelController(); - if (model != null) { + if (model != null && !model.isReadOnly()) { RteDeviceSelectorWizard wizard = new RteDeviceSelectorWizard(CpStringsUI.RteDeviceSelectorPage_SelectDevice, model.getDevices(), model.getDeviceInfo(), model.getBoards(), model.getBoardInfo()); OkWizardDialog dlg = new OkWizardDialog(getFocusWidget().getShell(), wizard); diff --git a/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/editors/RteEditor.java b/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/editors/RteEditor.java index d88204d..3684c75 100644 --- a/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/editors/RteEditor.java +++ b/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/editors/RteEditor.java @@ -1,9 +1,11 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Eclipse Project - generation from template @@ -107,17 +109,19 @@ public void dispose() { @Override protected void setInput(IEditorInput input) { super.setInput(input); - + boolean bReadOnly = false; String absFileName = CmsisConstants.EMPTY_STRING; if (input instanceof IURIEditorInput) { IURIEditorInput uriInput = (IURIEditorInput) input; File f = new File(uriInput.getURI()); absFileName = f.getAbsolutePath(); + bReadOnly = !f.canWrite(); } else { IFile file = ResourceUtil.getFile(input); if (file != null) { absFileName = file.getLocation().toPortableString(); } + bReadOnly = file.isReadOnly(); } if (absFileName.isEmpty()) @@ -140,7 +144,7 @@ protected void setInput(IEditorInput input) { return; } } - loadData(absFileName); + loadData(absFileName, bReadOnly); } protected ICpXmlParser getParser() { @@ -150,7 +154,7 @@ protected ICpXmlParser getParser() { return fParser; } - protected void loadData(String absFileName) { + protected void loadData(String absFileName, boolean bReadOnly) { if (absFileName == null || absFileName.isEmpty()) { fAbsFileName = CmsisConstants.EMPTY_STRING; return; @@ -163,6 +167,7 @@ protected void loadData(String absFileName) { fModelController = createController(); fModelController.addListener(this); } + fModelController.setReadOnly(bReadOnly); // fAbsFileName = absFileName; String title = Utils.extractFileName(absFileName); setPartName(title); @@ -239,8 +244,13 @@ protected synchronized void setSaving(boolean bSaving) { @Override public void doSave(IProgressMonitor monitor) { - if (isSaving()) + if (getModelController() == null || getModelController().isReadOnly()) { + return; + } + + if (isSaving()) { return; + } setSaving(true); fModelController.commit(); try { diff --git a/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/editors/RteEditorContributor.java b/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/editors/RteEditorContributor.java index e2dd3d6..6744943 100644 --- a/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/editors/RteEditorContributor.java +++ b/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/editors/RteEditorContributor.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * Eclipse Project - generation from template * ARM Ltd and ARM Germany GmbH - application-specific implementation diff --git a/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/editors/RteEditorPage.java b/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/editors/RteEditorPage.java index 4b8ae7d..40a3e2b 100644 --- a/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/editors/RteEditorPage.java +++ b/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/editors/RteEditorPage.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ @@ -149,7 +151,7 @@ public void updateActions() { protected void updateSaveAction() { if (saveAction != null && getModelController() != null) { - saveAction.setEnabled(getModelController().isModified()); + saveAction.setEnabled(!getModelController().isReadOnly() && getModelController().isModified()); } } diff --git a/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/editors/RteEditorPageHeader.java b/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/editors/RteEditorPageHeader.java index 7d7a60e..3c50dd8 100644 --- a/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/editors/RteEditorPageHeader.java +++ b/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/editors/RteEditorPageHeader.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/editors/RteModelEditor.java b/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/editors/RteModelEditor.java index f52761c..0e5f61a 100644 --- a/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/editors/RteModelEditor.java +++ b/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/editors/RteModelEditor.java @@ -1,9 +1,11 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Eclipse Project - generation from template diff --git a/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/editors/RteModelEditorController.java b/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/editors/RteModelEditorController.java index 15f6f2f..1e87713 100644 --- a/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/editors/RteModelEditorController.java +++ b/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/editors/RteModelEditorController.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/editors/RteModelEditorPage.java b/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/editors/RteModelEditorPage.java index 682ae5b..da27e14 100644 --- a/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/editors/RteModelEditorPage.java +++ b/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/editors/RteModelEditorPage.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/editors/RtePackPage.java b/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/editors/RtePackPage.java index 4db1af8..2c876f9 100644 --- a/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/editors/RtePackPage.java +++ b/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/editors/RtePackPage.java @@ -1,9 +1,11 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation @@ -138,8 +140,10 @@ void setUsedPacks(boolean bUse) { void updateUseAllLatest() { boolean bUse = true; + boolean bEnabled = true; if (fModelController != null) { bUse = fModelController.isUseAllLatestPacks(); + bEnabled = !fModelController.isReadOnly(); } useLatestAction.setChecked(bUse); if (bUse) { @@ -147,13 +151,16 @@ void updateUseAllLatest() { } else { useLatestAction.setImageDescriptor(CpPlugInUI.getImageDescriptor(CpPlugInUI.ICON_UNCHECKED)); } + useLatestAction.setEnabled(bEnabled); } // Used packs void updateUsedPacks() { boolean bUse = true; + boolean bEnabled = true; if (fModelController != null) { bUse = fModelController.isShowUsedPacksOnly(); + bEnabled = !fModelController.isReadOnly(); } usedPacksAction.setChecked(bUse); if (bUse) { @@ -161,6 +168,7 @@ void updateUsedPacks() { } else { usedPacksAction.setImageDescriptor(CpPlugInUI.getImageDescriptor(CpPlugInUI.ICON_UNCHECKED)); } + usedPacksAction.setEnabled(bEnabled); } // @@ -182,7 +190,7 @@ public void handle(RteEvent event) { public void updateActions() { if (getModelController() != null) { Collection missingPacks = RteModelUtils.getMissingPacks(getModelController()); - resolveMissingPacksAction.setEnabled(!missingPacks.isEmpty()); + resolveMissingPacksAction.setEnabled(!getModelController().isReadOnly() && !missingPacks.isEmpty()); } updateUseAllLatest(); updateUsedPacks(); diff --git a/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/preferences/CpConsolePreferencePage.java b/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/preferences/CpConsolePreferencePage.java index 1b6feac..dae08d1 100644 --- a/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/preferences/CpConsolePreferencePage.java +++ b/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/preferences/CpConsolePreferencePage.java @@ -1,9 +1,11 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation diff --git a/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/preferences/CpDirectoryFieldEditor.java b/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/preferences/CpDirectoryFieldEditor.java index ce957c2..4c33780 100644 --- a/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/preferences/CpDirectoryFieldEditor.java +++ b/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/preferences/CpDirectoryFieldEditor.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/preferences/CpPreferencePage.java b/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/preferences/CpPreferencePage.java index 6730cb1..43b926a 100644 --- a/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/preferences/CpPreferencePage.java +++ b/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/preferences/CpPreferencePage.java @@ -1,9 +1,11 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Liviu Ionescu - initial implementation diff --git a/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/preferences/CpUIPreferenceConstants.java b/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/preferences/CpUIPreferenceConstants.java index f470c5d..9a2a4c5 100644 --- a/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/preferences/CpUIPreferenceConstants.java +++ b/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/preferences/CpUIPreferenceConstants.java @@ -1,9 +1,11 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation diff --git a/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/preferences/CpUIPreferenceInitializer.java b/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/preferences/CpUIPreferenceInitializer.java index 2b19061..a123c8a 100644 --- a/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/preferences/CpUIPreferenceInitializer.java +++ b/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/preferences/CpUIPreferenceInitializer.java @@ -1,9 +1,11 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation diff --git a/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/tree/AdvisedCellLabelProvider.java b/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/tree/AdvisedCellLabelProvider.java index f629f0d..7898509 100644 --- a/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/tree/AdvisedCellLabelProvider.java +++ b/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/tree/AdvisedCellLabelProvider.java @@ -1,9 +1,11 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation diff --git a/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/tree/AdvisedEditingSupport.java b/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/tree/AdvisedEditingSupport.java index 4cc9a6f..b7ddfba 100644 --- a/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/tree/AdvisedEditingSupport.java +++ b/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/tree/AdvisedEditingSupport.java @@ -1,9 +1,11 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation diff --git a/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/tree/BoardTreeColumnComparator.java b/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/tree/BoardTreeColumnComparator.java index 7d3104a..1860ba9 100644 --- a/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/tree/BoardTreeColumnComparator.java +++ b/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/tree/BoardTreeColumnComparator.java @@ -1,9 +1,11 @@ /******************************************************************************* * Copyright (c) 2022 ARM Ltd. and others * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation diff --git a/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/tree/BoardViewContentProvider.java b/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/tree/BoardViewContentProvider.java index c11700a..29d72e5 100644 --- a/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/tree/BoardViewContentProvider.java +++ b/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/tree/BoardViewContentProvider.java @@ -1,9 +1,11 @@ /******************************************************************************* * Copyright (c) 2022 ARM Ltd. and others * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation diff --git a/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/tree/BoardsViewColumnAdvisor.java b/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/tree/BoardsViewColumnAdvisor.java index 9c9cbb6..2e5ed76 100644 --- a/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/tree/BoardsViewColumnAdvisor.java +++ b/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/tree/BoardsViewColumnAdvisor.java @@ -1,9 +1,11 @@ /******************************************************************************* * Copyright (c) 2022 ARM Ltd. and others * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation diff --git a/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/tree/BoardsViewLabelProvider.java b/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/tree/BoardsViewLabelProvider.java index 8f40924..3b3855a 100644 --- a/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/tree/BoardsViewLabelProvider.java +++ b/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/tree/BoardsViewLabelProvider.java @@ -1,9 +1,11 @@ /******************************************************************************* * Copyright (c) 2022 ARM Ltd. and others * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation diff --git a/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/tree/ColumnAdvisor.java b/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/tree/ColumnAdvisor.java index d58b707..3d3bfe4 100644 --- a/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/tree/ColumnAdvisor.java +++ b/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/tree/ColumnAdvisor.java @@ -1,9 +1,11 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation diff --git a/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/tree/CpItemColumnAdvisor.java b/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/tree/CpItemColumnAdvisor.java index ed08a8b..fb37381 100644 --- a/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/tree/CpItemColumnAdvisor.java +++ b/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/tree/CpItemColumnAdvisor.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/tree/DevicesViewColumnAdvisor.java b/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/tree/DevicesViewColumnAdvisor.java index 08b9045..5ee3547 100644 --- a/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/tree/DevicesViewColumnAdvisor.java +++ b/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/tree/DevicesViewColumnAdvisor.java @@ -1,9 +1,11 @@ /******************************************************************************* * Copyright (c) 2022 ARM Ltd. and others * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation diff --git a/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/tree/DevicesViewLabelProvider.java b/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/tree/DevicesViewLabelProvider.java index a715768..3200e80 100644 --- a/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/tree/DevicesViewLabelProvider.java +++ b/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/tree/DevicesViewLabelProvider.java @@ -1,9 +1,11 @@ /******************************************************************************* * Copyright (c) 2022 ARM Ltd. and others * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation diff --git a/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/tree/IColumnAdvisor.java b/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/tree/IColumnAdvisor.java index d17f223..154617b 100644 --- a/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/tree/IColumnAdvisor.java +++ b/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/tree/IColumnAdvisor.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/tree/NumberSpinner.java b/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/tree/NumberSpinner.java index 4b79cdc..85c6ebc 100644 --- a/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/tree/NumberSpinner.java +++ b/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/tree/NumberSpinner.java @@ -1,9 +1,11 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation diff --git a/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/tree/TreeColumnComparator.java b/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/tree/TreeColumnComparator.java index baab673..1577dd3 100644 --- a/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/tree/TreeColumnComparator.java +++ b/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/tree/TreeColumnComparator.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * Ivor Williams - Initial API and implementation: https://dzone.com/articles/javaswt-click-table-column * ARM Ltd and ARM Germany GmbH - application-specific implementation diff --git a/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/tree/TreeObjectContentProvider.java b/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/tree/TreeObjectContentProvider.java index 47ae384..051659f 100644 --- a/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/tree/TreeObjectContentProvider.java +++ b/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/tree/TreeObjectContentProvider.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/widgets/CmsisColumnAdvisor.java b/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/widgets/CmsisColumnAdvisor.java index 10d7407..1808a33 100644 --- a/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/widgets/CmsisColumnAdvisor.java +++ b/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/widgets/CmsisColumnAdvisor.java @@ -1,9 +1,11 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation diff --git a/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/widgets/CmsisColumnInfo.java b/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/widgets/CmsisColumnInfo.java index 13882bc..8e04e7f 100644 --- a/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/widgets/CmsisColumnInfo.java +++ b/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/widgets/CmsisColumnInfo.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/widgets/IRteColumnAdvisor.java b/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/widgets/IRteColumnAdvisor.java index e36c7f7..9fcd4f4 100644 --- a/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/widgets/IRteColumnAdvisor.java +++ b/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/widgets/IRteColumnAdvisor.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/widgets/RteColumnAdvisor.java b/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/widgets/RteColumnAdvisor.java index 2431a6b..c3c060d 100644 --- a/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/widgets/RteColumnAdvisor.java +++ b/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/widgets/RteColumnAdvisor.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/widgets/RteComponentManagerWidget.java b/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/widgets/RteComponentManagerWidget.java index da9269b..67e7867 100644 --- a/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/widgets/RteComponentManagerWidget.java +++ b/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/widgets/RteComponentManagerWidget.java @@ -1,9 +1,11 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation diff --git a/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/widgets/RteComponentSelectorWidget.java b/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/widgets/RteComponentSelectorWidget.java index 38c4c2f..c43e2f0 100644 --- a/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/widgets/RteComponentSelectorWidget.java +++ b/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/widgets/RteComponentSelectorWidget.java @@ -1,9 +1,11 @@ /******************************************************************************* * Copyright (c) 2022 ARM Ltd. and others * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation @@ -220,9 +222,15 @@ public boolean hasSuffixButton(Object obj, int columnIndex) { @Override public boolean isEnabled(Object obj, int columnIndex) { IRteComponentItem item = getComponentItem(obj); - if (columnIndex == COLSEL || columnIndex == COLSWCOMP || columnIndex == COLDESCR) { + if (columnIndex == COLSWCOMP || columnIndex == COLDESCR) { return true; } + + if (columnIndex == COLSEL || columnIndex == COLVARIANT || columnIndex == COLVENDOR + || columnIndex == COLVERSION) { + return !getModelController().isReadOnly(); + } + if (item instanceof IRteComponent) { IRteComponent rteComponent = (IRteComponent) item; if (rteComponent.isBootStrap()) { @@ -830,6 +838,7 @@ public void update() { if (fTreeViewer == null || getModelController() == null) { return; } + if (selItemKeyPath == null || selItemKeyPath.isEmpty()) { return; } diff --git a/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/widgets/RteDeviceInfoWidget.java b/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/widgets/RteDeviceInfoWidget.java index cc8793e..68ca477 100644 --- a/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/widgets/RteDeviceInfoWidget.java +++ b/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/widgets/RteDeviceInfoWidget.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2022 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ @@ -68,7 +70,7 @@ public class RteDeviceInfoWidget extends Composite { ICpDeviceInfo fDeviceInfo = null; String url = CmsisConstants.EMPTY_STRING; - private Button btnSelect; + private Button btnSelect = null; private Label lblDescription; private Label lblFamilyLabel; private Label lblSubfamilyLabel; @@ -376,8 +378,10 @@ public void widgetSelected(SelectionEvent e) { } protected void updateControls() { - if (isDisposed()) + if (isDisposed()) { return; + } + String description = CmsisConstants.EMPTY_STRING; String vendorName = CmsisConstants.EMPTY_STRING; String deviceName = CmsisConstants.EMPTY_STRING; @@ -455,7 +459,7 @@ protected void updateBoardControls() { if (board != null) { boardBooks = board.getBooks(); } else { - boardName += " (" + CpStringsUI.RteDeviceInfoWidget_MissingBoard + ")"; //$NON-NLS-1$ //$NON-NLS-3$ + boardName += " (" + CpStringsUI.RteDeviceInfoWidget_MissingBoard + ")"; //$NON-NLS-1$ //$NON-NLS-2$ } treeBoardBooks.setInput(boardBooks); @@ -535,11 +539,15 @@ public void dispose() { } public void setModelController(IRteModelController modelController) { - if (fBoardColumnAdvisor != null) + if (fBoardColumnAdvisor != null) { fBoardColumnAdvisor.setModelController(modelController); - if (fBookColumnAdvisor != null) + } + if (fBookColumnAdvisor != null) { fBookColumnAdvisor.setModelController(modelController); - + } + if (btnSelect != null) { + btnSelect.setEnabled(modelController != null && !modelController.isReadOnly()); + } } } diff --git a/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/widgets/RteDeviceInfoWidgetWrapper.java b/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/widgets/RteDeviceInfoWidgetWrapper.java index 98aafbd..38c7116 100644 --- a/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/widgets/RteDeviceInfoWidgetWrapper.java +++ b/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/widgets/RteDeviceInfoWidgetWrapper.java @@ -1,9 +1,11 @@ /******************************************************************************* * Copyright (c) 2022 ARM Ltd. and others * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation diff --git a/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/widgets/RteDeviceSelectorWidget.java b/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/widgets/RteDeviceSelectorWidget.java index 7288901..7dd5ee9 100644 --- a/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/widgets/RteDeviceSelectorWidget.java +++ b/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/widgets/RteDeviceSelectorWidget.java @@ -1,9 +1,11 @@ /******************************************************************************* * Copyright (c) 2022 ARM Ltd. and others * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation @@ -258,6 +260,9 @@ public void modifyText(ModifyEvent e) { } int index = comboMve.getSelectionIndex(); fSelectedMve = mveIndexToString(index); + if (fSelectedMve.equals(CmsisConstants.FP_MVE) && !fSelectedFpu.equals(CmsisConstants.DP_FPU)) { + updateFpu(); + } } }); @@ -766,8 +771,8 @@ protected void updateControls() { lblMemory.setText(mem); updateSecurity(); - updateFpu(); updateMve(); + updateFpu(); updateEndian(); } else { message = CpStringsUI.RteDeviceSelectorWidget_NoDeviceSelected; @@ -907,6 +912,10 @@ private void updateFpu() { fSelectedFpu = fpu; } + if (fSelectedMve.equals(CmsisConstants.FP_MVE)) { + fSelectedFpu = CmsisConstants.DP_FPU; + } + String[] fpuStrings = getFpuStrings(fpu); int index = fpuStringToIndex(fSelectedFpu); if (index < 0 || index >= fpuStrings.length) { @@ -1130,6 +1139,9 @@ public ICpDeviceInfo getDeviceInfo() { if (index >= 0) { String mve = mveIndexToString(index); fDeviceInfo.setAttribute(CmsisConstants.DMVE, mve); + if (fSelectedMve.equals(CmsisConstants.FP_MVE)) { + fDeviceInfo.setAttribute(CmsisConstants.DFPU, CmsisConstants.FP_MVE); + } } else { fDeviceInfo.removeAttribute(CmsisConstants.DMVE); } @@ -1141,10 +1153,15 @@ public ICpDeviceInfo getDeviceInfo() { public void setDeviceInfo(ICpDeviceInfo deviceInfo) { fDeviceInfo = deviceInfo; if (fDeviceInfo != null) { - fSelectedFpu = fDeviceInfo.getAttribute(CmsisConstants.DFPU); fSelectedEndian = fDeviceInfo.getAttribute(CmsisConstants.DENDIAN); fSelectedSecurity = fDeviceInfo.getAttribute(CmsisConstants.DSECURE); fSelectedMve = fDeviceInfo.getAttribute(CmsisConstants.DMVE); + if (fSelectedMve.equals(CmsisConstants.FP_MVE)) { + fSelectedFpu = CmsisConstants.DP_FPU; + } else { + fSelectedFpu = fDeviceInfo.getAttribute(CmsisConstants.DFPU); + } + // set initial selection IRteDeviceItem item = fDevices.findItem(fDeviceInfo.attributes()); if (item != null) { diff --git a/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/widgets/RteModelTreeWidget.java b/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/widgets/RteModelTreeWidget.java index 8df18ab..3e75098 100644 --- a/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/widgets/RteModelTreeWidget.java +++ b/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/widgets/RteModelTreeWidget.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/widgets/RteModelWidget.java b/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/widgets/RteModelWidget.java index 88dc0e6..ba0b503 100644 --- a/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/widgets/RteModelWidget.java +++ b/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/widgets/RteModelWidget.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/widgets/RtePackSelectorWidget.java b/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/widgets/RtePackSelectorWidget.java index c8ba56c..6b450b5 100644 --- a/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/widgets/RtePackSelectorWidget.java +++ b/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/widgets/RtePackSelectorWidget.java @@ -1,9 +1,11 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation @@ -243,7 +245,8 @@ public boolean canEdit(Object obj, int columnIndex) { @Override public boolean isEnabled(Object obj, int columnIndex) { if (columnIndex == COLSEL) { - if (getModelController().getRtePackCollection().isUseAllLatestPacks()) { + if (getModelController().isReadOnly() + || getModelController().getRtePackCollection().isUseAllLatestPacks()) { return false; } IRtePack pack = getRtePack(obj); diff --git a/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/widgets/RteTreeWidget.java b/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/widgets/RteTreeWidget.java index ef1059e..7d8aecb 100644 --- a/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/widgets/RteTreeWidget.java +++ b/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/widgets/RteTreeWidget.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/widgets/RteValidateWidget.java b/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/widgets/RteValidateWidget.java index b6cdb09..64d33a4 100644 --- a/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/widgets/RteValidateWidget.java +++ b/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/widgets/RteValidateWidget.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/widgets/RteWidget.java b/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/widgets/RteWidget.java index d1be857..361c403 100644 --- a/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/widgets/RteWidget.java +++ b/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/widgets/RteWidget.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/wizards/OkWizardDialog.java b/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/wizards/OkWizardDialog.java index aec5c59..ae393b2 100644 --- a/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/wizards/OkWizardDialog.java +++ b/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/wizards/OkWizardDialog.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/wizards/RteDeviceSelectorPage.java b/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/wizards/RteDeviceSelectorPage.java index c1ab2ed..a81c006 100644 --- a/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/wizards/RteDeviceSelectorPage.java +++ b/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/wizards/RteDeviceSelectorPage.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2022 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/wizards/RteDeviceSelectorWizard.java b/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/wizards/RteDeviceSelectorWizard.java index 301085b..0f083d0 100644 --- a/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/wizards/RteDeviceSelectorWizard.java +++ b/com.arm.cmsis.pack.ui/src/com/arm/cmsis/pack/ui/wizards/RteDeviceSelectorWizard.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2022 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack/.classpath b/com.arm.cmsis.pack/.classpath index f656d57..e6d0a3c 100644 --- a/com.arm.cmsis.pack/.classpath +++ b/com.arm.cmsis.pack/.classpath @@ -1,7 +1,21 @@ - + + + + + - + + + + + + + + + + + diff --git a/com.arm.cmsis.pack/META-INF/MANIFEST.MF b/com.arm.cmsis.pack/META-INF/MANIFEST.MF index 1278ff2..84c4a92 100644 --- a/com.arm.cmsis.pack/META-INF/MANIFEST.MF +++ b/com.arm.cmsis.pack/META-INF/MANIFEST.MF @@ -1,9 +1,9 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: CMSIS-Pack -Bundle-SymbolicName: com.arm.cmsis.pack;singleton:=true -Automatic-Module-Name: com.arm.cmsis.pack -Bundle-Version: 2.9.0.qualifier +Bundle-SymbolicName: com.arm.cmsis.pack;singleton:=true +Automatic-Module-Name: com.arm.cmsis.pack +Bundle-Version: 2.10.0.qualifier Bundle-Activator: com.arm.cmsis.pack.CpPlugIn Bundle-Vendor: Arm Limited Bundle-RequiredExecutionEnvironment: JavaSE-11 diff --git a/com.arm.cmsis.pack/plugin.xml b/com.arm.cmsis.pack/plugin.xml index 9e3d78a..fe36125 100644 --- a/com.arm.cmsis.pack/plugin.xml +++ b/com.arm.cmsis.pack/plugin.xml @@ -1,6 +1,5 @@ - diff --git a/com.arm.cmsis.pack/pom.xml b/com.arm.cmsis.pack/pom.xml index 65be119..e176c2e 100644 --- a/com.arm.cmsis.pack/pom.xml +++ b/com.arm.cmsis.pack/pom.xml @@ -5,7 +5,7 @@ com.arm.cmsis com.arm.cmsis.parent.sign - 2.9.0-SNAPSHOT + 2.10.0-SNAPSHOT ../com.arm.cmsis.parent.sign \ No newline at end of file diff --git a/com.arm.cmsis.pack/schema/DsqEngineFactory.exsd b/com.arm.cmsis.pack/schema/DsqEngineFactory.exsd index ce90931..919e11f 100644 --- a/com.arm.cmsis.pack/schema/DsqEngineFactory.exsd +++ b/com.arm.cmsis.pack/schema/DsqEngineFactory.exsd @@ -134,9 +134,11 @@ Copyright (c) 2021 ARM Inc. All rights reserved. This program and the accompanying materials are made available under the terms -of the Eclipse Public License v1.0 which accompanies this distribution, +of the Eclipse Public License 2.0 which accompanies this distribution, and is available at -http://www.eclipse.org/legal/epl-v10.html +https://www.eclipse.org/legal/epl-2.0/ + +SPDX-License-Identifier: EPL-2.0 diff --git a/com.arm.cmsis.pack/schema/EnvironmentProvider.exsd b/com.arm.cmsis.pack/schema/EnvironmentProvider.exsd index e8ed6ff..ab5da11 100644 --- a/com.arm.cmsis.pack/schema/EnvironmentProvider.exsd +++ b/com.arm.cmsis.pack/schema/EnvironmentProvider.exsd @@ -127,9 +127,11 @@ Copyright (c) 2021 ARM Inc. All rights reserved. This program and the accompanying materials are made available under the terms -of the Eclipse Public License v1.0 which accompanies this distribution, +of the Eclipse Public License 2.0 which accompanies this distribution, and is available at -http://www.eclipse.org/legal/epl-v10.html +https://www.eclipse.org/legal/epl-2.0/ + +SPDX-License-Identifier: EPL-2.0 diff --git a/com.arm.cmsis.pack/schema/PackInstaller.exsd b/com.arm.cmsis.pack/schema/PackInstaller.exsd index 68696b7..277be5b 100644 --- a/com.arm.cmsis.pack/schema/PackInstaller.exsd +++ b/com.arm.cmsis.pack/schema/PackInstaller.exsd @@ -134,9 +134,11 @@ Copyright (c) 2021 ARM Inc. All rights reserved. This program and the accompanying materials are made available under the terms -of the Eclipse Public License v1.0 which accompanies this distribution, +of the Eclipse Public License 2.0 which accompanies this distribution, and is available at -http://www.eclipse.org/legal/epl-v10.html +https://www.eclipse.org/legal/epl-2.0/ + +SPDX-License-Identifier: EPL-2.0 diff --git a/com.arm.cmsis.pack/src/com/arm/cmsis/pack/CpAbstractExtensionFactory.java b/com.arm.cmsis.pack/src/com/arm/cmsis/pack/CpAbstractExtensionFactory.java index cf7f732..b6b2ff7 100644 --- a/com.arm.cmsis.pack/src/com/arm/cmsis/pack/CpAbstractExtensionFactory.java +++ b/com.arm.cmsis.pack/src/com/arm/cmsis/pack/CpAbstractExtensionFactory.java @@ -1,9 +1,11 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation diff --git a/com.arm.cmsis.pack/src/com/arm/cmsis/pack/CpDsqEngineFactory.java b/com.arm.cmsis.pack/src/com/arm/cmsis/pack/CpDsqEngineFactory.java index 2a071de..874cdeb 100644 --- a/com.arm.cmsis.pack/src/com/arm/cmsis/pack/CpDsqEngineFactory.java +++ b/com.arm.cmsis.pack/src/com/arm/cmsis/pack/CpDsqEngineFactory.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack/src/com/arm/cmsis/pack/CpEnvironmentProvider.java b/com.arm.cmsis.pack/src/com/arm/cmsis/pack/CpEnvironmentProvider.java index 2c49245..6b52afd 100644 --- a/com.arm.cmsis.pack/src/com/arm/cmsis/pack/CpEnvironmentProvider.java +++ b/com.arm.cmsis.pack/src/com/arm/cmsis/pack/CpEnvironmentProvider.java @@ -1,3 +1,16 @@ +/******************************************************************************* + * Copyright (c) 2021 ARM Ltd. and others + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 + * which accompanies this distribution, and is available at + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * + * Contributors: + * ARM Ltd and ARM Germany GmbH - Initial API and implementation + *******************************************************************************/ + package com.arm.cmsis.pack; import java.util.Collection; diff --git a/com.arm.cmsis.pack/src/com/arm/cmsis/pack/CpEnvironmentProviderFactory.java b/com.arm.cmsis.pack/src/com/arm/cmsis/pack/CpEnvironmentProviderFactory.java index 5ebc816..97acff8 100644 --- a/com.arm.cmsis.pack/src/com/arm/cmsis/pack/CpEnvironmentProviderFactory.java +++ b/com.arm.cmsis.pack/src/com/arm/cmsis/pack/CpEnvironmentProviderFactory.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack/src/com/arm/cmsis/pack/CpPackInstallerFactory.java b/com.arm.cmsis.pack/src/com/arm/cmsis/pack/CpPackInstallerFactory.java index 5e1011a..24ec870 100644 --- a/com.arm.cmsis.pack/src/com/arm/cmsis/pack/CpPackInstallerFactory.java +++ b/com.arm.cmsis.pack/src/com/arm/cmsis/pack/CpPackInstallerFactory.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack/src/com/arm/cmsis/pack/CpPackManager.java b/com.arm.cmsis.pack/src/com/arm/cmsis/pack/CpPackManager.java index fce9e1c..f967155 100644 --- a/com.arm.cmsis.pack/src/com/arm/cmsis/pack/CpPackManager.java +++ b/com.arm.cmsis.pack/src/com/arm/cmsis/pack/CpPackManager.java @@ -1,9 +1,11 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation diff --git a/com.arm.cmsis.pack/src/com/arm/cmsis/pack/CpPlugIn.java b/com.arm.cmsis.pack/src/com/arm/cmsis/pack/CpPlugIn.java index dd6abbb..1c155a6 100644 --- a/com.arm.cmsis.pack/src/com/arm/cmsis/pack/CpPlugIn.java +++ b/com.arm.cmsis.pack/src/com/arm/cmsis/pack/CpPlugIn.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * Eclipse Project - generation from template * ARM Ltd and ARM Germany GmbH - application-specific implementation diff --git a/com.arm.cmsis.pack/src/com/arm/cmsis/pack/ICpEnvironmentProvider.java b/com.arm.cmsis.pack/src/com/arm/cmsis/pack/ICpEnvironmentProvider.java index b1b30d8..effd0e3 100644 --- a/com.arm.cmsis.pack/src/com/arm/cmsis/pack/ICpEnvironmentProvider.java +++ b/com.arm.cmsis.pack/src/com/arm/cmsis/pack/ICpEnvironmentProvider.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack/src/com/arm/cmsis/pack/ICpExampleImporter.java b/com.arm.cmsis.pack/src/com/arm/cmsis/pack/ICpExampleImporter.java index 4cca22d..4a23ed0 100644 --- a/com.arm.cmsis.pack/src/com/arm/cmsis/pack/ICpExampleImporter.java +++ b/com.arm.cmsis.pack/src/com/arm/cmsis/pack/ICpExampleImporter.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack/src/com/arm/cmsis/pack/ICpPackInstaller.java b/com.arm.cmsis.pack/src/com/arm/cmsis/pack/ICpPackInstaller.java index d3a59f9..542f22d 100644 --- a/com.arm.cmsis.pack/src/com/arm/cmsis/pack/ICpPackInstaller.java +++ b/com.arm.cmsis.pack/src/com/arm/cmsis/pack/ICpPackInstaller.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack/src/com/arm/cmsis/pack/ICpPackManager.java b/com.arm.cmsis.pack/src/com/arm/cmsis/pack/ICpPackManager.java index f138436..4889931 100644 --- a/com.arm.cmsis.pack/src/com/arm/cmsis/pack/ICpPackManager.java +++ b/com.arm.cmsis.pack/src/com/arm/cmsis/pack/ICpPackManager.java @@ -1,9 +1,11 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation diff --git a/com.arm.cmsis.pack/src/com/arm/cmsis/pack/ICpPackRootProvider.java b/com.arm.cmsis.pack/src/com/arm/cmsis/pack/ICpPackRootProvider.java index 1d6ed4f..d6e59af 100644 --- a/com.arm.cmsis.pack/src/com/arm/cmsis/pack/ICpPackRootProvider.java +++ b/com.arm.cmsis.pack/src/com/arm/cmsis/pack/ICpPackRootProvider.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack/src/com/arm/cmsis/pack/ICpRepoServiceProvider.java b/com.arm.cmsis.pack/src/com/arm/cmsis/pack/ICpRepoServiceProvider.java index e3323be..30f16f6 100644 --- a/com.arm.cmsis.pack/src/com/arm/cmsis/pack/ICpRepoServiceProvider.java +++ b/com.arm.cmsis.pack/src/com/arm/cmsis/pack/ICpRepoServiceProvider.java @@ -1,9 +1,11 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation diff --git a/com.arm.cmsis.pack/src/com/arm/cmsis/pack/preferences/CpPreferenceInitializer.java b/com.arm.cmsis.pack/src/com/arm/cmsis/pack/preferences/CpPreferenceInitializer.java index db161de..d6d70bc 100644 --- a/com.arm.cmsis.pack/src/com/arm/cmsis/pack/preferences/CpPreferenceInitializer.java +++ b/com.arm.cmsis.pack/src/com/arm/cmsis/pack/preferences/CpPreferenceInitializer.java @@ -1,9 +1,11 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation @@ -288,7 +290,6 @@ public static void updateLastUpdateTime(boolean useCurrentDate) { public static boolean getAutoUpdateFlag() { if (autoUpdateFlag == null) { // not defined yet readUpdateFile(); - } return autoUpdateFlag; } @@ -310,7 +311,7 @@ public static boolean isAutoInstallMissingPacks() { /** * Read the update.cfg file in .Web folder. If the file does not exist, set - * autoUpdateFlag to false and the lastUpdateTime to current time. + * autoUpdateFlag to true and the lastUpdateTime to current time. */ private static void readUpdateFile() { try (Stream stream = Files @@ -331,6 +332,10 @@ private static void readUpdateFile() { } private static void writeUpdateFile() { + if (autoUpdateFlag == null) { // not defined yet + readUpdateFile(); + } + List lines = Arrays.asList("Date=" + lastUpdateTime, "Auto=" + autoUpdateFlag.toString()); //$NON-NLS-1$ //$NON-NLS-2$ Path file = Paths.get(CpPlugIn.getPackManager().getCmsisPackWebDir(), UPDATE_CFG); try { diff --git a/com.arm.cmsis.pack/src/com/arm/cmsis/pack/repository/CpRepository.java b/com.arm.cmsis.pack/src/com/arm/cmsis/pack/repository/CpRepository.java index ece8087..dc72a47 100644 --- a/com.arm.cmsis.pack/src/com/arm/cmsis/pack/repository/CpRepository.java +++ b/com.arm.cmsis.pack/src/com/arm/cmsis/pack/repository/CpRepository.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack/src/com/arm/cmsis/pack/repository/CpRepositoryList.java b/com.arm.cmsis.pack/src/com/arm/cmsis/pack/repository/CpRepositoryList.java index a72832f..5dbddee 100644 --- a/com.arm.cmsis.pack/src/com/arm/cmsis/pack/repository/CpRepositoryList.java +++ b/com.arm.cmsis.pack/src/com/arm/cmsis/pack/repository/CpRepositoryList.java @@ -1,9 +1,11 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Liviu Ionescu - initial implementation diff --git a/com.arm.cmsis.pack/src/com/arm/cmsis/pack/repository/ICpRepository.java b/com.arm.cmsis.pack/src/com/arm/cmsis/pack/repository/ICpRepository.java index 12048ca..8c994f7 100644 --- a/com.arm.cmsis.pack/src/com/arm/cmsis/pack/repository/ICpRepository.java +++ b/com.arm.cmsis.pack/src/com/arm/cmsis/pack/repository/ICpRepository.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack/src/com/arm/cmsis/pack/repository/RteExampleJobResult.java b/com.arm.cmsis.pack/src/com/arm/cmsis/pack/repository/RteExampleJobResult.java index 1b6ebb0..bf5cfdc 100644 --- a/com.arm.cmsis.pack/src/com/arm/cmsis/pack/repository/RteExampleJobResult.java +++ b/com.arm.cmsis.pack/src/com/arm/cmsis/pack/repository/RteExampleJobResult.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack/src/com/arm/cmsis/pack/repository/RtePackJobResult.java b/com.arm.cmsis.pack/src/com/arm/cmsis/pack/repository/RtePackJobResult.java index 3c865cf..4e9c1dc 100644 --- a/com.arm.cmsis.pack/src/com/arm/cmsis/pack/repository/RtePackJobResult.java +++ b/com.arm.cmsis.pack/src/com/arm/cmsis/pack/repository/RtePackJobResult.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/IRteModel.java b/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/IRteModel.java index dba3a3a..aef6ecc 100644 --- a/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/IRteModel.java +++ b/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/IRteModel.java @@ -1,9 +1,11 @@ /******************************************************************************* * Copyright (c) 2022 ARM Ltd and others. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation diff --git a/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/IRteModelController.java b/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/IRteModelController.java index 2f27cf8..eaa621a 100644 --- a/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/IRteModelController.java +++ b/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/IRteModelController.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/RteConstants.java b/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/RteConstants.java index b33fd87..d75c85f 100644 --- a/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/RteConstants.java +++ b/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/RteConstants.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/RteModel.java b/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/RteModel.java index b8b62a3..99c4b70 100644 --- a/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/RteModel.java +++ b/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/RteModel.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2022 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/RteModelController.java b/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/RteModelController.java index 8d7088c..eeb61c0 100644 --- a/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/RteModelController.java +++ b/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/RteModelController.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2022 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ @@ -73,6 +75,8 @@ public abstract class RteModelController extends RteEventProxy implements IRteMo protected boolean fbBoardModified = false; protected boolean fbShowUsedPacksOnly = true; + protected boolean fbReadOnly = false; + /** * Default constructor */ @@ -141,6 +145,16 @@ protected Set collectGpdscFiles() { return new HashSet(genPacks.keySet()); } + @Override + public boolean isReadOnly() { + return fbReadOnly; + } + + @Override + public void setReadOnly(boolean bReadOnly) { + fbReadOnly = bReadOnly; + } + @Override public boolean isModified() { return isDeviceModified() || isBoardModified() || isPackFilterModified() || isComponentSelectionModified(); @@ -205,6 +219,9 @@ public void setConfigurationInfo(ICpConfigurationInfo info) { clear(); return; } + if (info.hasAttribute(CmsisConstants.CBUILD_YML)) { + setReadOnly(true); + } fSavedPackFilter = new CpPackFilter(info.createPackFilter()); fCurrentPackFilter = new CpPackFilter(fSavedPackFilter); diff --git a/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/RteModelUtils.java b/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/RteModelUtils.java index 6020043..fcfd15f 100644 --- a/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/RteModelUtils.java +++ b/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/RteModelUtils.java @@ -1,9 +1,11 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation diff --git a/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/boards/IRteBoardDeviceItem.java b/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/boards/IRteBoardDeviceItem.java index 50c67ad..83424fb 100644 --- a/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/boards/IRteBoardDeviceItem.java +++ b/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/boards/IRteBoardDeviceItem.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/boards/IRteBoardItem.java b/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/boards/IRteBoardItem.java index 3547acf..8ba092c 100644 --- a/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/boards/IRteBoardItem.java +++ b/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/boards/IRteBoardItem.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2022 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/boards/RteBoardDeviceItem.java b/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/boards/RteBoardDeviceItem.java index ead35a1..db36541 100644 --- a/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/boards/RteBoardDeviceItem.java +++ b/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/boards/RteBoardDeviceItem.java @@ -1,9 +1,11 @@ /******************************************************************************* * Copyright (c) 2022 ARM Ltd. and others * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation diff --git a/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/boards/RteBoardDeviceItemComparator.java b/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/boards/RteBoardDeviceItemComparator.java index d828584..61b5a0c 100644 --- a/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/boards/RteBoardDeviceItemComparator.java +++ b/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/boards/RteBoardDeviceItemComparator.java @@ -1,9 +1,11 @@ /******************************************************************************* * Copyright (c) 2022 ARM Ltd. and others * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation diff --git a/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/boards/RteBoardItem.java b/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/boards/RteBoardItem.java index 80195ef..6eb00b1 100644 --- a/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/boards/RteBoardItem.java +++ b/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/boards/RteBoardItem.java @@ -1,9 +1,11 @@ /******************************************************************************* * Copyright (c) 2022 ARM Ltd. and others * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation diff --git a/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/components/IRteComponent.java b/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/components/IRteComponent.java index 2be7e7f..b77129d 100644 --- a/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/components/IRteComponent.java +++ b/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/components/IRteComponent.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/components/IRteComponentBundle.java b/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/components/IRteComponentBundle.java index b86fbd7..9a9eb02 100644 --- a/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/components/IRteComponentBundle.java +++ b/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/components/IRteComponentBundle.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/components/IRteComponentClass.java b/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/components/IRteComponentClass.java index 8cc8577..a740262 100644 --- a/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/components/IRteComponentClass.java +++ b/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/components/IRteComponentClass.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/components/IRteComponentGroup.java b/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/components/IRteComponentGroup.java index 3a32721..7ef99fe 100644 --- a/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/components/IRteComponentGroup.java +++ b/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/components/IRteComponentGroup.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/components/IRteComponentItem.java b/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/components/IRteComponentItem.java index 59c4e2e..c175594 100644 --- a/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/components/IRteComponentItem.java +++ b/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/components/IRteComponentItem.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/components/RteComponent.java b/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/components/RteComponent.java index 2fe21df..0149b80 100644 --- a/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/components/RteComponent.java +++ b/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/components/RteComponent.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/components/RteComponentBundle.java b/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/components/RteComponentBundle.java index d3adbbb..755227c 100644 --- a/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/components/RteComponentBundle.java +++ b/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/components/RteComponentBundle.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/components/RteComponentBundleVersion.java b/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/components/RteComponentBundleVersion.java index ad65ec0..e41d1b2 100644 --- a/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/components/RteComponentBundleVersion.java +++ b/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/components/RteComponentBundleVersion.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/components/RteComponentClass.java b/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/components/RteComponentClass.java index de9901d..48aa0b2 100644 --- a/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/components/RteComponentClass.java +++ b/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/components/RteComponentClass.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/components/RteComponentGroup.java b/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/components/RteComponentGroup.java index 515de76..c3e9abb 100644 --- a/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/components/RteComponentGroup.java +++ b/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/components/RteComponentGroup.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/components/RteComponentItem.java b/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/components/RteComponentItem.java index 536902b..82ac940 100644 --- a/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/components/RteComponentItem.java +++ b/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/components/RteComponentItem.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/components/RteComponentRoot.java b/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/components/RteComponentRoot.java index d857288..e283529 100644 --- a/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/components/RteComponentRoot.java +++ b/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/components/RteComponentRoot.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/components/RteComponentVariant.java b/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/components/RteComponentVariant.java index 1422f6e..dc35506 100644 --- a/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/components/RteComponentVariant.java +++ b/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/components/RteComponentVariant.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/components/RteComponentVendor.java b/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/components/RteComponentVendor.java index 64e3ca0..94b059c 100644 --- a/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/components/RteComponentVendor.java +++ b/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/components/RteComponentVendor.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/components/RteComponentVersion.java b/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/components/RteComponentVersion.java index 1d0c90c..969a383 100644 --- a/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/components/RteComponentVersion.java +++ b/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/components/RteComponentVersion.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/components/RteMoreClass.java b/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/components/RteMoreClass.java index 6560c9e..0972227 100644 --- a/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/components/RteMoreClass.java +++ b/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/components/RteMoreClass.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/components/RteSelectedBoardClass.java b/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/components/RteSelectedBoardClass.java index 465bd69..6cc13a2 100644 --- a/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/components/RteSelectedBoardClass.java +++ b/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/components/RteSelectedBoardClass.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2022 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/components/RteSelectedDeviceClass.java b/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/components/RteSelectedDeviceClass.java index e0048a9..0d58669 100644 --- a/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/components/RteSelectedDeviceClass.java +++ b/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/components/RteSelectedDeviceClass.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2022 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/dependencies/IRteDependency.java b/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/dependencies/IRteDependency.java index 4249d8d..9bfaa3a 100644 --- a/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/dependencies/IRteDependency.java +++ b/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/dependencies/IRteDependency.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/dependencies/IRteDependencyItem.java b/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/dependencies/IRteDependencyItem.java index 66c2a3f..ed49ad0 100644 --- a/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/dependencies/IRteDependencyItem.java +++ b/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/dependencies/IRteDependencyItem.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/dependencies/IRteDependencyResult.java b/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/dependencies/IRteDependencyResult.java index 9e5edd9..847c687 100644 --- a/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/dependencies/IRteDependencyResult.java +++ b/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/dependencies/IRteDependencyResult.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/dependencies/IRteDependencySolver.java b/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/dependencies/IRteDependencySolver.java index a243188..04894aa 100644 --- a/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/dependencies/IRteDependencySolver.java +++ b/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/dependencies/IRteDependencySolver.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/dependencies/RteDependency.java b/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/dependencies/RteDependency.java index e5da780..3c37a18 100644 --- a/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/dependencies/RteDependency.java +++ b/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/dependencies/RteDependency.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/dependencies/RteDependencyItem.java b/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/dependencies/RteDependencyItem.java index 4d98259..85b0a2f 100644 --- a/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/dependencies/RteDependencyItem.java +++ b/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/dependencies/RteDependencyItem.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/dependencies/RteDependencyResult.java b/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/dependencies/RteDependencyResult.java index 8227524..c206313 100644 --- a/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/dependencies/RteDependencyResult.java +++ b/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/dependencies/RteDependencyResult.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/dependencies/RteDependencySolver.java b/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/dependencies/RteDependencySolver.java index 0c930f8..32a3283 100644 --- a/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/dependencies/RteDependencySolver.java +++ b/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/dependencies/RteDependencySolver.java @@ -1,9 +1,11 @@ /******************************************************************************* * Copyright (c) 2022 ARM Ltd. and others * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation diff --git a/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/dependencies/RteDependencyWrapper.java b/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/dependencies/RteDependencyWrapper.java index afe9f4e..17672a4 100644 --- a/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/dependencies/RteDependencyWrapper.java +++ b/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/dependencies/RteDependencyWrapper.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/dependencies/RteMissingBoardResult.java b/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/dependencies/RteMissingBoardResult.java index d394e02..a6674bb 100644 --- a/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/dependencies/RteMissingBoardResult.java +++ b/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/dependencies/RteMissingBoardResult.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2022 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/dependencies/RteMissingComponentResult.java b/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/dependencies/RteMissingComponentResult.java index f148b0e..83dd39b 100644 --- a/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/dependencies/RteMissingComponentResult.java +++ b/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/dependencies/RteMissingComponentResult.java @@ -1,9 +1,11 @@ /******************************************************************************* * Copyright (c) 2021 - 2019 ARM Ltd. and others * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation diff --git a/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/dependencies/RteMissingDeviceResult.java b/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/dependencies/RteMissingDeviceResult.java index 534ab14..f2dc475 100644 --- a/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/dependencies/RteMissingDeviceResult.java +++ b/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/dependencies/RteMissingDeviceResult.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/dependencies/RteMissingGpdscResult.java b/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/dependencies/RteMissingGpdscResult.java index dde443e..2a94e2b 100644 --- a/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/dependencies/RteMissingGpdscResult.java +++ b/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/dependencies/RteMissingGpdscResult.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/devices/IRteDeviceItem.java b/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/devices/IRteDeviceItem.java index d484abc..c2db914 100644 --- a/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/devices/IRteDeviceItem.java +++ b/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/devices/IRteDeviceItem.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/devices/IRteDeviceRoot.java b/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/devices/IRteDeviceRoot.java index 757d7b1..fddd7c4 100644 --- a/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/devices/IRteDeviceRoot.java +++ b/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/devices/IRteDeviceRoot.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/devices/RteDeviceItem.java b/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/devices/RteDeviceItem.java index 4622e62..e63fcd4 100644 --- a/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/devices/RteDeviceItem.java +++ b/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/devices/RteDeviceItem.java @@ -1,9 +1,11 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation diff --git a/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/devices/RteDeviceRoot.java b/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/devices/RteDeviceRoot.java index 5e77cac..6e74184 100644 --- a/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/devices/RteDeviceRoot.java +++ b/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/devices/RteDeviceRoot.java @@ -1,9 +1,11 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation diff --git a/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/examples/IRteExampleItem.java b/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/examples/IRteExampleItem.java index 6a906a1..ed2da60 100644 --- a/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/examples/IRteExampleItem.java +++ b/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/examples/IRteExampleItem.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/examples/RteExampleItem.java b/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/examples/RteExampleItem.java index 3128ebb..c7b0a0c 100644 --- a/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/examples/RteExampleItem.java +++ b/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/examples/RteExampleItem.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/packs/IRtePack.java b/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/packs/IRtePack.java index 0d8a409..b8ba23d 100644 --- a/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/packs/IRtePack.java +++ b/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/packs/IRtePack.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/packs/IRtePackCollection.java b/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/packs/IRtePackCollection.java index 4b364d7..b424d31 100644 --- a/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/packs/IRtePackCollection.java +++ b/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/packs/IRtePackCollection.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/packs/IRtePackFamily.java b/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/packs/IRtePackFamily.java index 1b9eb39..7a8dfef 100644 --- a/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/packs/IRtePackFamily.java +++ b/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/packs/IRtePackFamily.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/packs/IRtePackItem.java b/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/packs/IRtePackItem.java index 2edcb75..c1374bd 100644 --- a/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/packs/IRtePackItem.java +++ b/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/packs/IRtePackItem.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/packs/RtePack.java b/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/packs/RtePack.java index 6047dd9..dffff0d 100644 --- a/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/packs/RtePack.java +++ b/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/packs/RtePack.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/packs/RtePackCollection.java b/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/packs/RtePackCollection.java index 8d1dba0..234871a 100644 --- a/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/packs/RtePackCollection.java +++ b/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/packs/RtePackCollection.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/packs/RtePackFamily.java b/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/packs/RtePackFamily.java index 35f6572..0e58a6d 100644 --- a/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/packs/RtePackFamily.java +++ b/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/packs/RtePackFamily.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/packs/RtePackItem.java b/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/packs/RtePackItem.java index b0a7e2c..4442de6 100644 --- a/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/packs/RtePackItem.java +++ b/com.arm.cmsis.pack/src/com/arm/cmsis/pack/rte/packs/RtePackItem.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.parent.sign/pom.xml b/com.arm.cmsis.parent.sign/pom.xml index d0bebb0..0a2da85 100644 --- a/com.arm.cmsis.parent.sign/pom.xml +++ b/com.arm.cmsis.parent.sign/pom.xml @@ -5,7 +5,7 @@ com.arm.cmsis com.arm.cmsis.parent - 2.9.0-SNAPSHOT + 2.10.0-SNAPSHOT ../com.arm.cmsis.parent diff --git a/com.arm.cmsis.parent/pom.xml b/com.arm.cmsis.parent/pom.xml index a10579a..c7eed59 100644 --- a/com.arm.cmsis.parent/pom.xml +++ b/com.arm.cmsis.parent/pom.xml @@ -1,278 +1,298 @@ - - 4.0.0 - com.arm.cmsis - com.arm.cmsis.parent - pom - 2.9.0-SNAPSHOT - - - 2.5.0 - 1.6.0 - UTF-8 - - **/src-gen/**/* - - - - - - - - org.eclipse.tycho - tycho-maven-plugin - ${tycho-version} - true - - - org.eclipse.tycho - target-platform-configuration - ${tycho-version} - - - - com.arm.cmsis - com.arm.cmsis.target - 2.9.0-SNAPSHOT - - - - - win32 - win32 - x86_64 - - - linux - gtk - x86_64 - - - macosx - cocoa - x86_64 - - - - - - - org.eclipse.tycho - tycho-source-plugin - ${tycho-version} - - - plugin-source - - plugin-source - - - - feature-source - package - - feature-source - - - - - - org.eclipse.tycho - tycho-p2-plugin - ${tycho-version} - - - attach-p2-metadata - package - - p2-metadata - - - - - - com.github.spotbugs - spotbugs-maven-plugin - 3.1.12.2 - - true - - - - - - org.eclipse.tycho - tycho-surefire-plugin - ${tycho-version} - - - **/*Test.java - - - - - - - - - only-eclipse - - - m2e.version - - - - - - - org.eclipse.m2e - lifecycle-mapping - 1.0.0 - - - - - - org.eclipse.tycho - - tycho-compiler-plugin - - - ${tycho-version},) - - - testCompile - - - - - - - - - - org.eclipse.tycho - target-platform-configuration - [${tycho-version},) - - target-platform - - - - - - - - - org.codehaus.mojo - build-helper-maven-plugin - [3.0.0,) - - add-resource - add-source - add-test-resource - add-test-source - - - - - - - - - org.codehaus.mojo - exec-maven-plugin - [${exec-maven-plugin-version},) - - java - - - - - - - - - org.eclipse.tycho - tycho-compiler-plugin - [${tycho-version},) - - compile - - - - - - - - - org.eclipse.tycho - tycho-packaging-plugin - [${tycho-version},) - - build-qualifier - build-qualifier-aggregator - validate-id - validate-version - - - - - - - - - org.apache.maven.plugins - maven-clean-plugin - [3.1,) - - clean - - - - - - - - - - - - - - - - - - - ../com.arm.cmsis.target - ../com.arm.cmsis.pack.common - ../com.arm.cmsis.pack.data - ../com.arm.cmsis.pack - ../com.arm.cmsis.pack.ui - ../com.arm.cmsis.pack.project - ../com.arm.cmsis.config - ../com.arm.cmsis.help - ../com.arm.cmsis.pack.installer - ../com.arm.cmsis.pack.installer.ui - ../com.arm.cmsis.pack.build.settings - ../com.arm.cmsis.pack.build.armcc - ../com.arm.cmsis.pack.build.armgcc - ../com.arm.cmsis.pack.build.gnuarmeclipse - - ../com.arm.tpip.freemarker - ../com.arm.cmsis.zone - ../com.arm.cmsis.zone.ui - ../com.arm.cmsis.zone.it - - ../com.arm.cmsis.pack.feature - ../com.arm.cmsis.zone.feature - ../com.arm.cmsis.repository - - ../com.arm.cmsis.pack.common.tests - ../com.arm.cmsis.zone.tests - - - + + 4.0.0 + com.arm.cmsis + com.arm.cmsis.parent + pom + 2.10.0-SNAPSHOT + + + 2.5.0 + 1.6.0 + UTF-8 + + **/src-gen/**/* + + 3.1.1 + + + + + + + org.eclipse.tycho + tycho-maven-plugin + ${tycho-version} + true + + + org.eclipse.tycho + target-platform-configuration + ${tycho-version} + + + + com.arm.cmsis + com.arm.cmsis.target + 2.10.0-SNAPSHOT + + + + + win32 + win32 + x86_64 + + + linux + gtk + x86_64 + + + macosx + cocoa + x86_64 + + + + + + + org.eclipse.tycho + tycho-source-plugin + ${tycho-version} + + + plugin-source + + plugin-source + + + + feature-source + package + + feature-source + + + + + + org.eclipse.tycho + tycho-p2-plugin + ${tycho-version} + + + attach-p2-metadata + package + + p2-metadata + + + + + + com.github.spotbugs + spotbugs-maven-plugin + 3.1.12.2 + + true + + + + + + org.eclipse.tycho + tycho-surefire-plugin + ${tycho-version} + + + **/*Test.java + + + + + + + + + org.apache.maven.plugins + maven-deploy-plugin + ${maven.plugin.deploy.version} + + + + + + + + only-eclipse + + + m2e.version + + + + + + + org.eclipse.m2e + lifecycle-mapping + 1.0.0 + + + + + + org.eclipse.tycho + + tycho-compiler-plugin + + + ${tycho-version},) + + + testCompile + + + + + + + + + + org.eclipse.tycho + target-platform-configuration + [${tycho-version},) + + target-platform + + + + + + + + + org.codehaus.mojo + build-helper-maven-plugin + [3.0.0,) + + add-resource + add-source + add-test-resource + add-test-source + + + + + + + + + org.codehaus.mojo + exec-maven-plugin + [${exec-maven-plugin-version},) + + java + + + + + + + + + org.eclipse.tycho + tycho-compiler-plugin + [${tycho-version},) + + compile + + + + + + + + + org.eclipse.tycho + tycho-packaging-plugin + [${tycho-version},) + + build-qualifier + build-qualifier-aggregator + validate-id + validate-version + + + + + + + + + org.apache.maven.plugins + maven-clean-plugin + [3.1,) + + clean + + + + + + + + + + + + + + + + + + + ../com.arm.cmsis.target + ../com.arm.cmsis.pack.common + ../com.arm.cmsis.pack.data + ../com.arm.cmsis.pack.parser.yml + + ../com.arm.cmsis.pack + ../com.arm.cmsis.pack.ui + ../com.arm.cmsis.pack.project + ../com.arm.cmsis.config + ../com.arm.cmsis.help + ../com.arm.cmsis.pack.installer + ../com.arm.cmsis.pack.installer.ui + ../com.arm.cmsis.pack.build.settings + ../com.arm.cmsis.pack.build.armcc + ../com.arm.cmsis.pack.build.armgcc + ../com.arm.cmsis.pack.build.gnuarmeclipse + + ../com.arm.tpip.freemarker + ../com.arm.cmsis.zone + ../com.arm.cmsis.zone.ui + ../com.arm.cmsis.zone.it + + ../com.arm.cmsis.pack.feature + ../com.arm.cmsis.zone.feature + ../com.arm.cmsis.repository + + ../com.arm.cmsis.pack.common.tests + ../com.arm.cmsis.zone.tests + ../com.arm.cmsis.pack.data.tests + ../com.arm.cmsis.pack.parser.yml.tests + + ../com.arm.cmsis.tests.target + ../com.arm.cmsis.config.tests + + ../com.arm.cmsis.parent.sign + + + diff --git a/com.arm.cmsis.repository/category.xml b/com.arm.cmsis.repository/category.xml index f044fc0..51e8c93 100644 --- a/com.arm.cmsis.repository/category.xml +++ b/com.arm.cmsis.repository/category.xml @@ -1,15 +1,15 @@ - + - + - + - + diff --git a/com.arm.cmsis.repository/pom.xml b/com.arm.cmsis.repository/pom.xml index 8e1bb5b..2b41308 100644 --- a/com.arm.cmsis.repository/pom.xml +++ b/com.arm.cmsis.repository/pom.xml @@ -8,7 +8,7 @@ com.arm.cmsis com.arm.cmsis.parent - 2.9.0-SNAPSHOT + 2.10.0-SNAPSHOT ../com.arm.cmsis.parent diff --git a/com.arm.cmsis.target/pom.xml b/com.arm.cmsis.target/pom.xml index f5d65b9..6dafdab 100644 --- a/com.arm.cmsis.target/pom.xml +++ b/com.arm.cmsis.target/pom.xml @@ -5,7 +5,7 @@ com.arm.cmsis com.arm.cmsis.parent - 2.9.0-SNAPSHOT + 2.10.0-SNAPSHOT ../com.arm.cmsis.parent diff --git a/com.arm.cmsis.tests.target/pom.xml b/com.arm.cmsis.tests.target/pom.xml index 634f387..be32b0f 100644 --- a/com.arm.cmsis.tests.target/pom.xml +++ b/com.arm.cmsis.tests.target/pom.xml @@ -1,13 +1,16 @@ 4.0.0 - com.arm.cmsis com.arm.cmsis.tests.target eclipse-target-definition - 2.9.0-SNAPSHOT + + com.arm.cmsis + com.arm.cmsis.parent + 2.10.0-SNAPSHOT + ../com.arm.cmsis.parent + true - 2.5.0 diff --git a/com.arm.cmsis.zone.feature/feature.properties b/com.arm.cmsis.zone.feature/feature.properties index 1e208ba..9c250f6 100644 --- a/com.arm.cmsis.zone.feature/feature.properties +++ b/com.arm.cmsis.zone.feature/feature.properties @@ -2,12 +2,12 @@ featureName=CMSIS-Zone Eclipse plug-ins providerName=ARM Limited description=Eclipse plug-ins for CMSIS-Zone support copyright=Copyright (c) 2015-2023 ARM Limited. and others \n\ -Licensed under Eclipse Public License v1.0 +Licensed under Eclipse Public License 2.0 license=This program and the accompanying materials are made\n\ -available under the terms of the Eclipse Public License v1.0\n\ +available under the terms of the Eclipse Public License 2.0\n\ which accompanies this distribution. The complete license text\n\ -is here http://www.eclipse.org/legal/epl-v10.html\n\n\ +is here https://www.eclipse.org/legal/epl-2.0/\n\n\ The Apache FreeMarker 2.3.26 software is included and delivered\n\ under Apache License, Version 2.0. The complete license text is\n\ here https://freemarker.apache.org/docs/app_license.html -licenseURL=http://www.eclipse.org/legal/epl-v10.html +licenseURL=https://www.eclipse.org/legal/epl-2.0/ diff --git a/com.arm.cmsis.zone.feature/feature.xml b/com.arm.cmsis.zone.feature/feature.xml index 10fc63c..12c48fe 100644 --- a/com.arm.cmsis.zone.feature/feature.xml +++ b/com.arm.cmsis.zone.feature/feature.xml @@ -2,7 +2,7 @@ @@ -29,12 +29,12 @@ - - + + - - - + + + diff --git a/com.arm.cmsis.zone.feature/pom.xml b/com.arm.cmsis.zone.feature/pom.xml index 0380c7e..bbfe54b 100644 --- a/com.arm.cmsis.zone.feature/pom.xml +++ b/com.arm.cmsis.zone.feature/pom.xml @@ -1,12 +1,12 @@ 4.0.0 com.arm.cmsis.zone.feature - 1.2.2-SNAPSHOT + 1.2.3-SNAPSHOT eclipse-feature com.arm.cmsis com.arm.cmsis.parent.sign - 2.9.0-SNAPSHOT + 2.10.0-SNAPSHOT ../com.arm.cmsis.parent.sign diff --git a/com.arm.cmsis.zone.feature/sourceTemplateFeature/feature.properties b/com.arm.cmsis.zone.feature/sourceTemplateFeature/feature.properties index 917c547..9861a5c 100644 --- a/com.arm.cmsis.zone.feature/sourceTemplateFeature/feature.properties +++ b/com.arm.cmsis.zone.feature/sourceTemplateFeature/feature.properties @@ -2,9 +2,9 @@ featureName=CMSIS-Zone Eclipse plug-ins (source code) providerName=ARM Limited description=Source code for CMSIS-Zone Eclipse plug-ins copyright=Copyright (c) 2015-2022 ARM Limited. and others \n\ -Licensed under Eclipse Public License v1.0 +Licensed under Eclipse Public License 2.0 license=This program and the accompanying materials\n\ -are made available under the terms of the Eclipse Public License v1.0\n\ +are made available under the terms of the Eclipse Public License 2.0\n\ which accompanies this distribution, and is available at\n\ -http://www.eclipse.org/legal/epl-v10.html -licenseURL=http://www.eclipse.org/legal/epl-v10.html +https://www.eclipse.org/legal/epl-2.0/ +licenseURL=https://www.eclipse.org/legal/epl-2.0/ diff --git a/com.arm.cmsis.zone.it/META-INF/MANIFEST.MF b/com.arm.cmsis.zone.it/META-INF/MANIFEST.MF index 3c7d096..522bf34 100644 --- a/com.arm.cmsis.zone.it/META-INF/MANIFEST.MF +++ b/com.arm.cmsis.zone.it/META-INF/MANIFEST.MF @@ -3,15 +3,15 @@ Bundle-ManifestVersion: 2 Bundle-Name: CMSIS-Zone unit tests Bundle-SymbolicName: com.arm.cmsis.zone.it;singleton:=true Automatic-Module-Name: com.arm.cmsis.zone.it -Bundle-Version: 1.2.2.qualifier +Bundle-Version: 1.2.3.qualifier Bundle-Activator: com.arm.cmsis.zone.it.CmsisZoneTestsActivator Bundle-Vendor: Arm Limited Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, com.arm.cmsis.zone.ui, org.eclipse.core.resources, - com.arm.cmsis.pack.common;bundle-version="2.9.0", - com.arm.cmsis.pack.project;bundle-version="2.9.0" + com.arm.cmsis.pack.common;bundle-version="2.10.0", + com.arm.cmsis.pack.project;bundle-version="2.10.0" Bundle-RequiredExecutionEnvironment: JavaSE-11 Bundle-ActivationPolicy: lazy Import-Package: junit.framework;version="4.12.0", diff --git a/com.arm.cmsis.zone.it/pom.xml b/com.arm.cmsis.zone.it/pom.xml index 28a9ec8..a5b47e9 100644 --- a/com.arm.cmsis.zone.it/pom.xml +++ b/com.arm.cmsis.zone.it/pom.xml @@ -1,12 +1,12 @@ 4.0.0 com.arm.cmsis.zone.it - 1.2.2-SNAPSHOT + 1.2.3-SNAPSHOT eclipse-plugin com.arm.cmsis com.arm.cmsis.parent - 2.9.0-SNAPSHOT + 2.10.0-SNAPSHOT ../com.arm.cmsis.parent \ No newline at end of file diff --git a/com.arm.cmsis.zone.tests/.classpath b/com.arm.cmsis.zone.tests/.classpath index d4128ff..7931ec2 100644 --- a/com.arm.cmsis.zone.tests/.classpath +++ b/com.arm.cmsis.zone.tests/.classpath @@ -1,14 +1,20 @@ - + - + - + + + + + + + diff --git a/com.arm.cmsis.zone.tests/META-INF/MANIFEST.MF b/com.arm.cmsis.zone.tests/META-INF/MANIFEST.MF index 0ecb8dd..210a783 100644 --- a/com.arm.cmsis.zone.tests/META-INF/MANIFEST.MF +++ b/com.arm.cmsis.zone.tests/META-INF/MANIFEST.MF @@ -2,9 +2,9 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Tests Bundle-SymbolicName: com.arm.cmsis.zone.tests -Bundle-Version: 1.2.2.qualifier +Bundle-Version: 1.2.3.qualifier Bundle-Vendor: Arm Limited Automatic-Module-Name: com.arm.cmsis.zone.tests Bundle-RequiredExecutionEnvironment: JavaSE-11 Require-Bundle: org.junit;bundle-version="4.12.0", - com.arm.cmsis.zone;bundle-version="1.2.2" + com.arm.cmsis.zone;bundle-version="1.2.3" diff --git a/com.arm.cmsis.zone.tests/pom.xml b/com.arm.cmsis.zone.tests/pom.xml index bb2eb6c..af7d959 100644 --- a/com.arm.cmsis.zone.tests/pom.xml +++ b/com.arm.cmsis.zone.tests/pom.xml @@ -1,12 +1,12 @@ 4.0.0 com.arm.cmsis.zone.tests - 1.2.2-SNAPSHOT + 1.2.3-SNAPSHOT eclipse-test-plugin com.arm.cmsis com.arm.cmsis.parent - 2.9.0-SNAPSHOT + 2.10.0-SNAPSHOT ../com.arm.cmsis.parent \ No newline at end of file diff --git a/com.arm.cmsis.zone.tests/src/com/arm/cmsis/zone/data/CpMpuSetupTest.java b/com.arm.cmsis.zone.tests/src/com/arm/cmsis/zone/data/CpMpuSetupTest.java index 8e315a9..fdb32b4 100644 --- a/com.arm.cmsis.zone.tests/src/com/arm/cmsis/zone/data/CpMpuSetupTest.java +++ b/com.arm.cmsis.zone.tests/src/com/arm/cmsis/zone/data/CpMpuSetupTest.java @@ -1,9 +1,11 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation diff --git a/com.arm.cmsis.zone.ui/META-INF/MANIFEST.MF b/com.arm.cmsis.zone.ui/META-INF/MANIFEST.MF index 9c81d5a..11c3b5b 100644 --- a/com.arm.cmsis.zone.ui/META-INF/MANIFEST.MF +++ b/com.arm.cmsis.zone.ui/META-INF/MANIFEST.MF @@ -1,9 +1,9 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: CMSIS-Zone UI -Bundle-SymbolicName: com.arm.cmsis.zone.ui;singleton:=true -Automatic-Module-Name: com.arm.cmsis.zone.ui -Bundle-Version: 1.2.2.qualifier +Bundle-SymbolicName: com.arm.cmsis.zone.ui;singleton:=true +Automatic-Module-Name: com.arm.cmsis.zone.ui +Bundle-Version: 1.2.3.qualifier Bundle-Activator: com.arm.cmsis.zone.ui.CpZonePluginUI Bundle-Vendor: Arm Limited Require-Bundle: org.eclipse.ui, @@ -14,11 +14,11 @@ Require-Bundle: org.eclipse.ui, org.eclipse.ui.editors, org.eclipse.ui.ide, org.eclipse.ui.navigator, - com.arm.cmsis.pack.common;bundle-version="2.9.0", - com.arm.cmsis.pack.data;bundle-version="2.9.0", - com.arm.cmsis.pack;bundle-version="2.9.0", - com.arm.cmsis.pack.ui;bundle-version="2.9.0", - com.arm.cmsis.pack.project;bundle-version="2.9.0", + com.arm.cmsis.pack.common;bundle-version="2.10.0", + com.arm.cmsis.pack.data;bundle-version="2.10.0", + com.arm.cmsis.pack;bundle-version="2.10.0", + com.arm.cmsis.pack.ui;bundle-version="2.10.0", + com.arm.cmsis.pack.project;bundle-version="2.10.0", com.arm.cmsis.zone, com.arm.tpip.freemarker;bundle-version="2.3.29" Bundle-RequiredExecutionEnvironment: JavaSE-11 diff --git a/com.arm.cmsis.zone.ui/pom.xml b/com.arm.cmsis.zone.ui/pom.xml index 4997970..1321f45 100644 --- a/com.arm.cmsis.zone.ui/pom.xml +++ b/com.arm.cmsis.zone.ui/pom.xml @@ -1,12 +1,12 @@ 4.0.0 com.arm.cmsis.zone.ui - 1.2.2-SNAPSHOT + 1.2.3-SNAPSHOT eclipse-plugin com.arm.cmsis com.arm.cmsis.parent.sign - 2.9.0-SNAPSHOT + 2.10.0-SNAPSHOT ../com.arm.cmsis.parent.sign \ No newline at end of file diff --git a/com.arm.cmsis.zone.ui/src/com/arm/cmsis/zone/gen/FmGenerator.java b/com.arm.cmsis.zone.ui/src/com/arm/cmsis/zone/gen/FmGenerator.java index 89b9758..9dd761a 100644 --- a/com.arm.cmsis.zone.ui/src/com/arm/cmsis/zone/gen/FmGenerator.java +++ b/com.arm.cmsis.zone.ui/src/com/arm/cmsis/zone/gen/FmGenerator.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.zone.ui/src/com/arm/cmsis/zone/gen/HeadlessGen.java b/com.arm.cmsis.zone.ui/src/com/arm/cmsis/zone/gen/HeadlessGen.java index 8e7ccfe..309617a 100644 --- a/com.arm.cmsis.zone.ui/src/com/arm/cmsis/zone/gen/HeadlessGen.java +++ b/com.arm.cmsis.zone.ui/src/com/arm/cmsis/zone/gen/HeadlessGen.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.zone.ui/src/com/arm/cmsis/zone/project/CmsisZoneProjectCreator.java b/com.arm.cmsis.zone.ui/src/com/arm/cmsis/zone/project/CmsisZoneProjectCreator.java index cac23ef..e5ba623 100644 --- a/com.arm.cmsis.zone.ui/src/com/arm/cmsis/zone/project/CmsisZoneProjectCreator.java +++ b/com.arm.cmsis.zone.ui/src/com/arm/cmsis/zone/project/CmsisZoneProjectCreator.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.zone.ui/src/com/arm/cmsis/zone/project/CmsisZoneProjectNature.java b/com.arm.cmsis.zone.ui/src/com/arm/cmsis/zone/project/CmsisZoneProjectNature.java index e4e15a5..c32423d 100644 --- a/com.arm.cmsis.zone.ui/src/com/arm/cmsis/zone/project/CmsisZoneProjectNature.java +++ b/com.arm.cmsis.zone.ui/src/com/arm/cmsis/zone/project/CmsisZoneProjectNature.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.zone.ui/src/com/arm/cmsis/zone/project/CmsisZoneValidator.java b/com.arm.cmsis.zone.ui/src/com/arm/cmsis/zone/project/CmsisZoneValidator.java index f9f6371..b6a9b59 100644 --- a/com.arm.cmsis.zone.ui/src/com/arm/cmsis/zone/project/CmsisZoneValidator.java +++ b/com.arm.cmsis.zone.ui/src/com/arm/cmsis/zone/project/CmsisZoneValidator.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.zone.ui/src/com/arm/cmsis/zone/project/ICmsisZoneValidator.java b/com.arm.cmsis.zone.ui/src/com/arm/cmsis/zone/project/ICmsisZoneValidator.java index 71ba857..e31a0e2 100644 --- a/com.arm.cmsis.zone.ui/src/com/arm/cmsis/zone/project/ICmsisZoneValidator.java +++ b/com.arm.cmsis.zone.ui/src/com/arm/cmsis/zone/project/ICmsisZoneValidator.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.zone.ui/src/com/arm/cmsis/zone/ui/IZoneHelpContextIds.java b/com.arm.cmsis.zone.ui/src/com/arm/cmsis/zone/ui/IZoneHelpContextIds.java index dc4fd3a..0e61421 100644 --- a/com.arm.cmsis.zone.ui/src/com/arm/cmsis/zone/ui/IZoneHelpContextIds.java +++ b/com.arm.cmsis.zone.ui/src/com/arm/cmsis/zone/ui/IZoneHelpContextIds.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.zone.ui/src/com/arm/cmsis/zone/ui/editors/CmsisZoneAssignPage.java b/com.arm.cmsis.zone.ui/src/com/arm/cmsis/zone/ui/editors/CmsisZoneAssignPage.java index 0f471b5..1172d20 100644 --- a/com.arm.cmsis.zone.ui/src/com/arm/cmsis/zone/ui/editors/CmsisZoneAssignPage.java +++ b/com.arm.cmsis.zone.ui/src/com/arm/cmsis/zone/ui/editors/CmsisZoneAssignPage.java @@ -1,9 +1,11 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation diff --git a/com.arm.cmsis.zone.ui/src/com/arm/cmsis/zone/ui/editors/CmsisZoneController.java b/com.arm.cmsis.zone.ui/src/com/arm/cmsis/zone/ui/editors/CmsisZoneController.java index 0a5ceba..7dc7713 100644 --- a/com.arm.cmsis.zone.ui/src/com/arm/cmsis/zone/ui/editors/CmsisZoneController.java +++ b/com.arm.cmsis.zone.ui/src/com/arm/cmsis/zone/ui/editors/CmsisZoneController.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.zone.ui/src/com/arm/cmsis/zone/ui/editors/CmsisZoneEditor.java b/com.arm.cmsis.zone.ui/src/com/arm/cmsis/zone/ui/editors/CmsisZoneEditor.java index 499c863..a73927a 100644 --- a/com.arm.cmsis.zone.ui/src/com/arm/cmsis/zone/ui/editors/CmsisZoneEditor.java +++ b/com.arm.cmsis.zone.ui/src/com/arm/cmsis/zone/ui/editors/CmsisZoneEditor.java @@ -1,9 +1,11 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Eclipse Project - generation from template @@ -202,7 +204,7 @@ protected void saveXml(IProgressMonitor monitor) throws CoreException { } @Override - protected void loadData(String absFileName) { + protected void loadData(String absFileName, boolean bReadOnly) { if (absFileName == null) { return; @@ -230,7 +232,7 @@ protected void loadData(String absFileName) { } // Load azone file's data - super.loadData(azoneFileName); + super.loadData(azoneFileName, bReadOnly); } } diff --git a/com.arm.cmsis.zone.ui/src/com/arm/cmsis/zone/ui/editors/CmsisZoneEditorContributor.java b/com.arm.cmsis.zone.ui/src/com/arm/cmsis/zone/ui/editors/CmsisZoneEditorContributor.java index 2cc32df..ef77dda 100644 --- a/com.arm.cmsis.zone.ui/src/com/arm/cmsis/zone/ui/editors/CmsisZoneEditorContributor.java +++ b/com.arm.cmsis.zone.ui/src/com/arm/cmsis/zone/ui/editors/CmsisZoneEditorContributor.java @@ -1,9 +1,11 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Eclipse Project - generation from template diff --git a/com.arm.cmsis.zone.ui/src/com/arm/cmsis/zone/ui/editors/CmsisZoneMapPage.java b/com.arm.cmsis.zone.ui/src/com/arm/cmsis/zone/ui/editors/CmsisZoneMapPage.java index 1a5d8e7..9332a93 100644 --- a/com.arm.cmsis.zone.ui/src/com/arm/cmsis/zone/ui/editors/CmsisZoneMapPage.java +++ b/com.arm.cmsis.zone.ui/src/com/arm/cmsis/zone/ui/editors/CmsisZoneMapPage.java @@ -1,9 +1,11 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation diff --git a/com.arm.cmsis.zone.ui/src/com/arm/cmsis/zone/ui/editors/CmsisZonePage.java b/com.arm.cmsis.zone.ui/src/com/arm/cmsis/zone/ui/editors/CmsisZonePage.java index 70dbc9b..bcfa323 100644 --- a/com.arm.cmsis.zone.ui/src/com/arm/cmsis/zone/ui/editors/CmsisZonePage.java +++ b/com.arm.cmsis.zone.ui/src/com/arm/cmsis/zone/ui/editors/CmsisZonePage.java @@ -1,9 +1,11 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation diff --git a/com.arm.cmsis.zone.ui/src/com/arm/cmsis/zone/ui/editors/CmsisZoneResourceMapPage.java b/com.arm.cmsis.zone.ui/src/com/arm/cmsis/zone/ui/editors/CmsisZoneResourceMapPage.java index df58ebf..f024121 100644 --- a/com.arm.cmsis.zone.ui/src/com/arm/cmsis/zone/ui/editors/CmsisZoneResourceMapPage.java +++ b/com.arm.cmsis.zone.ui/src/com/arm/cmsis/zone/ui/editors/CmsisZoneResourceMapPage.java @@ -1,9 +1,11 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation diff --git a/com.arm.cmsis.zone.ui/src/com/arm/cmsis/zone/ui/editors/CmsisZoneSetupPage.java b/com.arm.cmsis.zone.ui/src/com/arm/cmsis/zone/ui/editors/CmsisZoneSetupPage.java index 27c46be..6dfd83b 100644 --- a/com.arm.cmsis.zone.ui/src/com/arm/cmsis/zone/ui/editors/CmsisZoneSetupPage.java +++ b/com.arm.cmsis.zone.ui/src/com/arm/cmsis/zone/ui/editors/CmsisZoneSetupPage.java @@ -1,9 +1,11 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation diff --git a/com.arm.cmsis.zone.ui/src/com/arm/cmsis/zone/ui/handlers/CmsisZoneGenerateAction.java b/com.arm.cmsis.zone.ui/src/com/arm/cmsis/zone/ui/handlers/CmsisZoneGenerateAction.java index b6e6f27..a5e5f2e 100644 --- a/com.arm.cmsis.zone.ui/src/com/arm/cmsis/zone/ui/handlers/CmsisZoneGenerateAction.java +++ b/com.arm.cmsis.zone.ui/src/com/arm/cmsis/zone/ui/handlers/CmsisZoneGenerateAction.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.zone.ui/src/com/arm/cmsis/zone/ui/handlers/GenerateHandler.java b/com.arm.cmsis.zone.ui/src/com/arm/cmsis/zone/ui/handlers/GenerateHandler.java index a7e9b22..b8dc390 100644 --- a/com.arm.cmsis.zone.ui/src/com/arm/cmsis/zone/ui/handlers/GenerateHandler.java +++ b/com.arm.cmsis.zone.ui/src/com/arm/cmsis/zone/ui/handlers/GenerateHandler.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.zone.ui/src/com/arm/cmsis/zone/ui/wizards/CmsisZoneAbstractWizardPage.java b/com.arm.cmsis.zone.ui/src/com/arm/cmsis/zone/ui/wizards/CmsisZoneAbstractWizardPage.java index 1ce6257..14ec30d 100644 --- a/com.arm.cmsis.zone.ui/src/com/arm/cmsis/zone/ui/wizards/CmsisZoneAbstractWizardPage.java +++ b/com.arm.cmsis.zone.ui/src/com/arm/cmsis/zone/ui/wizards/CmsisZoneAbstractWizardPage.java @@ -1,9 +1,11 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation diff --git a/com.arm.cmsis.zone.ui/src/com/arm/cmsis/zone/ui/wizards/CmsisZoneProjectMainPage.java b/com.arm.cmsis.zone.ui/src/com/arm/cmsis/zone/ui/wizards/CmsisZoneProjectMainPage.java index a2eaf22..672e6b5 100644 --- a/com.arm.cmsis.zone.ui/src/com/arm/cmsis/zone/ui/wizards/CmsisZoneProjectMainPage.java +++ b/com.arm.cmsis.zone.ui/src/com/arm/cmsis/zone/ui/wizards/CmsisZoneProjectMainPage.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.zone.ui/src/com/arm/cmsis/zone/ui/wizards/CmsisZoneProjectWizard.java b/com.arm.cmsis.zone.ui/src/com/arm/cmsis/zone/ui/wizards/CmsisZoneProjectWizard.java index ffdd348..c0e554a 100644 --- a/com.arm.cmsis.zone.ui/src/com/arm/cmsis/zone/ui/wizards/CmsisZoneProjectWizard.java +++ b/com.arm.cmsis.zone.ui/src/com/arm/cmsis/zone/ui/wizards/CmsisZoneProjectWizard.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.zone.ui/src/com/arm/cmsis/zone/ui/wizards/CmsisZoneWizardPage.java b/com.arm.cmsis.zone.ui/src/com/arm/cmsis/zone/ui/wizards/CmsisZoneWizardPage.java index 81f435f..1e44214 100644 --- a/com.arm.cmsis.zone.ui/src/com/arm/cmsis/zone/ui/wizards/CmsisZoneWizardPage.java +++ b/com.arm.cmsis.zone.ui/src/com/arm/cmsis/zone/ui/wizards/CmsisZoneWizardPage.java @@ -1,9 +1,11 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation diff --git a/com.arm.cmsis.zone.ui/src/com/arm/cmsis/zone/ui/wizards/CpPeripheralSlotSetupDlg.java b/com.arm.cmsis.zone.ui/src/com/arm/cmsis/zone/ui/wizards/CpPeripheralSlotSetupDlg.java index 34aae8a..e56b60a 100644 --- a/com.arm.cmsis.zone.ui/src/com/arm/cmsis/zone/ui/wizards/CpPeripheralSlotSetupDlg.java +++ b/com.arm.cmsis.zone.ui/src/com/arm/cmsis/zone/ui/wizards/CpPeripheralSlotSetupDlg.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.zone.ui/src/com/arm/cmsis/zone/ui/wizards/MemoryBlockWizardPage.java b/com.arm.cmsis.zone.ui/src/com/arm/cmsis/zone/ui/wizards/MemoryBlockWizardPage.java index a2dd248..d31bb1f 100644 --- a/com.arm.cmsis.zone.ui/src/com/arm/cmsis/zone/ui/wizards/MemoryBlockWizardPage.java +++ b/com.arm.cmsis.zone.ui/src/com/arm/cmsis/zone/ui/wizards/MemoryBlockWizardPage.java @@ -1,9 +1,11 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation diff --git a/com.arm.cmsis.zone.ui/src/com/arm/cmsis/zone/widgets/CmsisZoneAssignWidget.java b/com.arm.cmsis.zone.ui/src/com/arm/cmsis/zone/widgets/CmsisZoneAssignWidget.java index 1df72fc..51237d4 100644 --- a/com.arm.cmsis.zone.ui/src/com/arm/cmsis/zone/widgets/CmsisZoneAssignWidget.java +++ b/com.arm.cmsis.zone.ui/src/com/arm/cmsis/zone/widgets/CmsisZoneAssignWidget.java @@ -1,9 +1,11 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation diff --git a/com.arm.cmsis.zone.ui/src/com/arm/cmsis/zone/widgets/CmsisZoneColumnAdvisor.java b/com.arm.cmsis.zone.ui/src/com/arm/cmsis/zone/widgets/CmsisZoneColumnAdvisor.java index e8f4759..401120d 100644 --- a/com.arm.cmsis.zone.ui/src/com/arm/cmsis/zone/widgets/CmsisZoneColumnAdvisor.java +++ b/com.arm.cmsis.zone.ui/src/com/arm/cmsis/zone/widgets/CmsisZoneColumnAdvisor.java @@ -1,9 +1,11 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation diff --git a/com.arm.cmsis.zone.ui/src/com/arm/cmsis/zone/widgets/CmsisZoneContentProvider.java b/com.arm.cmsis.zone.ui/src/com/arm/cmsis/zone/widgets/CmsisZoneContentProvider.java index e625eea..46892fe 100644 --- a/com.arm.cmsis.zone.ui/src/com/arm/cmsis/zone/widgets/CmsisZoneContentProvider.java +++ b/com.arm.cmsis.zone.ui/src/com/arm/cmsis/zone/widgets/CmsisZoneContentProvider.java @@ -1,9 +1,11 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation diff --git a/com.arm.cmsis.zone.ui/src/com/arm/cmsis/zone/widgets/CmsisZoneKeyAdapter.java b/com.arm.cmsis.zone.ui/src/com/arm/cmsis/zone/widgets/CmsisZoneKeyAdapter.java index d4a0b02..c977978 100644 --- a/com.arm.cmsis.zone.ui/src/com/arm/cmsis/zone/widgets/CmsisZoneKeyAdapter.java +++ b/com.arm.cmsis.zone.ui/src/com/arm/cmsis/zone/widgets/CmsisZoneKeyAdapter.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.zone.ui/src/com/arm/cmsis/zone/widgets/CmsisZoneMapWidget.java b/com.arm.cmsis.zone.ui/src/com/arm/cmsis/zone/widgets/CmsisZoneMapWidget.java index 06b3910..c9403a6 100644 --- a/com.arm.cmsis.zone.ui/src/com/arm/cmsis/zone/widgets/CmsisZoneMapWidget.java +++ b/com.arm.cmsis.zone.ui/src/com/arm/cmsis/zone/widgets/CmsisZoneMapWidget.java @@ -1,9 +1,11 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation diff --git a/com.arm.cmsis.zone.ui/src/com/arm/cmsis/zone/widgets/CmsisZoneResourceMapWidget.java b/com.arm.cmsis.zone.ui/src/com/arm/cmsis/zone/widgets/CmsisZoneResourceMapWidget.java index f0544d5..b054b3f 100644 --- a/com.arm.cmsis.zone.ui/src/com/arm/cmsis/zone/widgets/CmsisZoneResourceMapWidget.java +++ b/com.arm.cmsis.zone.ui/src/com/arm/cmsis/zone/widgets/CmsisZoneResourceMapWidget.java @@ -1,9 +1,11 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation diff --git a/com.arm.cmsis.zone.ui/src/com/arm/cmsis/zone/widgets/CmsisZoneSetupComposite.java b/com.arm.cmsis.zone.ui/src/com/arm/cmsis/zone/widgets/CmsisZoneSetupComposite.java index 4b7a2e8..933a203 100644 --- a/com.arm.cmsis.zone.ui/src/com/arm/cmsis/zone/widgets/CmsisZoneSetupComposite.java +++ b/com.arm.cmsis.zone.ui/src/com/arm/cmsis/zone/widgets/CmsisZoneSetupComposite.java @@ -1,9 +1,11 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Eclipse Project - generation from template diff --git a/com.arm.cmsis.zone.ui/src/com/arm/cmsis/zone/widgets/CmsisZoneSetupWidget.java b/com.arm.cmsis.zone.ui/src/com/arm/cmsis/zone/widgets/CmsisZoneSetupWidget.java index 5880dd9..f48c5e5 100644 --- a/com.arm.cmsis.zone.ui/src/com/arm/cmsis/zone/widgets/CmsisZoneSetupWidget.java +++ b/com.arm.cmsis.zone.ui/src/com/arm/cmsis/zone/widgets/CmsisZoneSetupWidget.java @@ -1,9 +1,11 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation diff --git a/com.arm.cmsis.zone.ui/src/com/arm/cmsis/zone/widgets/CmsisZoneSystemResourcesWidget.java b/com.arm.cmsis.zone.ui/src/com/arm/cmsis/zone/widgets/CmsisZoneSystemResourcesWidget.java index 5e9bfac..d489987 100644 --- a/com.arm.cmsis.zone.ui/src/com/arm/cmsis/zone/widgets/CmsisZoneSystemResourcesWidget.java +++ b/com.arm.cmsis.zone.ui/src/com/arm/cmsis/zone/widgets/CmsisZoneSystemResourcesWidget.java @@ -1,9 +1,11 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation diff --git a/com.arm.cmsis.zone.ui/src/com/arm/cmsis/zone/widgets/CmsisZoneTreeWidget.java b/com.arm.cmsis.zone.ui/src/com/arm/cmsis/zone/widgets/CmsisZoneTreeWidget.java index 850c197..1da1496 100644 --- a/com.arm.cmsis.zone.ui/src/com/arm/cmsis/zone/widgets/CmsisZoneTreeWidget.java +++ b/com.arm.cmsis.zone.ui/src/com/arm/cmsis/zone/widgets/CmsisZoneTreeWidget.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.zone/.classpath b/com.arm.cmsis.zone/.classpath index f656d57..e6d0a3c 100644 --- a/com.arm.cmsis.zone/.classpath +++ b/com.arm.cmsis.zone/.classpath @@ -1,7 +1,21 @@ - + + + + + - + + + + + + + + + + + diff --git a/com.arm.cmsis.zone/META-INF/MANIFEST.MF b/com.arm.cmsis.zone/META-INF/MANIFEST.MF index 8bf5b95..34ced80 100644 --- a/com.arm.cmsis.zone/META-INF/MANIFEST.MF +++ b/com.arm.cmsis.zone/META-INF/MANIFEST.MF @@ -1,12 +1,12 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: CMSIS-Zone framework -Bundle-SymbolicName: com.arm.cmsis.zone -Automatic-Module-Name: com.arm.cmsis.zone -Bundle-Version: 1.2.2.qualifier +Bundle-SymbolicName: com.arm.cmsis.zone +Automatic-Module-Name: com.arm.cmsis.zone +Bundle-Version: 1.2.3.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-11 -Require-Bundle: com.arm.cmsis.pack.common;bundle-version="2.9.0";visibility:=reexport, - com.arm.cmsis.pack.data;bundle-version="2.9.0";visibility:=reexport +Require-Bundle: com.arm.cmsis.pack.common;bundle-version="2.10.0";visibility:=reexport, + com.arm.cmsis.pack.data;bundle-version="2.10.0";visibility:=reexport Export-Package: com.arm.cmsis.zone.data, com.arm.cmsis.zone.error, com.arm.cmsis.zone.model, diff --git a/com.arm.cmsis.zone/pom.xml b/com.arm.cmsis.zone/pom.xml index 7cb3efd..7075ea1 100644 --- a/com.arm.cmsis.zone/pom.xml +++ b/com.arm.cmsis.zone/pom.xml @@ -1,12 +1,12 @@ 4.0.0 com.arm.cmsis.zone - 1.2.2-SNAPSHOT + 1.2.3-SNAPSHOT eclipse-plugin com.arm.cmsis com.arm.cmsis.parent - 2.9.0-SNAPSHOT + 2.10.0-SNAPSHOT ../com.arm.cmsis.parent \ No newline at end of file diff --git a/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/CpDeviceUnit.java b/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/CpDeviceUnit.java index 9ca096f..b11fbe3 100644 --- a/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/CpDeviceUnit.java +++ b/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/CpDeviceUnit.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/CpMemoryBlock.java b/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/CpMemoryBlock.java index 6ac7c36..17a0f4b 100644 --- a/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/CpMemoryBlock.java +++ b/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/CpMemoryBlock.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/CpMpc.java b/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/CpMpc.java index 8966e0b..4ce4e43 100644 --- a/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/CpMpc.java +++ b/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/CpMpc.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/CpMpuRegion.java b/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/CpMpuRegion.java index 3c24798..6f6c485 100644 --- a/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/CpMpuRegion.java +++ b/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/CpMpuRegion.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/CpMpuRegionV7M.java b/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/CpMpuRegionV7M.java index 58f426b..9178e87 100644 --- a/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/CpMpuRegionV7M.java +++ b/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/CpMpuRegionV7M.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/CpMpuSetup.java b/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/CpMpuSetup.java index eeb4ad3..cb762c3 100644 --- a/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/CpMpuSetup.java +++ b/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/CpMpuSetup.java @@ -1,9 +1,11 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation diff --git a/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/CpPartitionGroup.java b/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/CpPartitionGroup.java index 200c3ec..b2b7b2f 100644 --- a/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/CpPartitionGroup.java +++ b/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/CpPartitionGroup.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/CpPeripheral.java b/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/CpPeripheral.java index e2b4bca..2cb2ea1 100644 --- a/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/CpPeripheral.java +++ b/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/CpPeripheral.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/CpPeripheralGroup.java b/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/CpPeripheralGroup.java index 546626a..256368c 100644 --- a/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/CpPeripheralGroup.java +++ b/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/CpPeripheralGroup.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/CpPeripheralItem.java b/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/CpPeripheralItem.java index b42c862..1b6ef35 100644 --- a/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/CpPeripheralItem.java +++ b/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/CpPeripheralItem.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/CpProcessorUnit.java b/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/CpProcessorUnit.java index f390391..d7d55ea 100644 --- a/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/CpProcessorUnit.java +++ b/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/CpProcessorUnit.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/CpResourceContainer.java b/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/CpResourceContainer.java index 34ef59c..d15d99b 100644 --- a/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/CpResourceContainer.java +++ b/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/CpResourceContainer.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/CpResourceGroup.java b/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/CpResourceGroup.java index 179e5f9..3ff464c 100644 --- a/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/CpResourceGroup.java +++ b/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/CpResourceGroup.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/CpResourceItem.java b/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/CpResourceItem.java index 650453f..92c2de8 100644 --- a/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/CpResourceItem.java +++ b/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/CpResourceItem.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/CpResourceZone.java b/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/CpResourceZone.java index dc03008..064697b 100644 --- a/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/CpResourceZone.java +++ b/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/CpResourceZone.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/CpRootZone.java b/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/CpRootZone.java index efb8d49..29f8180 100644 --- a/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/CpRootZone.java +++ b/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/CpRootZone.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/CpSauInit.java b/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/CpSauInit.java index 0bba066..fbe9279 100644 --- a/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/CpSauInit.java +++ b/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/CpSauInit.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/CpSauRegion.java b/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/CpSauRegion.java index 186442e..47444a2 100644 --- a/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/CpSauRegion.java +++ b/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/CpSauRegion.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/CpSlot.java b/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/CpSlot.java index 0d48102..0d1635a 100644 --- a/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/CpSlot.java +++ b/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/CpSlot.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2019 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/CpZone.java b/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/CpZone.java index b1ddf4b..a5a3c54 100644 --- a/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/CpZone.java +++ b/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/CpZone.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/CpZoneAssignment.java b/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/CpZoneAssignment.java index faffa34..e3583ec 100644 --- a/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/CpZoneAssignment.java +++ b/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/CpZoneAssignment.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/CpZoneConfig.java b/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/CpZoneConfig.java index 879e0dc..33d2fb5 100644 --- a/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/CpZoneConfig.java +++ b/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/CpZoneConfig.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/CpZoneContainer.java b/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/CpZoneContainer.java index 94d7bd0..4cd2998 100644 --- a/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/CpZoneContainer.java +++ b/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/CpZoneContainer.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/CpZoneCreator.java b/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/CpZoneCreator.java index 9f32f55..da2ee06 100644 --- a/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/CpZoneCreator.java +++ b/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/CpZoneCreator.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/CpZoneItem.java b/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/CpZoneItem.java index fbf971e..e258df1 100644 --- a/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/CpZoneItem.java +++ b/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/CpZoneItem.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/ICpDeviceResource.java b/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/ICpDeviceResource.java index 3c0eae8..1e3a3d9 100644 --- a/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/ICpDeviceResource.java +++ b/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/ICpDeviceResource.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/ICpDeviceUnit.java b/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/ICpDeviceUnit.java index d8b480f..9629bdb 100644 --- a/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/ICpDeviceUnit.java +++ b/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/ICpDeviceUnit.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/ICpMemoryBlock.java b/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/ICpMemoryBlock.java index db2a26b..3b4a93e 100644 --- a/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/ICpMemoryBlock.java +++ b/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/ICpMemoryBlock.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/ICpMpc.java b/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/ICpMpc.java index 1376f3f..3f231ec 100644 --- a/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/ICpMpc.java +++ b/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/ICpMpc.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/ICpMpuRegion.java b/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/ICpMpuRegion.java index 66d3b68..8e467d7 100644 --- a/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/ICpMpuRegion.java +++ b/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/ICpMpuRegion.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/ICpMpuSetup.java b/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/ICpMpuSetup.java index b9071c0..ceba725 100644 --- a/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/ICpMpuSetup.java +++ b/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/ICpMpuSetup.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/ICpPartitionGroup.java b/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/ICpPartitionGroup.java index 7a17c9a..c93fb62 100644 --- a/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/ICpPartitionGroup.java +++ b/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/ICpPartitionGroup.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/ICpPeripheral.java b/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/ICpPeripheral.java index c02d0d3..de9845b 100644 --- a/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/ICpPeripheral.java +++ b/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/ICpPeripheral.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/ICpPeripheralGroup.java b/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/ICpPeripheralGroup.java index 85fd24a..ef52ac2 100644 --- a/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/ICpPeripheralGroup.java +++ b/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/ICpPeripheralGroup.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/ICpPeripheralItem.java b/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/ICpPeripheralItem.java index 2c801f0..4d9af54 100644 --- a/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/ICpPeripheralItem.java +++ b/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/ICpPeripheralItem.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/ICpPeripheralSetup.java b/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/ICpPeripheralSetup.java index bc7a860..719b682 100644 --- a/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/ICpPeripheralSetup.java +++ b/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/ICpPeripheralSetup.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/ICpProcessorUnit.java b/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/ICpProcessorUnit.java index 8a4c7d1..e33da89 100644 --- a/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/ICpProcessorUnit.java +++ b/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/ICpProcessorUnit.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/ICpResourceContainer.java b/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/ICpResourceContainer.java index 7c1254e..94f29f5 100644 --- a/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/ICpResourceContainer.java +++ b/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/ICpResourceContainer.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/ICpResourceGroup.java b/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/ICpResourceGroup.java index c6fbf52..d5115b2 100644 --- a/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/ICpResourceGroup.java +++ b/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/ICpResourceGroup.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/ICpResourceItem.java b/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/ICpResourceItem.java index 347252c..dc760d0 100644 --- a/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/ICpResourceItem.java +++ b/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/ICpResourceItem.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/ICpResourceZone.java b/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/ICpResourceZone.java index 94bbee9..971b3b8 100644 --- a/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/ICpResourceZone.java +++ b/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/ICpResourceZone.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/ICpRootZone.java b/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/ICpRootZone.java index bda4e69..87df169 100644 --- a/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/ICpRootZone.java +++ b/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/ICpRootZone.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/ICpSauInit.java b/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/ICpSauInit.java index 3296efd..209d8e5 100644 --- a/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/ICpSauInit.java +++ b/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/ICpSauInit.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/ICpSauRegion.java b/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/ICpSauRegion.java index 10983db..77f315d 100644 --- a/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/ICpSauRegion.java +++ b/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/ICpSauRegion.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/ICpSlot.java b/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/ICpSlot.java index 1b3b6b9..4fb528a 100644 --- a/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/ICpSlot.java +++ b/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/ICpSlot.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/ICpZone.java b/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/ICpZone.java index 895b86d..c78655c 100644 --- a/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/ICpZone.java +++ b/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/ICpZone.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/ICpZoneAssignment.java b/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/ICpZoneAssignment.java index 1e0ad44..e5b97d8 100644 --- a/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/ICpZoneAssignment.java +++ b/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/ICpZoneAssignment.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/ICpZoneConfig.java b/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/ICpZoneConfig.java index 3b7561f..204b222 100644 --- a/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/ICpZoneConfig.java +++ b/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/ICpZoneConfig.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/ICpZoneContainer.java b/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/ICpZoneContainer.java index 4629de8..658b38e 100644 --- a/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/ICpZoneContainer.java +++ b/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/ICpZoneContainer.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/ICpZoneCreator.java b/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/ICpZoneCreator.java index d72fbe1..cf4818c 100644 --- a/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/ICpZoneCreator.java +++ b/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/ICpZoneCreator.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/ICpZoneItem.java b/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/ICpZoneItem.java index 822400e..cb97cc9 100644 --- a/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/ICpZoneItem.java +++ b/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/ICpZoneItem.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/IMpcBlockInfo.java b/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/IMpcBlockInfo.java index 96c1861..f6edfa4 100644 --- a/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/IMpcBlockInfo.java +++ b/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/IMpcBlockInfo.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/IMpcRegion.java b/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/IMpcRegion.java index 9612172..4671167 100644 --- a/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/IMpcRegion.java +++ b/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/IMpcRegion.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/MpcRegion.java b/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/MpcRegion.java index ee847af..416f8c6 100644 --- a/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/MpcRegion.java +++ b/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/MpcRegion.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/PhysicalMemoryRegion.java b/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/PhysicalMemoryRegion.java index 4d9d64c..04b13c3 100644 --- a/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/PhysicalMemoryRegion.java +++ b/com.arm.cmsis.zone/src/com/arm/cmsis/zone/data/PhysicalMemoryRegion.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.zone/src/com/arm/cmsis/zone/error/CmsisZoneError.java b/com.arm.cmsis.zone/src/com/arm/cmsis/zone/error/CmsisZoneError.java index fce9eb5..53a0430 100644 --- a/com.arm.cmsis.zone/src/com/arm/cmsis/zone/error/CmsisZoneError.java +++ b/com.arm.cmsis.zone/src/com/arm/cmsis/zone/error/CmsisZoneError.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.zone/src/com/arm/cmsis/zone/error/Messages.java b/com.arm.cmsis.zone/src/com/arm/cmsis/zone/error/Messages.java index 6794c3a..687315e 100644 --- a/com.arm.cmsis.zone/src/com/arm/cmsis/zone/error/Messages.java +++ b/com.arm.cmsis.zone/src/com/arm/cmsis/zone/error/Messages.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.zone/src/com/arm/cmsis/zone/model/MemoryMap.java b/com.arm.cmsis.zone/src/com/arm/cmsis/zone/model/MemoryMap.java index b705ab5..c3f5904 100644 --- a/com.arm.cmsis.zone/src/com/arm/cmsis/zone/model/MemoryMap.java +++ b/com.arm.cmsis.zone/src/com/arm/cmsis/zone/model/MemoryMap.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.zone/src/com/arm/cmsis/zone/model/MemoryMapEntry.java b/com.arm.cmsis.zone/src/com/arm/cmsis/zone/model/MemoryMapEntry.java index 9b401c3..3a92273 100644 --- a/com.arm.cmsis.zone/src/com/arm/cmsis/zone/model/MemoryMapEntry.java +++ b/com.arm.cmsis.zone/src/com/arm/cmsis/zone/model/MemoryMapEntry.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.zone/src/com/arm/cmsis/zone/parser/CpZoneParser.java b/com.arm.cmsis.zone/src/com/arm/cmsis/zone/parser/CpZoneParser.java index a05612b..9cd34f6 100644 --- a/com.arm.cmsis.zone/src/com/arm/cmsis/zone/parser/CpZoneParser.java +++ b/com.arm.cmsis.zone/src/com/arm/cmsis/zone/parser/CpZoneParser.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.zone/src/com/arm/cmsis/zone/parser/MemoryRegionCollector.java b/com.arm.cmsis.zone/src/com/arm/cmsis/zone/parser/MemoryRegionCollector.java index 5a81fa7..c361c17 100644 --- a/com.arm.cmsis.zone/src/com/arm/cmsis/zone/parser/MemoryRegionCollector.java +++ b/com.arm.cmsis.zone/src/com/arm/cmsis/zone/parser/MemoryRegionCollector.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.zone/src/com/arm/cmsis/zone/svd/ISvdInterrupt.java b/com.arm.cmsis.zone/src/com/arm/cmsis/zone/svd/ISvdInterrupt.java index 6a9a7d7..26e6c79 100644 --- a/com.arm.cmsis.zone/src/com/arm/cmsis/zone/svd/ISvdInterrupt.java +++ b/com.arm.cmsis.zone/src/com/arm/cmsis/zone/svd/ISvdInterrupt.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.zone/src/com/arm/cmsis/zone/svd/ISvdItem.java b/com.arm.cmsis.zone/src/com/arm/cmsis/zone/svd/ISvdItem.java index c09e71a..ffbde95 100644 --- a/com.arm.cmsis.zone/src/com/arm/cmsis/zone/svd/ISvdItem.java +++ b/com.arm.cmsis.zone/src/com/arm/cmsis/zone/svd/ISvdItem.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.zone/src/com/arm/cmsis/zone/svd/ISvdPeripheral.java b/com.arm.cmsis.zone/src/com/arm/cmsis/zone/svd/ISvdPeripheral.java index c8e28ba..1a9e0b3 100644 --- a/com.arm.cmsis.zone/src/com/arm/cmsis/zone/svd/ISvdPeripheral.java +++ b/com.arm.cmsis.zone/src/com/arm/cmsis/zone/svd/ISvdPeripheral.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.zone/src/com/arm/cmsis/zone/svd/ISvdRoot.java b/com.arm.cmsis.zone/src/com/arm/cmsis/zone/svd/ISvdRoot.java index f2b8efb..1f13076 100644 --- a/com.arm.cmsis.zone/src/com/arm/cmsis/zone/svd/ISvdRoot.java +++ b/com.arm.cmsis.zone/src/com/arm/cmsis/zone/svd/ISvdRoot.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.zone/src/com/arm/cmsis/zone/svd/SvdInterrupt.java b/com.arm.cmsis.zone/src/com/arm/cmsis/zone/svd/SvdInterrupt.java index 16779ab..1ec3d71 100644 --- a/com.arm.cmsis.zone/src/com/arm/cmsis/zone/svd/SvdInterrupt.java +++ b/com.arm.cmsis.zone/src/com/arm/cmsis/zone/svd/SvdInterrupt.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.zone/src/com/arm/cmsis/zone/svd/SvdItem.java b/com.arm.cmsis.zone/src/com/arm/cmsis/zone/svd/SvdItem.java index 412cace..afe4e32 100644 --- a/com.arm.cmsis.zone/src/com/arm/cmsis/zone/svd/SvdItem.java +++ b/com.arm.cmsis.zone/src/com/arm/cmsis/zone/svd/SvdItem.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.zone/src/com/arm/cmsis/zone/svd/SvdParser.java b/com.arm.cmsis.zone/src/com/arm/cmsis/zone/svd/SvdParser.java index f38097d..4d4754e 100644 --- a/com.arm.cmsis.zone/src/com/arm/cmsis/zone/svd/SvdParser.java +++ b/com.arm.cmsis.zone/src/com/arm/cmsis/zone/svd/SvdParser.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.zone/src/com/arm/cmsis/zone/svd/SvdPeripheral.java b/com.arm.cmsis.zone/src/com/arm/cmsis/zone/svd/SvdPeripheral.java index e246f4d..eeea6fd 100644 --- a/com.arm.cmsis.zone/src/com/arm/cmsis/zone/svd/SvdPeripheral.java +++ b/com.arm.cmsis.zone/src/com/arm/cmsis/zone/svd/SvdPeripheral.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.cmsis.zone/src/com/arm/cmsis/zone/svd/SvdRoot.java b/com.arm.cmsis.zone/src/com/arm/cmsis/zone/svd/SvdRoot.java index 716f757..33cd58c 100644 --- a/com.arm.cmsis.zone/src/com/arm/cmsis/zone/svd/SvdRoot.java +++ b/com.arm.cmsis.zone/src/com/arm/cmsis/zone/svd/SvdRoot.java @@ -1,10 +1,12 @@ /******************************************************************************* * Copyright (c) 2021 ARM Ltd. and others * All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 +* are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * * Contributors: * ARM Ltd and ARM Germany GmbH - Initial API and implementation *******************************************************************************/ diff --git a/com.arm.tpip.freemarker/META-INF/MANIFEST.MF b/com.arm.tpip.freemarker/META-INF/MANIFEST.MF index 156be88..8ed8b06 100644 --- a/com.arm.tpip.freemarker/META-INF/MANIFEST.MF +++ b/com.arm.tpip.freemarker/META-INF/MANIFEST.MF @@ -1,9 +1,9 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Apache FreeMarker -Bundle-SymbolicName: com.arm.tpip.freemarker;singleton:=true -Automatic-Module-Name: com.arm.tpip.freemarker -Bundle-Version: 2.3.29.qualifier +Bundle-SymbolicName: com.arm.tpip.freemarker;singleton:=true +Automatic-Module-Name: com.arm.tpip.freemarker +Bundle-Version: 2.3.29 Bundle-Vendor: Arm Limited Bundle-ClassPath: lib/freemarker.jar Bundle-RequiredExecutionEnvironment: JavaSE-11 diff --git a/com.arm.tpip.freemarker/pom.xml b/com.arm.tpip.freemarker/pom.xml index e5fa17b..9157db5 100644 --- a/com.arm.tpip.freemarker/pom.xml +++ b/com.arm.tpip.freemarker/pom.xml @@ -1,12 +1,12 @@ 4.0.0 com.arm.tpip.freemarker - 2.3.29-SNAPSHOT + 2.3.29 eclipse-plugin com.arm.cmsis com.arm.cmsis.parent.sign - 2.9.0-SNAPSHOT + 2.10.0-SNAPSHOT ../com.arm.cmsis.parent.sign diff --git a/license.md b/license.md index 203e9a7..b94c780 100644 --- a/license.md +++ b/license.md @@ -1,93 +1,283 @@ -Copyright (c) 2014-2022, ARM Limited and Contributors. All rights reserved. +Copyright (c) 2014-2024, ARM Limited and Contributors. All rights reserved. This program and the accompanying materials are made available under the terms of the -Eclipse Public License v1.0 which accompanies this distribution, and is available at -https://www.eclipse.org/legal/epl-v10.html +Eclipse Public License v2.0 which accompanies this distribution, and is available at +https://www.eclipse.org/legal/epl-20 -Eclipse Public License - v 1.0 +Eclipse Public License - v 2.0 -THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT. + THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE + PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION + OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT. 1. DEFINITIONS "Contribution" means: -a) in the case of the initial Contributor, the initial code and documentation distributed under this Agreement, and - -b) in the case of each subsequent Contributor: - -i) changes to the Program, and - -ii) additions to the Program; - -where such changes and/or additions to the Program originate from and are distributed by that particular Contributor. A Contribution 'originates' from a Contributor if it was added to the Program by such Contributor itself or anyone acting on such Contributor's behalf. Contributions do not include additions to the Program which: (i) are separate modules of software distributed in conjunction with the Program under their own license agreement, and (ii) are not derivative works of the Program. - -"Contributor" means any person or entity that distributes the Program. - -"Licensed Patents" mean patent claims licensable by a Contributor which are necessarily infringed by the use or sale of its Contribution alone or when combined with the Program. - -"Program" means the Contributions distributed in accordance with this Agreement. - -"Recipient" means anyone who receives the Program under this Agreement, including all Contributors. + a) in the case of the initial Contributor, the initial content + Distributed under this Agreement, and + + b) in the case of each subsequent Contributor: + i) changes to the Program, and + ii) additions to the Program; + where such changes and/or additions to the Program originate from + and are Distributed by that particular Contributor. A Contribution + "originates" from a Contributor if it was added to the Program by + such Contributor itself or anyone acting on such Contributor's behalf. + Contributions do not include changes or additions to the Program that + are not Modified Works. + +"Contributor" means any person or entity that Distributes the Program. + +"Licensed Patents" mean patent claims licensable by a Contributor which +are necessarily infringed by the use or sale of its Contribution alone +or when combined with the Program. + +"Program" means the Contributions Distributed in accordance with this +Agreement. + +"Recipient" means anyone who receives the Program under this Agreement +or any Secondary License (as applicable), including Contributors. + +"Derivative Works" shall mean any work, whether in Source Code or other +form, that is based on (or derived from) the Program and for which the +editorial revisions, annotations, elaborations, or other modifications +represent, as a whole, an original work of authorship. + +"Modified Works" shall mean any work in Source Code or other form that +results from an addition to, deletion from, or modification of the +contents of the Program, including, for purposes of clarity any new file +in Source Code form that contains any contents of the Program. Modified +Works shall not include works that contain only declarations, +interfaces, types, classes, structures, or files of the Program solely +in each case in order to link to, bind by name, or subclass the Program +or Modified Works thereof. + +"Distribute" means the acts of a) distributing or b) making available +in any manner that enables the transfer of a copy. + +"Source Code" means the form of a Program preferred for making +modifications, including but not limited to software source code, +documentation source, and configuration files. + +"Secondary License" means either the GNU General Public License, +Version 2.0, or any later versions of that license, including any +exceptions or additional permissions as identified by the initial +Contributor. 2. GRANT OF RIGHTS -a) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free copyright license to reproduce, prepare derivative works of, publicly display, publicly perform, distribute and sublicense the Contribution of such Contributor, if any, and such derivative works, in source code and object code form. - -b) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free patent license under Licensed Patents to make, use, sell, offer to sell, import and otherwise transfer the Contribution of such Contributor, if any, in source code and object code form. This patent license shall apply to the combination of the Contribution and the Program if, at the time the Contribution is added by the Contributor, such addition of the Contribution causes such combination to be covered by the Licensed Patents. The patent license shall not apply to any other combinations which include the Contribution. No hardware per se is licensed hereunder. - -c) Recipient understands that although each Contributor grants the licenses to its Contributions set forth herein, no assurances are provided by any Contributor that the Program does not infringe the patent or other intellectual property rights of any other entity. Each Contributor disclaims any liability to Recipient for claims brought by any other entity based on infringement of intellectual property rights or otherwise. As a condition to exercising the rights and licenses granted hereunder, each Recipient hereby assumes sole responsibility to secure any other intellectual property rights needed, if any. For example, if a third party patent license is required to allow Recipient to distribute the Program, it is Recipient's responsibility to acquire that license before distributing the Program. - -d) Each Contributor represents that to its knowledge it has sufficient copyright rights in its Contribution, if any, to grant the copyright license set forth in this Agreement. + a) Subject to the terms of this Agreement, each Contributor hereby + grants Recipient a non-exclusive, worldwide, royalty-free copyright + license to reproduce, prepare Derivative Works of, publicly display, + publicly perform, Distribute and sublicense the Contribution of such + Contributor, if any, and such Derivative Works. + + b) Subject to the terms of this Agreement, each Contributor hereby + grants Recipient a non-exclusive, worldwide, royalty-free patent + license under Licensed Patents to make, use, sell, offer to sell, + import and otherwise transfer the Contribution of such Contributor, + if any, in Source Code or other form. This patent license shall + apply to the combination of the Contribution and the Program if, at + the time the Contribution is added by the Contributor, such addition + of the Contribution causes such combination to be covered by the + Licensed Patents. The patent license shall not apply to any other + combinations which include the Contribution. No hardware per se is + licensed hereunder. + + c) Recipient understands that although each Contributor grants the + licenses to its Contributions set forth herein, no assurances are + provided by any Contributor that the Program does not infringe the + patent or other intellectual property rights of any other entity. + Each Contributor disclaims any liability to Recipient for claims + brought by any other entity based on infringement of intellectual + property rights or otherwise. As a condition to exercising the + rights and licenses granted hereunder, each Recipient hereby + assumes sole responsibility to secure any other intellectual + property rights needed, if any. For example, if a third party + patent license is required to allow Recipient to Distribute the + Program, it is Recipient's responsibility to acquire that license + before distributing the Program. + + d) Each Contributor represents that to its knowledge it has + sufficient copyright rights in its Contribution, if any, to grant + the copyright license set forth in this Agreement. + + e) Notwithstanding the terms of any Secondary License, no + Contributor makes additional grants to any Recipient (other than + those set forth in this Agreement) as a result of such Recipient's + receipt of the Program under the terms of a Secondary License + (if permitted under the terms of Section 3). 3. REQUIREMENTS -A Contributor may choose to distribute the Program in object code form under its own license agreement, provided that: - -a) it complies with the terms and conditions of this Agreement; and +3.1 If a Contributor Distributes the Program in any form, then: -b) its license agreement: + a) the Program must also be made available as Source Code, in + accordance with section 3.2, and the Contributor must accompany + the Program with a statement that the Source Code for the Program + is available under this Agreement, and informs Recipients how to + obtain it in a reasonable manner on or through a medium customarily + used for software exchange; and -i) effectively disclaims on behalf of all Contributors all warranties and conditions, express and implied, including warranties or conditions of title and non-infringement, and implied warranties or conditions of merchantability and fitness for a particular purpose; + b) the Contributor may Distribute the Program under a license + different than this Agreement, provided that such license: + i) effectively disclaims on behalf of all other Contributors all + warranties and conditions, express and implied, including + warranties or conditions of title and non-infringement, and + implied warranties or conditions of merchantability and fitness + for a particular purpose; -ii) effectively excludes on behalf of all Contributors all liability for damages, including direct, indirect, special, incidental and consequential damages, such as lost profits; + ii) effectively excludes on behalf of all other Contributors all + liability for damages, including direct, indirect, special, + incidental and consequential damages, such as lost profits; -iii) states that any provisions which differ from this Agreement are offered by that Contributor alone and not by any other party; and + iii) does not attempt to limit or alter the recipients' rights + in the Source Code under section 3.2; and -iv) states that source code for the Program is available from such Contributor, and informs licensees how to obtain it in a reasonable manner on or through a medium customarily used for software exchange. + iv) requires any subsequent distribution of the Program by any + party to be under a license that satisfies the requirements + of this section 3. -When the Program is made available in source code form: +3.2 When the Program is Distributed as Source Code: -a) it must be made available under this Agreement; and + a) it must be made available under this Agreement, or if the + Program (i) is combined with other material in a separate file or + files made available under a Secondary License, and (ii) the initial + Contributor attached to the Source Code the notice described in + Exhibit A of this Agreement, then the Program may be made available + under the terms of such Secondary Licenses, and -b) a copy of this Agreement must be included with each copy of the Program. + b) a copy of this Agreement must be included with each copy of + the Program. -Contributors may not remove or alter any copyright notices contained within the Program. - -Each Contributor must identify itself as the originator of its Contribution, if any, in a manner that reasonably allows subsequent Recipients to identify the originator of the Contribution. +3.3 Contributors may not remove or alter any copyright, patent, +trademark, attribution notices, disclaimers of warranty, or limitations +of liability ("notices") contained within the Program from any copy of +the Program which they Distribute, provided that Contributors may add +their own appropriate notices. 4. COMMERCIAL DISTRIBUTION -Commercial distributors of software may accept certain responsibilities with respect to end users, business partners and the like. While this license is intended to facilitate the commercial use of the Program, the Contributor who includes the Program in a commercial product offering should do so in a manner which does not create potential liability for other Contributors. Therefore, if a Contributor includes the Program in a commercial product offering, such Contributor ("Commercial Contributor") hereby agrees to defend and indemnify every other Contributor ("Indemnified Contributor") against any losses, damages and costs (collectively "Losses") arising from claims, lawsuits and other legal actions brought by a third party against the Indemnified Contributor to the extent caused by the acts or omissions of such Commercial Contributor in connection with its distribution of the Program in a commercial product offering. The obligations in this section do not apply to any claims or Losses relating to any actual or alleged intellectual property infringement. In order to qualify, an Indemnified Contributor must: a) promptly notify the Commercial Contributor in writing of such claim, and b) allow the Commercial Contributor to control, and cooperate with the Commercial Contributor in, the defense and any related settlement negotiations. The Indemnified Contributor may participate in any such claim at its own expense. - -For example, a Contributor might include the Program in a commercial product offering, Product X. That Contributor is then a Commercial Contributor. If that Commercial Contributor then makes performance claims, or offers warranties related to Product X, those performance claims and warranties are such Commercial Contributor's responsibility alone. Under this section, the Commercial Contributor would have to defend claims against the other Contributors related to those performance claims and warranties, and if a court requires any other Contributor to pay any damages as a result, the Commercial Contributor must pay those damages. +Commercial distributors of software may accept certain responsibilities +with respect to end users, business partners and the like. While this +license is intended to facilitate the commercial use of the Program, +the Contributor who includes the Program in a commercial product +offering should do so in a manner which does not create potential +liability for other Contributors. Therefore, if a Contributor includes +the Program in a commercial product offering, such Contributor +("Commercial Contributor") hereby agrees to defend and indemnify every +other Contributor ("Indemnified Contributor") against any losses, +damages and costs (collectively "Losses") arising from claims, lawsuits +and other legal actions brought by a third party against the Indemnified +Contributor to the extent caused by the acts or omissions of such +Commercial Contributor in connection with its distribution of the Program +in a commercial product offering. The obligations in this section do not +apply to any claims or Losses relating to any actual or alleged +intellectual property infringement. In order to qualify, an Indemnified +Contributor must: a) promptly notify the Commercial Contributor in +writing of such claim, and b) allow the Commercial Contributor to control, +and cooperate with the Commercial Contributor in, the defense and any +related settlement negotiations. The Indemnified Contributor may +participate in any such claim at its own expense. + +For example, a Contributor might include the Program in a commercial +product offering, Product X. That Contributor is then a Commercial +Contributor. If that Commercial Contributor then makes performance +claims, or offers warranties related to Product X, those performance +claims and warranties are such Commercial Contributor's responsibility +alone. Under this section, the Commercial Contributor would have to +defend claims against the other Contributors related to those performance +claims and warranties, and if a court requires any other Contributor to +pay any damages as a result, the Commercial Contributor must pay +those damages. 5. NO WARRANTY -EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely responsible for determining the appropriateness of using and distributing the Program and assumes all risks associated with its exercise of rights under this Agreement , including but not limited to the risks and costs of program errors, compliance with applicable laws, damage to or loss of data, programs or equipment, and unavailability or interruption of operations. +EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT +PERMITTED BY APPLICABLE LAW, THE PROGRAM IS PROVIDED ON AN "AS IS" +BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR +IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF +TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR +PURPOSE. Each Recipient is solely responsible for determining the +appropriateness of using and distributing the Program and assumes all +risks associated with its exercise of rights under this Agreement, +including but not limited to the risks and costs of program errors, +compliance with applicable laws, damage to or loss of data, programs +or equipment, and unavailability or interruption of operations. 6. DISCLAIMER OF LIABILITY -EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. +EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT +PERMITTED BY APPLICABLE LAW, NEITHER RECIPIENT NOR ANY CONTRIBUTORS +SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST +PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE +EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. 7. GENERAL -If any provision of this Agreement is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this Agreement, and without further action by the parties hereto, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable. - -If Recipient institutes patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Program itself (excluding combinations of the Program with other software or hardware) infringes such Recipient's patent(s), then such Recipient's rights granted under Section 2(b) shall terminate as of the date such litigation is filed. - -All Recipient's rights under this Agreement shall terminate if it fails to comply with any of the material terms or conditions of this Agreement and does not cure such failure in a reasonable period of time after becoming aware of such noncompliance. If all Recipient's rights under this Agreement terminate, Recipient agrees to cease use and distribution of the Program as soon as reasonably practicable. However, Recipient's obligations under this Agreement and any licenses granted by Recipient relating to the Program shall continue and survive. - -Everyone is permitted to copy and distribute copies of this Agreement, but in order to avoid inconsistency the Agreement is copyrighted and may only be modified in the following manner. The Agreement Steward reserves the right to publish new versions (including revisions) of this Agreement from time to time. No one other than the Agreement Steward has the right to modify this Agreement. The Eclipse Foundation is the initial Agreement Steward. The Eclipse Foundation may assign the responsibility to serve as the Agreement Steward to a suitable separate entity. Each new version of the Agreement will be given a distinguishing version number. The Program (including Contributions) may always be distributed subject to the version of the Agreement under which it was received. In addition, after a new version of the Agreement is published, Contributor may elect to distribute the Program (including its Contributions) under the new version. Except as expressly stated in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to the intellectual property of any Contributor under this Agreement, whether expressly, by implication, estoppel or otherwise. All rights in the Program not expressly granted under this Agreement are reserved. - -This Agreement is governed by the laws of the State of New York and the intellectual property laws of the United States of America. No party to this Agreement will bring a legal action under this Agreement more than one year after the cause of action arose. Each party waives its rights to a jury trial in any resulting litigation. +If any provision of this Agreement is invalid or unenforceable under +applicable law, it shall not affect the validity or enforceability of +the remainder of the terms of this Agreement, and without further +action by the parties hereto, such provision shall be reformed to the +minimum extent necessary to make such provision valid and enforceable. + +If Recipient institutes patent litigation against any entity +(including a cross-claim or counterclaim in a lawsuit) alleging that the +Program itself (excluding combinations of the Program with other software +or hardware) infringes such Recipient's patent(s), then such Recipient's +rights granted under Section 2(b) shall terminate as of the date such +litigation is filed. + +All Recipient's rights under this Agreement shall terminate if it +fails to comply with any of the material terms or conditions of this +Agreement and does not cure such failure in a reasonable period of +time after becoming aware of such noncompliance. If all Recipient's +rights under this Agreement terminate, Recipient agrees to cease use +and distribution of the Program as soon as reasonably practicable. +However, Recipient's obligations under this Agreement and any licenses +granted by Recipient relating to the Program shall continue and survive. + +Everyone is permitted to copy and distribute copies of this Agreement, +but in order to avoid inconsistency the Agreement is copyrighted and +may only be modified in the following manner. The Agreement Steward +reserves the right to publish new versions (including revisions) of +this Agreement from time to time. No one other than the Agreement +Steward has the right to modify this Agreement. The Eclipse Foundation +is the initial Agreement Steward. The Eclipse Foundation may assign the +responsibility to serve as the Agreement Steward to a suitable separate +entity. Each new version of the Agreement will be given a distinguishing +version number. The Program (including Contributions) may always be +Distributed subject to the version of the Agreement under which it was +received. In addition, after a new version of the Agreement is published, +Contributor may elect to Distribute the Program (including its +Contributions) under the new version. + +Except as expressly stated in Sections 2(a) and 2(b) above, Recipient +receives no rights or licenses to the intellectual property of any +Contributor under this Agreement, whether expressly, by implication, +estoppel or otherwise. All rights in the Program not expressly granted +under this Agreement are reserved. Nothing in this Agreement is intended +to be enforceable by any entity that is not a Contributor or Recipient. +No third-party beneficiary rights are created under this Agreement. + +Exhibit A - Form of Secondary Licenses Notice + +"This Source Code may also be made available under the following +Secondary Licenses when the conditions for such availability set forth +in the Eclipse Public License, v. 2.0 are satisfied: {name license(s), +version(s), and exceptions or additional permissions here}." + + Simply including a copy of this Agreement, including this Exhibit A + is not sufficient to license the Source Code under Secondary Licenses. + + If it is not possible or desirable to put the notice in a particular + file, then You may include the notice in a location (such as a LICENSE + file in a relevant directory) where a recipient would be likely to + look for such a notice. + + You may add additional accurate notices of copyright ownership. \ No newline at end of file diff --git a/readme.md b/readme.md index d0bf6e5..f6d8b30 100644 --- a/readme.md +++ b/readme.md @@ -11,10 +11,15 @@ Releases can be found on the [releases page](https://github.com/ARM-software/cms For evaluation you need CMSIS-Pack compliant Software Packs that are available for download from the [CMSIS Pack Repository]. -**License:** The software is provided under the [Eclipse Public License] Version 1.0. Contributions to this project are under the same license and there is no additional Contributor License Agreement (CLA) required. +## License +The software is provided under the [Eclipse Public License] Version 2.0. Contributions to this project are under the same license and there is no additional Contributor License Agreement (CLA) required. + The [Apache FreeMarker 2.3.29](https://freemarker.apache.org/) is delivered under the Apache License 2.0: https://freemarker.apache.org/docs/app_license.html -**Platform:** This release of the **CMSIS-Pack Management for Eclipse** has been tested on Eclipse and 4.6.3 (Neon), 2019-03, 2019-06 and 2019-9. +The [eo-yaml 7.0.9](https://github.com/decorators-squad/eo-yaml) is delivered under BSD 3-Clause "New" or "Revised" License (BSD-3-Clause) : https://github.com/decorators-squad/eo-yaml/blob/master/LICENSE + +## Platform +This release of the **CMSIS-Pack Management for Eclipse** has been tested on Eclipse 2023-06 and 2023-12. ## Source Code This repository contains the source code of the **CMSIS-Pack Management for Eclipse** that consists of the following plug-ins: @@ -31,6 +36,7 @@ This repository contains the source code of the **CMSIS-Pack Management for Ecli * **com.arm.cmsis.pack.build.setting.armcc** - adapter for ARMCC 5.x toolchain (DS-MDK built-in) * **com.arm.cmsis.pack.build.setting.armgcc** - adapter for ARM GCC toolchain (DS-5 built-in) * **com.arm.cmsis.pack.build.setting.gnuarmeclipse** - adapter for Cross ARM GNU toolchain: http://gnuarmeclipse.github.io/ +* **com.arm.cmsis.pack.parser.yml** - DOM-like wrapper over eo-yaml YAML parser * **com.arm.cmsis.config** - Configuration Wizard editor * **com.arm.cmsis.help** - integrated help * **com.arm.cmsis.pack.refclient** - a reference example for engineers integrating CMSIS-Pack plug-in into their development environments (not included in binary build) @@ -108,7 +114,7 @@ You may change the component selection and use the **Resolve** toolbar button. - - - - - - - - - - - - - - - - - - - - - - - - - - -_Copyright (c) 2014-2022, ARM Limited and Contributors. All rights reserved._ +_Copyright (c) 2014-2024, ARM Limited and Contributors. All rights reserved._ [Eclipse Public License]: ./license.md "Eclipse Public License for CMSIS-Pack Management for Eclipse" diff --git a/third_party_licenses.txt b/third_party_licenses.txt new file mode 100644 index 0000000..088a51e --- /dev/null +++ b/third_party_licenses.txt @@ -0,0 +1,275 @@ +================================================================================ +This file lists the package level copyright and license information for third +party software included in this release of 'CMSIS-Pack Eclipse Plug-ins'. + +The information is grouped into two sections. The first section lists out +details of third party software projects, including names of the applicable +licenses as per the SPDX format (http://spdx.org/licenses). The second section +includes the full license text of all applicable licenses referenced in the +first section. +================================================================================ + +SECTION 1: THIRD PARTY SOFTWARE PROJECTS +================================================================================ + +Name: Apache FreeMarker 2.3.29 +Summary: Apache FreeMarker™ is a template engine: a Java library to generate + text output (configuration files, source code, etc.) based on + templates and changing data. Templates are written in + the FreeMarker Template Language (FTL). +Home-page: https://freemarker.apache.org/ +License(s): Apache License 2.0 (Apache-2.0). See later section for a copy of + license text. +Copyright(s): (c) Copyright 2015-2017 The Apache Software Foundation +Source(s): https://freemarker.apache.org/sourcecode.html +---------------------------------------------------------------------- +Name: eo-yaml 7.0.9 +Summary: YAML for Java 8 and above. A user-friendly OOP library. + +Home-page: https://github.com/decorators-squad/eo-yaml +License(s): BSD 3-Clause "New" or "Revised" License (BSD-3-Clause). See later + section for a copy of license text. +Copyright(s): (c) Copyright 2016-2023, Mihai Emil Andronache + All rights reserved. +Source(s): https://github.com/decorators-squad/eo-yaml +---------------------------------------------------------------------- +=============================================================================== + +SECTION 2: APPLICABLE LICENSES +=============================================================================== + +1) License text (Apache License 2.0) for 'Apache FreeMarker': + +TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + +============================================================================== +END LICENSE + +=============================================================================== +=============================================================================== + +2) License text (BSD-3-Clause) for 'eol-yaml': + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + +* Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. + +* Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + +* Neither the name of the copyright holder nor the names of its + contributors may be used to endorse or promote products derived from + this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE +FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR +SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER +CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +=============================================================================== +================================================================================ +END OF FILE: third_party_licenses.txt