Changeset 294:e98e14d1c808 in finroc_tools_finstruct-java

Timestamp:

04.01.2022 14:31:52 (2 years ago)

Author:

Max Reichardt <max.reichardt@…>

Branch:

default

Phase:

public

Message:

Adds possibility to always open connect option dialog when connecting remote ports by holding the 'Shift' key

Files:

• FinstructConnectionPanel.java (modified) (3 diffs)
• SmartConnecting.java (modified) (1 diff)

FinstructConnectionPanel.java

@@ -28 +28 @@
 import java.awt.Rectangle;
 import java.awt.event.ActionEvent;
+import java.awt.event.InputEvent;
 import java.awt.event.MouseEvent;
 import java.util.ArrayList;
@@ -330 +331 @@
 
     @Override
-    protected void connect(List<Object> nodes1, List<Object> nodes2) {
+    protected void connect(List<Object> nodes1, List<Object> nodes2, InputEvent event) {
         if (nodes1 == null || nodes2 == null || nodes1.size() == 0 || nodes2.size() == 0) {
             return;
@@ -378 +379 @@
 
             // Query for any type conversions
-            boolean showCreateConnectorDialog = false;
+            boolean showCreateConnectorDialog = (event.getModifiersEx() & InputEvent.SHIFT_DOWN_MASK) != 0;
             for (FinstructAction a : ((CompositeAction)action).getActions()) {
                 if (a instanceof ConnectAction) {

SmartConnecting.java

@@ -187 +187 @@
         } else {
             result.rating = getBestRating(forwardPossible ? sourceRuntime.getTypeConversionRating(sourcePort.getDataType(), destinationPort.getDataType()) : Definitions.TypeConversionRating.IMPOSSIBLE,
-                                          reversePossible ? sourceRuntime.getTypeConversionRating(sourcePort.getDataType(), destinationPort.getDataType()) : Definitions.TypeConversionRating.IMPOSSIBLE);
+                                          reversePossible ? sourceRuntime.getTypeConversionRating(destinationPort.getDataType(), sourcePort.getDataType()) : Definitions.TypeConversionRating.IMPOSSIBLE);
         }