Changeset 346:c0eb803e5b3e in finroc_core-java

Timestamp:

22.02.2021 13:52:25 (5 days ago)

Author:

Max Reichardt <mreichardt@…>

Branch:

default

Phase:

public

Tags:

tip

Message:

Adapts to changes in finroc_plugins_data_ports (consistent spelling of 'Metadata')

File:

• remote/RemoteRuntime.java (modified) (7 diffs)

remote/RemoteRuntime.java

@@ -313 +313 @@
         RemoteTypeConversion getTupleElementOperation = getTypeConversionOperation(RemoteTypeConversion.SupportedTypeFilter.GET_TUPLE_ELEMENT);
         RemoteTypeConversion adjustLengthOperation = getTypeConversionOperation(RemoteTypeConversion.SupportedTypeFilter.ADJUST_LENGTH);
-        RemoteTypeConversion captureMetaDataOperation = getTypeConversionOperation("Capture Meta Data");
-        RemoteTypeConversion appendMetaDataOperation = getTypeConversionOperation("Append Meta Data");
+        RemoteTypeConversion captureMetadataOperation = getTypeConversionOperation("Capture Metadata");
+        RemoteTypeConversion appendMetadataOperation = getTypeConversionOperation("Append Metadata");
         RemoteType checkType = sourceType;
         while (checkType != null) {
@@ -348 +348 @@
             checkType = getUnderlyingTypeOperationsAreInheritedFrom(checkType);
         }
-        if (captureMetaDataOperation != null) {
+        if (captureMetadataOperation != null) {
             for (int i = 0, n = remoteTypes.size(); i < n; i++) {
                 RemoteType type = remoteTypes.get(i);
-                if (IsSupportedMetaDataCaptureType(type)) {
-                    fromSourceType.add(new GetCastOperationEntry(captureMetaDataOperation, type, false));
-                }
-            }
-        }
-        if (appendMetaDataOperation != null) {
+                if (IsSupportedMetadataCaptureType(type)) {
+                    fromSourceType.add(new GetCastOperationEntry(captureMetadataOperation, type, false));
+                }
+            }
+        }
+        if (appendMetadataOperation != null) {
             for (int i = 0, n = remoteTypes.size(); i < n; i++) {
                 RemoteType type = remoteTypes.get(i);
-                if (appendMetaDataSupported(sourceType, type)) {
-                    fromSourceType.add(new GetCastOperationEntry(appendMetaDataOperation, type, false));
+                if (appendMetadataSupported(sourceType, type)) {
+                    fromSourceType.add(new GetCastOperationEntry(appendMetadataOperation, type, false));
                 }
             }
@@ -403 +403 @@
             }
         }
-        if (captureMetaDataOperation != null && IsSupportedMetaDataCaptureType(destinationType)) {
+        if (captureMetadataOperation != null && IsSupportedMetadataCaptureType(destinationType)) {
             for (int i = 0, n = remoteTypes.size(); i < n; i++) {
                 RemoteType type = remoteTypes.get(i);
-                fromDestinationType.add(new GetCastOperationEntry(captureMetaDataOperation, type, false));
-            }
-        }
-        if (appendMetaDataOperation != null && destinationType.getTupleElementTypes() != null) {
+                fromDestinationType.add(new GetCastOperationEntry(captureMetadataOperation, type, false));
+            }
+        }
+        if (appendMetadataOperation != null && destinationType.getTupleElementTypes() != null) {
             RemoteType newType = remoteTypes.get(destinationType.getTupleElementTypes()[destinationType.getTupleElementTypes().length - 1]);
-            if (IsSupportedMetaDataCaptureType(newType)) {
+            if (IsSupportedMetadataCaptureType(newType)) {
                 for (int i = 0, n = remoteTypes.size(); i < n; i++) {
                     RemoteType type = remoteTypes.get(i);
-                    if (appendMetaDataSupported(type, destinationType)) {
-                        fromDestinationType.add(new GetCastOperationEntry(appendMetaDataOperation, type, false));
+                    if (appendMetadataSupported(type, destinationType)) {
+                        fromDestinationType.add(new GetCastOperationEntry(appendMetadataOperation, type, false));
                     }
                 }
@@ -526 +526 @@
         }
 
-        // Remove nonsense meta data casts
+        // Remove nonsense metadata casts
         for (int i = 0; i < result.size(); i++) {
             RemoteConnectOptions operation = result.get(i);
-            if ((operation.operation1 == captureMetaDataOperation || operation.operation1 == appendMetaDataOperation) && (operation.operation2 == captureMetaDataOperation || operation.operation2 == appendMetaDataOperation)) {
+            if ((operation.operation1 == captureMetadataOperation || operation.operation1 == appendMetadataOperation) && (operation.operation2 == captureMetadataOperation || operation.operation2 == appendMetadataOperation)) {
                 result.remove(i);
                 i--;
-            } else if ((operation.operation1 == captureMetaDataOperation || operation.operation2 == captureMetaDataOperation) && operation.operation2 != null) {
+            } else if ((operation.operation1 == captureMetadataOperation || operation.operation2 == captureMetadataOperation) && operation.operation2 != null) {
                 result.remove(i);
                 i--;
@@ -1571 +1571 @@
      * @param sourceType Remote source type
      * @param sourceType Remote destinationType type
-     * @return Whether remote AppendMetaData operation supports converting sourceType to destinationType
-     */
-    boolean appendMetaDataSupported(RemoteType sourceType, RemoteType destinationType) {
+     * @return Whether remote AppendMetadata operation supports converting sourceType to destinationType
+     */
+    boolean appendMetadataSupported(RemoteType sourceType, RemoteType destinationType) {
         short[] sourceTupleElements = sourceType.getTupleElementTypes();
         short[] destinationTupleElements = destinationType.getTupleElementTypes();
@@ -1591 +1591 @@
             }
             RemoteType newType = remoteTypes.get(destinationTupleElements[destinationTupleElementCount - 1]);
-            if (IsSupportedMetaDataCaptureType(newType)) {
+            if (IsSupportedMetadataCaptureType(newType)) {
                 return true;
             }
@@ -1600 +1600 @@
     /**
      * @param type Type to check
-     * @return Whether it is possible to capture type as meta data (with the respective remote conversion operations)
-     */
-    static boolean IsSupportedMetaDataCaptureType(RemoteType type) {
-        return (type.isCheapCopyType() && (type.getLocalTypeMatch() != RemoteType.LocalTypeMatch.EXACT || type.getDefaultLocalDataType() != Event.TYPE)) || type.getName().equals("finroc.data_ports.MetaData");
+     * @return Whether it is possible to capture type as metadata (with the respective remote conversion operations)
+     */
+    static boolean IsSupportedMetadataCaptureType(RemoteType type) {
+        return (type.isCheapCopyType() && (type.getLocalTypeMatch() != RemoteType.LocalTypeMatch.EXACT || type.getDefaultLocalDataType() != Event.TYPE)) || type.getName().equals("finroc.data_ports.Metadata");
     }
 }