77import com .dooapp .fxform .handler .NamedFieldHandler ;
88import com .dooapp .fxform .view .factory .DefaultFactoryProvider ;
99import com .kodedu .component .SliderBuilt ;
10- import com .kodedu .config .factory .*;
10+ import com .kodedu .config .factory .FileChooserEditableFactory ;
11+ import com .kodedu .config .factory .ListChoiceBoxFactory ;
12+ import com .kodedu .config .factory .SliderFactory ;
13+ import com .kodedu .config .factory .SpinnerFactory ;
1114import com .kodedu .controller .ApplicationController ;
1215import com .kodedu .helper .IOHelper ;
1316import com .kodedu .service .ThreadService ;
@@ -514,10 +517,9 @@ public void load(Path configPath, ActionEvent... actionEvent) {
514517 setDetachedStagePositions (jsonObject );
515518
516519 String defaultFont = fontFamilies .stream ()
517- .filter (f -> Objects .equals (f , "Arial " ))
520+ .filter (f -> Objects .equals (f , "Verdana " ))
518521 .findFirst ()
519- .or (() -> fontFamilies .stream ().filter (f -> Objects .equals (f , "Verdana" )).findFirst ())
520- .or (() -> fontFamilies .stream ().filter (f -> Objects .equals (f , "Calibri" )).findFirst ())
522+ .or (() -> fontFamilies .stream ().filter (f -> Objects .equals (f , "Arial" )).findFirst ())
521523 .orElse (Font .getDefault ().getFamily ());
522524
523525 String aceDefaultFont = aceFontFamilies .stream ()
@@ -526,7 +528,7 @@ public void load(Path configPath, ActionEvent... actionEvent) {
526528 .or (() -> aceFontFamilies .stream ().filter (f -> f .contains ("Consolas" )).findFirst ())
527529 .orElse ("Monospaced" );
528530
529- String fontFamily = jsonObject .getString ("fontFamily " , defaultFont );
531+ String fontFamily = jsonObject .getString ("generalFontFamily " , defaultFont );
530532 String aceFontFamily = jsonObject .getString ("aceFontFamily" , aceDefaultFont );
531533 int aceFontSize = jsonObject .getInt ("aceFontSize" , 14 );
532534 String aceTheme = jsonObject .getString ("aceTheme" , "xcode" );
@@ -717,7 +719,7 @@ public JsonObject getJSON() {
717719 JsonObjectBuilder objectBuilder = Json .createObjectBuilder ();
718720
719721 objectBuilder
720- .add ("fontFamily " , getFontFamily ().get (0 ))
722+ .add ("generalFontFamily " , getFontFamily ().get (0 ))
721723 .add ("aceFontFamily" , getAceFontFamily ().get (0 ))
722724 .add ("aceFontSize" , getAceFontSize ())
723725 .add ("scrollSpeed" , getScrollSpeed ())
0 commit comments