fix merge
This commit is contained in:
parent
1f9d9086a6
commit
5479c909c9
|
@ -150,19 +150,21 @@ public class RootLayout extends Application implements EventObserver {
|
|||
System.out.println("Le titre du premier article est: "+NewsListModel.getInstance().getNews().get(0).getTitle());
|
||||
System.out.println("La description du premier article est: "+NewsListModel.getInstance().getNews().get(0).getDescription());
|
||||
|
||||
// For each news
|
||||
for( NewsModel news : NewsListModel.getInstance().getNews() ){
|
||||
|
||||
try{
|
||||
|
||||
this.articles.addItem( news );
|
||||
|
||||
}catch(Exception e1){
|
||||
|
||||
System.out.println("Cannot fetch article data");
|
||||
e1.printStackTrace();
|
||||
// For each news
|
||||
for( NewsModel news : NewsListModel.getInstance().getNews() ){
|
||||
|
||||
try{
|
||||
|
||||
this.articles.addItem( news );
|
||||
|
||||
}catch(Exception e1){
|
||||
|
||||
System.out.println("Cannot fetch article data");
|
||||
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");
|
||||
|
||||
|
|
Loading…
Reference in New Issue