From a950dff86647eb127f63513cd172a1fb27d9ce85 Mon Sep 17 00:00:00 2001
From: hneemann <helmut.neemann@arcor.de>
Date: Mon, 11 Sep 2017 22:20:30 +0200
Subject: [PATCH] more robust groupEdit

---
 .../gui/components/CircuitComponent.java      | 42 ++++++++++++-------
 1 file changed, 26 insertions(+), 16 deletions(-)

diff --git a/src/main/java/de/neemann/digital/gui/components/CircuitComponent.java b/src/main/java/de/neemann/digital/gui/components/CircuitComponent.java
index 39fdb2294..b771a4f64 100644
--- a/src/main/java/de/neemann/digital/gui/components/CircuitComponent.java
+++ b/src/main/java/de/neemann/digital/gui/components/CircuitComponent.java
@@ -981,35 +981,45 @@ public class CircuitComponent extends JComponent implements Circuit.ChangedListe
         if (!isLocked())
             try {
                 ArrayList<Key> keyList = new ArrayList<>();
-                ElementAttributes attr = new ElementAttributes();
                 ArrayList<VisualElement> elementList = new ArrayList<>();
                 for (VisualElement ve : circuit.getElements())
                     if (ve.matches(min, max)) {
                         elementList.add(ve);
                         for (Key k : library.getElementType(ve.getElementName()).getAttributeList()) {
-                            if (k.isGroupEditAllowed() && !keyList.contains(k)) {
+                            if (k.isGroupEditAllowed() && !keyList.contains(k))
                                 keyList.add(k);
-                                attr.set(k, ve.getElementAttributes().get(k));
-                            }
                         }
                     }
 
-                AttributeDialog attributeDialog = new AttributeDialog(this, keyList, attr);
-                ElementAttributes mod = attributeDialog.showDialog();
-                if (attributeDialog.isOkPressed()) {
-                    if (mod == null) mod = attr;
+                if (keyList.size() > 0) {
+                    Key key = null;
+                    if (keyList.size() == 1)
+                        key = keyList.get(0);
+                    else {
+                        ItemPicker<Key> ip = new ItemPicker<Key>(this, keyList);
+                        if (ip.showDialog())
+                            key = ip.getSelected();
+                    }
+                    if (key != null) {
+                        keyList.clear();
+                        keyList.add(key);
+                        ElementAttributes attr = new ElementAttributes();
+                        AttributeDialog attributeDialog = new AttributeDialog(this, keyList, attr);
+                        ElementAttributes mod = attributeDialog.showDialog();
+                        if (attributeDialog.isOkPressed()) {
+                            if (mod == null) mod = attr;
 
-                    Modifications.Builder modBuilder = new Modifications.Builder(Lang.get("mod_groupEdit"));
-                    for (Key k : keyList) {
-                        Object newVal = mod.get(k);
-                        for (VisualElement ve : elementList) {
-                            if (library.getElementType(ve.getElementName()).getAttributeList().contains(k)) {
-                                if (!ve.getElementAttributes().get(k).equals(newVal))
-                                    modBuilder.add(new ModifyAttribute<>(ve, k, newVal));
+                            Modifications.Builder modBuilder = new Modifications.Builder(Lang.get("mod_groupEdit"));
+                            Object newVal = mod.get(key);
+                            for (VisualElement ve : elementList) {
+                                if (library.getElementType(ve.getElementName()).getAttributeList().contains(key)) {
+                                    if (!ve.getElementAttributes().get(key).equals(newVal))
+                                        modBuilder.add(new ModifyAttribute<>(ve, key, newVal));
+                                }
                             }
+                            modify(modBuilder.build());
                         }
                     }
-                    modify(modBuilder.build());
                 }
             } catch (ElementNotFoundException e) {
                 // Do nothing if an element is not in library