fix merge

This commit is contained in:
SeekDaSky 2017-11-21 08:38:24 +01:00
parent 1f9d9086a6
commit 5479c909c9
1 changed files with 15 additions and 13 deletions

View File

@ -163,6 +163,8 @@ public class RootLayout extends Application implements EventObserver {
e1.printStackTrace();
}
}
}
break;
@ -179,11 +181,11 @@ public class RootLayout extends Application implements EventObserver {
}
public void handleMainLayoutChange(String layout) {
/*
NewsListModel.getInstance().addObserver("MainClass", this);
NewsListModel.getInstance().setCategory(Category.gaming);
NewsListModel.getInstance().setSortType(SortTypes.relevancy);
NewsListModel.getInstance().query("the evil within");*/
NewsListModel.getInstance().query("the evil within");
DictionaryModel.getInstance().addObserver("MainClass", this);
DictionaryModel.getInstance().query("maison");