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

org.fortiss.tooling.common.ui/src/org/fortiss/tooling/common/ui/javafx/control/treetableview/.ratings

@@ -5,7 +5,7 @@ DynamicTextFieldTreeTableCell.java 62fa0c08b11d87e0eed41f84be85505c2740e75d GREE
 DynamicTreeContentProviderBase.java 91896b1fb5104d126544c44c1ff8c30f2a13a8d6 GREEN
 DynamicTreeItem.java 7e81ea98038b5eca90df583e0268d4e8f37aaf25 GREEN
 DynamicTreeItemBase.java d883066ecc181120302ca32f328538de7a45b093 GREEN
-DynamicTreeTableUIProviderBase.java 360df9d5114c5d4a391a7a7afe70a5b8ad584490 GREEN
+DynamicTreeTableUIProviderBase.java 11565b3f72bb5a861043d1d68a93a939e37baafc GREEN
 DynamicTreeTableViewer.java 77e9995a3bee37d57578dad9434a53c702128efa YELLOW
 DynamicTreeUIProviderBase.java 82d3c051213f0147f4c67ad247a08696cee73110 GREEN
 DynamicTreeViewer.java 33066062a82101cf28410e4d04f85bb9c24251db GREEN

org.fortiss.tooling.common.ui/src/org/fortiss/tooling/common/ui/javafx/control/treetableview/DynamicTreeTableUIProviderBase.java

@@ -15,6 +15,8 @@ package org.fortiss.tooling.common.ui.javafx.control.treetableview;
 
 import static java.util.stream.Collectors.toMap;
 import static javafx.collections.FXCollections.observableArrayList;
+import static javafx.scene.text.Font.font;
+import static javafx.util.Duration.seconds;
 import static org.apache.commons.lang3.SystemUtils.IS_OS_LINUX;
 
 import java.util.Map;
@@ -28,6 +30,7 @@ import javafx.scene.Node;
 import javafx.scene.control.ComboBox;
 import javafx.scene.control.ContextMenu;
 import javafx.scene.control.TextField;
+import javafx.scene.control.Tooltip;
 import javafx.scene.control.TreeItem;
 import javafx.scene.control.TreeTableCell;
 import javafx.scene.control.TreeTableColumn;
@@ -40,6 +43,7 @@ import javafx.scene.input.KeyEvent;
 import javafx.scene.input.MouseButton;
 import javafx.scene.input.MouseEvent;
 import javafx.scene.paint.Color;
+import javafx.scene.text.Font;
 import javafx.util.Callback;
 import javafx.util.converter.DefaultStringConverter;
 
@@ -64,6 +68,22 @@ public abstract class DynamicTreeTableUIProviderBase<T> {
 		return "";
 	}
 
+	/**
+	 * Retrieves the tooltip text which shall be displayed for the given element in the given
+	 * column.
+	 * 
+	 * No tooltip will be displayed, if this method return 'null'.
+	 * 
+	 * @param element
+	 *            The element to get a tooltip for.
+	 * @param column
+	 *            The column index for which to get a tooltip.
+	 * @return The tooltip as a {@link String}.
+	 */
+	public String getTooltip(T element, int column) {
+		return null;
+	}
+
 	/**
 	 * Determines, which {@link String} is in text editor cells when stating to edit.
 	 * 
@@ -324,6 +344,19 @@ public abstract class DynamicTreeTableUIProviderBase<T> {
 				cell.setStyle(getCellStyle(data, columnIndex));
 
 				addContextMenuToCell(cell, columnIndex);
+
+				final String tooltipStr = getTooltip(data, columnIndex);
+				if(tooltipStr != null) {
+					Tooltip tt = new Tooltip();
+					double fontSize = 14.0;
+					Font font = font(fontSize);
+
+					tt.setText(tooltipStr);
+					tt.setShowDuration(seconds(15));
+					tt.setFont(font);
+
+					cell.setTooltip(tt);
+				}
 			} else {
 				// reset icon for cases, in which a row was styled before, but became empty by now.
 				cell.setGraphic(null);

org.fortiss.tooling.ext.variability.ui/src/org/fortiss/tooling/ext/variability/ui/properties/.ratings

 CrossFeatureConstraintPropertySectionBase.java 37e772fb3471f85320170d373cbe2f319c350655 GREEN
-FeaturePropertySectionBase.java 2ac0a6a56ea4755852fd14a9b5df81dff4a5dc7e GREEN
+FeaturePropertySectionBase.java 598842b12b5bbb6f3cf2461a4d05fc721b637f54 GREEN
 HasPresenceConditionPropertySectionBase.java ef300f0d9294d76f5d80e45b8cc0d94c24586a24 GREEN

org.fortiss.tooling.ext.variability.ui/src/org/fortiss/tooling/ext/variability/ui/properties/FeaturePropertySectionBase.java

@@ -28,6 +28,7 @@ import org.fortiss.tooling.kernel.service.ICommandStackService;
 import org.fortiss.tooling.kernel.ui.extension.base.PropertySectionBase;
 import org.fortiss.variability.model.features.AbstractAlternativeFeature;
 import org.fortiss.variability.model.features.AbstractFeature;
+import org.fortiss.variability.model.features.AbstractFeatureModel;
 
 /**
  * Property Section for {@link AbstractFeature}s.
@@ -52,10 +53,13 @@ public class FeaturePropertySectionBase extends PropertySectionBase {
 			feature = (AbstractFeature)input;
 
 			if(optionalCheckbox != null) {
-				if(feature.eContainer() instanceof AbstractAlternativeFeature) {
+				if(feature.eContainer() instanceof AbstractAlternativeFeature ||
+						feature instanceof AbstractFeatureModel) {
 					optionalCheckbox.setEnabled(false);
-				} else
+				} else {
+					optionalCheckbox.setEnabled(true);
 					optionalCheckbox.setSelection(feature.isOptional());
+				}
 			}
 		}
 	}