diff --git a/biblioteca.vpp b/biblioteca.vpp index 8f6e6ea..5feccf1 100644 Binary files a/biblioteca.vpp and b/biblioteca.vpp differ diff --git a/script.sql b/script.sql index cd4e236..ac4eb69 100644 --- a/script.sql +++ b/script.sql @@ -26,6 +26,7 @@ drop table if exists libro_idioma; drop table if exists libro_categoria; drop table if exists libro_autor; drop table if exists libro; +drop table if exists ejemplar; drop table if exists editorial; drop table if exists idioma; drop table if exists categoria; @@ -72,15 +73,22 @@ create table idioma create table libro ( id int unsigned primary key auto_increment, - serie varchar(255) unique not null, - isbn varchar(255) not null, + isbn varchar(255) not null, titulo varchar(255) default null, - numero_paginas int not null, - precio_referencia int not null, + numero_paginas int not null, + precio_referencia int not null, ano_publicacion int default null, - editorial_id int unsigned not null, - estado_id int unsigned default 1, - foreign key (editorial_id) references editorial (id) on delete restrict on update cascade, + editorial_id int unsigned not null, + foreign key (editorial_id) references editorial (id) on delete restrict on update cascade +); + +create table ejemplar +( + id int unsigned primary key auto_increment, + serie varchar(255) not null, + libro_id int unsigned not null, + estado_id int unsigned default 1, + foreign key (libro_id) references libro (id) on delete restrict on update cascade, foreign key (estado_id) references estado (id) on delete restrict on update cascade ); diff --git a/src/main/java/xyz/danielcortes/controllers/libro/LibroCreateController.java b/src/main/java/xyz/danielcortes/controllers/libro/LibroCreateController.java index 181c268..296027a 100644 --- a/src/main/java/xyz/danielcortes/controllers/libro/LibroCreateController.java +++ b/src/main/java/xyz/danielcortes/controllers/libro/LibroCreateController.java @@ -54,7 +54,7 @@ public class LibroCreateController extends BaseController { @Override public void show() { this.reload(); - this.view.getSerieField().requestFocus(); + this.view.getIsbnField().requestFocus(); } private void setupListeners() { @@ -62,9 +62,6 @@ public class LibroCreateController extends BaseController { } private void save() { - String serie = this.view.getSerieField().getText(); - if(!validator.validateSerie(serie)) return; - String isbn = this.view.getIsbnField().getText(); if(!validator.validateISBN(isbn)) return; isbn = isbn.replaceAll("[^\\d]", ""); @@ -94,7 +91,6 @@ public class LibroCreateController extends BaseController { if(!validator.validateEditorial(editorial)) return; Libro libro = new Libro(); - libro.setSerie(serie); libro.setIsbn(isbn); libro.setTitulo(titulo); libro.setNumeroPaginas(Integer.parseInt(numeroPaginas)); diff --git a/src/main/java/xyz/danielcortes/controllers/libro/LibroUpdateController.java b/src/main/java/xyz/danielcortes/controllers/libro/LibroUpdateController.java index f280665..bc70d7d 100644 --- a/src/main/java/xyz/danielcortes/controllers/libro/LibroUpdateController.java +++ b/src/main/java/xyz/danielcortes/controllers/libro/LibroUpdateController.java @@ -64,7 +64,6 @@ public class LibroUpdateController extends BaseController { if (libro == null) return; - this.view.getSerieField().setText(String.valueOf(libro.getSerie())); this.view.getIsbnField().setText(libro.getIsbn()); this.view.getTituloField().setText(libro.getTitulo()); this.view.getPaginasField().setText(String.valueOf(libro.getNumeroPaginas())); @@ -89,9 +88,6 @@ public class LibroUpdateController extends BaseController { // @formatter:off if(!validator.validateLibro(libro)) return; - String serie = this.view.getSerieField().getText(); - if(!validator.validateSerie(serie, libro)) return; - String isbn = this.view.getIsbnField().getText(); if(!validator.validateISBN(isbn)) return; isbn = isbn.replaceAll("[^\\d]", ""); @@ -123,7 +119,6 @@ public class LibroUpdateController extends BaseController { assert libro != null; - libro.setSerie(serie); libro.setIsbn(isbn); libro.setTitulo(titulo); libro.setNumeroPaginas(Integer.parseInt(numeroPaginas)); diff --git a/src/main/java/xyz/danielcortes/controllers/libro/LibroViewController.java b/src/main/java/xyz/danielcortes/controllers/libro/LibroViewController.java index 1be8e1e..6714de2 100644 --- a/src/main/java/xyz/danielcortes/controllers/libro/LibroViewController.java +++ b/src/main/java/xyz/danielcortes/controllers/libro/LibroViewController.java @@ -66,7 +66,6 @@ public class LibroViewController extends BaseController { if(libro == null) return; - this.view.getSerieField().setText(this.libro.getSerie()); this.view.getIsbnField().setText(this.libro.getIsbn()); this.view.getTituloField().setText(this.libro.getTitulo()); this.view.getPaginasField().setText(String.valueOf(this.libro.getNumeroPaginas())); diff --git a/src/main/java/xyz/danielcortes/models/Ejemplar.java b/src/main/java/xyz/danielcortes/models/Ejemplar.java new file mode 100644 index 0000000..54dcc6d --- /dev/null +++ b/src/main/java/xyz/danielcortes/models/Ejemplar.java @@ -0,0 +1,68 @@ +package xyz.danielcortes.models; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.Table; + +@Entity +@Table(name = "ejemplar") +public class Ejemplar { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + @Column(name = "id", nullable = false) + private Integer id; + + @Column(name = "serie", nullable = false) + private String serie; + + @ManyToOne + @JoinColumn(name = "libro_id") + private Libro libro; + + @ManyToOne + @JoinColumn(name = "estado_id") + private Estado estado; + + public Integer getId() { + return id; + } + + public void setId(Integer id) { + this.id = id; + } + + public String getSerie() { + return serie; + } + + public void setSerie(String serie) { + this.serie = serie; + } + + public Libro getLibro() { + return libro; + } + + public void setLibro(Libro libro) { + this.libro = libro; + } + + public Estado getEstado() { + return estado; + } + + public void setEstado(Estado estado) { + this.estado = estado; + } + + @Override + public String toString() { + return this.serie + " " + this.estado.getNombre(); + } +} diff --git a/src/main/java/xyz/danielcortes/models/Estado.java b/src/main/java/xyz/danielcortes/models/Estado.java index aa5c0a6..7d2b049 100644 --- a/src/main/java/xyz/danielcortes/models/Estado.java +++ b/src/main/java/xyz/danielcortes/models/Estado.java @@ -23,7 +23,7 @@ public class Estado { private String nombre; @OneToMany(mappedBy = "estado") - private Set libros; + private Set ejemplares; public Integer getId() { return id; @@ -41,15 +41,15 @@ public class Estado { this.nombre = nombre; } - public Set getLibros() { - if (this.libros == null) { - this.libros = new HashSet<>(); + public Set getLibros() { + if (this.ejemplares == null) { + this.ejemplares = new HashSet<>(); } - return libros; + return ejemplares; } - public void setLibros(Set libros) { - this.libros = libros; + public void setLibros(Set ejemplares) { + this.ejemplares = ejemplares; } @Override diff --git a/src/main/java/xyz/danielcortes/models/Libro.java b/src/main/java/xyz/danielcortes/models/Libro.java index a933a31..4a0b8ce 100644 --- a/src/main/java/xyz/danielcortes/models/Libro.java +++ b/src/main/java/xyz/danielcortes/models/Libro.java @@ -1,6 +1,7 @@ package xyz.danielcortes.models; import java.time.Year; +import java.util.HashSet; import java.util.Set; import javax.persistence.Column; import javax.persistence.Convert; @@ -12,6 +13,7 @@ import javax.persistence.JoinColumn; import javax.persistence.JoinTable; import javax.persistence.ManyToMany; import javax.persistence.ManyToOne; +import javax.persistence.OneToMany; import javax.persistence.Table; import xyz.danielcortes.framework.YearAttributeConverter; @@ -24,9 +26,6 @@ public class Libro { @Column(name = "id", nullable = false) private Integer id; - @Column(name = "serie", unique = true) - private String serie; - @Column(name = "isbn", nullable = false) private String isbn; @@ -71,9 +70,8 @@ public class Libro { @JoinColumn(name = "editorial_id") private Editorial editorial; - @ManyToOne - @JoinColumn(name = "estado_id") - private Estado estado; + @OneToMany(mappedBy = "libro") + private Set ejemplares; public Integer getId() { return id; @@ -83,14 +81,6 @@ public class Libro { this.id = id; } - public String getSerie() { - return serie; - } - - public void setSerie(String serie) { - this.serie = serie; - } - public String getIsbn() { return isbn; } @@ -132,6 +122,8 @@ public class Libro { } public Set getIdiomas() { + if(idiomas == null) + this.idiomas = new HashSet<>(); return idiomas; } @@ -140,6 +132,8 @@ public class Libro { } public Set getAutores() { + if(autores == null) + this.autores = new HashSet<>(); return autores; } @@ -148,6 +142,9 @@ public class Libro { } public Set getCategorias() { + if(this.categorias == null) + this.categorias = new HashSet<>(); + return categorias; } @@ -163,17 +160,19 @@ public class Libro { this.editorial = editorial; } - public Estado getEstado() { - return estado; + public Set getEjemplares() { + if(ejemplares == null) + this.ejemplares = new HashSet<>(); + return ejemplares; } - public void setEstado(Estado estado) { - this.estado = estado; + public void setEjemplares(Set ejemplar) { + this.ejemplares = ejemplar; } @Override public String toString() { - return this.serie + " " + this.isbn + " " + this.titulo; + return this.isbn + " " + this.titulo; } } diff --git a/src/main/java/xyz/danielcortes/views/libro/LibroCreatePanel.form b/src/main/java/xyz/danielcortes/views/libro/LibroCreatePanel.form index 0fa9a09..d9811c3 100644 --- a/src/main/java/xyz/danielcortes/views/libro/LibroCreatePanel.form +++ b/src/main/java/xyz/danielcortes/views/libro/LibroCreatePanel.form @@ -1,14 +1,14 @@
- + - + - + @@ -16,17 +16,9 @@ - - - - - - - - - + @@ -36,7 +28,7 @@ - + @@ -44,7 +36,7 @@ - + @@ -52,7 +44,7 @@ - + @@ -60,7 +52,7 @@ - + @@ -70,7 +62,7 @@ - + @@ -85,7 +77,7 @@ - + @@ -100,7 +92,7 @@ - + @@ -113,17 +105,9 @@ - - - - - - - - - + @@ -131,7 +115,7 @@ - + @@ -139,7 +123,7 @@ - + @@ -147,7 +131,7 @@ - + @@ -155,7 +139,7 @@ - + @@ -163,7 +147,7 @@ - + @@ -171,7 +155,7 @@ - + @@ -179,7 +163,7 @@ - + @@ -187,22 +171,22 @@ - + - + - + - + @@ -210,7 +194,7 @@ - + diff --git a/src/main/java/xyz/danielcortes/views/libro/LibroCreatePanel.java b/src/main/java/xyz/danielcortes/views/libro/LibroCreatePanel.java index 420f2de..f5bf157 100644 --- a/src/main/java/xyz/danielcortes/views/libro/LibroCreatePanel.java +++ b/src/main/java/xyz/danielcortes/views/libro/LibroCreatePanel.java @@ -25,7 +25,6 @@ import xyz.danielcortes.views.BasePanel; public class LibroCreatePanel extends BasePanel { private JPanel contentPane; - private JTextField serieField; private JTextField isbnField; private JTextField tituloField; private JTextField paginasField; @@ -45,10 +44,6 @@ public class LibroCreatePanel extends BasePanel { return contentPane; } - public JTextField getSerieField() { - return serieField; - } - public JTextField getIsbnField() { return isbnField; } @@ -120,107 +115,98 @@ public class LibroCreatePanel extends BasePanel { private void $$$setupUI$$$() { createUIComponents(); contentPane = new JPanel(); - contentPane.setLayout(new GridLayoutManager(22, 3, new Insets(20, 20, 20, 20), -1, -1)); - serieField = new JTextField(); - contentPane.add(serieField, - 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.setLayout(new GridLayoutManager(20, 3, new Insets(20, 20, 20, 20), -1, -1)); isbnField = new JTextField(); contentPane.add(isbnField, - new GridConstraints(3, 1, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_WANT_GROW, + 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)); tituloField = new JTextField(); tituloField.setText(""); contentPane.add(tituloField, - new GridConstraints(5, 1, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_WANT_GROW, + 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)); paginasField = new JTextField(); contentPane.add(paginasField, - new GridConstraints(7, 1, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_WANT_GROW, + 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)); anoPublicacionField = new JTextField(); contentPane.add(anoPublicacionField, - new GridConstraints(9, 1, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_WANT_GROW, + new GridConstraints(7, 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(editorialCombo, - new GridConstraints(19, 1, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_CAN_GROW, + new GridConstraints(17, 1, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_CAN_GROW, GridConstraints.SIZEPOLICY_FIXED, null, new Dimension(400, -1), null, 0, false)); guardarButton = new JButton(); guardarButton.setText("Guardar"); - contentPane.add(guardarButton, new GridConstraints(20, 1, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_NONE, + contentPane.add(guardarButton, new GridConstraints(18, 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 JScrollPane scrollPane1 = new JScrollPane(); - contentPane.add(scrollPane1, new GridConstraints(13, 1, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_BOTH, + contentPane.add(scrollPane1, new GridConstraints(11, 1, 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(idiomasList); final JScrollPane scrollPane2 = new JScrollPane(); - contentPane.add(scrollPane2, new GridConstraints(15, 1, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_BOTH, + contentPane.add(scrollPane2, new GridConstraints(13, 1, 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)); scrollPane2.setViewportView(autoresList); final JScrollPane scrollPane3 = new JScrollPane(); - contentPane.add(scrollPane3, new GridConstraints(17, 1, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_BOTH, + contentPane.add(scrollPane3, new GridConstraints(15, 1, 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)); scrollPane3.setViewportView(categoriasList); final JLabel label1 = new JLabel(); - label1.setText("Nº Serie:"); + label1.setText("ISBN:"); 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("ISBN:"); + label2.setText("Titulo:"); 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)); final JLabel label3 = new JLabel(); - label3.setText("Titulo:"); + label3.setText("Nº Paginas:"); 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)); final JLabel label4 = new JLabel(); - label4.setText("Nº Paginas:"); + label4.setText("Año Publicacion:"); contentPane.add(label4, new GridConstraints(6, 1, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false)); final JLabel label5 = new JLabel(); - label5.setText("Año Publicacion:"); - contentPane.add(label5, new GridConstraints(8, 1, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, + label5.setText("Idiomas:"); + contentPane.add(label5, new GridConstraints(10, 1, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false)); final JLabel label6 = new JLabel(); - label6.setText("Idiomas:"); + label6.setText("Autores:"); contentPane.add(label6, new GridConstraints(12, 1, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false)); final JLabel label7 = new JLabel(); - label7.setText("Autores:"); + label7.setText("Categorias:"); contentPane.add(label7, new GridConstraints(14, 1, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false)); final JLabel label8 = new JLabel(); - label8.setText("Categorias:"); + label8.setText("Editorial:"); contentPane.add(label8, new GridConstraints(16, 1, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false)); - final JLabel label9 = new JLabel(); - label9.setText("Editorial:"); - contentPane.add(label9, new GridConstraints(18, 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(7, 2, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_WANT_GROW, 1, null, + new GridConstraints(5, 2, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_WANT_GROW, 1, null, null, null, 0, false)); final Spacer spacer2 = new Spacer(); contentPane.add(spacer2, - new GridConstraints(7, 0, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_WANT_GROW, 1, null, + 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(21, 1, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_VERTICAL, 1, GridConstraints.SIZEPOLICY_WANT_GROW, null, + new GridConstraints(19, 1, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_VERTICAL, 1, GridConstraints.SIZEPOLICY_WANT_GROW, null, null, null, 0, false)); - final JLabel label10 = new JLabel(); - label10.setText("Precio Referencia:"); - contentPane.add(label10, - new GridConstraints(10, 1, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, - GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false)); + final JLabel label9 = new JLabel(); + label9.setText("Precio Referencia:"); + contentPane.add(label9, new GridConstraints(8, 1, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, + GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false)); precioReferenciaField = new JTextField(); contentPane.add(precioReferenciaField, - new GridConstraints(11, 1, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_WANT_GROW, + new GridConstraints(9, 1, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_WANT_GROW, GridConstraints.SIZEPOLICY_FIXED, null, new Dimension(400, -1), null, 0, false)); } diff --git a/src/main/java/xyz/danielcortes/views/libro/LibroSearchPanel.java b/src/main/java/xyz/danielcortes/views/libro/LibroSearchPanel.java index 6746c08..1b74c96 100644 --- a/src/main/java/xyz/danielcortes/views/libro/LibroSearchPanel.java +++ b/src/main/java/xyz/danielcortes/views/libro/LibroSearchPanel.java @@ -65,13 +65,13 @@ public class LibroSearchPanel extends BasePanel { private void createLibrosTable() { //@formatter:off this.librosModel = new BaseTableModel<>( - new String[]{"Serie", "ISBN", "Titulo", "Precio Referencial"}, + new String[]{"ISBN", "Titulo", "Precio Referencial", "Stock"}, (rows, rowIndex, colIndex) -> { switch(colIndex) { - case 0: return rows.get(rowIndex).getSerie(); - case 1: return rows.get(rowIndex).getIsbn(); - case 2: return rows.get(rowIndex).getTitulo(); - case 3: return rows.get(rowIndex).getPrecioReferencia(); + case 0: return rows.get(rowIndex).getIsbn(); + case 1: return rows.get(rowIndex).getTitulo(); + case 2: return rows.get(rowIndex).getPrecioReferencia(); + case 3: return rows.get(rowIndex).getEjemplares().size(); default: return null; } } diff --git a/src/main/java/xyz/danielcortes/views/libro/LibroUpdatePanel.form b/src/main/java/xyz/danielcortes/views/libro/LibroUpdatePanel.form index 5c621dd..459f1fb 100644 --- a/src/main/java/xyz/danielcortes/views/libro/LibroUpdatePanel.form +++ b/src/main/java/xyz/danielcortes/views/libro/LibroUpdatePanel.form @@ -1,32 +1,16 @@ - + - + - - - - - - - - - - - - - - - - - + @@ -34,7 +18,7 @@ - + @@ -42,7 +26,7 @@ - + @@ -50,7 +34,7 @@ - + @@ -58,7 +42,7 @@ - + @@ -66,7 +50,7 @@ - + @@ -74,7 +58,7 @@ - + @@ -82,7 +66,7 @@ - + @@ -90,7 +74,7 @@ - + @@ -98,7 +82,7 @@ - + @@ -106,7 +90,7 @@ - + @@ -114,7 +98,7 @@ - + @@ -129,7 +113,7 @@ - + @@ -137,7 +121,7 @@ - + @@ -152,7 +136,7 @@ - + @@ -160,7 +144,7 @@ - + @@ -175,7 +159,7 @@ - + @@ -183,7 +167,7 @@ - + @@ -191,7 +175,7 @@ - + @@ -201,17 +185,17 @@ - + - + - + diff --git a/src/main/java/xyz/danielcortes/views/libro/LibroUpdatePanel.java b/src/main/java/xyz/danielcortes/views/libro/LibroUpdatePanel.java index 2adacee..3b10959 100644 --- a/src/main/java/xyz/danielcortes/views/libro/LibroUpdatePanel.java +++ b/src/main/java/xyz/danielcortes/views/libro/LibroUpdatePanel.java @@ -25,7 +25,6 @@ import xyz.danielcortes.views.BasePanel; public class LibroUpdatePanel extends BasePanel { private JPanel contentPane; - private JTextField serieField; private JTextField isbnField; private JTextField tituloField; private JTextField paginasField; @@ -45,10 +44,6 @@ public class LibroUpdatePanel extends BasePanel { return contentPane; } - public JTextField getSerieField() { - return serieField; - } - public JTextField getIsbnField() { return isbnField; } @@ -150,106 +145,97 @@ public class LibroUpdatePanel extends BasePanel { private void $$$setupUI$$$() { createUIComponents(); contentPane = new JPanel(); - contentPane.setLayout(new GridLayoutManager(22, 3, new Insets(20, 20, 20, 20), -1, -1)); + contentPane.setLayout(new GridLayoutManager(20, 3, new Insets(20, 20, 20, 20), -1, -1)); final JLabel label1 = new JLabel(); - label1.setText("Nº Serie:"); + label1.setText("ISBN:"); 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)); - serieField = new JTextField(); - contentPane.add(serieField, - 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("ISBN:"); - 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)); isbnField = new JTextField(); contentPane.add(isbnField, - new GridConstraints(3, 1, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_WANT_GROW, + 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 label3 = new JLabel(); - label3.setText("Titulo:"); - contentPane.add(label3, new GridConstraints(4, 1, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, + final JLabel label2 = new JLabel(); + label2.setText("Titulo:"); + 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)); tituloField = new JTextField(); contentPane.add(tituloField, - new GridConstraints(5, 1, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_WANT_GROW, + 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 label4 = new JLabel(); - label4.setText("Nº Paginas:"); - contentPane.add(label4, new GridConstraints(6, 1, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, + final JLabel label3 = new JLabel(); + label3.setText("Nº Paginas:"); + 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)); paginasField = new JTextField(); contentPane.add(paginasField, - new GridConstraints(7, 1, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_WANT_GROW, + 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)); - final JLabel label5 = new JLabel(); - label5.setText("Año Publicacion:"); - contentPane.add(label5, new GridConstraints(8, 1, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, + final JLabel label4 = new JLabel(); + label4.setText("Año Publicacion:"); + contentPane.add(label4, new GridConstraints(6, 1, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false)); anoPublicacionField = new JTextField(); contentPane.add(anoPublicacionField, - new GridConstraints(9, 1, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_WANT_GROW, + new GridConstraints(7, 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 label6 = new JLabel(); - label6.setText("Precio Referencia:"); - contentPane.add(label6, new GridConstraints(10, 1, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, + final JLabel label5 = new JLabel(); + label5.setText("Precio Referencia:"); + contentPane.add(label5, new GridConstraints(8, 1, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false)); precioReferenciaField = new JTextField(); contentPane.add(precioReferenciaField, - new GridConstraints(11, 1, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_WANT_GROW, + new GridConstraints(9, 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 label7 = new JLabel(); - label7.setText("Idiomas:"); - contentPane.add(label7, new GridConstraints(12, 1, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, + final JLabel label6 = new JLabel(); + label6.setText("Idiomas:"); + contentPane.add(label6, new GridConstraints(10, 1, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false)); final JScrollPane scrollPane1 = new JScrollPane(); - contentPane.add(scrollPane1, new GridConstraints(13, 1, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_BOTH, + contentPane.add(scrollPane1, new GridConstraints(11, 1, 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(idiomasList); - final JLabel label8 = new JLabel(); - label8.setText("Autores:"); - contentPane.add(label8, new GridConstraints(14, 1, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, + final JLabel label7 = new JLabel(); + label7.setText("Autores:"); + contentPane.add(label7, new GridConstraints(12, 1, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false)); final JScrollPane scrollPane2 = new JScrollPane(); - contentPane.add(scrollPane2, new GridConstraints(15, 1, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_BOTH, + contentPane.add(scrollPane2, new GridConstraints(13, 1, 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)); scrollPane2.setViewportView(autoresList); - final JLabel label9 = new JLabel(); - label9.setText("Categorias:"); - contentPane.add(label9, new GridConstraints(16, 1, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, + final JLabel label8 = new JLabel(); + label8.setText("Categorias:"); + contentPane.add(label8, new GridConstraints(14, 1, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false)); final JScrollPane scrollPane3 = new JScrollPane(); - contentPane.add(scrollPane3, new GridConstraints(17, 1, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_BOTH, + contentPane.add(scrollPane3, new GridConstraints(15, 1, 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)); scrollPane3.setViewportView(categoriasList); - final JLabel label10 = new JLabel(); - label10.setText("Editorial:"); - contentPane.add(label10, - new GridConstraints(18, 1, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, - GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false)); + final JLabel label9 = new JLabel(); + label9.setText("Editorial:"); + contentPane.add(label9, new GridConstraints(16, 1, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, + GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false)); contentPane.add(editorialCombo, - new GridConstraints(19, 1, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_CAN_GROW, + new GridConstraints(17, 1, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_CAN_GROW, GridConstraints.SIZEPOLICY_FIXED, null, new Dimension(400, -1), null, 0, false)); actualizarButton = new JButton(); actualizarButton.setText("Actualizar"); - contentPane.add(actualizarButton, new GridConstraints(20, 1, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_NONE, + contentPane.add(actualizarButton, new GridConstraints(18, 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 Spacer spacer1 = new Spacer(); contentPane.add(spacer1, - new GridConstraints(21, 1, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_VERTICAL, 1, GridConstraints.SIZEPOLICY_WANT_GROW, null, + new GridConstraints(19, 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(21, 0, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_WANT_GROW, 1, + new GridConstraints(19, 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(21, 2, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_WANT_GROW, 1, + new GridConstraints(19, 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/libro/LibroViewPanel.form b/src/main/java/xyz/danielcortes/views/libro/LibroViewPanel.form index 71bf6e2..02e9a96 100644 --- a/src/main/java/xyz/danielcortes/views/libro/LibroViewPanel.form +++ b/src/main/java/xyz/danielcortes/views/libro/LibroViewPanel.form @@ -1,14 +1,14 @@ - + - + - + @@ -18,19 +18,9 @@ - - - - - - - - - - - + @@ -41,7 +31,7 @@ - + @@ -51,7 +41,7 @@ - + @@ -61,7 +51,7 @@ - + @@ -69,7 +59,7 @@ - + @@ -79,7 +69,7 @@ - + @@ -94,7 +84,7 @@ - + @@ -109,7 +99,7 @@ - + @@ -122,17 +112,9 @@ - - - - - - - - - + @@ -140,7 +122,7 @@ - + @@ -148,7 +130,7 @@ - + @@ -156,7 +138,7 @@ - + @@ -164,7 +146,7 @@ - + @@ -172,7 +154,7 @@ - + @@ -180,7 +162,7 @@ - + @@ -188,7 +170,7 @@ - + @@ -196,12 +178,12 @@ - + - + @@ -209,7 +191,7 @@ - + @@ -219,12 +201,12 @@ - + - + diff --git a/src/main/java/xyz/danielcortes/views/libro/LibroViewPanel.java b/src/main/java/xyz/danielcortes/views/libro/LibroViewPanel.java index 32ec39c..b3169e5 100644 --- a/src/main/java/xyz/danielcortes/views/libro/LibroViewPanel.java +++ b/src/main/java/xyz/danielcortes/views/libro/LibroViewPanel.java @@ -25,7 +25,6 @@ import xyz.danielcortes.views.BasePanel; public class LibroViewPanel extends BasePanel { private JPanel contentPane; - private JTextField serieField; private JTextField isbnField; private JTextField tituloField; private JTextField paginasField; @@ -45,10 +44,6 @@ public class LibroViewPanel extends BasePanel { return contentPane; } - public JTextField getSerieField() { - return serieField; - } - public JTextField getIsbnField() { return isbnField; } @@ -120,113 +115,103 @@ public class LibroViewPanel extends BasePanel { private void $$$setupUI$$$() { createUIComponents(); contentPane = new JPanel(); - contentPane.setLayout(new GridLayoutManager(22, 3, new Insets(20, 20, 20, 20), -1, -1)); - serieField = new JTextField(); - serieField.setEditable(false); - contentPane.add(serieField, - 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.setLayout(new GridLayoutManager(20, 3, new Insets(20, 20, 20, 20), -1, -1)); isbnField = new JTextField(); isbnField.setEditable(false); contentPane.add(isbnField, - new GridConstraints(3, 1, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_WANT_GROW, + 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)); tituloField = new JTextField(); tituloField.setEditable(false); tituloField.setText(""); contentPane.add(tituloField, - new GridConstraints(5, 1, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_WANT_GROW, + 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)); paginasField = new JTextField(); paginasField.setEditable(false); contentPane.add(paginasField, - new GridConstraints(7, 1, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_WANT_GROW, + 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)); anoPublicacionField = new JTextField(); anoPublicacionField.setEditable(false); contentPane.add(anoPublicacionField, - new GridConstraints(9, 1, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_WANT_GROW, + new GridConstraints(7, 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(editorialCombo, - new GridConstraints(19, 1, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_CAN_GROW, + new GridConstraints(17, 1, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_CAN_GROW, GridConstraints.SIZEPOLICY_FIXED, null, new Dimension(400, -1), null, 0, false)); volverButton = new JButton(); volverButton.setText("Volver"); - contentPane.add(volverButton, new GridConstraints(20, 1, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_NONE, + contentPane.add(volverButton, new GridConstraints(18, 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 JScrollPane scrollPane1 = new JScrollPane(); - contentPane.add(scrollPane1, new GridConstraints(13, 1, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_BOTH, + contentPane.add(scrollPane1, new GridConstraints(11, 1, 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(idiomasList); final JScrollPane scrollPane2 = new JScrollPane(); - contentPane.add(scrollPane2, new GridConstraints(15, 1, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_BOTH, + contentPane.add(scrollPane2, new GridConstraints(13, 1, 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)); scrollPane2.setViewportView(autoresList); final JScrollPane scrollPane3 = new JScrollPane(); - contentPane.add(scrollPane3, new GridConstraints(17, 1, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_BOTH, + contentPane.add(scrollPane3, new GridConstraints(15, 1, 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)); scrollPane3.setViewportView(categoriasList); final JLabel label1 = new JLabel(); - label1.setText("Nº Serie:"); + label1.setText("ISBN:"); 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("ISBN:"); + label2.setText("Titulo:"); 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)); final JLabel label3 = new JLabel(); - label3.setText("Titulo:"); + label3.setText("Nº Paginas:"); 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)); final JLabel label4 = new JLabel(); - label4.setText("Nº Paginas:"); + label4.setText("Año Publicacion:"); contentPane.add(label4, new GridConstraints(6, 1, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false)); final JLabel label5 = new JLabel(); - label5.setText("Año Publicacion:"); - contentPane.add(label5, new GridConstraints(8, 1, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, + label5.setText("Idiomas:"); + contentPane.add(label5, new GridConstraints(10, 1, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false)); final JLabel label6 = new JLabel(); - label6.setText("Idiomas:"); + label6.setText("Autores:"); contentPane.add(label6, new GridConstraints(12, 1, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false)); final JLabel label7 = new JLabel(); - label7.setText("Autores:"); + label7.setText("Categorias:"); contentPane.add(label7, new GridConstraints(14, 1, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false)); final JLabel label8 = new JLabel(); - label8.setText("Categorias:"); + label8.setText("Editorial:"); contentPane.add(label8, new GridConstraints(16, 1, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false)); - final JLabel label9 = new JLabel(); - label9.setText("Editorial:"); - contentPane.add(label9, new GridConstraints(18, 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(21, 1, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_VERTICAL, 1, GridConstraints.SIZEPOLICY_WANT_GROW, null, + new GridConstraints(19, 1, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_VERTICAL, 1, GridConstraints.SIZEPOLICY_WANT_GROW, null, null, null, 0, false)); - final JLabel label10 = new JLabel(); - label10.setText("Precio Referencia:"); - contentPane.add(label10, - new GridConstraints(10, 1, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, - GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false)); + final JLabel label9 = new JLabel(); + label9.setText("Precio Referencia:"); + contentPane.add(label9, new GridConstraints(8, 1, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, + GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false)); precioReferenciaField = new JTextField(); precioReferenciaField.setEditable(false); contentPane.add(precioReferenciaField, - new GridConstraints(11, 1, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_WANT_GROW, + new GridConstraints(9, 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(21, 2, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_WANT_GROW, 1, + new GridConstraints(19, 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(21, 0, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_WANT_GROW, 1, + new GridConstraints(19, 0, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_WANT_GROW, 1, null, null, null, 0, false)); }