Commit 06434a20 authored by Tiziano Munaro's avatar Tiziano Munaro
Browse files

Merge remote-tracking branch 'origin/master' into 4085

parents ab2b5e6e 5322ecda
Pipeline #34877 failed with stage
......@@ -54,6 +54,14 @@
path = org.fortiss.af3.expression.ui/.settings
url = https://git.fortiss.org/af3/plugin-settings.git
branch = master
[submodule "org.fortiss.af3.function/.settings"]
path = org.fortiss.af3.function/.settings
url = https://git.fortiss.org/af3/plugin-settings.git
branch = master
[submodule "org.fortiss.af3.function.ui/.settings"]
path = org.fortiss.af3.function.ui/.settings
url = https://git.fortiss.org/af3/plugin-settings.git
branch = master
[submodule "org.fortiss.af3.generator.common/.settings"]
path = org.fortiss.af3.generator.common/.settings
url = https://git.fortiss.org/af3/plugin-settings.git
......@@ -176,3 +184,9 @@
[submodule "org.fortiss.af3.platform.raspberry.ui/.settings"]
path = org.fortiss.af3.platform.raspberry.ui/.settings
url = https://git.fortiss.org/af3/plugin-settings.git
[submodule "org.fortiss.af3.featuremodel/.settings"]
path = org.fortiss.af3.featuremodel/.settings
url = https://git.fortiss.org/af3/plugin-settings.git
[submodule "org.fortiss.af3.featuremodel.ui/.settings"]
path = org.fortiss.af3.featuremodel.ui/.settings
url = https://git.fortiss.org/af3/plugin-settings.git
......@@ -3,7 +3,7 @@ Automatic-Module-Name: com.microsoft.z3
Bundle-ManifestVersion: 2
Bundle-Name: Microsoft Z3 API
Bundle-SymbolicName: com.microsoft.z3;singleton:=true
Bundle-Version: 2.20.0.qualifier
Bundle-Version: 2.21.0.qualifier
Bundle-ClassPath: lib/com.microsoft.z3.jar,
.
Bundle-Vendor: fortiss GmbH
......
......@@ -3,7 +3,7 @@ Automatic-Module-Name: eu.fbk.af3.tools.diagram.ui
Bundle-ManifestVersion: 2
Bundle-Name: Diagram Document Creator UI
Bundle-SymbolicName: eu.fbk.af3.tools.diagram.ui;singleton:=true
Bundle-Version: 2.20.0.qualifier
Bundle-Version: 2.21.0.qualifier
Bundle-Activator: eu.fbk.af3.tools.diagram.ui.DiagramUIActivator
Require-Bundle: eu.fbk.af3.tools.diagram;bundle-version="1.0.0",
org.fortiss.af3.component.ui,
......
......@@ -3,7 +3,7 @@ Automatic-Module-Name: eu.fbk.af3.tools.diagram
Bundle-ManifestVersion: 2
Bundle-Name: Diagram Document Creator
Bundle-SymbolicName: eu.fbk.af3.tools.diagram
Bundle-Version: 2.20.0.qualifier
Bundle-Version: 2.21.0.qualifier
Bundle-Activator: eu.fbk.af3.tools.diagram.Activator
Bundle-Vendor: FBK (Fondazione Bruno Kessler)
Require-Bundle: org.eclipse.core.runtime,
......
......@@ -3,7 +3,7 @@ Automatic-Module-Name: org.fortiss.af3.allocation.ui
Bundle-ManifestVersion: 2
Bundle-Name: fortiss AF3 Allocation UI
Bundle-SymbolicName: org.fortiss.af3.allocation.ui;singleton:=true
Bundle-Version: 2.20.0.qualifier
Bundle-Version: 2.21.0.qualifier
Bundle-Activator: org.fortiss.af3.allocation.ui.AF3AllocationUIActivator
Require-Bundle: org.eclipse.ui.ide;visibility:=reexport,
org.fortiss.af3.allocation;visibility:=reexport,
......
AllocationTableEditor.java 5a0d0a2f5318f91725c902e934c7409bdd73b4bd GREEN
ArchitectureParameterEditorBase.java 9d477be844b4132598814603bc9ef82a24baf3ca GREEN
ArchitectureParameterEditorBase.java 8e057b81cb075a8c19cbd4df01043e5512f3c7aa GREEN
ArchitectureParameterTableEditorBase.java f3bed37f42075e7b1cb93518e490c37b100ed3e3 GREEN
ModelListenerEditorBase.java af1bdff55ac3f33f9035bbda2dfef986c4f7a4cc GREEN
ParameterTableEditor.java 435231b3020dca1e20189a132439cc666cc72eb6 GREEN
......@@ -162,7 +162,7 @@ public abstract class ArchitectureParameterEditorBase<A extends ParameterTableRe
* allocation table of the given type for the edited architecture and that therefore can be used
* to the store a {@link ParameterTable}.
*/
private List<IProjectRootElement> getArchitectureAllocationTableCollections() {
protected List<IProjectRootElement> getArchitectureAllocationTableCollections() {
IAllocationService as = IAllocationService.getInstance();
List<IProjectRootElement> rval = new ArrayList<>();
......@@ -203,6 +203,7 @@ public abstract class ArchitectureParameterEditorBase<A extends ParameterTableRe
topLevel.runAsCommand(() -> {
IElementCompositorService.getInstance().compose(atc, paramTable, null);
setParameterTableFromRootElement(atc);
});
}
}
......@@ -266,8 +267,10 @@ public abstract class ArchitectureParameterEditorBase<A extends ParameterTableRe
updateModelSelectionComboBox(gui.getComboViewerAllocation(), allocationTableCollections,
selectedAtc);
ParameterTable currentParamTable = getParameterTable();
final IProjectRootElement atc = selectedAtc;
if(atc != null) {
if(currentParamTable != null && currentParamTable.getAllocationTableCollection() != atc &&
atc != null) {
ParameterTable parameterTable = getFirstChildWithType(atc, paramTableType);
if(parameterTable != getParameterTable()) {
......
ParameterEntryTreeViewerEditingSupport.java 44647dc9fc05a5b5a5947968993cc7cd003d265d GREEN
ParameterEntryTreeViewerEditingSupport.java 2840bb577f1e867e9e229cfb61af7d81275e2c87 GREEN
ParameterEntryTreeViewerLabelProvider.java 819872cf24343760c7770712945404d1143d9481 GREEN
ParameterSourceElementTreeViewerEditingSupport.java 9e30e6e0df10beaaf3231c9ff06a0c5ab1df9b34 GREEN
ParameterSourceElementTreeViewerLabelProvider.java e642d289da431e4b4d5070871b6f91171d2765dd GREEN
......
......@@ -115,7 +115,7 @@ public class ParameterEntryTreeViewerEditingSupport<T extends ParameterTable>
(Composite)getViewer().getControl(), SWT.READ_ONLY);
comboCellEditor.setLabelProvider(new LabelProvider());
comboCellEditor.setContentProvider(new ArrayContentProvider());
entries.add(0, "");
comboCellEditor.setInput(entries);
// comboCellEditor.getControl().set
return comboCellEditor;
......
......@@ -3,7 +3,7 @@ Automatic-Module-Name: org.fortiss.af3.allocation
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.fortiss.af3.allocation;singleton:=true
Bundle-Version: 2.20.0.qualifier
Bundle-Version: 2.21.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
......
......@@ -3,7 +3,7 @@ Automatic-Module-Name: org.fortiss.af3.component.ui
Bundle-ManifestVersion: 2
Bundle-Name: AF3 Component UI
Bundle-SymbolicName: org.fortiss.af3.component.ui;singleton:=true
Bundle-Version: 2.20.0.qualifier
Bundle-Version: 2.21.0.qualifier
Bundle-Activator: org.fortiss.af3.component.ui.AF3ComponentUIActivator
Require-Bundle: org.fortiss.af3.expression.ui;visibility:=reexport,
org.fortiss.af3.component;visibility:=reexport,
......
......@@ -107,6 +107,26 @@
type="org.fortiss.af3.component.model.ComponentArchitecture">
</input>
</propertySection>
<propertySection
afterSection="org.fortiss.af3.component.ui.properties.PortInitValueSection"
class="org.fortiss.tooling.ext.variability.ui.properties.HasPresenceConditionPropertySectionBase"
enablesFor="1"
id="org.fortiss.af3.component.ui.properties.PortPresenceConsitionPropertySection"
tab="org.fortiss.tooling.kernel.ui.property.tab.general">
<input
type="org.fortiss.af3.component.model.Port">
</input>
</propertySection>
<propertySection
afterSection="org.fortiss.af3.component.ui.properties.ComponentSpecificationPropertySection"
class="org.fortiss.tooling.ext.variability.ui.properties.HasPresenceConditionPropertySectionBase"
enablesFor="1"
id="org.fortiss.af3.component.ui.properties.ComponentPresenceConsitionPropertySection"
tab="org.fortiss.tooling.kernel.ui.property.tab.general">
<input
type="org.fortiss.af3.component.model.Component">
</input>
</propertySection>
</propertySections>
</extension>
......
ComponentArchitectureTransformationMenuBase.java e7149140c7489f74c63e7c140b9485868589b9e0 GREEN
ComponentArchitectureTransformationMenuBase.java 2b48545cfdc3912154338891b68538b7d0560090 GREEN
......@@ -38,9 +38,9 @@ import org.fortiss.af3.component.model.Component;
import org.fortiss.af3.component.model.ComponentArchitecture;
import org.fortiss.af3.component.utils.IComponentArchitectureTransformation;
import org.fortiss.af3.project.model.FileProject;
import org.fortiss.tooling.base.layout.IAutoLayouter;
import org.fortiss.tooling.base.layout.KielerAutoLayouter;
import org.fortiss.tooling.base.model.element.IHierarchicElement;
import org.fortiss.tooling.base.ui.layout.auto.IAutoLayouter;
import org.fortiss.tooling.base.ui.layout.auto.KielerAutoLayouter;
import org.fortiss.tooling.kernel.extension.data.ITopLevelElement;
import org.fortiss.tooling.kernel.model.IProjectRootElement;
import org.fortiss.tooling.kernel.service.IElementCompositorService;
......
CodeSpecificationEditor.java 09d4a2024ab4e32d4d9a83b026f7fdb82e58b1e8 GREEN
CodeSpecificationEditorBinding.java aeff3d23f484b3adeac6dfa01bb52ddcb8daba94 GREEN
PackSelectionToComponentMenu.java 9648d3ae9b119585f10d247e333926a9c01b5cd2 GREEN
PackSelectionToComponentMenu.java 548c50f822a69e255e8d9c0e2f43e424b14ddc81 GREEN
PackUnpackComponentMenuBase.java 4dd4e9f2489e8d6772c7b590f6f47a33c903e310 GREEN
PackUnpackComponents.java 74c46a1a33860ba4ea1d2f283e22483cdd472125 GREEN
UnpackSelectionToComponentsMenu.java aaaa0af013a663c26a528114628300cc07af8f55 GREEN
UnpackSelectionToComponentsMenu.java 12ca3fe8afbeae0f9ff0260a4cab8a88f09c67fc GREEN
......@@ -23,8 +23,8 @@ import java.util.List;
import org.eclipse.jface.action.Action;
import org.fortiss.af3.component.model.Component;
import org.fortiss.af3.component.ui.AF3ComponentUIActivator;
import org.fortiss.tooling.base.ui.layout.auto.IAutoLayouter;
import org.fortiss.tooling.base.ui.layout.auto.KielerAutoLayouter;
import org.fortiss.tooling.base.layout.IAutoLayouter;
import org.fortiss.tooling.base.layout.KielerAutoLayouter;
import org.fortiss.tooling.kernel.ui.extension.IContextMenuContributor;
import org.fortiss.tooling.kernel.ui.extension.base.MultiEObjectActionBase;
......
......@@ -22,8 +22,8 @@ import java.util.List;
import org.eclipse.jface.action.Action;
import org.fortiss.af3.component.model.Component;
import org.fortiss.af3.component.ui.AF3ComponentUIActivator;
import org.fortiss.tooling.base.ui.layout.auto.IAutoLayouter;
import org.fortiss.tooling.base.ui.layout.auto.KielerAutoLayouter;
import org.fortiss.tooling.base.layout.IAutoLayouter;
import org.fortiss.tooling.base.layout.KielerAutoLayouter;
import org.fortiss.tooling.kernel.ui.extension.IContextMenuContributor;
import org.fortiss.tooling.kernel.ui.extension.base.MultiEObjectActionBase;
......
PortContentAnchorageController.java 6d505a2f18763c705c40ffbe602fff17e73ef061 GREEN
PortContentAnchorageController.java c415a1e6f15d80b23565dd83c5fe9170aa540e1a GREEN
......@@ -27,7 +27,7 @@ import static org.fortiss.tooling.base.model.layout.EOrientation.EAST;
import static org.fortiss.tooling.base.model.layout.EOrientation.NORTH;
import static org.fortiss.tooling.base.model.layout.EOrientation.SOUTH;
import static org.fortiss.tooling.base.model.layout.EOrientation.WEST;
import static org.fortiss.tooling.base.ui.utils.LayoutDataUIUtils.getConnectorOffsetOrientation;
import static org.fortiss.tooling.base.utils.LayoutDataUtils.getConnectorOffsetOrientation;
import static org.fortiss.tooling.base.utils.LayoutDataUtils.getNodeBounds;
import static org.fortiss.tooling.base.utils.OffsetOrientationUtils.setOffsetOrientation;
......
SimpleTrafficLightsComponentArchitectureExample.java f1e3238b593a4e8d1c5420e4d8d1f71f53f035f8 GREEN
SimpleTrafficLightsComponentArchitectureExample.java 4430c03faf7f50a4b8e8677604c5dd1deb0d7424 GREEN
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment