From 16249247086630d811e90548ebde27ec60d82145 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Cort=C3=A9s?= Date: Wed, 8 May 2019 11:35:56 -0400 Subject: [PATCH] Muchos cambios se me fue un poco la onda pero ahora esta funcionando las vistas de categoria de la misma manera que la vista de autores Ademas arregle un error en el que el Set de libros en categoria, editorial, estado e idioma eran null --- .../controllers/LaunchController.java | 32 +----- .../autor/AutorSearchController.java | 2 +- .../categoria/CategoriaDeleteController.java | 72 -------------- .../categoria/CategoriaSearchController.java | 83 +++++++++++++++- .../categoria/CategoriaUpdateController.java | 50 ++++------ .../categoria/CategoriaViewController.java | 46 +++++++++ .../xyz/danielcortes/framework/PanelName.java | 3 +- .../xyz/danielcortes/models/Categoria.java | 4 + .../xyz/danielcortes/models/Editorial.java | 6 +- .../java/xyz/danielcortes/models/Estado.java | 6 +- .../java/xyz/danielcortes/models/Idioma.java | 4 + .../views/categoria/CategoriaCreatePanel.form | 18 ++-- .../views/categoria/CategoriaCreatePanel.java | 40 ++++---- .../views/categoria/CategoriaDeletePanel.java | 98 ------------------- .../views/categoria/CategoriaSearchPanel.form | 72 +++++++++++++- .../views/categoria/CategoriaSearchPanel.java | 78 +++++++++++++-- .../views/categoria/CategoriaUpdatePanel.form | 68 +++++++------ .../views/categoria/CategoriaUpdatePanel.java | 92 ++++++++--------- ...letePanel.form => CategoriaViewPanel.form} | 38 +++---- .../views/categoria/CategoriaViewPanel.java | 80 +++++++++++++++ 20 files changed, 515 insertions(+), 377 deletions(-) delete mode 100644 src/main/java/xyz/danielcortes/controllers/categoria/CategoriaDeleteController.java create mode 100644 src/main/java/xyz/danielcortes/controllers/categoria/CategoriaViewController.java delete mode 100644 src/main/java/xyz/danielcortes/views/categoria/CategoriaDeletePanel.java rename src/main/java/xyz/danielcortes/views/categoria/{CategoriaDeletePanel.form => CategoriaViewPanel.form} (70%) create mode 100644 src/main/java/xyz/danielcortes/views/categoria/CategoriaViewPanel.java diff --git a/src/main/java/xyz/danielcortes/controllers/LaunchController.java b/src/main/java/xyz/danielcortes/controllers/LaunchController.java index d6c6303..b4ccd52 100644 --- a/src/main/java/xyz/danielcortes/controllers/LaunchController.java +++ b/src/main/java/xyz/danielcortes/controllers/LaunchController.java @@ -12,9 +12,9 @@ import xyz.danielcortes.controllers.autor.AutorSearchController; import xyz.danielcortes.controllers.autor.AutorUpdateController; import xyz.danielcortes.controllers.autor.AutorViewController; import xyz.danielcortes.controllers.categoria.CategoriaCreateController; -import xyz.danielcortes.controllers.categoria.CategoriaDeleteController; import xyz.danielcortes.controllers.categoria.CategoriaSearchController; import xyz.danielcortes.controllers.categoria.CategoriaUpdateController; +import xyz.danielcortes.controllers.categoria.CategoriaViewController; import xyz.danielcortes.controllers.editorial.EditorialCreateController; import xyz.danielcortes.controllers.editorial.EditorialDeleteController; import xyz.danielcortes.controllers.editorial.EditorialListController; @@ -34,9 +34,9 @@ import xyz.danielcortes.views.autor.AutorSearchPanel; import xyz.danielcortes.views.autor.AutorUpdatePanel; import xyz.danielcortes.views.autor.AutorViewPanel; import xyz.danielcortes.views.categoria.CategoriaCreatePanel; -import xyz.danielcortes.views.categoria.CategoriaDeletePanel; import xyz.danielcortes.views.categoria.CategoriaSearchPanel; import xyz.danielcortes.views.categoria.CategoriaUpdatePanel; +import xyz.danielcortes.views.categoria.CategoriaViewPanel; import xyz.danielcortes.views.editorial.EditorialCreatePanel; import xyz.danielcortes.views.editorial.EditorialDeletePanel; import xyz.danielcortes.views.editorial.EditorialListPanel; @@ -85,8 +85,8 @@ public class LaunchController { this.controllers.put(PanelName.CATEGORIA_SEARCH, new CategoriaSearchController(new CategoriaSearchPanel(), this)); this.controllers.put(PanelName.CATEGORIA_CREATE, new CategoriaCreateController(new CategoriaCreatePanel(), this)); - this.controllers.put(PanelName.CATEGORIA_DELETE, new CategoriaDeleteController(new CategoriaDeletePanel(), this)); this.controllers.put(PanelName.CATEGORIA_UPDATE, new CategoriaUpdateController(new CategoriaUpdatePanel(), this)); + this.controllers.put(PanelName.CATEGORIA_VIEW, new CategoriaViewController(new CategoriaViewPanel(), this)); this.controllers.put(PanelName.EDITORIAL_SEARCH, new EditorialListController(new EditorialListPanel(), this)); this.controllers.put(PanelName.EDITORIAL_CREATE, new EditorialCreateController(new EditorialCreatePanel(), this)); @@ -111,8 +111,6 @@ public class LaunchController { JMenu librosMenu = new JMenu("Libros"); librosMenu.setMnemonic(KeyEvent.VK_L); JMenuItem libroSearch = new JMenuItem("Buscar"); libroSearch.setMnemonic(KeyEvent.VK_B); JMenuItem libroCreate = new JMenuItem("Crear"); libroCreate.setMnemonic(KeyEvent.VK_C); - JMenuItem libroUpdate= new JMenuItem("Actualizar"); libroUpdate.setMnemonic(KeyEvent.VK_U); - JMenuItem libroDelete = new JMenuItem("Eliminar"); libroDelete.setMnemonic(KeyEvent.VK_E); JMenu autoresMenu = new JMenu("Autores"); autoresMenu.setMnemonic(KeyEvent.VK_A); JMenuItem autorSearch = new JMenuItem("Buscar"); autorSearch.setMnemonic(KeyEvent.VK_B); @@ -121,20 +119,14 @@ public class LaunchController { JMenu idiomasMenu = new JMenu("Idiomas"); idiomasMenu.setMnemonic(KeyEvent.VK_I); JMenuItem idiomaSearch = new JMenuItem("Buscar"); idiomaSearch.setMnemonic(KeyEvent.VK_B); JMenuItem idiomaCreate = new JMenuItem("Crear"); idiomaCreate.setMnemonic(KeyEvent.VK_C); - JMenuItem idiomaUpdate = new JMenuItem("Actualizar"); idiomaUpdate.setMnemonic(KeyEvent.VK_A); - JMenuItem idiomaDelete = new JMenuItem("Eliminar"); idiomaDelete.setMnemonic(KeyEvent.VK_E); JMenu categoriasMenu = new JMenu("Categorias"); categoriasMenu.setMnemonic(KeyEvent.VK_C); JMenuItem categoriaSearch = new JMenuItem("Buscar"); categoriaSearch.setMnemonic(KeyEvent.VK_B); JMenuItem categoriaCreate = new JMenuItem("Crear"); categoriaCreate.setMnemonic(KeyEvent.VK_C); - JMenuItem categoriaUpdate = new JMenuItem("Actualizar"); categoriaUpdate.setMnemonic(KeyEvent.VK_A); - JMenuItem categoriaDelete = new JMenuItem("Eliminar"); categoriaDelete.setMnemonic(KeyEvent.VK_E); JMenu editorialesMenu = new JMenu("Editoriales"); editorialesMenu.setMnemonic(KeyEvent.VK_E); JMenuItem editorialSearch= new JMenuItem("Buscar"); editorialSearch.setMnemonic(KeyEvent.VK_B); JMenuItem editorialCreate= new JMenuItem("Crear"); editorialCreate.setMnemonic(KeyEvent.VK_C); - JMenuItem editorialUpdate = new JMenuItem("Actualizar"); editorialUpdate.setMnemonic(KeyEvent.VK_A); - JMenuItem editorialDelete = new JMenuItem("Eliminar"); editorialDelete.setMnemonic(KeyEvent.VK_E); // @formatter:on autorSearch.addActionListener(e -> this.showCard(PanelName.AUTOR_SEARCH)); @@ -142,29 +134,19 @@ public class LaunchController { idiomaSearch.addActionListener(e -> this.showCard(PanelName.IDIOMA_SEARCH)); idiomaCreate.addActionListener(e -> this.showCard(PanelName.IDIOMA_CREATE)); - idiomaUpdate.addActionListener(e -> this.showCard(PanelName.IDIOMA_UPDATE)); - idiomaDelete.addActionListener(e -> this.showCard(PanelName.IDIOMA_DELETE)); libroSearch.addActionListener(e -> this.showCard(PanelName.LIBRO_SEARCH)); libroCreate.addActionListener(e -> this.showCard(PanelName.LIBRO_CREATE)); - libroUpdate.addActionListener(e -> this.showCard(PanelName.LIBRO_UPDATE)); - libroDelete.addActionListener(e -> this.showCard(PanelName.LIBRO_DELETE)); categoriaSearch.addActionListener(e -> this.showCard(PanelName.CATEGORIA_SEARCH)); categoriaCreate.addActionListener(e -> this.showCard(PanelName.CATEGORIA_CREATE)); - categoriaUpdate.addActionListener(e -> this.showCard(PanelName.CATEGORIA_UPDATE)); - categoriaDelete.addActionListener(e -> this.showCard(PanelName.CATEGORIA_DELETE)); editorialSearch.addActionListener(e -> this.showCard(PanelName.EDITORIAL_SEARCH)); editorialCreate.addActionListener(e -> this.showCard(PanelName.EDITORIAL_CREATE)); - editorialUpdate.addActionListener(e -> this.showCard(PanelName.EDITORIAL_UPDATE)); - editorialDelete.addActionListener(e -> this.showCard(PanelName.EDITORIAL_DELETE)); menuBar.add(librosMenu); librosMenu.add(libroSearch); librosMenu.add(libroCreate); - librosMenu.add(libroUpdate); - librosMenu.add(libroDelete); menuBar.add(autoresMenu); autoresMenu.add(autorSearch); @@ -173,25 +155,19 @@ public class LaunchController { menuBar.add(idiomasMenu); idiomasMenu.add(idiomaSearch); idiomasMenu.add(idiomaCreate); - idiomasMenu.add(idiomaUpdate); - idiomasMenu.add(idiomaDelete); menuBar.add(categoriasMenu); categoriasMenu.add(categoriaSearch); categoriasMenu.add(categoriaCreate); - categoriasMenu.add(categoriaUpdate); - categoriasMenu.add(categoriaDelete); menuBar.add(editorialesMenu); editorialesMenu.add(editorialSearch); editorialesMenu.add(editorialCreate); - editorialesMenu.add(editorialUpdate); - editorialesMenu.add(editorialDelete); this.frame.setJMenuBar(menuBar); } - public void showCard(PanelName name){ + public void showCard(PanelName name) { this.controllers.get(name).show(); this.frame.showCard(name); } diff --git a/src/main/java/xyz/danielcortes/controllers/autor/AutorSearchController.java b/src/main/java/xyz/danielcortes/controllers/autor/AutorSearchController.java index b91217d..e914066 100644 --- a/src/main/java/xyz/danielcortes/controllers/autor/AutorSearchController.java +++ b/src/main/java/xyz/danielcortes/controllers/autor/AutorSearchController.java @@ -106,7 +106,7 @@ public class AutorSearchController extends BaseController { return null; } - return this.view.getAutorModel().getRow(this.view.getAutorTable().getSelectedRow()); + return this.view.getAutorModel().getRow(selectedRow); } public BasePanel getView() { diff --git a/src/main/java/xyz/danielcortes/controllers/categoria/CategoriaDeleteController.java b/src/main/java/xyz/danielcortes/controllers/categoria/CategoriaDeleteController.java deleted file mode 100644 index 39a21e4..0000000 --- a/src/main/java/xyz/danielcortes/controllers/categoria/CategoriaDeleteController.java +++ /dev/null @@ -1,72 +0,0 @@ -package xyz.danielcortes.controllers.categoria; - -import java.util.List; -import javax.swing.JComboBox; -import javax.swing.JOptionPane; -import xyz.danielcortes.controllers.BaseController; -import xyz.danielcortes.controllers.LaunchController; -import xyz.danielcortes.models.Categoria; -import xyz.danielcortes.repository.CategoriaRepository; -import xyz.danielcortes.views.BasePanel; -import xyz.danielcortes.views.categoria.CategoriaDeletePanel; - -public class CategoriaDeleteController extends BaseController { - - private CategoriaRepository categoriaRepository; - private CategoriaDeletePanel view; - - public CategoriaDeleteController(CategoriaDeletePanel view, LaunchController parent) { - super(parent); - this.view = view; - this.categoriaRepository = new CategoriaRepository(); - this.setupListeners(); - } - - @Override - public void show() { - this.reload(); - this.view.getCategoriaCombo().requestFocus(); - } - - private void setupListeners() { - view.getEliminarButton().addActionListener(e -> delete()); - } - - private void delete() { - Categoria selected = (Categoria) this.view.getCategoriaCombo().getSelectedItem(); - if (!validateCategoria(selected)) return; - - this.categoriaRepository.delete(selected); - this.reload(); - } - - private boolean validateCategoria(Categoria categoria) { - if (categoria == null) { - JOptionPane.showMessageDialog( - this.view.getContentPane(), - "No hay categoria seleccionada", - "Error", - JOptionPane.ERROR_MESSAGE); - return false; - } - return true; - } - - public void reload() { - this.loadCategoriaCombo(); - } - - private void loadCategoriaCombo() { - List categorias = this.categoriaRepository.getAll(); - JComboBox combobox = this.view.getCategoriaCombo(); - combobox.removeAllItems(); - for (Categoria categoria : categorias) { - combobox.addItem(categoria); - } - } - - public BasePanel getView() { - return view; - } - -} diff --git a/src/main/java/xyz/danielcortes/controllers/categoria/CategoriaSearchController.java b/src/main/java/xyz/danielcortes/controllers/categoria/CategoriaSearchController.java index 350e9a0..26ec331 100644 --- a/src/main/java/xyz/danielcortes/controllers/categoria/CategoriaSearchController.java +++ b/src/main/java/xyz/danielcortes/controllers/categoria/CategoriaSearchController.java @@ -1,15 +1,18 @@ package xyz.danielcortes.controllers.categoria; import java.util.List; +import javax.swing.JOptionPane; import xyz.danielcortes.controllers.BaseController; import xyz.danielcortes.controllers.LaunchController; import xyz.danielcortes.framework.BaseTableModel; +import xyz.danielcortes.framework.PanelName; import xyz.danielcortes.models.Categoria; import xyz.danielcortes.repository.CategoriaRepository; import xyz.danielcortes.views.BasePanel; import xyz.danielcortes.views.categoria.CategoriaSearchPanel; public class CategoriaSearchController extends BaseController { + private CategoriaRepository categoriaRepository; private CategoriaSearchPanel view; @@ -18,20 +21,96 @@ public class CategoriaSearchController extends BaseController { this.view = view; this.categoriaRepository = new CategoriaRepository(); this.loadCategoriaTable(); + this.setupListeners(); } @Override public void show() { this.reload(); + this.view.getCategoriaTable().clearSelection(); } - public void reload() {this.loadCategoriaTable();} + private void setupListeners() { + this.view.getSearchField().addActionListener(e -> this.search()); + this.view.getBuscarButton().addActionListener(e -> this.search()); + this.view.getVerButton().addActionListener(e -> this.view()); + this.view.getEditarButton().addActionListener(e -> this.edit()); + this.view.getEliminarButton().addActionListener(e -> this.delete()); + } + + private void edit() { + Categoria categoria = this.getSelectedCategoria(); + if (categoria != null) { + CategoriaUpdateController controller = (CategoriaUpdateController) this.getParentController().getCard(PanelName.CATEGORIA_UPDATE); + controller.setCategoria(categoria); + this.getParentController().showCard(PanelName.CATEGORIA_UPDATE); + } + } + + private void delete() { + Categoria categoria = this.getSelectedCategoria(); + if (categoria == null) + return; + + int option = JOptionPane.showConfirmDialog( + null, + "¿Estas seguro de que deseas eliminar la categoria?", + "Confirmacion", + JOptionPane.YES_NO_OPTION, + JOptionPane.QUESTION_MESSAGE + ); + if (option == JOptionPane.NO_OPTION) + return; + + this.categoriaRepository.delete(categoria); + this.reload(); + } + + private void view() { + Categoria categoria = this.getSelectedCategoria(); + if (categoria != null) { + CategoriaViewController controller = (CategoriaViewController) this.getParentController().getCard(PanelName.CATEGORIA_VIEW); + controller.setCategoria(categoria); + this.getParentController().showCard(PanelName.CATEGORIA_VIEW); + } + } + + private void search() { + String term = this.view.getSearchField().getText(); + List categorias = this.categoriaRepository.search(term); + this.loadCategoriaTable(categorias); + } + + public void reload() { + this.loadCategoriaTable(); + } private void loadCategoriaTable() { List categorias = this.categoriaRepository.getAll(); + this.loadCategoriaTable(categorias); + } + + private void loadCategoriaTable(List categorias) { BaseTableModel model = this.view.getCategoriaModel(); model.setRows(categorias); } - public BasePanel getView() { return view; } + private Categoria getSelectedCategoria() { + int selectedRow = this.view.getCategoriaTable().getSelectedRow(); + if (selectedRow == -1) { + JOptionPane.showMessageDialog( + null, + "No hay categoria seleccionada", + "Error", + JOptionPane.ERROR_MESSAGE + ); + return null; + } + + return this.view.getCategoriaModel().getRow(selectedRow); + } + + 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 25102a4..38c0b4e 100644 --- a/src/main/java/xyz/danielcortes/controllers/categoria/CategoriaUpdateController.java +++ b/src/main/java/xyz/danielcortes/controllers/categoria/CategoriaUpdateController.java @@ -1,10 +1,9 @@ package xyz.danielcortes.controllers.categoria; -import java.util.List; -import javax.swing.JComboBox; import javax.swing.JOptionPane; import xyz.danielcortes.controllers.BaseController; import xyz.danielcortes.controllers.LaunchController; +import xyz.danielcortes.framework.PanelName; import xyz.danielcortes.models.Categoria; import xyz.danielcortes.repository.CategoriaRepository; import xyz.danielcortes.views.BasePanel; @@ -12,6 +11,7 @@ import xyz.danielcortes.views.categoria.CategoriaUpdatePanel; public class CategoriaUpdateController extends BaseController { + private Categoria categoria; private CategoriaUpdatePanel view; private CategoriaRepository categoriaRepository; @@ -25,33 +25,34 @@ public class CategoriaUpdateController extends BaseController { @Override public void show() { - this.reload(); + this.fillCategoria(); this.view.getNombreField().requestFocus(); } + private void fillCategoria() { + if(categoria != null) + this.view.getNombreField().setText(this.categoria.getNombre()); + } + private void setupListeners() { - this.view.getCategoriaCombo().addActionListener(e -> { - Categoria selected = (Categoria) view.getCategoriaCombo().getSelectedItem(); - if(selected != null) - this.view.getNombreField().setText(selected.getNombre()); - }); this.view.getNombreField().addActionListener(e -> this.update()); this.view.getUpdateButton().addActionListener(e -> this.update()); + this.view.getVolverButton().addActionListener(e -> this.getParentController().showCard(PanelName.CATEGORIA_SEARCH)); } private void update() { - Categoria original = (Categoria) this.view.getCategoriaCombo().getSelectedItem(); - if (!validateOriginal(original)) return; + if (!validateOriginal(this.categoria)) + return; String nombre = this.view.getNombreField().getText(); - if (!validateNombre(nombre)) return; + if (!validateNombre(nombre)) + return; - assert original != null; - original.setNombre(nombre); - categoriaRepository.update(original); + assert this.categoria != null; + this.categoria.setNombre(nombre); + categoriaRepository.update(this.categoria); - this.loadCategoriaCombo(); - this.view.getNombreField().requestFocus(); + this.getParentController().showCard(PanelName.CATEGORIA_SEARCH); } private boolean validateOriginal(Categoria original) { @@ -85,20 +86,11 @@ public class CategoriaUpdateController extends BaseController { return true; } - public void reload() { - this.loadCategoriaCombo(); - } - - private void loadCategoriaCombo() { - List categorias = this.categoriaRepository.getAll(); - JComboBox combobox = this.view.getCategoriaCombo(); - combobox.removeAllItems(); - for (Categoria categoria : categorias) { - combobox.addItem(categoria); - } - } - public BasePanel getView() { return view; } + + public void setCategoria(Categoria categoria) { + this.categoria = categoria; + } } diff --git a/src/main/java/xyz/danielcortes/controllers/categoria/CategoriaViewController.java b/src/main/java/xyz/danielcortes/controllers/categoria/CategoriaViewController.java new file mode 100644 index 0000000..ca7abaa --- /dev/null +++ b/src/main/java/xyz/danielcortes/controllers/categoria/CategoriaViewController.java @@ -0,0 +1,46 @@ +package xyz.danielcortes.controllers.categoria; + +import xyz.danielcortes.controllers.BaseController; +import xyz.danielcortes.controllers.LaunchController; +import xyz.danielcortes.framework.PanelName; +import xyz.danielcortes.models.Categoria; +import xyz.danielcortes.repository.CategoriaRepository; +import xyz.danielcortes.views.BasePanel; +import xyz.danielcortes.views.categoria.CategoriaViewPanel; + +public class CategoriaViewController extends BaseController { + + private Categoria categoria; + private CategoriaViewPanel view; + private CategoriaRepository categoriaRepository; + + public CategoriaViewController(CategoriaViewPanel view, LaunchController parent) { + super(parent); + this.view = view; + this.categoriaRepository = new CategoriaRepository(); + this.setupListeners(); + } + + public void setCategoria(Categoria categoria) { + this.categoria = categoria; + } + + private void setupListeners() { + this.view.getVolverButton().addActionListener(e -> this.getParentController().showCard(PanelName.CATEGORIA_SEARCH)); + } + + private void fillCategoria() { + if(this.categoria != null) + this.view.getNombreField().setText(categoria.getNombre()); + } + + @Override + public void show() { + this.fillCategoria(); + } + + @Override + public BasePanel getView() { + return this.view; + } +} diff --git a/src/main/java/xyz/danielcortes/framework/PanelName.java b/src/main/java/xyz/danielcortes/framework/PanelName.java index 3835f91..4d91d79 100644 --- a/src/main/java/xyz/danielcortes/framework/PanelName.java +++ b/src/main/java/xyz/danielcortes/framework/PanelName.java @@ -13,10 +13,10 @@ public enum PanelName { IDIOMA_UPDATE, IDIOMA_DELETE, + CATEGORIA_VIEW, CATEGORIA_SEARCH, CATEGORIA_CREATE, CATEGORIA_UPDATE, - CATEGORIA_DELETE, EDITORIAL_SEARCH, EDITORIAL_CREATE, @@ -27,5 +27,4 @@ public enum PanelName { AUTOR_SEARCH, AUTOR_CREATE, AUTOR_UPDATE, - AUTOR_DELETE } diff --git a/src/main/java/xyz/danielcortes/models/Categoria.java b/src/main/java/xyz/danielcortes/models/Categoria.java index 9b2a82c..7748895 100644 --- a/src/main/java/xyz/danielcortes/models/Categoria.java +++ b/src/main/java/xyz/danielcortes/models/Categoria.java @@ -1,5 +1,6 @@ package xyz.danielcortes.models; +import java.util.HashSet; import java.util.Set; import javax.persistence.Column; import javax.persistence.Entity; @@ -41,6 +42,9 @@ public class Categoria { } public Set getLibros() { + if (this.libros == null) { + this.libros = new HashSet<>(); + } return libros; } diff --git a/src/main/java/xyz/danielcortes/models/Editorial.java b/src/main/java/xyz/danielcortes/models/Editorial.java index b76fd17..28e9e3d 100644 --- a/src/main/java/xyz/danielcortes/models/Editorial.java +++ b/src/main/java/xyz/danielcortes/models/Editorial.java @@ -1,5 +1,6 @@ package xyz.danielcortes.models; +import java.util.HashSet; import java.util.Set; import javax.persistence.Column; import javax.persistence.Entity; @@ -40,7 +41,10 @@ public class Editorial { this.nombre = nombre; } - public Set getLibros() { + public Set getLibros() { + if (this.libros == null) { + this.libros = new HashSet<>(); + } return libros; } diff --git a/src/main/java/xyz/danielcortes/models/Estado.java b/src/main/java/xyz/danielcortes/models/Estado.java index c7f9997..aa5c0a6 100644 --- a/src/main/java/xyz/danielcortes/models/Estado.java +++ b/src/main/java/xyz/danielcortes/models/Estado.java @@ -1,5 +1,6 @@ package xyz.danielcortes.models; +import java.util.HashSet; import java.util.Set; import javax.persistence.Column; import javax.persistence.Entity; @@ -14,7 +15,7 @@ import javax.persistence.Table; public class Estado { @Id - @GeneratedValue(strategy= GenerationType.IDENTITY) + @GeneratedValue(strategy = GenerationType.IDENTITY) @Column(name = "id", nullable = false) private Integer id; @@ -41,6 +42,9 @@ public class Estado { } public Set getLibros() { + if (this.libros == null) { + this.libros = new HashSet<>(); + } return libros; } diff --git a/src/main/java/xyz/danielcortes/models/Idioma.java b/src/main/java/xyz/danielcortes/models/Idioma.java index 2d24d8d..3b59e43 100644 --- a/src/main/java/xyz/danielcortes/models/Idioma.java +++ b/src/main/java/xyz/danielcortes/models/Idioma.java @@ -1,5 +1,6 @@ package xyz.danielcortes.models; +import java.util.HashSet; import java.util.Set; import javax.persistence.Column; import javax.persistence.Entity; @@ -41,6 +42,9 @@ public class Idioma { } public Set getLibros() { + if (this.libros == null) { + this.libros = new HashSet<>(); + } return libros; } diff --git a/src/main/java/xyz/danielcortes/views/categoria/CategoriaCreatePanel.form b/src/main/java/xyz/danielcortes/views/categoria/CategoriaCreatePanel.form index 667b916..c8b03df 100644 --- a/src/main/java/xyz/danielcortes/views/categoria/CategoriaCreatePanel.form +++ b/src/main/java/xyz/danielcortes/views/categoria/CategoriaCreatePanel.form @@ -3,14 +3,16 @@ - + - + + + @@ -37,14 +39,14 @@ - - - - - - + + + + + + diff --git a/src/main/java/xyz/danielcortes/views/categoria/CategoriaCreatePanel.java b/src/main/java/xyz/danielcortes/views/categoria/CategoriaCreatePanel.java index db06140..36f9ab9 100644 --- a/src/main/java/xyz/danielcortes/views/categoria/CategoriaCreatePanel.java +++ b/src/main/java/xyz/danielcortes/views/categoria/CategoriaCreatePanel.java @@ -38,8 +38,7 @@ public class CategoriaCreatePanel 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 */ @@ -48,32 +47,29 @@ public class CategoriaCreatePanel extends BasePanel { contentPane.setLayout(new GridLayoutManager(4, 3, new Insets(20, 20, 20, 20), -1, -1)); guardarButton = new JButton(); guardarButton.setText("Guardar"); - contentPane.add(guardarButton, - new GridConstraints(2, 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(guardarButton, new GridConstraints(2, 1, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_NONE, + GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, GridConstraints.SIZEPOLICY_FIXED, null, new Dimension(150, -1), + null, 0, false)); final JLabel label1 = new JLabel(); label1.setText("Nombre:"); - 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)); + 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(); - 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)); + 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 Spacer spacer1 = new Spacer(); - contentPane.add(spacer1, new GridConstraints(3, 1, 1, 1, GridConstraints.ANCHOR_CENTER, - GridConstraints.FILL_VERTICAL, 1, GridConstraints.SIZEPOLICY_WANT_GROW, null, null, null, 0, - false)); + contentPane.add(spacer1, + new GridConstraints(3, 1, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_VERTICAL, 1, GridConstraints.SIZEPOLICY_WANT_GROW, null, + null, null, 0, false)); final Spacer spacer2 = new Spacer(); - contentPane.add(spacer2, new GridConstraints(2, 2, 1, 1, GridConstraints.ANCHOR_CENTER, - GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_WANT_GROW, 1, null, null, null, - 0, false)); + contentPane.add(spacer2, + new GridConstraints(3, 0, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_WANT_GROW, 1, null, + null, null, 0, false)); final Spacer spacer3 = new Spacer(); - contentPane.add(spacer3, new GridConstraints(2, 0, 1, 1, GridConstraints.ANCHOR_CENTER, - GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_WANT_GROW, 1, null, null, null, - 0, false)); + contentPane.add(spacer3, + new GridConstraints(3, 2, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_WANT_GROW, 1, null, + null, null, 0, false)); } /** diff --git a/src/main/java/xyz/danielcortes/views/categoria/CategoriaDeletePanel.java b/src/main/java/xyz/danielcortes/views/categoria/CategoriaDeletePanel.java deleted file mode 100644 index 9647c77..0000000 --- a/src/main/java/xyz/danielcortes/views/categoria/CategoriaDeletePanel.java +++ /dev/null @@ -1,98 +0,0 @@ -package xyz.danielcortes.views.categoria; - -import com.intellij.uiDesigner.core.GridConstraints; -import com.intellij.uiDesigner.core.GridLayoutManager; -import com.intellij.uiDesigner.core.Spacer; -import java.awt.Dimension; -import java.awt.Insets; -import javax.swing.DefaultComboBoxModel; -import javax.swing.JButton; -import javax.swing.JComboBox; -import javax.swing.JComponent; -import javax.swing.JLabel; -import javax.swing.JPanel; -import xyz.danielcortes.models.Categoria; -import xyz.danielcortes.views.BasePanel; - -public class CategoriaDeletePanel extends BasePanel { - - private JComboBox categoriaCombo; - private DefaultComboBoxModel categoriaModel; - private JButton eliminarButton; - private JPanel contentPane; - - public JComboBox getCategoriaCombo() { - return categoriaCombo; - } - - public JButton getEliminarButton() { - return eliminarButton; - } - - public JPanel getContentPane() { - return contentPane; - } - - private void createUIComponents() { - createCategoriaCombo(); - } - - private void createCategoriaCombo() { - categoriaModel = new DefaultComboBoxModel<>(); - categoriaCombo = new JComboBox<>(categoriaModel); - } - - { -// GUI initializer generated by IntelliJ IDEA GUI Designer -// >>> IMPORTANT!! <<< -// DO NOT EDIT OR ADD ANY CODE HERE! - $$$setupUI$$$(); - } - - /** - * Method generated by IntelliJ IDEA GUI Designer >>> IMPORTANT!! <<< DO NOT edit this method OR - * call it in your code! - * - * @noinspection ALL - */ - private void $$$setupUI$$$() { - createUIComponents(); - contentPane = new JPanel(); - contentPane.setLayout(new GridLayoutManager(4, 3, new Insets(20, 20, 20, 20), -1, -1)); - contentPane.add(categoriaCombo, 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)); - eliminarButton = new JButton(); - eliminarButton.setText("Eliminar"); - contentPane.add(eliminarButton, - new GridConstraints(2, 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 JLabel label1 = new JLabel(); - label1.setText("Categoria:"); - 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)); - final Spacer spacer1 = new Spacer(); - contentPane.add(spacer1, new GridConstraints(3, 1, 1, 1, GridConstraints.ANCHOR_CENTER, - GridConstraints.FILL_VERTICAL, 1, GridConstraints.SIZEPOLICY_WANT_GROW, null, null, null, 0, - false)); - final Spacer spacer2 = new Spacer(); - contentPane.add(spacer2, new GridConstraints(2, 0, 1, 1, GridConstraints.ANCHOR_CENTER, - GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_WANT_GROW, 1, null, null, null, - 0, false)); - final Spacer spacer3 = new Spacer(); - contentPane.add(spacer3, new GridConstraints(2, 2, 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; - } - -} diff --git a/src/main/java/xyz/danielcortes/views/categoria/CategoriaSearchPanel.form b/src/main/java/xyz/danielcortes/views/categoria/CategoriaSearchPanel.form index 8e5c39e..ba3048c 100644 --- a/src/main/java/xyz/danielcortes/views/categoria/CategoriaSearchPanel.form +++ b/src/main/java/xyz/danielcortes/views/categoria/CategoriaSearchPanel.form @@ -1,6 +1,6 @@
- + @@ -10,7 +10,7 @@ - + @@ -23,6 +23,74 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/java/xyz/danielcortes/views/categoria/CategoriaSearchPanel.java b/src/main/java/xyz/danielcortes/views/categoria/CategoriaSearchPanel.java index b73f1d7..d4eae25 100644 --- a/src/main/java/xyz/danielcortes/views/categoria/CategoriaSearchPanel.java +++ b/src/main/java/xyz/danielcortes/views/categoria/CategoriaSearchPanel.java @@ -4,10 +4,13 @@ import com.intellij.uiDesigner.core.GridConstraints; import com.intellij.uiDesigner.core.GridLayoutManager; import java.awt.Dimension; import java.awt.Insets; +import javax.swing.JButton; import javax.swing.JComponent; import javax.swing.JPanel; import javax.swing.JScrollPane; import javax.swing.JTable; +import javax.swing.JTextField; +import javax.swing.ListSelectionModel; import xyz.danielcortes.framework.BaseTableModel; import xyz.danielcortes.models.Categoria; import xyz.danielcortes.views.BasePanel; @@ -16,8 +19,14 @@ public class CategoriaSearchPanel extends BasePanel { private JPanel contentPane; private JTable categoriaTable; + private JButton verButton; + private JButton editarButton; + private JButton eliminarButton; + private JTextField searchField; + private JButton buscarButton; private BaseTableModel categoriaModel; + @Override public JPanel getContentPane() { return contentPane; } @@ -26,6 +35,26 @@ public class CategoriaSearchPanel extends BasePanel { return categoriaTable; } + public JButton getVerButton() { + return verButton; + } + + public JButton getEditarButton() { + return editarButton; + } + + public JButton getEliminarButton() { + return eliminarButton; + } + + public JTextField getSearchField() { + return searchField; + } + + public JButton getBuscarButton() { + return buscarButton; + } + public BaseTableModel getCategoriaModel() { return categoriaModel; } @@ -48,6 +77,7 @@ public class CategoriaSearchPanel extends BasePanel { ); // @formatter:on this.categoriaTable = new JTable(this.categoriaModel); + this.categoriaTable.setSelectionMode(ListSelectionModel.SINGLE_SELECTION); } { @@ -58,22 +88,53 @@ public class CategoriaSearchPanel 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$$$() { createUIComponents(); contentPane = new JPanel(); - contentPane.setLayout(new GridLayoutManager(1, 1, new Insets(20, 20, 20, 20), -1, -1)); + contentPane.setLayout(new GridLayoutManager(3, 1, new Insets(20, 20, 20, 20), -1, -1)); final JScrollPane scrollPane1 = new JScrollPane(); - contentPane.add(scrollPane1, - new GridConstraints(0, 0, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_BOTH, - GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_WANT_GROW, - GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_WANT_GROW, null, - new Dimension(400, -1), null, 0, false)); + contentPane.add(scrollPane1, new GridConstraints(1, 0, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_BOTH, + GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_WANT_GROW, + GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_WANT_GROW, null, new Dimension(400, -1), null, 0, false)); scrollPane1.setViewportView(categoriaTable); + final JPanel panel1 = new JPanel(); + panel1.setLayout(new GridLayoutManager(1, 3, new Insets(0, 0, 0, 0), -1, -1)); + contentPane.add(panel1, new GridConstraints(2, 0, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_BOTH, + GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, + GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, null, null, null, 0, false)); + verButton = new JButton(); + verButton.setText("Ver"); + panel1.add(verButton, new GridConstraints(0, 0, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_NONE, + GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, GridConstraints.SIZEPOLICY_FIXED, null, new Dimension(150, -1), + null, 0, false)); + editarButton = new JButton(); + editarButton.setText("Editar"); + panel1.add(editarButton, new GridConstraints(0, 1, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_NONE, + GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, GridConstraints.SIZEPOLICY_FIXED, null, new Dimension(150, -1), + null, 0, false)); + eliminarButton = new JButton(); + eliminarButton.setText("Eliminar"); + panel1.add(eliminarButton, new GridConstraints(0, 2, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_NONE, + GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, GridConstraints.SIZEPOLICY_FIXED, null, new Dimension(150, -1), + null, 0, false)); + final JPanel panel2 = new JPanel(); + panel2.setLayout(new GridLayoutManager(1, 2, new Insets(0, 0, 0, 0), -1, -1)); + contentPane.add(panel2, new GridConstraints(0, 0, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_BOTH, + GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, + GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, null, null, null, 0, false)); + searchField = new JTextField(); + panel2.add(searchField, + new GridConstraints(0, 0, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_WANT_GROW, + GridConstraints.SIZEPOLICY_FIXED, null, new Dimension(150, -1), null, 0, false)); + buscarButton = new JButton(); + buscarButton.setText("Buscar"); + panel2.add(buscarButton, new GridConstraints(0, 1, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_HORIZONTAL, + GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, GridConstraints.SIZEPOLICY_FIXED, null, new Dimension(150, -1), + null, 0, false)); } /** @@ -82,4 +143,5 @@ public class CategoriaSearchPanel extends BasePanel { public JComponent $$$getRootComponent$$$() { return contentPane; } + } diff --git a/src/main/java/xyz/danielcortes/views/categoria/CategoriaUpdatePanel.form b/src/main/java/xyz/danielcortes/views/categoria/CategoriaUpdatePanel.form index dd2231c..3167072 100644 --- a/src/main/java/xyz/danielcortes/views/categoria/CategoriaUpdatePanel.form +++ b/src/main/java/xyz/danielcortes/views/categoria/CategoriaUpdatePanel.form @@ -1,68 +1,74 @@
- + - + - - - - - - - - - + - - - - - - - - - + - - - - - - - - - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/java/xyz/danielcortes/views/categoria/CategoriaUpdatePanel.java b/src/main/java/xyz/danielcortes/views/categoria/CategoriaUpdatePanel.java index 95aefbc..167c16b 100644 --- a/src/main/java/xyz/danielcortes/views/categoria/CategoriaUpdatePanel.java +++ b/src/main/java/xyz/danielcortes/views/categoria/CategoriaUpdatePanel.java @@ -5,24 +5,21 @@ import com.intellij.uiDesigner.core.GridLayoutManager; import com.intellij.uiDesigner.core.Spacer; import java.awt.Dimension; import java.awt.Insets; -import javax.swing.DefaultComboBoxModel; import javax.swing.JButton; -import javax.swing.JComboBox; import javax.swing.JComponent; import javax.swing.JLabel; import javax.swing.JPanel; import javax.swing.JTextField; -import xyz.danielcortes.models.Categoria; import xyz.danielcortes.views.BasePanel; public class CategoriaUpdatePanel extends BasePanel { private JPanel contentPane; private JTextField nombreField; - private JComboBox categoriaCombo; - private DefaultComboBoxModel categoriaModel; private JButton updateButton; + private JButton volverButton; + @Override public JPanel getContentPane() { return contentPane; } @@ -31,22 +28,14 @@ public class CategoriaUpdatePanel extends BasePanel { return nombreField; } - public JComboBox getCategoriaCombo() { - return categoriaCombo; - } - public JButton getUpdateButton() { return updateButton; } - private void createUIComponents() { - this.createCategoriaCombo(); + public JButton getVolverButton() { + return volverButton; } - private void createCategoriaCombo() { - this.categoriaModel = new DefaultComboBoxModel<>(); - this.categoriaCombo = new JComboBox<>(this.categoriaModel); - } { // GUI initializer generated by IntelliJ IDEA GUI Designer @@ -56,52 +45,48 @@ public class CategoriaUpdatePanel 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$$$() { - createUIComponents(); contentPane = new JPanel(); - contentPane.setLayout(new GridLayoutManager(6, 3, new Insets(20, 20, 20, 20), -1, -1)); + contentPane.setLayout(new GridLayoutManager(4, 3, new Insets(20, 20, 20, 20), -1, -1)); final JLabel label1 = new JLabel(); - label1.setText("Categoria:"); - 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)); - final JLabel label2 = new JLabel(); - label2.setText("Nombre:"); - 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)); + label1.setText("Nombre:"); + 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)); + final Spacer spacer1 = new Spacer(); + contentPane.add(spacer1, + new GridConstraints(3, 1, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_VERTICAL, 1, GridConstraints.SIZEPOLICY_WANT_GROW, null, + null, null, 0, false)); + nombreField = new JTextField(); + 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(150, -1), null, 0, false)); + final Spacer spacer2 = new Spacer(); + contentPane.add(spacer2, + new GridConstraints(3, 0, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_WANT_GROW, 1, null, + null, null, 0, false)); + final Spacer spacer3 = new Spacer(); + contentPane.add(spacer3, + new GridConstraints(3, 2, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_WANT_GROW, 1, null, + null, null, 0, false)); + final JPanel panel1 = new JPanel(); + panel1.setLayout(new GridLayoutManager(1, 2, new Insets(0, 0, 0, 0), -1, -1)); + contentPane.add(panel1, new GridConstraints(2, 1, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_BOTH, + GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, + GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, null, null, null, 0, false)); updateButton = new JButton(); updateButton.setText("Actualizar"); - contentPane.add(updateButton, - new GridConstraints(4, 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(); - contentPane.add(spacer1, new GridConstraints(5, 1, 1, 1, GridConstraints.ANCHOR_CENTER, - GridConstraints.FILL_VERTICAL, 1, GridConstraints.SIZEPOLICY_WANT_GROW, null, null, null, 0, - false)); - nombreField = new JTextField(); - contentPane.add(nombreField, new GridConstraints(3, 1, 1, 1, GridConstraints.ANCHOR_WEST, - GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_WANT_GROW, - GridConstraints.SIZEPOLICY_FIXED, null, new Dimension(150, -1), null, 0, false)); - contentPane.add(categoriaCombo, 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 Spacer spacer2 = new Spacer(); - contentPane.add(spacer2, new GridConstraints(5, 0, 1, 1, GridConstraints.ANCHOR_CENTER, - GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_WANT_GROW, 1, null, null, null, - 0, false)); - final Spacer spacer3 = new Spacer(); - contentPane.add(spacer3, new GridConstraints(5, 2, 1, 1, GridConstraints.ANCHOR_CENTER, - GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_WANT_GROW, 1, null, null, null, - 0, false)); + panel1.add(updateButton, new GridConstraints(0, 0, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_HORIZONTAL, + GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, GridConstraints.SIZEPOLICY_FIXED, null, new Dimension(150, -1), + null, 0, false)); + volverButton = new JButton(); + volverButton.setText("Volver"); + panel1.add(volverButton, new GridConstraints(0, 1, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_HORIZONTAL, + GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, GridConstraints.SIZEPOLICY_FIXED, null, new Dimension(150, -1), + null, 0, false)); } /** @@ -110,4 +95,5 @@ public class CategoriaUpdatePanel extends BasePanel { public JComponent $$$getRootComponent$$$() { return contentPane; } + } diff --git a/src/main/java/xyz/danielcortes/views/categoria/CategoriaDeletePanel.form b/src/main/java/xyz/danielcortes/views/categoria/CategoriaViewPanel.form similarity index 70% rename from src/main/java/xyz/danielcortes/views/categoria/CategoriaDeletePanel.form rename to src/main/java/xyz/danielcortes/views/categoria/CategoriaViewPanel.form index 68aab12..d60c3d9 100644 --- a/src/main/java/xyz/danielcortes/views/categoria/CategoriaDeletePanel.form +++ b/src/main/java/xyz/danielcortes/views/categoria/CategoriaViewPanel.form @@ -1,14 +1,22 @@ -
+ - + - + + + + + + + + + @@ -16,35 +24,27 @@ - + - + - + - - - - - - - - - + - + - + - + - + diff --git a/src/main/java/xyz/danielcortes/views/categoria/CategoriaViewPanel.java b/src/main/java/xyz/danielcortes/views/categoria/CategoriaViewPanel.java new file mode 100644 index 0000000..fc32988 --- /dev/null +++ b/src/main/java/xyz/danielcortes/views/categoria/CategoriaViewPanel.java @@ -0,0 +1,80 @@ +package xyz.danielcortes.views.categoria; + +import com.intellij.uiDesigner.core.GridConstraints; +import com.intellij.uiDesigner.core.GridLayoutManager; +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.JLabel; +import javax.swing.JPanel; +import javax.swing.JTextField; +import xyz.danielcortes.views.BasePanel; + +public class CategoriaViewPanel extends BasePanel { + + private JPanel contentPane; + private JTextField nombreField; + private JButton volverButton; + + public JPanel getContentPane() { + return contentPane; + } + + public JTextField getNombreField() { + return nombreField; + } + + public JButton getVolverButton() { + return volverButton; + } + + { +// GUI initializer generated by IntelliJ IDEA GUI Designer +// >>> IMPORTANT!! <<< +// DO NOT EDIT OR ADD ANY CODE HERE! + $$$setupUI$$$(); + } + + /** + * Method generated by IntelliJ IDEA GUI Designer >>> IMPORTANT!! <<< DO NOT edit this method OR call it in your code! + * + * @noinspection ALL + */ + private void $$$setupUI$$$() { + contentPane = new JPanel(); + contentPane.setLayout(new GridLayoutManager(4, 3, new Insets(20, 20, 20, 20), -1, -1)); + final JLabel label1 = new JLabel(); + label1.setText("Nombre:"); + 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(); + 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)); + volverButton = new JButton(); + volverButton.setText("Volver"); + contentPane.add(volverButton, new GridConstraints(2, 1, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_HORIZONTAL, + GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false)); + final Spacer spacer1 = new Spacer(); + contentPane.add(spacer1, + new GridConstraints(3, 1, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_VERTICAL, 1, GridConstraints.SIZEPOLICY_WANT_GROW, null, + null, null, 0, false)); + final Spacer spacer2 = new Spacer(); + contentPane.add(spacer2, + new GridConstraints(3, 2, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_WANT_GROW, 1, null, + null, null, 0, false)); + final Spacer spacer3 = new Spacer(); + contentPane.add(spacer3, + new GridConstraints(3, 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; + } +}