Changeset 289:358261d4b196 in finroc_tools_finstruct-java

Timestamp:

25.05.2020 23:01:55 (8 months ago)

Author:

Max Reichardt <mreichardt@…>

Branch:

default

Phase:

public

Message:

Adapts remote component creation to change in finroc_core - and improves CreateModule dialog to show runtime parameters on creation of components in more constellations

Files:

• FinstructRightPanel.java (modified) (1 diff)
• dialogs/CreateInterfacesDialog.java (modified) (1 diff)
• dialogs/CreateModuleDialog.java (modified) (5 diffs)

FinstructRightPanel.java

@@ -647 +647 @@
                 try {
                     // wait for creation and show element properties in panel
-                    String error = runtime.getAdminInterface().createModule(selectedCreateAction, componentCreateName.toString(), ((RemoteFrameworkElement)rootElement).getRemoteHandle(), componentConstructorParameters);
-                    if (error.length() > 0) {
-                        Finstruct.showErrorMessage("Error creating component: " + error, false, false);
+                    Object error = runtime.getAdminInterface().createModule(selectedCreateAction, componentCreateName.toString(), ((RemoteFrameworkElement)rootElement).getRemoteHandle(), componentConstructorParameters);
+                    if (error instanceof String) {
+                        Finstruct.showErrorMessage("Error creating component: " + error.toString(), false, false);
                     } else {
                         createdElementToSwitchTo = componentCreateName.toString();

dialogs/CreateInterfacesDialog.java

@@ -316 +316 @@
                             parameters.get(2).setValue(task.shared);
                             parameters.get(3).setValue(task.globallyUniqueLinks);
-                            String error = rr.getAdminInterface().createModule(createInterfaceAction, task.name, element.getRemoteHandle(), parameters);
-                            if (error.length() == 0 && task.portCreationList.getSize() > 0) {
+                            Object result = rr.getAdminInterface().createModule(createInterfaceAction, task.name, element.getRemoteHandle(), parameters);
+                            boolean error = result instanceof String;
+                            if ((!error) && task.portCreationList.getSize() > 0) {
                                 setPortListCount++;
-                            } else if (error.length() > 0) {
+                            } else if (error) {
                                 Finstruct.showErrorMessage("Error creating interfaces: " + error, false, false);
                             }

dialogs/CreateModuleDialog.java

@@ -86 +86 @@
     //private final ArrayList<RemoteCreateModuleAction> filteredActions = new ArrayList<RemoteCreateModuleAction>();
 
-    /** Name of Created module */
-    private String created;
+    /** Name of Created module, as sent to remote runtime environment */
+    private String createdModuleExpectedName;
+
+    /** Handle of created module (if available) */
+    private Integer createdModuleHandle;
 
     /** Created Module - set when changed event is received via runtime listener */
@@ -94 +97 @@
     /** Tree model of remote framework elements */
     private InterfaceTreeModel treeModel;
+
+    /** Any active timer */
+    private Timer timer;
 
     public CreateModuleDialog(Frame owner) {
@@ -235 +241 @@
             String error = "";
 
-            boolean timerActive = false;
             try {
                 treeModel.addTreeModelListener(this);
-                created = name.getText();
-                error = rr.getAdminInterface().createModule(rcma, name.getText(), parent.getRemoteHandle(), spl);
+                createdModuleExpectedName = name.getText();
+                createdModuleHandle = null;
+                createdModule = null;
+                timer = null;
+                Object result = rr.getAdminInterface().createModule(rcma, name.getText(), parent.getRemoteHandle(), spl);
+                if (result instanceof Integer) {
+                    createdModuleHandle = (Integer)result;
+                } else if (result instanceof String) {
+                    error = result.toString();
+                }
                 if (error.length() == 0) {
-                    Timer timer = new Timer(2000, this);
+                    timer = new Timer(2000, this);
                     timer.setRepeats(false);
                     timer.start();
-                    timerActive = true;
                 }
 
             } finally {
-                if (!timerActive) {
+                if (timer == null) {
                     treeModel.removeTreeModelListener(this);
                 }
@@ -260 +272 @@
                 Finstruct.showErrorMessage("Couldn't find & edit created element", false, false);
                 treeModel.removeTreeModelListener(this);
-            }
+            } else {
+                // show edit dialog
+                try {
+                    new ParameterEditDialog(this).show(createdModule, false, false);
+                } catch (Exception exception) {
+                    Finstruct.showErrorMessage(exception, true);
+                }
+                close();
+            }
+            timer = null;
         }
     }
@@ -308 +329 @@
         if (e.getTreePath().getLastPathComponent() == parent) {
             for (Object o : e.getChildren()) {
-                if (o instanceof RemoteFrameworkElement && o.toString().equals(created)) {
+                if (o instanceof RemoteFrameworkElement && ((createdModuleHandle == null && o.toString().equals(createdModuleExpectedName) || (createdModuleHandle != null && ((RemoteFrameworkElement)o).getRemoteHandle() == createdModuleHandle.intValue())))) {
                     createdModule = (RemoteFrameworkElement)o;
                     treeModel.removeTreeModelListener(this);
 
-                    // possibly show edit dialog
-                    try {
-                        new ParameterEditDialog(this).show(createdModule, false, false);
-                    } catch (Exception exception) {
-                        Finstruct.showErrorMessage(exception, true);
+                    if (timer != null) {
+                        timer.stop();
+                        timer = new Timer(300, this);
+                        timer.setRepeats(false);
+                        timer.start();
+                    } else {
+                        Finstruct.showErrorMessage("No timer active", false, false);
                     }
-                    close();
+
                     return;
                 }