From 50f1246a9905fea096c0fbc60e46993e5ed2dae4 Mon Sep 17 00:00:00 2001 From: xdrm-brackets Date: Tue, 28 Nov 2017 08:26:58 +0100 Subject: [PATCH] ? --- controller/Article.java | 125 +++++++++++++++++++------------------ controller/RootLayout.java | 2 + model/NewsListModel.java | 4 +- 3 files changed, 69 insertions(+), 62 deletions(-) diff --git a/controller/Article.java b/controller/Article.java index 51d467a..b5e0bac 100644 --- a/controller/Article.java +++ b/controller/Article.java @@ -17,102 +17,110 @@ import javafx.scene.text.Text; import model.NewsModel; public class Article{ - + /* Data */ private ArrayList items; private FlowPane parent; private EventObserver observer; - - + + /* Constructor */ public Article(FlowPane p_parent, EventObserver observer){ - this.parent = p_parent; - this.items = new ArrayList(); + + /* (1) Attributes + ---------------------------------------------------------*/ + this.parent = p_parent; + this.items = new ArrayList(); this.observer = observer; } - public void addItem(NewsModel model) throws IOException { - - /* (1) Load the article_disp.fxml */ - FXMLLoader loader = new FXMLLoader(); - loader.setLocation(getClass().getResource("/fxml/article_disp.fxml")); - - /* (2) Get the loaded item*/ + public synchronized void addItem(NewsModel model) throws IOException { + + /* (1) Get the loaded item*/ + FXMLLoader loader = new FXMLLoader( getClass().getResource("/fxml/article_disp.fxml") ); AnchorPane item = (AnchorPane) loader.load(); - - /* (3) Set content */ + + /* (2) Set content */ this.gsetContent( model.getDescription(), item ); - - /* (4) Set date */ + + /* (3) Set date */ this.gsetDate( model.getDate(), item ); - - /* (5) Set title */ + + /* (4) Set title */ HBox headerContainer = (HBox) item.getChildren().get(3); this.gsetTitle( model.getTitle(), headerContainer ); - - /* (6) Set tags */ + + /* (5) Set tags */ this.gsetTags( model.getTags(), headerContainer ); - - /* (7) Set image */ + + /* (6) Set image */ this.gsetImage( model.getImageURL(), item ); - - /* (8) Bind event */ + + /* (7) Bind event */ // item.setOnMousePressed(new EventHandler() { // @Override // public void handle(MouseEvent event) { // Article.this.observer.handleEvent(new Classes.Event(item.getId(),"changeMainLayout")); // } // }); - - /* (9) Add to the controller local */ + + /* (8) Add to the controller local */ this.items.add(item); - - /* (10) On bind au width du parent */ + + /* (9) On bind au width du parent */ item.prefWidthProperty().bind(this.parent.widthProperty()); item.maxWidthProperty().bind(this.parent.widthProperty()); - - /* (11) Add to parent (graphics) */ + + } + + public void display(){ + Platform.runLater(new Runnable(){ public void run(){ - Article.this.parent.getChildren().add(item); + + for( AnchorPane item : items ) + Article.this.parent.getChildren().add(item); + } }); + + } - - - + + + public void gsetContent(String p_content, AnchorPane p_parent){ /* (1) Get node */ Text g_content = (Text) p_parent.getChildren().get(1); - + /* (2) Update content */ - g_content.setText(p_content); + g_content.setText(p_content); } - - + + public void gsetDate(Date p_date, AnchorPane p_parent){ /* (1) Get node */ Text g_date = (Text) p_parent.getChildren().get(2); - + /* (2) Update content */ g_date.setText(p_date.toString()); - + } - + public void gsetTitle(String p_title, HBox p_parent){ /* (1) Get node */ Text g_title = (Text) p_parent.getChildren().get(0); - + /* (2) Update title */ g_title.setText(p_title); } - + public void gsetImage(String p_uri, AnchorPane p_parent){ /* (1) Get node */ ImageView g_image = (ImageView) p_parent.getChildren().get(0); - + /* (2) Update title */ try{ g_image.setImage(new Image(p_uri)); @@ -120,31 +128,28 @@ public class Article{ System.out.println("Cannot find image URL: '"+p_uri+"'"); } } - - + + public void gsetTags(ArrayList p_tags, HBox p_parent) throws IOException{ - + /* (1) For each tag -> load a new one */ for( Category tag : p_tags ){ - /* (1.1) Create the container */ - FXMLLoader loader = new FXMLLoader(); - loader.setLocation(getClass().getResource("/fxml/article_tag_disp.fxml")); - - /* (1.2) Load the tag elements */ + /* (1.1) Load the tag elements */ + FXMLLoader loader = new FXMLLoader( getClass().getResource("/fxml/article_tag_disp.fxml") ); FlowPane g_tag = (FlowPane) loader.load(); Text g_tagText = (Text) g_tag.getChildren().get(0); - - /* (1.3) Update the tag name */ + + /* (1.2) Update the tag name */ g_tagText.setText(tag.getLabel()); - - /* (1.4) Set the custom color */ + + /* (1.3) Set the custom color */ g_tag.setStyle("-fx-background-color: "+tag.getColor()); - - /* (1.5) Ajout au parent*/ + + /* (1.4) Ajout au parent*/ p_parent.getChildren().add(g_tag); - + } } - + } diff --git a/controller/RootLayout.java b/controller/RootLayout.java index 7856659..fd062dc 100644 --- a/controller/RootLayout.java +++ b/controller/RootLayout.java @@ -175,9 +175,11 @@ public class RootLayout extends Application implements EventObserver { this.articles.addItem( news ); }catch(Exception e1){ System.out.println("Cannot fetch article data"); + e1.printStackTrace(); } } + this.articles.display(); break; /* (3) articles.query.error -> display error ('no result') */ diff --git a/model/NewsListModel.java b/model/NewsListModel.java index 0a8667b..03dae12 100644 --- a/model/NewsListModel.java +++ b/model/NewsListModel.java @@ -76,8 +76,8 @@ public class NewsListModel implements Observable{ //on rajoute la clé d'api URL += "&apiKey="+this.APIKey; - //création de l'appel - ApiCall api = new ApiCall(URL,"GET",new Callback() { + // Création de l'appel + ApiCall api = new ApiCall(URL, "GET", new Callback(){ @Override public void onSuccess(JSONObject response) {