From 39462e1b269afd937b68f856831f3ab0527deb9e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Cort=C3=A9s?= Date: Tue, 7 May 2019 22:40:46 -0400 Subject: [PATCH] Se generalizo la creacion de controllers/vistas eso <3 --- .../controllers/BaseController.java | 3 + .../controllers/LaunchController.java | 207 +++++------------- .../autor/AutorCreateController.java | 3 +- .../autor/AutorDeleteController.java | 3 +- .../autor/AutorListController.java | 3 +- .../autor/AutorUpdateController.java | 6 +- .../autor/AutorViewController.java | 4 + .../categoria/CategoriaCreateController.java | 5 +- .../categoria/CategoriaDeleteController.java | 3 +- .../categoria/CategoriaListController.java | 3 +- .../categoria/CategoriaUpdateController.java | 3 +- .../editorial/EditorialCreateController.java | 3 +- .../editorial/EditorialDeleteController.java | 3 +- .../editorial/EditorialListController.java | 3 +- .../editorial/EditorialUpdateController.java | 3 +- .../idioma/IdiomaCreateController.java | 3 +- .../idioma/IdiomaDeleteController.java | 3 +- .../idioma/IdiomaListController.java | 5 +- .../idioma/IdiomaUpdateController.java | 3 +- .../libro/LibroCreateController.java | 3 +- .../libro/LibroDeleteController.java | 3 +- .../libro/LibroListController.java | 3 +- .../libro/LibroUpdateController.java | 3 +- .../xyz/danielcortes/views/BasePanel.java | 5 +- .../views/autor/AutorViewPanel.form | 2 +- .../views/autor/AutorViewPanel.java | 80 +++---- 26 files changed, 149 insertions(+), 219 deletions(-) diff --git a/src/main/java/xyz/danielcortes/controllers/BaseController.java b/src/main/java/xyz/danielcortes/controllers/BaseController.java index 7896a2e..78e5085 100644 --- a/src/main/java/xyz/danielcortes/controllers/BaseController.java +++ b/src/main/java/xyz/danielcortes/controllers/BaseController.java @@ -1,9 +1,12 @@ package xyz.danielcortes.controllers; +import xyz.danielcortes.views.BasePanel; + public interface BaseController { /** * Este metodo sera llamado cada vez que se necesite mostrar la vista que contiene */ void show(); + BasePanel getView(); } diff --git a/src/main/java/xyz/danielcortes/controllers/LaunchController.java b/src/main/java/xyz/danielcortes/controllers/LaunchController.java index f0a10b1..9d952d9 100644 --- a/src/main/java/xyz/danielcortes/controllers/LaunchController.java +++ b/src/main/java/xyz/danielcortes/controllers/LaunchController.java @@ -1,6 +1,8 @@ package xyz.danielcortes.controllers; import java.awt.event.KeyEvent; +import java.util.HashMap; +import java.util.Map; import javax.swing.JMenu; import javax.swing.JMenuBar; import javax.swing.JMenuItem; @@ -51,31 +53,11 @@ import xyz.danielcortes.views.libro.LibroUpdatePanel; public class LaunchController { private LaunchFrame frame; + private Map controllers; - private LibroListController libroListController; - private LibroCreateController libroCreateController; - private LibroUpdateController libroUpdateController; - private LibroDeleteController libroDeleteController; - - private AutorListController autorListController; - private AutorCreateController autorCreateController; - private AutorUpdateController autorUpdateController; - private AutorDeleteController autorDeleteController; - - private IdiomaListController idiomaListController; - private IdiomaCreateController idiomaCreateController; - private IdiomaUpdateController idiomaUpdateController; - private IdiomaDeleteController idiomaDeleteController; - - private CategoriaListController categoriaListController; - private CategoriaCreateController categoriaCreateController; - private CategoriaUpdateController categoriaUpdateController; - private CategoriaDeleteController categoriaDeleteController; - - private EditorialListController editorialListController; - private EditorialCreateController editorialCreateController; - private EditorialUpdateController editorialUpdateController; - private EditorialDeleteController editorialDeleteController; + public LaunchController() { + this.controllers = new HashMap<>(); + } private void create() { frame = new LaunchFrame(); @@ -86,113 +68,37 @@ public class LaunchController { private void createCards() { this.frame.addCard(new JPanel(), PanelName.EMPTY); - this.libroListController = new LibroListController(new LibroListPanel(this.frame)); - this.libroCreateController = new LibroCreateController(new LibroCreatePanel(this.frame)); - this.libroUpdateController = new LibroUpdateController(new LibroUpdatePanel(this.frame)); - this.libroDeleteController = new LibroDeleteController(new LibroDeletePanel(this.frame)); + this.controllers.put(PanelName.LIBRO_LIST, new LibroListController(new LibroListPanel(this.frame))); + this.controllers.put(PanelName.LIBRO_CREATE, new LibroCreateController(new LibroCreatePanel(this.frame))); + this.controllers.put(PanelName.LIBRO_UPDATE, new LibroUpdateController(new LibroUpdatePanel(this.frame))); + this.controllers.put(PanelName.LIBRO_DELETE, new LibroDeleteController(new LibroDeletePanel(this.frame))); - this.frame.addCard( - this.libroListController.getView().getContentPane(), - PanelName.LIBRO_LIST - ); - this.frame.addCard( - this.libroCreateController.getView().getContentPane(), - PanelName.LIBRO_CREATE - ); - this.frame.addCard( - this.libroUpdateController.getView().getContentPane(), - PanelName.LIBRO_UPDATE - ); - this.frame.addCard( - this.libroDeleteController.getView().getContentPane(), - PanelName.LIBRO_DELETE - ); + this.controllers.put(PanelName.AUTOR_LIST, new AutorListController(new AutorListPanel(this.frame))); + this.controllers.put(PanelName.AUTOR_CREATE, new AutorCreateController(new AutorCreatePanel(this.frame))); + this.controllers.put(PanelName.AUTOR_UPDATE, new AutorUpdateController(new AutorUpdatePanel(this.frame))); + this.controllers.put(PanelName.AUTOR_DELETE, new AutorDeleteController(new AutorDeletePanel(this.frame))); - this.autorListController = new AutorListController(new AutorListPanel(this.frame)); - this.autorCreateController = new AutorCreateController(new AutorCreatePanel(this.frame)); - this.autorUpdateController = new AutorUpdateController(new AutorUpdatePanel(this.frame)); - this.autorDeleteController = new AutorDeleteController(new AutorDeletePanel(this.frame)); - this.frame.addCard( - this.autorListController.getView().getContentPane(), - PanelName.AUTOR_LIST - ); - this.frame.addCard( - this.autorCreateController.getView().getContentPane(), - PanelName.AUTOR_CREATE - ); - this.frame.addCard( - this.autorUpdateController.getView().getContentPane(), - PanelName.AUTOR_UPDATE - ); - this.frame.addCard( - this.autorDeleteController.getView().getContentPane(), - PanelName.AUTOR_DELETE - ); + this.controllers.put(PanelName.IDIOMA_LIST, new IdiomaListController(new IdiomaListPanel(this.frame))); + this.controllers.put(PanelName.IDIOMA_CREATE, new IdiomaCreateController(new IdiomaCreatePanel(this.frame))); + this.controllers.put(PanelName.IDIOMA_UPDATE, new IdiomaUpdateController(new IdiomaUpdatePanel(this.frame))); + this.controllers.put(PanelName.IDIOMA_DELETE, new IdiomaDeleteController(new IdiomaDeletePanel(this.frame))); - this.idiomaListController = new IdiomaListController(new IdiomaListPanel(this.frame)); - this.idiomaCreateController = new IdiomaCreateController(new IdiomaCreatePanel(this.frame)); - this.idiomaUpdateController = new IdiomaUpdateController(new IdiomaUpdatePanel(this.frame)); - this.idiomaDeleteController = new IdiomaDeleteController(new IdiomaDeletePanel(this.frame)); - this.frame.addCard( - this.idiomaListController.getView().getContentPane(), - PanelName.IDIOMA_LIST - ); - this.frame.addCard( - this.idiomaCreateController.getView().getContentPane(), - PanelName.IDIOMA_CREATE - ); - this.frame.addCard( - this.idiomaUpdateController.getView().getContentPane(), - PanelName.IDIOMA_UPDATE - ); - this.frame.addCard( - this.idiomaDeleteController.getView().getContentPane(), - PanelName.IDIOMA_DELETE - ); + this.controllers.put(PanelName.CATEGORIA_LIST, new CategoriaListController(new CategoriaListPanel(this.frame))); + this.controllers.put(PanelName.CATEGORIA_CREATE, new CategoriaCreateController(new CategoriaCreatePanel(this.frame))); + this.controllers.put(PanelName.CATEGORIA_DELETE, new CategoriaDeleteController(new CategoriaDeletePanel(this.frame))); + this.controllers.put(PanelName.CATEGORIA_UPDATE, new CategoriaUpdateController(new CategoriaUpdatePanel(this.frame))); - this.categoriaListController = new CategoriaListController(new CategoriaListPanel(this.frame)); - this.categoriaCreateController = new CategoriaCreateController(new CategoriaCreatePanel(this.frame)); - this.categoriaDeleteController = new CategoriaDeleteController(new CategoriaDeletePanel(this.frame)); - this.categoriaUpdateController = new CategoriaUpdateController(new CategoriaUpdatePanel(this.frame)); + this.controllers.put(PanelName.EDITORIAL_LIST, new EditorialListController(new EditorialListPanel(this.frame))); + this.controllers.put(PanelName.EDITORIAL_CREATE, new EditorialCreateController(new EditorialCreatePanel(this.frame))); + this.controllers.put(PanelName.EDITORIAL_UPDATE, new EditorialUpdateController(new EditorialUpdatePanel(this.frame))); + this.controllers.put(PanelName.EDITORIAL_DELETE, new EditorialDeleteController(new EditorialDeletePanel(this.frame))); - this.frame.addCard( - this.categoriaListController.getView().getContentPane(), - PanelName.CATEGORIA_LIST - ); - this.frame.addCard( - this.categoriaUpdateController.getView().getContentPane(), - PanelName.CATEGORIA_UPDATE - ); - this.frame.addCard( - this.categoriaCreateController.getView().getContentPane(), - PanelName.CATEGORIA_CREATE - ); - this.frame.addCard( - this.categoriaDeleteController.getView().getContentPane(), - PanelName.CATEGORIA_DELETE - ); + for (PanelName name : this.controllers.keySet()) { + BaseController controller = this.controllers.get(name); + controller.show(); + this.frame.addCard(controller.getView().getContentPane(), name); + } - this.editorialListController = new EditorialListController(new EditorialListPanel(this.frame)); - this.editorialCreateController= new EditorialCreateController(new EditorialCreatePanel(this.frame)); - this.editorialUpdateController= new EditorialUpdateController(new EditorialUpdatePanel(this.frame)); - this.editorialDeleteController= new EditorialDeleteController(new EditorialDeletePanel(this.frame)); - - this.frame.addCard( - this.editorialListController.getView().getContentPane(), - PanelName.EDITORIAL_LIST - ); - this.frame.addCard( - this.editorialCreateController.getView().getContentPane(), - PanelName.EDITORIAL_CREATE - ); - this.frame.addCard( - this.editorialUpdateController.getView().getContentPane(), - PanelName.EDITORIAL_UPDATE - ); - this.frame.addCard( - this.editorialDeleteController.getView().getContentPane(), - PanelName.EDITORIAL_DELETE - ); } private void createMenuBar() { @@ -234,98 +140,88 @@ public class LaunchController { // @formatter:on autorList.addActionListener(e -> { - this.autorListController.reload(); + this.controllers.get(PanelName.AUTOR_LIST).show(); this.frame.showCard(PanelName.AUTOR_LIST); }); autorCreate.addActionListener(e -> { this.frame.showCard(PanelName.AUTOR_CREATE); - this.autorCreateController.getView().getNombreField().requestFocus(); + this.controllers.get(PanelName.AUTOR_CREATE).show(); }); autorUpdate.addActionListener(e -> { - this.autorUpdateController.reload(); + this.controllers.get(PanelName.AUTOR_UPDATE).show(); this.frame.showCard(PanelName.AUTOR_UPDATE); - this.autorUpdateController.getView().getAutorCombo().requestFocus(); }); autorDelete.addActionListener(e -> { - this.autorDeleteController.reload(); + this.controllers.get(PanelName.AUTOR_DELETE).show(); this.frame.showCard(PanelName.AUTOR_DELETE); - this.autorDeleteController.getView().getAutorCombo().requestFocus(); }); idiomaList.addActionListener(e -> { - this.idiomaListController.reload(); + this.controllers.get(PanelName.IDIOMA_LIST).show(); this.frame.showCard(PanelName.IDIOMA_LIST); }); idiomaCreate.addActionListener(e -> { + this.controllers.get(PanelName.IDIOMA_CREATE).show(); this.frame.showCard(PanelName.IDIOMA_CREATE); - this.idiomaCreateController.getView().getNombreField().requestFocus(); }); idiomaUpdate.addActionListener(e -> { - this.idiomaUpdateController.reload(); + this.controllers.get(PanelName.IDIOMA_UPDATE).show(); this.frame.showCard(PanelName.IDIOMA_UPDATE); - this.idiomaUpdateController.getView().getIdiomaCombo().requestFocus(); }); idiomaDelete.addActionListener(e -> { - this.idiomaDeleteController.reload(); + this.controllers.get(PanelName.IDIOMA_DELETE).show(); this.frame.showCard(PanelName.IDIOMA_DELETE); - this.idiomaDeleteController.getView().getIdiomaCombo().requestFocus(); }); libroList.addActionListener(e -> { - this.libroListController.reload(); + this.controllers.get(PanelName.LIBRO_LIST).show(); this.frame.showCard(PanelName.LIBRO_LIST); }); libroCreate.addActionListener(e -> { - this.libroCreateController.reload(); + this.controllers.get(PanelName.LIBRO_CREATE).show(); this.frame.showCard(PanelName.LIBRO_CREATE); - this.libroCreateController.getView().getSerieField().requestFocus(); }); libroUpdate.addActionListener(e -> { - this.libroUpdateController.reload(); + this.controllers.get(PanelName.LIBRO_UPDATE).show(); this.frame.showCard(PanelName.LIBRO_UPDATE); - this.libroUpdateController.getView().getSerieField().requestFocus(); }); libroDelete.addActionListener(e -> { - this.libroDeleteController.reload(); + this.controllers.get(PanelName.LIBRO_DELETE).show(); this.frame.showCard(PanelName.LIBRO_DELETE); }); categoriaList.addActionListener(e -> { - this.categoriaListController.reload(); + this.controllers.get(PanelName.CATEGORIA_LIST).show(); this.frame.showCard(PanelName.CATEGORIA_LIST); }); categoriaCreate.addActionListener(e -> { + this.controllers.get(PanelName.CATEGORIA_CREATE).show(); this.frame.showCard(PanelName.CATEGORIA_CREATE); - this.categoriaCreateController.getView().getNombreField().requestFocus(); }); categoriaUpdate.addActionListener(e -> { - this.categoriaUpdateController.reload(); + this.controllers.get(PanelName.CATEGORIA_UPDATE).show(); this.frame.showCard(PanelName.CATEGORIA_UPDATE); - this.categoriaUpdateController.getView().getCategoriaCombo().requestFocus(); }); categoriaDelete.addActionListener(e -> { - this.categoriaDeleteController.reload(); + this.controllers.get(PanelName.CATEGORIA_DELETE).show(); this.frame.showCard(PanelName.CATEGORIA_DELETE); - this.categoriaDeleteController.getView().getCategoriaCombo().requestFocus(); }); editorialList.addActionListener(e -> { - this.editorialListController.reload(); + this.controllers.get(PanelName.EDITORIAL_LIST).show(); this.frame.showCard(PanelName.EDITORIAL_LIST); }); editorialCreate.addActionListener(e -> { + this.controllers.get(PanelName.EDITORIAL_CREATE).show(); this.frame.showCard(PanelName.EDITORIAL_CREATE); - this.editorialCreateController.getView().getNombreField().requestFocus(); }); editorialUpdate.addActionListener(e -> { - this.editorialUpdateController.reload(); + this.controllers.get(PanelName.EDITORIAL_UPDATE).show(); this.frame.showCard(PanelName.EDITORIAL_UPDATE); - this.editorialUpdateController.getView().getEditorialCombo().requestFocus(); }); editorialDelete.addActionListener(e -> { - this.editorialDeleteController.reload(); + this.controllers.get(PanelName.EDITORIAL_DELETE).show(); this.frame.showCard(PanelName.EDITORIAL_DELETE); - this.editorialDeleteController.getView().getEditorialCombo().requestFocus(); }); menuBar.add(librosMenu); @@ -361,6 +257,7 @@ public class LaunchController { this.frame.setJMenuBar(menuBar); } + public void run() { this.create(); this.frame.setVisible(true); diff --git a/src/main/java/xyz/danielcortes/controllers/autor/AutorCreateController.java b/src/main/java/xyz/danielcortes/controllers/autor/AutorCreateController.java index 9ac7555..2b639f3 100644 --- a/src/main/java/xyz/danielcortes/controllers/autor/AutorCreateController.java +++ b/src/main/java/xyz/danielcortes/controllers/autor/AutorCreateController.java @@ -4,6 +4,7 @@ import javax.swing.JOptionPane; import xyz.danielcortes.controllers.BaseController; import xyz.danielcortes.models.Autor; import xyz.danielcortes.repository.AutorRepository; +import xyz.danielcortes.views.BasePanel; import xyz.danielcortes.views.autor.AutorCreatePanel; public class AutorCreateController implements BaseController { @@ -105,7 +106,7 @@ public class AutorCreateController implements BaseController { return true; } - public AutorCreatePanel getView() { + public BasePanel getView() { return this.view; } } diff --git a/src/main/java/xyz/danielcortes/controllers/autor/AutorDeleteController.java b/src/main/java/xyz/danielcortes/controllers/autor/AutorDeleteController.java index c047387..87c4c2d 100644 --- a/src/main/java/xyz/danielcortes/controllers/autor/AutorDeleteController.java +++ b/src/main/java/xyz/danielcortes/controllers/autor/AutorDeleteController.java @@ -6,6 +6,7 @@ import javax.swing.JOptionPane; import xyz.danielcortes.controllers.BaseController; import xyz.danielcortes.models.Autor; import xyz.danielcortes.repository.AutorRepository; +import xyz.danielcortes.views.BasePanel; import xyz.danielcortes.views.autor.AutorDeletePanel; public class AutorDeleteController implements BaseController { @@ -62,7 +63,7 @@ public class AutorDeleteController implements BaseController { } } - public AutorDeletePanel getView() { + public BasePanel getView() { return view; } diff --git a/src/main/java/xyz/danielcortes/controllers/autor/AutorListController.java b/src/main/java/xyz/danielcortes/controllers/autor/AutorListController.java index dec3432..63428d2 100644 --- a/src/main/java/xyz/danielcortes/controllers/autor/AutorListController.java +++ b/src/main/java/xyz/danielcortes/controllers/autor/AutorListController.java @@ -5,6 +5,7 @@ import xyz.danielcortes.controllers.BaseController; import xyz.danielcortes.framework.BaseTableModel; import xyz.danielcortes.models.Autor; import xyz.danielcortes.repository.AutorRepository; +import xyz.danielcortes.views.BasePanel; import xyz.danielcortes.views.autor.AutorListPanel; public class AutorListController implements BaseController { @@ -46,7 +47,7 @@ public class AutorListController implements BaseController { } - public AutorListPanel getView() { + public BasePanel getView() { return view; } } diff --git a/src/main/java/xyz/danielcortes/controllers/autor/AutorUpdateController.java b/src/main/java/xyz/danielcortes/controllers/autor/AutorUpdateController.java index 3c33065..d6a89e3 100644 --- a/src/main/java/xyz/danielcortes/controllers/autor/AutorUpdateController.java +++ b/src/main/java/xyz/danielcortes/controllers/autor/AutorUpdateController.java @@ -1,12 +1,12 @@ package xyz.danielcortes.controllers.autor; import java.util.List; -import java.util.Objects; import javax.swing.JComboBox; import javax.swing.JOptionPane; import xyz.danielcortes.controllers.BaseController; import xyz.danielcortes.models.Autor; import xyz.danielcortes.repository.AutorRepository; +import xyz.danielcortes.views.BasePanel; import xyz.danielcortes.views.autor.AutorUpdatePanel; public class AutorUpdateController implements BaseController { @@ -24,7 +24,7 @@ public class AutorUpdateController implements BaseController { @Override public void show() { this.reload(); - this.getView().getAutorCombo().requestFocus(); + this.view.getAutorCombo().requestFocus(); } private void setupListeners() { @@ -144,7 +144,7 @@ public class AutorUpdateController implements BaseController { } } - public AutorUpdatePanel getView() { + public BasePanel getView() { return view; } } diff --git a/src/main/java/xyz/danielcortes/controllers/autor/AutorViewController.java b/src/main/java/xyz/danielcortes/controllers/autor/AutorViewController.java index a3fea83..af5d0f8 100644 --- a/src/main/java/xyz/danielcortes/controllers/autor/AutorViewController.java +++ b/src/main/java/xyz/danielcortes/controllers/autor/AutorViewController.java @@ -2,6 +2,7 @@ package xyz.danielcortes.controllers.autor; import xyz.danielcortes.controllers.BaseController; import xyz.danielcortes.models.Autor; +import xyz.danielcortes.views.BasePanel; import xyz.danielcortes.views.autor.AutorViewPanel; public class AutorViewController implements BaseController { @@ -31,4 +32,7 @@ public class AutorViewController implements BaseController { this.view.getApellidoMaternoField().setText(this.autor.getApellidoMaterno()); } + public BasePanel getView() { + return view; + } } diff --git a/src/main/java/xyz/danielcortes/controllers/categoria/CategoriaCreateController.java b/src/main/java/xyz/danielcortes/controllers/categoria/CategoriaCreateController.java index 4d939eb..1185158 100644 --- a/src/main/java/xyz/danielcortes/controllers/categoria/CategoriaCreateController.java +++ b/src/main/java/xyz/danielcortes/controllers/categoria/CategoriaCreateController.java @@ -4,6 +4,7 @@ import javax.swing.JOptionPane; import xyz.danielcortes.controllers.BaseController; import xyz.danielcortes.models.Categoria; import xyz.danielcortes.repository.CategoriaRepository; +import xyz.danielcortes.views.BasePanel; import xyz.danielcortes.views.categoria.CategoriaCreatePanel; public class CategoriaCreateController implements BaseController { @@ -18,7 +19,7 @@ public class CategoriaCreateController implements BaseController { @Override public void show() { - this.getView().getNombreField().requestFocus(); + this.view.getNombreField().requestFocus(); } private void setupListeners() { @@ -58,7 +59,7 @@ public class CategoriaCreateController implements BaseController { return true; } - public CategoriaCreatePanel getView() { + public BasePanel getView() { return view; } diff --git a/src/main/java/xyz/danielcortes/controllers/categoria/CategoriaDeleteController.java b/src/main/java/xyz/danielcortes/controllers/categoria/CategoriaDeleteController.java index 78f3a48..1bc76d2 100644 --- a/src/main/java/xyz/danielcortes/controllers/categoria/CategoriaDeleteController.java +++ b/src/main/java/xyz/danielcortes/controllers/categoria/CategoriaDeleteController.java @@ -6,6 +6,7 @@ import javax.swing.JOptionPane; import xyz.danielcortes.controllers.BaseController; import xyz.danielcortes.models.Categoria; import xyz.danielcortes.repository.CategoriaRepository; +import xyz.danielcortes.views.BasePanel; import xyz.danielcortes.views.categoria.CategoriaDeletePanel; public class CategoriaDeleteController implements BaseController { @@ -62,7 +63,7 @@ public class CategoriaDeleteController implements BaseController { } } - public CategoriaDeletePanel getView() { + public BasePanel getView() { return view; } diff --git a/src/main/java/xyz/danielcortes/controllers/categoria/CategoriaListController.java b/src/main/java/xyz/danielcortes/controllers/categoria/CategoriaListController.java index 20f50eb..1257132 100644 --- a/src/main/java/xyz/danielcortes/controllers/categoria/CategoriaListController.java +++ b/src/main/java/xyz/danielcortes/controllers/categoria/CategoriaListController.java @@ -5,6 +5,7 @@ import xyz.danielcortes.controllers.BaseController; import xyz.danielcortes.framework.BaseTableModel; import xyz.danielcortes.models.Categoria; import xyz.danielcortes.repository.CategoriaRepository; +import xyz.danielcortes.views.BasePanel; import xyz.danielcortes.views.categoria.CategoriaListPanel; public class CategoriaListController implements BaseController { @@ -30,5 +31,5 @@ public class CategoriaListController implements BaseController { model.addRows(categorias); } - public CategoriaListPanel getView() { return view; } + public BasePanel getView() { return view; } } diff --git a/src/main/java/xyz/danielcortes/controllers/categoria/CategoriaUpdateController.java b/src/main/java/xyz/danielcortes/controllers/categoria/CategoriaUpdateController.java index 408163a..26d9066 100644 --- a/src/main/java/xyz/danielcortes/controllers/categoria/CategoriaUpdateController.java +++ b/src/main/java/xyz/danielcortes/controllers/categoria/CategoriaUpdateController.java @@ -6,6 +6,7 @@ import javax.swing.JOptionPane; import xyz.danielcortes.controllers.BaseController; import xyz.danielcortes.models.Categoria; import xyz.danielcortes.repository.CategoriaRepository; +import xyz.danielcortes.views.BasePanel; import xyz.danielcortes.views.categoria.CategoriaUpdatePanel; public class CategoriaUpdateController implements BaseController { @@ -95,7 +96,7 @@ public class CategoriaUpdateController implements BaseController { } } - public CategoriaUpdatePanel getView() { + public BasePanel getView() { return view; } } diff --git a/src/main/java/xyz/danielcortes/controllers/editorial/EditorialCreateController.java b/src/main/java/xyz/danielcortes/controllers/editorial/EditorialCreateController.java index 37acedf..2fc888c 100644 --- a/src/main/java/xyz/danielcortes/controllers/editorial/EditorialCreateController.java +++ b/src/main/java/xyz/danielcortes/controllers/editorial/EditorialCreateController.java @@ -4,6 +4,7 @@ import javax.swing.JOptionPane; import xyz.danielcortes.controllers.BaseController; import xyz.danielcortes.models.Editorial; import xyz.danielcortes.repository.EditorialRepository; +import xyz.danielcortes.views.BasePanel; import xyz.danielcortes.views.editorial.EditorialCreatePanel; public class EditorialCreateController implements BaseController { @@ -60,7 +61,7 @@ public class EditorialCreateController implements BaseController { return true; } - public EditorialCreatePanel getView() { + public BasePanel getView() { return view; } } diff --git a/src/main/java/xyz/danielcortes/controllers/editorial/EditorialDeleteController.java b/src/main/java/xyz/danielcortes/controllers/editorial/EditorialDeleteController.java index 6bd8509..c1f1d08 100644 --- a/src/main/java/xyz/danielcortes/controllers/editorial/EditorialDeleteController.java +++ b/src/main/java/xyz/danielcortes/controllers/editorial/EditorialDeleteController.java @@ -6,6 +6,7 @@ import javax.swing.JOptionPane; import xyz.danielcortes.controllers.BaseController; import xyz.danielcortes.models.Editorial; import xyz.danielcortes.repository.EditorialRepository; +import xyz.danielcortes.views.BasePanel; import xyz.danielcortes.views.editorial.EditorialDeletePanel; public class EditorialDeleteController implements BaseController { @@ -63,7 +64,7 @@ public class EditorialDeleteController implements BaseController { } } - public EditorialDeletePanel getView() { + public BasePanel getView() { return view; } } diff --git a/src/main/java/xyz/danielcortes/controllers/editorial/EditorialListController.java b/src/main/java/xyz/danielcortes/controllers/editorial/EditorialListController.java index aeda553..c787664 100644 --- a/src/main/java/xyz/danielcortes/controllers/editorial/EditorialListController.java +++ b/src/main/java/xyz/danielcortes/controllers/editorial/EditorialListController.java @@ -5,6 +5,7 @@ import xyz.danielcortes.controllers.BaseController; import xyz.danielcortes.framework.BaseTableModel; import xyz.danielcortes.models.Editorial; import xyz.danielcortes.repository.EditorialRepository; +import xyz.danielcortes.views.BasePanel; import xyz.danielcortes.views.editorial.EditorialListPanel; public class EditorialListController implements BaseController { @@ -32,7 +33,7 @@ public class EditorialListController implements BaseController { model.addRows(editoriales); } - public EditorialListPanel getView() { + public BasePanel getView() { return view; } } diff --git a/src/main/java/xyz/danielcortes/controllers/editorial/EditorialUpdateController.java b/src/main/java/xyz/danielcortes/controllers/editorial/EditorialUpdateController.java index c2d603c..d09fcc2 100644 --- a/src/main/java/xyz/danielcortes/controllers/editorial/EditorialUpdateController.java +++ b/src/main/java/xyz/danielcortes/controllers/editorial/EditorialUpdateController.java @@ -6,6 +6,7 @@ import javax.swing.JOptionPane; import xyz.danielcortes.controllers.BaseController; import xyz.danielcortes.models.Editorial; import xyz.danielcortes.repository.EditorialRepository; +import xyz.danielcortes.views.BasePanel; import xyz.danielcortes.views.editorial.EditorialUpdatePanel; public class EditorialUpdateController implements BaseController { @@ -98,7 +99,7 @@ public class EditorialUpdateController implements BaseController { } } - public EditorialUpdatePanel getView() { + public BasePanel getView() { return view; } } diff --git a/src/main/java/xyz/danielcortes/controllers/idioma/IdiomaCreateController.java b/src/main/java/xyz/danielcortes/controllers/idioma/IdiomaCreateController.java index 416cd6c..a5d9ac6 100644 --- a/src/main/java/xyz/danielcortes/controllers/idioma/IdiomaCreateController.java +++ b/src/main/java/xyz/danielcortes/controllers/idioma/IdiomaCreateController.java @@ -4,6 +4,7 @@ import javax.swing.JOptionPane; import xyz.danielcortes.controllers.BaseController; import xyz.danielcortes.models.Idioma; import xyz.danielcortes.repository.IdiomaRepository; +import xyz.danielcortes.views.BasePanel; import xyz.danielcortes.views.idioma.IdiomaCreatePanel; public class IdiomaCreateController implements BaseController { @@ -60,7 +61,7 @@ public class IdiomaCreateController implements BaseController { return true; } - public IdiomaCreatePanel getView() { + public BasePanel getView() { return view; } diff --git a/src/main/java/xyz/danielcortes/controllers/idioma/IdiomaDeleteController.java b/src/main/java/xyz/danielcortes/controllers/idioma/IdiomaDeleteController.java index eefbb3e..f400f71 100644 --- a/src/main/java/xyz/danielcortes/controllers/idioma/IdiomaDeleteController.java +++ b/src/main/java/xyz/danielcortes/controllers/idioma/IdiomaDeleteController.java @@ -6,6 +6,7 @@ import javax.swing.JOptionPane; import xyz.danielcortes.controllers.BaseController; import xyz.danielcortes.models.Idioma; import xyz.danielcortes.repository.IdiomaRepository; +import xyz.danielcortes.views.BasePanel; import xyz.danielcortes.views.idioma.IdiomaDeletePanel; public class IdiomaDeleteController implements BaseController { @@ -63,7 +64,7 @@ public class IdiomaDeleteController implements BaseController { } } - public IdiomaDeletePanel getView() { + public BasePanel getView() { return view; } diff --git a/src/main/java/xyz/danielcortes/controllers/idioma/IdiomaListController.java b/src/main/java/xyz/danielcortes/controllers/idioma/IdiomaListController.java index 543b28a..a774400 100644 --- a/src/main/java/xyz/danielcortes/controllers/idioma/IdiomaListController.java +++ b/src/main/java/xyz/danielcortes/controllers/idioma/IdiomaListController.java @@ -2,9 +2,10 @@ package xyz.danielcortes.controllers.idioma; import java.util.List; import xyz.danielcortes.controllers.BaseController; +import xyz.danielcortes.framework.BaseTableModel; import xyz.danielcortes.models.Idioma; import xyz.danielcortes.repository.IdiomaRepository; -import xyz.danielcortes.framework.BaseTableModel; +import xyz.danielcortes.views.BasePanel; import xyz.danielcortes.views.idioma.IdiomaListPanel; public class IdiomaListController implements BaseController { @@ -33,7 +34,7 @@ public class IdiomaListController implements BaseController { model.addRows(idiomas); } - public IdiomaListPanel getView() { + public BasePanel getView() { return view; } diff --git a/src/main/java/xyz/danielcortes/controllers/idioma/IdiomaUpdateController.java b/src/main/java/xyz/danielcortes/controllers/idioma/IdiomaUpdateController.java index 4760f2b..3f3f578 100644 --- a/src/main/java/xyz/danielcortes/controllers/idioma/IdiomaUpdateController.java +++ b/src/main/java/xyz/danielcortes/controllers/idioma/IdiomaUpdateController.java @@ -6,6 +6,7 @@ import javax.swing.JOptionPane; import xyz.danielcortes.controllers.BaseController; import xyz.danielcortes.models.Idioma; import xyz.danielcortes.repository.IdiomaRepository; +import xyz.danielcortes.views.BasePanel; import xyz.danielcortes.views.idioma.IdiomaUpdatePanel; public class IdiomaUpdateController implements BaseController { @@ -96,7 +97,7 @@ public class IdiomaUpdateController implements BaseController { } } - public IdiomaUpdatePanel getView() { + public BasePanel getView() { return view; } diff --git a/src/main/java/xyz/danielcortes/controllers/libro/LibroCreateController.java b/src/main/java/xyz/danielcortes/controllers/libro/LibroCreateController.java index debf4d4..2528009 100644 --- a/src/main/java/xyz/danielcortes/controllers/libro/LibroCreateController.java +++ b/src/main/java/xyz/danielcortes/controllers/libro/LibroCreateController.java @@ -16,6 +16,7 @@ import xyz.danielcortes.repository.CategoriaRepository; import xyz.danielcortes.repository.EditorialRepository; import xyz.danielcortes.repository.IdiomaRepository; import xyz.danielcortes.repository.LibroRepository; +import xyz.danielcortes.views.BasePanel; import xyz.danielcortes.views.libro.LibroCreatePanel; public class LibroCreateController implements BaseController { @@ -159,7 +160,7 @@ public class LibroCreateController implements BaseController { } } - public LibroCreatePanel getView() { + public BasePanel getView() { return view; } diff --git a/src/main/java/xyz/danielcortes/controllers/libro/LibroDeleteController.java b/src/main/java/xyz/danielcortes/controllers/libro/LibroDeleteController.java index 0b66535..a47c61b 100644 --- a/src/main/java/xyz/danielcortes/controllers/libro/LibroDeleteController.java +++ b/src/main/java/xyz/danielcortes/controllers/libro/LibroDeleteController.java @@ -5,6 +5,7 @@ import javax.swing.JComboBox; import xyz.danielcortes.controllers.BaseController; import xyz.danielcortes.models.Libro; import xyz.danielcortes.repository.LibroRepository; +import xyz.danielcortes.views.BasePanel; import xyz.danielcortes.views.libro.LibroDeletePanel; public class LibroDeleteController implements BaseController { @@ -52,7 +53,7 @@ public class LibroDeleteController implements BaseController { } } - public LibroDeletePanel getView() { + public BasePanel getView() { return view; } } diff --git a/src/main/java/xyz/danielcortes/controllers/libro/LibroListController.java b/src/main/java/xyz/danielcortes/controllers/libro/LibroListController.java index a95d6ac..32bba65 100644 --- a/src/main/java/xyz/danielcortes/controllers/libro/LibroListController.java +++ b/src/main/java/xyz/danielcortes/controllers/libro/LibroListController.java @@ -5,6 +5,7 @@ import xyz.danielcortes.controllers.BaseController; import xyz.danielcortes.framework.BaseTableModel; import xyz.danielcortes.models.Libro; import xyz.danielcortes.repository.LibroRepository; +import xyz.danielcortes.views.BasePanel; import xyz.danielcortes.views.libro.LibroListPanel; public class LibroListController implements BaseController { @@ -33,7 +34,7 @@ public class LibroListController implements BaseController { model.addRows(libros); } - public LibroListPanel getView() { + public BasePanel getView() { return view; } } diff --git a/src/main/java/xyz/danielcortes/controllers/libro/LibroUpdateController.java b/src/main/java/xyz/danielcortes/controllers/libro/LibroUpdateController.java index 7721c97..03d31c3 100644 --- a/src/main/java/xyz/danielcortes/controllers/libro/LibroUpdateController.java +++ b/src/main/java/xyz/danielcortes/controllers/libro/LibroUpdateController.java @@ -17,6 +17,7 @@ import xyz.danielcortes.repository.CategoriaRepository; import xyz.danielcortes.repository.EditorialRepository; import xyz.danielcortes.repository.IdiomaRepository; import xyz.danielcortes.repository.LibroRepository; +import xyz.danielcortes.views.BasePanel; import xyz.danielcortes.views.libro.LibroUpdatePanel; public class LibroUpdateController implements BaseController { @@ -183,7 +184,7 @@ public class LibroUpdateController implements BaseController { } } - public LibroUpdatePanel getView() { + public BasePanel getView() { return view; } } diff --git a/src/main/java/xyz/danielcortes/views/BasePanel.java b/src/main/java/xyz/danielcortes/views/BasePanel.java index ebde8bb..33d5cb2 100644 --- a/src/main/java/xyz/danielcortes/views/BasePanel.java +++ b/src/main/java/xyz/danielcortes/views/BasePanel.java @@ -1,8 +1,9 @@ package xyz.danielcortes.views; import javax.swing.JFrame; +import javax.swing.JPanel; -public class BasePanel { +public abstract class BasePanel { private JFrame parentFrame; public BasePanel(JFrame parentFrame) { @@ -12,4 +13,6 @@ public class BasePanel { public JFrame getParentFrame() { return parentFrame; } + + public abstract JPanel getContentPane(); } diff --git a/src/main/java/xyz/danielcortes/views/autor/AutorViewPanel.form b/src/main/java/xyz/danielcortes/views/autor/AutorViewPanel.form index 3b50f54..bbf8896 100644 --- a/src/main/java/xyz/danielcortes/views/autor/AutorViewPanel.form +++ b/src/main/java/xyz/danielcortes/views/autor/AutorViewPanel.form @@ -1,6 +1,6 @@
- + diff --git a/src/main/java/xyz/danielcortes/views/autor/AutorViewPanel.java b/src/main/java/xyz/danielcortes/views/autor/AutorViewPanel.java index cff71d1..394d6c6 100644 --- a/src/main/java/xyz/danielcortes/views/autor/AutorViewPanel.java +++ b/src/main/java/xyz/danielcortes/views/autor/AutorViewPanel.java @@ -6,6 +6,7 @@ import com.intellij.uiDesigner.core.Spacer; import java.awt.Dimension; import java.awt.Insets; import javax.swing.JButton; +import javax.swing.JComponent; import javax.swing.JFrame; import javax.swing.JLabel; import javax.swing.JPanel; @@ -18,11 +19,16 @@ public class AutorViewPanel extends BasePanel { private JTextField apellidoPaternoField; private JTextField apellidoMaternoField; private JButton volverButton; + private JPanel contentPane; public AutorViewPanel(JFrame parentFrame) { super(parentFrame); } + public JPanel getContentPane() { + return contentPane; + } + public JTextField getNombreField() { return nombreField; } @@ -47,67 +53,65 @@ public class AutorViewPanel extends BasePanel { } /** - * Method generated by IntelliJ IDEA GUI Designer >>> IMPORTANT!! <<< DO NOT edit this method OR - * call it in your code! + * Method generated by IntelliJ IDEA GUI Designer >>> IMPORTANT!! <<< DO NOT edit this method OR call it in your code! * * @noinspection ALL */ private void $$$setupUI$$$() { - final JPanel panel1 = new JPanel(); - panel1.setLayout(new GridLayoutManager(8, 3, new Insets(10, 10, 10, 10), -1, -1)); + contentPane = new JPanel(); + contentPane.setLayout(new GridLayoutManager(8, 3, new Insets(10, 10, 10, 10), -1, -1)); final JLabel label1 = new JLabel(); label1.setText("Nombre:"); - panel1.add(label1, - new GridConstraints(0, 1, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_NONE, - GridConstraints.SIZEPOLICY_FIXED, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, - false)); + contentPane.add(label1, new GridConstraints(0, 1, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, + GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false)); nombreField = new JTextField(); nombreField.setEditable(false); nombreField.setEnabled(false); - panel1.add(nombreField, new GridConstraints(1, 1, 1, 1, GridConstraints.ANCHOR_WEST, - GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_WANT_GROW, - GridConstraints.SIZEPOLICY_FIXED, null, new Dimension(400, -1), null, 0, false)); + contentPane.add(nombreField, + new GridConstraints(1, 1, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_WANT_GROW, + GridConstraints.SIZEPOLICY_FIXED, null, new Dimension(400, -1), null, 0, false)); final JLabel label2 = new JLabel(); label2.setText("Apellido Paterno:"); - panel1.add(label2, - new GridConstraints(2, 1, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_NONE, - GridConstraints.SIZEPOLICY_FIXED, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, - false)); + contentPane.add(label2, new GridConstraints(2, 1, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, + GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false)); apellidoPaternoField = new JTextField(); apellidoPaternoField.setEditable(false); apellidoPaternoField.setEnabled(false); - panel1.add(apellidoPaternoField, new GridConstraints(3, 1, 1, 1, GridConstraints.ANCHOR_WEST, - GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_WANT_GROW, - GridConstraints.SIZEPOLICY_FIXED, null, new Dimension(400, -1), null, 0, false)); + contentPane.add(apellidoPaternoField, + new GridConstraints(3, 1, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_WANT_GROW, + GridConstraints.SIZEPOLICY_FIXED, null, new Dimension(400, -1), null, 0, false)); final JLabel label3 = new JLabel(); label3.setText("Apellido Materno:"); - panel1.add(label3, - new GridConstraints(4, 1, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_NONE, - GridConstraints.SIZEPOLICY_FIXED, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, - false)); + contentPane.add(label3, new GridConstraints(4, 1, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, + GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false)); apellidoMaternoField = new JTextField(); apellidoMaternoField.setEditable(false); apellidoMaternoField.setEnabled(false); - panel1.add(apellidoMaternoField, new GridConstraints(5, 1, 1, 1, GridConstraints.ANCHOR_WEST, - GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_WANT_GROW, - GridConstraints.SIZEPOLICY_FIXED, null, new Dimension(400, -1), null, 0, false)); + contentPane.add(apellidoMaternoField, + new GridConstraints(5, 1, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_WANT_GROW, + GridConstraints.SIZEPOLICY_FIXED, null, new Dimension(400, -1), null, 0, false)); volverButton = new JButton(); volverButton.setText("Volver"); - panel1.add(volverButton, - new GridConstraints(6, 1, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_NONE, - GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, - GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false)); + contentPane.add(volverButton, new GridConstraints(6, 1, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_NONE, + GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false)); final Spacer spacer1 = new Spacer(); - panel1.add(spacer1, new GridConstraints(7, 1, 1, 1, GridConstraints.ANCHOR_CENTER, - GridConstraints.FILL_VERTICAL, 1, GridConstraints.SIZEPOLICY_WANT_GROW, null, null, null, 0, - false)); + contentPane.add(spacer1, + new GridConstraints(7, 1, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_VERTICAL, 1, GridConstraints.SIZEPOLICY_WANT_GROW, null, + null, null, 0, false)); final Spacer spacer2 = new Spacer(); - panel1.add(spacer2, new GridConstraints(7, 2, 1, 1, GridConstraints.ANCHOR_CENTER, - GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_WANT_GROW, 1, null, null, null, - 0, false)); + contentPane.add(spacer2, + new GridConstraints(7, 2, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_WANT_GROW, 1, null, + null, null, 0, false)); final Spacer spacer3 = new Spacer(); - panel1.add(spacer3, new GridConstraints(7, 0, 1, 1, GridConstraints.ANCHOR_CENTER, - GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_WANT_GROW, 1, null, null, null, - 0, false)); + contentPane.add(spacer3, + new GridConstraints(7, 0, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_WANT_GROW, 1, null, + null, null, 0, false)); + } + + /** + * @noinspection ALL + */ + public JComponent $$$getRootComponent$$$() { + return contentPane; } }