Changeset 290:3e069d9c3cb4 in finroc_tools_finstruct-java

Timestamp:

22.06.2020 12:14:29 (3 weeks ago)

Author:

Max Reichardt <max.reichardt@…>

Branch:

default

Phase:

public

Tags:

tip

Message:

Makes removal of config entry links via finstruct connection panel work in all constellations with Finroc17 and later

File:

• FinstructConnectionPanel.java (modified) (2 diffs)

FinstructConnectionPanel.java

@@ -487 +487 @@
                         ParameterInfo pi = (ParameterInfo)remotePort.getAnnotation(ParameterInfo.TYPE);
                         if (pi != null && pi.getConfigEntry().equals(path) && ConfigFileModel.findConfigFile(remotePort) == ConfigFileModel.findConfigFile(currentRoot)) {
-                            pi.setConfigEntry("");
                             RemoteRuntime rr = RemoteRuntime.find(remotePort);
                             AdminClient ac = rr.getAdminInterface();
-                            pi.setConfigEntry("");
+                            pi.setConfigEntry("", true);
+                            ac.setAnnotation(remotePort.getRemoteHandle(), ParameterInfo.TYPE.getName(), pi);
+                            pi.setConfigEntry("", false);
                             ac.setAnnotation(remotePort.getRemoteHandle(), ParameterInfo.TYPE.getName(), pi);
                         }
@@ -498 +499 @@
                     AdminClient ac = rr.getAdminInterface();
                     ParameterInfo pi = (ParameterInfo)((RemotePort)object).getAnnotation(ParameterInfo.TYPE);
-                    pi.setConfigEntry("");
+                    pi.setConfigEntry("", true);
+                    ac.setAnnotation(((RemotePort)object).getRemoteHandle(), ParameterInfo.TYPE.getName(), pi);
+                    pi.setConfigEntry("", false);
                     ac.setAnnotation(((RemotePort)object).getRemoteHandle(), ParameterInfo.TYPE.getName(), pi);
                 }