@@ -524,43 +524,43 @@ public HierarchicalLayoutManager(Combine b, LayoutSettingBean setting) {
524524 cancelled = new AtomicBoolean (false );
525525 }
526526
527- private void initSettings (LayoutSettingBean setting ) {
527+ private void initSettings () {
528528 // Boolean settings (cached once per instance)
529- bothSort = setting .get (Boolean .class , BOTH_SORT );
530- reverseSort = setting .get (Boolean .class , REVERSE_SORT );
531- dummyFirstSort = setting .get (Boolean .class , DUMMY_FIRST_SORT );
532- lastDownSweep = setting .get (Boolean .class , LAST_DOWN_SWEEP );
533- optimalUpVip = setting .get (Boolean .class , OPTIMAL_UP_VIP );
534- squashPosition = setting .get (Boolean .class , SQUASH_POSITION );
535- centerSimpleNodes = setting .get (Boolean .class , CENTER_SIMPLE_NODES );
536- meanNotMedian = setting .get (Boolean .class , MEAN_NOT_MEDIAN );
537- crossingSort = setting .get (Boolean .class , CROSSING_SORT );
538- noCrossingLayerReassign = setting .get (Boolean .class , NO_CROSSING_LAYER_REASSIGN );
539- lastUpCrossingSweep = setting .get (Boolean .class , LAST_UP_CROSSING_SWEEP );
540- irrelevantLayoutCode = setting .get (Boolean .class , IRRELEVANT_LAYOUT_CODE );
541- centerCrossingX = setting .get (Boolean .class , CENTER_CROSSING_X );
542- crossResetXFromNode = setting .get (Boolean .class , CROSS_RESET_X_FROM_NODE );
543- crossResetXFromMiddle = setting .get (Boolean .class , CROSS_RESET_X_FROM_MIDDLE );
544- spanByAngle = setting .get (Boolean .class , SPAN_BY_ANGLE );
545- noDummyLongEdges = setting .get (Boolean .class , NO_DUMMY_LONG_EDGES );
546- standalones = setting .get (Boolean .class , STANDALONES );
547- edgeBending = setting .get (Boolean .class , EDGE_BENDING );
548- decreaseLayerWidthDeviation = setting .get (Boolean .class , DECREASE_LAYER_WIDTH_DEVIATION );
549- decreaseLayerWidthDeviationQuick = setting .get (Boolean .class , DECREASE_LAYER_WIDTH_DEVIATION_QUICK );
550- decreaseLayerWidthDeviationUp = setting .get (Boolean .class , DECREASE_LAYER_WIDTH_DEVIATION_UP );
551- unreverseVips = setting .get (Boolean .class , UNREVERSE_VIPS );
552- noVip = setting .get (Boolean .class , NO_VIP );
553- crossReduceRouting = setting .get (Boolean .class , CROSS_REDUCE_ROUTING );
554- crossPositionDuring = setting .get (Boolean .class , CROSS_POSITION_DURING );
555- properCrossingClosestNode = setting .get (Boolean .class , PROPER_CROSSING_CLOSEST_NODE );
556- unknownCrossingNumber = setting .get (Boolean .class , UNKNOWN_CROSSING_NUMBER );
529+ bothSort = settings .get (Boolean .class , BOTH_SORT );
530+ reverseSort = settings .get (Boolean .class , REVERSE_SORT );
531+ dummyFirstSort = settings .get (Boolean .class , DUMMY_FIRST_SORT );
532+ lastDownSweep = settings .get (Boolean .class , LAST_DOWN_SWEEP );
533+ optimalUpVip = settings .get (Boolean .class , OPTIMAL_UP_VIP );
534+ squashPosition = settings .get (Boolean .class , SQUASH_POSITION );
535+ centerSimpleNodes = settings .get (Boolean .class , CENTER_SIMPLE_NODES );
536+ meanNotMedian = settings .get (Boolean .class , MEAN_NOT_MEDIAN );
537+ crossingSort = settings .get (Boolean .class , CROSSING_SORT );
538+ noCrossingLayerReassign = settings .get (Boolean .class , NO_CROSSING_LAYER_REASSIGN );
539+ lastUpCrossingSweep = settings .get (Boolean .class , LAST_UP_CROSSING_SWEEP );
540+ irrelevantLayoutCode = settings .get (Boolean .class , IRRELEVANT_LAYOUT_CODE );
541+ centerCrossingX = settings .get (Boolean .class , CENTER_CROSSING_X );
542+ crossResetXFromNode = settings .get (Boolean .class , CROSS_RESET_X_FROM_NODE );
543+ crossResetXFromMiddle = settings .get (Boolean .class , CROSS_RESET_X_FROM_MIDDLE );
544+ spanByAngle = settings .get (Boolean .class , SPAN_BY_ANGLE );
545+ noDummyLongEdges = settings .get (Boolean .class , NO_DUMMY_LONG_EDGES );
546+ standalones = settings .get (Boolean .class , STANDALONES );
547+ edgeBending = settings .get (Boolean .class , EDGE_BENDING );
548+ decreaseLayerWidthDeviation = settings .get (Boolean .class , DECREASE_LAYER_WIDTH_DEVIATION );
549+ decreaseLayerWidthDeviationQuick = settings .get (Boolean .class , DECREASE_LAYER_WIDTH_DEVIATION_QUICK );
550+ decreaseLayerWidthDeviationUp = settings .get (Boolean .class , DECREASE_LAYER_WIDTH_DEVIATION_UP );
551+ unreverseVips = settings .get (Boolean .class , UNREVERSE_VIPS );
552+ noVip = settings .get (Boolean .class , NO_VIP );
553+ crossReduceRouting = settings .get (Boolean .class , CROSS_REDUCE_ROUTING );
554+ crossPositionDuring = settings .get (Boolean .class , CROSS_POSITION_DURING );
555+ properCrossingClosestNode = settings .get (Boolean .class , PROPER_CROSSING_CLOSEST_NODE );
556+ unknownCrossingNumber = settings .get (Boolean .class , UNKNOWN_CROSSING_NUMBER );
557557
558558 // int and float settings
559559
560- xAssignSweepCount = setting .get (Integer .class , X_ASSIGN_SWEEP_COUNT );
561- crossingSweepCount = setting .get (Integer .class , CROSSING_SWEEP_COUNT );
562- minEdgeAngle = setting .get (Integer .class , MIN_EDGE_ANGLE );
563- crossFactor = setting .get (Float .class , CROSS_FACTOR );
560+ xAssignSweepCount = settings .get (Integer .class , X_ASSIGN_SWEEP_COUNT );
561+ crossingSweepCount = settings .get (Integer .class , CROSSING_SWEEP_COUNT );
562+ minEdgeAngle = settings .get (Integer .class , MIN_EDGE_ANGLE );
563+ crossFactor = settings .get (Float .class , CROSS_FACTOR );
564564 }
565565
566566 public int getMaxLayerLength () {
@@ -579,7 +579,7 @@ private void cleanup() {
579579 nodes .clear ();
580580 longEdges .clear ();
581581
582- initSettings (settings );
582+ initSettings ();
583583 }
584584
585585 @ Override
0 commit comments