diff --git a/org.fortiss.af3.rcp.application/META-INF/MANIFEST.MF b/org.fortiss.af3.rcp.application/META-INF/MANIFEST.MF
index b6f36e7aeb4b015aad5131de138c5bc4c7a3d148..ee43b03d435f13cb64aeff5117b594dc1190b853 100644
--- a/org.fortiss.af3.rcp.application/META-INF/MANIFEST.MF
+++ b/org.fortiss.af3.rcp.application/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Automatic-Module-Name: org.fortiss.af3.rcp.application
Bundle-ManifestVersion: 2
Bundle-Name: AF3 RCP
Bundle-SymbolicName: org.fortiss.af3.rcp.application;singleton:=true
-Bundle-Version: 2.25.0.qualifier
+Bundle-Version: 2.26.0.qualifier
Bundle-Activator: org.fortiss.af3.rcp.application.AF3ApplicationActivator
Bundle-Vendor: fortiss GmbH
Bundle-RequiredExecutionEnvironment: JavaSE-11
@@ -18,25 +18,25 @@ Export-Package: org.fortiss.af3.rcp.application;
org.eclipse.equinox.app,
org.osgi.framework",
org.fortiss.af3.rcp.application.example
-Require-Bundle: org.fortiss.af3.rcp.help;bundle-version="2.25.0",
- eu.fbk.af3.tools.diagram.ui;bundle-version="2.25.0",
- org.fortiss.af3.cosimulation.ui;bundle-version="2.25.0",
- org.fortiss.af3.exploration.ui;bundle-version="2.25.0",
- org.fortiss.af3.mira.ui;bundle-version="2.25.0",
- org.fortiss.af3.mode.ui;bundle-version="2.25.0",
- org.fortiss.af3.operatorpanel.ui;bundle-version="2.25.0",
- org.fortiss.af3.partition.ui;bundle-version="2.25.0",
- org.fortiss.af3.platform.hierarchic.ui;bundle-version="2.25.0",
- org.fortiss.af3.platform.ui;bundle-version="2.25.0",
- org.fortiss.af3.project;bundle-version="2.25.0",
- org.fortiss.af3.project.ui;bundle-version="2.25.0",
- org.fortiss.af3.safety.ui;bundle-version="2.25.0",
- org.fortiss.af3.safetycases.ui;bundle-version="2.25.0",
- org.fortiss.af3.task.ui;bundle-version="2.25.0",
- org.fortiss.af3.schedule.ui;bundle-version="2.25.0",
- org.fortiss.af3.state.ui;bundle-version="2.25.0",
- org.fortiss.af3.timing.ui;bundle-version="2.25.0",
- org.fortiss.tooling.kernel.ui;bundle-version="2.25.0",
+Require-Bundle: org.fortiss.af3.rcp.help;bundle-version="2.26.0",
+ eu.fbk.af3.tools.diagram.ui;bundle-version="2.26.0",
+ org.fortiss.af3.cosimulation.ui;bundle-version="2.26.0",
+ org.fortiss.af3.exploration.ui;bundle-version="2.26.0",
+ org.fortiss.af3.mira.ui;bundle-version="2.26.0",
+ org.fortiss.af3.mode.ui;bundle-version="2.26.0",
+ org.fortiss.af3.operatorpanel.ui;bundle-version="2.26.0",
+ org.fortiss.af3.partition.ui;bundle-version="2.26.0",
+ org.fortiss.af3.platform.hierarchic.ui;bundle-version="2.26.0",
+ org.fortiss.af3.platform.ui;bundle-version="2.26.0",
+ org.fortiss.af3.project;bundle-version="2.26.0",
+ org.fortiss.af3.project.ui;bundle-version="2.26.0",
+ org.fortiss.af3.safety.ui;bundle-version="2.26.0",
+ org.fortiss.af3.safetycases.ui;bundle-version="2.26.0",
+ org.fortiss.af3.task.ui;bundle-version="2.26.0",
+ org.fortiss.af3.schedule.ui;bundle-version="2.26.0",
+ org.fortiss.af3.state.ui;bundle-version="2.26.0",
+ org.fortiss.af3.timing.ui;bundle-version="2.26.0",
+ org.fortiss.tooling.kernel.ui;bundle-version="2.26.0",
javax.servlet,
javax.servlet.jsp,
org.apache.commons.logging,
diff --git a/org.fortiss.af3.rcp.application/intro/newFeatures.html b/org.fortiss.af3.rcp.application/intro/newFeatures.html
index 27d20e566a297f8d53a27c08324a7a5de054ef7c..278f892062502a0278de38015a41358bcf61d7d3 100644
--- a/org.fortiss.af3.rcp.application/intro/newFeatures.html
+++ b/org.fortiss.af3.rcp.application/intro/newFeatures.html
@@ -16,44 +16,43 @@
<div class="mBlock">
<h2>New Features and Changes in AutoFOCUS 2.26</h2>
- <h3>Model Consistency</h3>
- <ul>
- <li> Integration of a novel consistency checking functionality (CCCC) </li>
- <li> Automated checks for consistency of cost requirements with the technical architecture. </li>
- <li> Enables check for consistency with arbitrary external models via consistency adapters. </li>
- </ul>
-
- <h3>Model Metrics and Quality</h3>
- <ul>
- <li> New button to extract metrics via EGit </li>
- <li> Improved metrics extraction from git repositories </li>
- </ul>
-
- <h3>Architecture Viewpoints for Industrial Automation</h3>
- <ul>
- <li> Dedicated architecture viewpoints for industrial automation available in expert mode </li>
- <li> Modeling support for plant topology </li>
- <li> Modeling support for PLC architecture </li>
- <li> Modeling support for product structure </li>
- </ul>
-
- <h3>Variability</h3>
- <ul>
- <li> Added product-line analysis to state automata with variability </li>
- <li> Presence Conditions are automatically checked for correctness. </li>
- <li> Improved editor behavior and automated checks ensure unique names of features </li>
- </ul>
+ <h3>Architecture Viewpoints for Industrial Automation</h3>
+ <ul>
+ <li> Dedicated architecture viewpoints for industrial automation available in expert mode </li>
+ <li> Modeling support for plant topology </li>
+ <li> Modeling support for product structure </li>
+ </ul>
- <h3>SysML-Export</h3>
- <ul>
- <li> Usability improvements via more robust UI and new warnings in case of unintended usage </li>
- <li> Improved encoding of atomic data types </li>
- </ul>
+ <h3>Model Consistency</h3>
+ <ul>
+ <li> Integration of a novel consistency checking functionality (<i>CCCC</i>) in expert mode </li>
+ <li> Enables automated check for consistency with arbitrary external models via consistency adapters </li>
+ <li> Build-in check for consistency of system cost between requirements and technical architecture </li>
+ </ul>
- <h3>Component Architecture</h3>
- <ul>
- <li> Enable to connect connections more easy, by automatically creating missing ports on sub-components </li>
- </ul>
+ <h3>Variability</h3>
+ <ul>
+ <li> Extended product-line analysis to state automata with variability </li>
+ <li> Presence Conditions are automatically checked for correctness </li>
+ <li> Improved editor behavior and automated checks to ensure unique names of features </li>
+ </ul>
+
+ <h3>Model Metrics and Quality</h3>
+ <ul>
+ <li> New button to extract metrics via EGit </li>
+ <li> Improved metrics extraction from git repositories </li>
+ </ul>
+
+ <h3>SysML-Export</h3>
+ <ul>
+ <li> Usability improvements via more robust UI and new warnings in case of unintended usage </li>
+ <li> Improved encoding of atomic data types </li>
+ </ul>
+
+ <h3>Component Architecture</h3>
+ <ul>
+ <li> Editor enables to connect connections more easy, by automatically creating missing ports on sub-components </li>
+ </ul>
<br>
<h3>Detailed list of changes in 2.26:</h3>
@@ -73,6 +72,10 @@
<li>Integrate Consistency Checker and AF3 Consistency Adapter into AF3 (#4362)</li>
<li>Feature Model: Assign a unique name for newly created features (#4313)</li>
<li>Component Architecture: Create connections without existing ports (#4304)</li>
+ <li>[CCCC] Fix NPE when no possible AF3 element class/type can be found for a requested consistency element inside AF3 C-Adapter (#4430)/li>
+ <li>Reuse: PresenceConditions are not removed when adding StateAutomata to a Reuse Libarary (#4427)/li>
+ <li>[Manufacturing] Integrate Manufacturing Plugin: Topology and Product Viewpoints (#4425)/li>
+ <li>Fix "Failed to load icon" in some AF3 plugins (#4431)/li>
</ul>
</div>
</body>
diff --git a/org.fortiss.af3.rcp.application/intro/newFeatures_af3_fortissPage.html b/org.fortiss.af3.rcp.application/intro/newFeatures_af3_fortissPage.html
index 7704cc38d8f0b4c7b5a62ef279b6a41177455501..227ace90b2cc20d24b362a21afd64edf1cf964ad 100644
--- a/org.fortiss.af3.rcp.application/intro/newFeatures_af3_fortissPage.html
+++ b/org.fortiss.af3.rcp.application/intro/newFeatures_af3_fortissPage.html
@@ -17,32 +17,31 @@
<div class="mBlock">
<h2>New Features and Changes in AutoFOCUS 2.26</h2>
- <h3>Model Consistency</h3>
+ <h3>Architecture Viewpoints for Industrial Automation</h3>
<ul>
- <li> Integration of a novel consistency checking functionality (CCCC) </li>
- <li> Automated checks for consistency of cost requirements with the technical architecture. </li>
- <li> Enables check for consistency with arbitrary external models via consistency adapters. </li>
+ <li> Dedicated architecture viewpoints for industrial automation available in expert mode </li>
+ <li> Modeling support for plant topology </li>
+ <li> Modeling support for product structure </li>
</ul>
- <h3>Model Metrics and Quality</h3>
+ <h3>Model Consistency</h3>
<ul>
- <li> New button to extract metrics via EGit </li>
- <li> Improved metrics extraction from git repositories </li>
- </ul>
+ <li> Integration of a novel consistency checking functionality (<i>CCCC</i>) in expert mode </li>
+ <li> Enables automated check for consistency with arbitrary external models via consistency adapters </li>
+ <li> Build-in check for consistency of system cost between requirements and technical architecture </li>
+ </ul>
<h3>Variability</h3>
<ul>
- <li> Added product-line analysis to state automata with variability </li>
- <li> Presence Conditions are automatically checked for correctness. </li>
- <li> Improved editor behavior and automated checks ensure unique names of features </li>
- </ul>
+ <li> Extended product-line analysis to state automata with variability </li>
+ <li> Presence Conditions are automatically checked for correctness </li>
+ <li> Improved editor behavior and automated checks to ensure unique names of features </li>
+ </ul>
- <h3>Architecture Viewpoints for Industrial Automation</h3>
+ <h3>Model Metrics and Quality</h3>
<ul>
- <li> Dedicated architecture viewpoints for industrial automation available in expert mode </li>
- <li> Modeling support for plant topology </li>
- <li> Modeling support for PLC architecture </li>
- <li> Modeling support for product structure </li>
+ <li> New button to extract metrics via EGit </li>
+ <li> Improved metrics extraction from git repositories </li>
</ul>
<h3>SysML-Export</h3>
@@ -53,9 +52,8 @@
<h3>Component Architecture</h3>
<ul>
- <li> Enable to connect connections more easy, by automatically creating missing ports on sub-components </li>
+ <li> Editor enables to connect connections more easy, by automatically creating missing ports on sub-components </li>
</ul>
-
<br>
@@ -110,6 +108,10 @@
<li>Integrate Consistency Checker and AF3 Consistency Adapter into AF3 (#4362)</li>
<li>Feature Model: Assign a unique name for newly created features (#4313)</li>
<li>Component Architecture: Create connections without existing ports (#4304)</li>
+ <li>[CCCC] Fix NPE when no possible AF3 element class/type can be found for a requested consistency element inside AF3 C-Adapter (#4430)/li>
+ <li>Reuse: PresenceConditions are not removed when adding StateAutomata to a Reuse Libarary (#4427)/li>
+ <li>[Manufacturing] Integrate Manufacturing Plugin: Topology and Product Viewpoints (#4425)/li>
+ <li>Fix "Failed to load icon" in some AF3 plugins (#4431)/li>
</ul>
</div>
diff --git a/org.fortiss.af3.rcp.application/plugin.xml b/org.fortiss.af3.rcp.application/plugin.xml
index 2c4c2db18a07685405d99335c0036b5e3ff56b55..2d214e4cd9896d93d3735c9adffd1534e98333e5 100644
--- a/org.fortiss.af3.rcp.application/plugin.xml
+++ b/org.fortiss.af3.rcp.application/plugin.xml
@@ -19,10 +19,10 @@
<product
application="org.fortiss.af3.rcp.application.af3app"
description="AutoFOCUS 3 - "Phoenix" Release"
- name="AutoFOCUS 3 - "Phoenix" 2.25">
+ name="AutoFOCUS 3 - "Phoenix" 2.26">
<property
name="appName"
- value="AutoFOCUS 3 - "Phoenix" 2.25">
+ value="AutoFOCUS 3 - "Phoenix" 2.26">
</property>
<property
name="aboutImage"
@@ -34,7 +34,7 @@
</property>
<property
name="aboutText"
- value="AutoFOCUS 3 - "Phoenix"

Version: 2.25.0

Copyright 2011-2024 fortiss GmbH

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.">
+ value="AutoFOCUS 3 - "Phoenix"

Version: 2.26.0

Copyright 2011-2024 fortiss GmbH

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.">
</property>
<property
name="startupProgressRect"
diff --git a/org.fortiss.af3.rcp.help/META-INF/MANIFEST.MF b/org.fortiss.af3.rcp.help/META-INF/MANIFEST.MF
index 9de817027359359ad82146544063c61f1f89dd77..70e3d1466fa0dc2bb1efc8b62f18aec0fdb92492 100644
--- a/org.fortiss.af3.rcp.help/META-INF/MANIFEST.MF
+++ b/org.fortiss.af3.rcp.help/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Eclipse-BundleShape: dir
Bundle-ManifestVersion: 2
Bundle-Name: AF3 Online Help
Bundle-SymbolicName: org.fortiss.af3.rcp.help;singleton:=true
-Bundle-Version: 2.25.0.qualifier
+Bundle-Version: 2.26.0.qualifier
Bundle-Vendor: fortiss GmbH
Bundle-RequiredExecutionEnvironment: JavaSE-11
Bundle-ActivationPolicy: lazy