mti
/
JavaFX
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
controller/RootLayout.java
View File

@ -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("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()); System.out.println("La description du premier article est: "+NewsListModel.getInstance().getNews().get(0).getDescription());
// For each news // For each news
for( NewsModel news : NewsListModel.getInstance().getNews() ){ for( NewsModel news : NewsListModel.getInstance().getNews() ){
try{ try{
this.articles.addItem( news ); this.articles.addItem( news );
}catch(Exception e1){
System.out.println("Cannot fetch article data");
e1.printStackTrace();
}catch(Exception e1){
System.out.println("Cannot fetch article data");
e1.printStackTrace();
}
} }
}
break; break;
@ -179,11 +181,11 @@ public class RootLayout extends Application implements EventObserver {
} }
public void handleMainLayoutChange(String layout) { public void handleMainLayoutChange(String layout) {
/*
NewsListModel.getInstance().addObserver("MainClass", this); NewsListModel.getInstance().addObserver("MainClass", this);
NewsListModel.getInstance().setCategory(Category.gaming); NewsListModel.getInstance().setCategory(Category.gaming);
NewsListModel.getInstance().setSortType(SortTypes.relevancy); NewsListModel.getInstance().setSortType(SortTypes.relevancy);
NewsListModel.getInstance().query("the evil within");*/ NewsListModel.getInstance().query("the evil within");
DictionaryModel.getInstance().addObserver("MainClass", this); DictionaryModel.getInstance().addObserver("MainClass", this);
DictionaryModel.getInstance().query("maison"); DictionaryModel.getInstance().query("maison");