From ce4ed615b6a6d56e7de90d40f617f4a4d1b5940d Mon Sep 17 00:00:00 2001 From: Maywand Amin Date: Fri, 27 Mar 2015 19:20:44 +0000 Subject: [PATCH] Worked on issue #18 Waiting to test it to confirm completion. --- src/ItemDetailViewController.form | 43 +++++++++++++++++++++---------- src/ItemDetailViewController.java | 7 +++-- 2 files changed, 35 insertions(+), 15 deletions(-) diff --git a/src/ItemDetailViewController.form b/src/ItemDetailViewController.form index 8f0fbf9..d5f8740 100644 --- a/src/ItemDetailViewController.form +++ b/src/ItemDetailViewController.form @@ -1,6 +1,6 @@
- + @@ -16,7 +16,7 @@ - + @@ -25,26 +25,36 @@ - + - + - + - + + + + + + + + + + + - + @@ -89,14 +99,21 @@ - + - + - - - - + + + + + + + + + + + diff --git a/src/ItemDetailViewController.java b/src/ItemDetailViewController.java index d6a68ba..cbda5d0 100644 --- a/src/ItemDetailViewController.java +++ b/src/ItemDetailViewController.java @@ -9,7 +9,7 @@ public class ItemDetailViewController extends ViewController { private JLabel itemName; private JLabel price; - private JLabel itemDescription; + private JTextArea itemDescription ; private JComboBox quantityCmb; private JPanel panel; private JLabel priceTotalLabel; @@ -18,6 +18,7 @@ public class ItemDetailViewController extends ViewController { private JLabel logoLabel; final private Item item; + public ItemDetailViewController(Item item) { this.item = item; populateField(); @@ -44,8 +45,10 @@ public void itemStateChanged(ItemEvent e) { public void populateField() { itemName.setText(item.getName()); - itemDescription.setText(item.getDescription()); price.setText("£ " + item.getPrice()); + itemDescription.setText(item.getDescription()); + itemDescription.setEditable(false); + itemDescription.setLineWrap(true); }