Changeset 367


Ignore:
Timestamp:
Apr 10, 2012, 11:28:35 PM (5 years ago)
Author:
tim.te.beek@…
Message:

Yet another copy paste duplication error
Update reference profile to use column names and fix current tests

Location:
branches/alttableimport-model-rewrite/src
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/alttableimport-model-rewrite/src/main/java/nl/nbic/brs/alttableimport/models/ParsingTableModel.java

    r365 r367  
    102102        }
    103103
    104         @SuppressWarnings("unused")
    105         // TODO remove suppressing of warnings
    106104        public void assimilate(final SaveableSettings saveableSettings) throws IOException {
    107105                // We're going to change a lot of values, but do not want to notify listeners for each individual change
     
    134132                settings.getSourceInteraction().setSelectedItem(sourceIntIndex == ArrayUtils.INDEX_NOT_FOUND ? null : sourceIntIndex);
    135133
    136                 String edgeInteractionName = saveableSettings.getSourceInteraction();
     134                String edgeInteractionName = saveableSettings.getEdgeInteraction();
    137135                int edgeIntIndex = ArrayUtils.indexOf(columnNames, edgeInteractionName);
    138136                // TODO Handling of AlternateEdgeInteractions
    139137                settings.getEdgeInteraction().setSelectedItem(edgeIntIndex == ArrayUtils.INDEX_NOT_FOUND ? null : edgeIntIndex);
    140138
    141                 String targetInteractionName = saveableSettings.getSourceInteraction();
     139                String targetInteractionName = saveableSettings.getTargetInteraction();
    142140                int targetIntIndex = ArrayUtils.indexOf(columnNames, targetInteractionName);
    143141                settings.getTargetInteraction().setSelectedItem(targetIntIndex == ArrayUtils.INDEX_NOT_FOUND ? null : targetIntIndex);
  • branches/alttableimport-model-rewrite/src/test/resources/transacties-import-profile.json

    r285 r367  
    88  "firstRowHeader" : true,
    99  "guessDataTypes" : true,
    10   "sourceInteraction" : 2,
     10  "sourceInteraction" : "Vertrek",
    1111  "edgeInteraction" : null,
    12   "targetInteraction" : 4,
    13   "sourceAttributes" : [ 2 ],
    14   "edgeAttributes" : [ 0, 5 ],
    15   "targetAttributes" : [ 4 ],
     12  "targetInteraction" : "Bestemming",
     13  "sourceAttributes" : [ "Vertrek" ],
     14  "edgeAttributes" : [ "Bedrag", "Datum" ],
     15  "targetAttributes" : [ "Bestemming" ],
    1616  "interpretation" : {
    17     "5" : "java.lang.Double"
     17    "Bedrag" : "java.lang.Double"
    1818  }
    1919}
Note: See TracChangeset for help on using the changeset viewer.