import org.simantics.scl.compiler.types.Type;
import org.simantics.scl.compiler.types.Types;
import org.simantics.scl.reflection.annotations.SCLValue;
+import org.simantics.scl.runtime.function.Function1;
import org.simantics.selectionview.SelectionInput;
+import org.simantics.selectionview.SelectionViewResources;
import org.simantics.selectionview.StandardSelectionInput;
import org.simantics.ui.colors.Colors;
import org.simantics.ui.fonts.Fonts;
public static Object getPropertyChildName(ReadGraph graph, Resource resource, Object context) throws DatabaseException {
if(context instanceof Variable) {
Variable variable = (Variable)context;
+ String label = variable.getParent(graph).getPossiblePropertyValue(graph, "HasLabel", Bindings.STRING);
+ if(label != null)
+ return label;
return variable.getParent(graph).getName(graph);
}
throw new DatabaseException("Unknown context " + context);
}
- if(!asserted) {
- Resource assertedObject = Layer0Utils.getPossibleAssertedObject(graph, container, property);
- if(assertedObject != null) {
- if(graph.isInstanceOf(assertedObject, newType)) {
- Object assertedValue = graph.getValue(assertedObject, (Binding)_binding);
- if(assertedValue.equals(value)) {
- graph.deny(container, property);
- return null;
- }
- }
- }
- }
-
Datatype datatype = variable.getDatatype(graph);
Binding binding = (Binding)_binding;
Layer0Utils.claimAdaptedValue(graph, objectResource, value, binding, datatype);
Object value = null;
Resource formatter = property.getPossiblePropertyValue(graph, Variables.FORMATTER);
if(formatter != null) {
-
Formatter fmt = graph.adaptContextual(formatter, property, Variable.class, Formatter.class);
value = fmt.format(property.getValue(graph));
-
- } else {
+ }
+ if(value == null) {
+ SelectionViewResources SEL = SelectionViewResources.getInstance(graph);
+ Function1<Object,String> formatterFunction = property.getPossiblePropertyValue(graph, SEL.formatter);
+ if(formatterFunction != null) {
+ value = formatterFunction.apply(property.getValue(graph));
+ }
+ }
+ if(value == null) {
Variant variant = property.getVariantValue(graph);
value = variant.getValue();
-
Binding binding = variant.getBinding();
if(binding != null) {
Datatype dt = binding.type();