Changeset 275:601415be24b8 in finroc_tools_finstruct-java


Ignore:
Timestamp:
31.07.2018 15:16:48 (5 months ago)
Author:
Max Reichardt <max.reichardt@…>
Branch:
default
Parents:
274:d1c59aaaf130 (diff), 273:ca189ab72404 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Phase:
public
Tags:
tip
Message:

Merge with 17.03

Files:
3 edited

Legend:

Unmodified
Added
Removed
  • propertyeditor/FinrocComponentFactory.java

    r272 r275  
    4949import org.finroc.tools.gui.util.propertyeditor.gui.DataTypeEditor; 
    5050import org.finroc.plugins.data_types.PaintablePortData; 
     51import org.finroc.plugins.data_types.TaskProfile; 
    5152import org.rrlib.serialization.BinarySerializable; 
    5253import org.rrlib.serialization.EnumValue; 
     
    8687            if (type != null) { 
    8788                return (type.equals(PortCreationList.class) || DataTypeReference.class.equals(type) 
    88                         || PaintablePortData.class.isAssignableFrom(type) || XML.class.isAssignableFrom(type) || type.isEnum() 
     89                        || PaintablePortData.class.isAssignableFrom(type) || XML.class.isAssignableFrom(type) || type.isEnum() || type.equals(TaskProfile.List.class) 
    8990                        || type.equals(EnumValue.class) || CoreBoolean.class.isAssignableFrom(type) || type.equals(PortDataListImpl.class) 
    9091                        || (BinarySerializable.class.isAssignableFrom(type) && (Serialization.isStringSerializable(type) || Serialization.isXmlSerializable(type)))); 
     
    140141            wpec = new BooleanEditor(); 
    141142            acc = new CoreBooleanAdapter((PropertyAccessor<CoreBoolean>)acc); 
     143        } else if (type.equals(TaskProfile.List.class)) { 
     144            wpec = new TaskProfileViewer(RemoteRuntime.find(commonParent)); 
    142145        } else if (type.equals(PortDataListImpl.class)) { 
    143146            wpec = new CoreSerializableDefaultEditor(type); 
  • propertyeditor/FinrocComponentFactory.java

    r274 r275  
    4848import org.finroc.tools.gui.util.propertyeditor.StandardComponentFactory; 
    4949import org.finroc.tools.gui.util.propertyeditor.gui.DataTypeEditor; 
    50 import org.finroc.plugins.data_types.ContainsStrings; 
    5150import org.finroc.plugins.data_types.PaintablePortData; 
    5251import org.finroc.plugins.data_types.TaskProfile; 
     
    6059import org.rrlib.serialization.rtti.Copyable; 
    6160import org.rrlib.serialization.rtti.DataTypeBase; 
     61import org.rrlib.serialization.rtti.datatype.ContainsStrings; 
    6262import org.rrlib.xml.XMLDocument; 
    6363import org.xml.sax.InputSource; 
  • views/StandardViewGraphViz.java

    r274 r275  
    7979import org.finroc.core.remote.RemoteStaticParameterList; 
    8080import org.finroc.core.util.Files; 
    81 import org.finroc.plugins.data_types.StdStringList; 
    8281import org.finroc.tools.finstruct.Finstruct; 
    8382import org.finroc.tools.finstruct.dialogs.CreateInterfacesDialog; 
     
    9493import org.rrlib.logging.LogLevel; 
    9594import org.rrlib.serialization.BinaryInputStream; 
     95import org.rrlib.serialization.rtti.datatype.StringList; 
    9696import org.rrlib.xml.XMLNode; 
    9797 
     
    276276                if (child.getName().equals("expanded")) { 
    277277                    String rootString = getRootElement().getQualifiedName('/') + "/"; 
    278                     StdStringList stringList = new StdStringList(); 
     278                    StringList stringList = new StringList(); 
    279279                    try { 
    280280                        stringList.deserialize(child); 
     
    17551755        super.storeViewConfiguration(node); 
    17561756        if (expandedGroups.size() > 0) { 
    1757             StdStringList serializedExpandedGroups = new StdStringList(); 
     1757            StringList serializedExpandedGroups = new StringList(); 
    17581758            for (ModelNode expandedGroup : expandedGroups) { 
    17591759                if (expandedGroup instanceof RemoteFrameworkElement) { 
Note: See TracChangeset for help on using the changeset viewer.