diff --git a/diylc/diylc-core/src/org/diylc/components/AbstractComponent.java b/diylc/diylc-core/src/org/diylc/components/AbstractComponent.java index ff51f4ab..e172e05d 100644 --- a/diylc/diylc-core/src/org/diylc/components/AbstractComponent.java +++ b/diylc/diylc-core/src/org/diylc/components/AbstractComponent.java @@ -30,6 +30,7 @@ import java.lang.reflect.Array; import java.lang.reflect.Field; import java.lang.reflect.Modifier; import java.util.Arrays; +import java.util.stream.Collectors; import org.diylc.core.IDIYComponent; import org.diylc.core.Project; import org.diylc.core.annotations.EditableProperty; @@ -87,8 +88,15 @@ public abstract class AbstractComponent implements IDIYComponent { } @Override - public String getValueForDisplay() { - return getValue() == null ? "" : getValue().toString(); + public String getValueForDisplay() { + if (getValue() == null) + return ""; + + Object val = getValue(); + if (val.getClass().isArray()) { + return String.join(" / ", Arrays.stream((Object[])val).map(x -> x == null ? "" : x.toString()).collect(Collectors.toList())); + } + return val.toString(); } /** diff --git a/diylc/diylc-core/src/org/diylc/presenter/update.xml b/diylc/diylc-core/src/org/diylc/presenter/update.xml index 614d3cd9..a7cf56ea 100644 --- a/diylc/diylc-core/src/org/diylc/presenter/update.xml +++ b/diylc/diylc-core/src/org/diylc/presenter/update.xml @@ -4241,6 +4241,10 @@ NEW_FEATURE Added 'PCB Terminal Block' component + + + NEW_FEATURE + Show component values in the project explorer IMPROVEMENT diff --git a/diylc/diylc-library/lib/diylc-core.jar b/diylc/diylc-library/lib/diylc-core.jar index f75afc7a..21ea907e 100644 Binary files a/diylc/diylc-library/lib/diylc-core.jar and b/diylc/diylc-library/lib/diylc-core.jar differ diff --git a/diylc/diylc-swing/dict.txt b/diylc/diylc-swing/dict.txt index 692971ab..9bc9768f 100644 --- a/diylc/diylc-swing/dict.txt +++ b/diylc/diylc-swing/dict.txt @@ -49,7 +49,6 @@ AWG Alternate And Angle Offset -Apply Model B-C-E BJT Background Box @@ -148,7 +147,6 @@ Source Style Source Type Srpski Stroke -TB2 Ten Terminal Timing diff --git a/diylc/diylc-swing/lib/diylc-core.jar b/diylc/diylc-swing/lib/diylc-core.jar index f75afc7a..21ea907e 100644 Binary files a/diylc/diylc-swing/lib/diylc-core.jar and b/diylc/diylc-swing/lib/diylc-core.jar differ diff --git a/diylc/diylc-swing/library/main.jar b/diylc/diylc-swing/library/main.jar index 2857fa78..ce5c745d 100644 Binary files a/diylc/diylc-swing/library/main.jar and b/diylc/diylc-swing/library/main.jar differ