diff --git a/UyTube_aplicacion/src/Presentacion/Usuario/frmModificarUsuario.form b/UyTube_aplicacion/src/Presentacion/Usuario/frmModificarUsuario.form
index ef5d5bd1005291ae04f15a4620411e578f6559cb..f68238dffcdbf9811ffd8597436012d334503a33 100644
--- a/UyTube_aplicacion/src/Presentacion/Usuario/frmModificarUsuario.form
+++ b/UyTube_aplicacion/src/Presentacion/Usuario/frmModificarUsuario.form
@@ -346,20 +346,6 @@
</Constraint>
</Constraints>
</Component>
- <Component class="javax.swing.JTextField" name="txtContraNueva1">
- <Constraints>
- <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
- <AbsoluteConstraints x="470" y="300" width="160" height="-1"/>
- </Constraint>
- </Constraints>
- </Component>
- <Component class="javax.swing.JTextField" name="txtContraNueva">
- <Constraints>
- <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
- <AbsoluteConstraints x="470" y="270" width="160" height="-1"/>
- </Constraint>
- </Constraints>
- </Component>
<Component class="javax.swing.JTextField" name="txtApellido">
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
@@ -483,6 +469,26 @@
</Constraint>
</Constraints>
</Component>
+ <Component class="javax.swing.JPasswordField" name="txtContraNueva2">
+ <Properties>
+ <Property name="text" type="java.lang.String" value="jPasswordField1"/>
+ </Properties>
+ <Constraints>
+ <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+ <AbsoluteConstraints x="450" y="300" width="170" height="-1"/>
+ </Constraint>
+ </Constraints>
+ </Component>
+ <Component class="javax.swing.JPasswordField" name="txtContraNueva1">
+ <Properties>
+ <Property name="text" type="java.lang.String" value="jPasswordField1"/>
+ </Properties>
+ <Constraints>
+ <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+ <AbsoluteConstraints x="450" y="270" width="170" height="-1"/>
+ </Constraint>
+ </Constraints>
+ </Component>
</SubComponents>
</Container>
</SubComponents>
diff --git a/UyTube_aplicacion/src/Presentacion/Usuario/frmModificarUsuario.java b/UyTube_aplicacion/src/Presentacion/Usuario/frmModificarUsuario.java
index ad75ef0c568adea7fd85d784c1ee0b523f72cdcc..83733c56244e254af964c8119d6392b1780792c8 100644
--- a/UyTube_aplicacion/src/Presentacion/Usuario/frmModificarUsuario.java
+++ b/UyTube_aplicacion/src/Presentacion/Usuario/frmModificarUsuario.java
@@ -28,8 +28,8 @@ public class frmModificarUsuario extends javax.swing.JDialog {
super(parent, modal);
initComponents();
this.setLocationRelativeTo(null);
- txtContraNueva.setEnabled(false); // TODO add your handling code here:
txtContraNueva1.setEnabled(false); // TODO add your handling code here:
+ txtContraNueva2.setEnabled(false); // TODO add your handling code here:
lbCN.setEnabled(false);
lbRCN.setEnabled(false);
btnVideo.setEnabled(false);
@@ -77,8 +77,6 @@ public class frmModificarUsuario extends javax.swing.JDialog {
jpImagen = new javax.swing.JPanel();
lbImg = new javax.swing.JLabel();
jSeparator6 = new javax.swing.JSeparator();
- txtContraNueva1 = new javax.swing.JTextField();
- txtContraNueva = new javax.swing.JTextField();
txtApellido = new javax.swing.JTextField();
lbApellido = new javax.swing.JLabel();
lbRCN = new javax.swing.JLabel();
@@ -90,6 +88,8 @@ public class frmModificarUsuario extends javax.swing.JDialog {
lbImagen1 = new javax.swing.JLabel();
dcFecha = new com.toedter.calendar.JDateChooser();
btnQuitarImagen = new javax.swing.JButton();
+ txtContraNueva2 = new javax.swing.JPasswordField();
+ txtContraNueva1 = new javax.swing.JPasswordField();
setDefaultCloseOperation(javax.swing.WindowConstants.DISPOSE_ON_CLOSE);
setTitle("Modificar usuario");
@@ -199,8 +199,6 @@ public class frmModificarUsuario extends javax.swing.JDialog {
lbMes.add(jpImagen, new org.netbeans.lib.awtextra.AbsoluteConstraints(330, 370, 110, 110));
lbMes.add(jSeparator6, new org.netbeans.lib.awtextra.AbsoluteConstraints(310, 40, 650, 20));
- lbMes.add(txtContraNueva1, new org.netbeans.lib.awtextra.AbsoluteConstraints(470, 300, 160, -1));
- lbMes.add(txtContraNueva, new org.netbeans.lib.awtextra.AbsoluteConstraints(470, 270, 160, -1));
lbMes.add(txtApellido, new org.netbeans.lib.awtextra.AbsoluteConstraints(390, 100, 230, -1));
lbApellido.setText("Apellido");
@@ -246,6 +244,12 @@ public class frmModificarUsuario extends javax.swing.JDialog {
});
lbMes.add(btnQuitarImagen, new org.netbeans.lib.awtextra.AbsoluteConstraints(450, 430, 170, 50));
+ txtContraNueva2.setText("jPasswordField1");
+ lbMes.add(txtContraNueva2, new org.netbeans.lib.awtextra.AbsoluteConstraints(450, 300, 170, -1));
+
+ txtContraNueva1.setText("jPasswordField1");
+ lbMes.add(txtContraNueva1, new org.netbeans.lib.awtextra.AbsoluteConstraints(450, 270, 170, -1));
+
javax.swing.GroupLayout layout = new javax.swing.GroupLayout(getContentPane());
getContentPane().setLayout(layout);
layout.setHorizontalGroup(
@@ -280,8 +284,8 @@ public class frmModificarUsuario extends javax.swing.JDialog {
private void desactivarCampos() {
txtNombre.setEnabled(false);
- txtContraNueva.setEnabled(false);
txtContraNueva1.setEnabled(false);
+ txtContraNueva2.setEnabled(false);
txtDescrpcion.setEnabled(false);
txtNombreCanal.setEnabled(false);
txtApellido.setEnabled(false);
@@ -435,12 +439,14 @@ public class frmModificarUsuario extends javax.swing.JDialog {
String pass = user.getContrasenia();
if (chkCambiarContra.isSelected()) {
- if (!(txtContraNueva.getText().equals("") && txtContraNueva1.getText().equals(""))) {
+ if (!(txtContraNueva1.getText().equals("") && txtContraNueva2.getText().equals(""))) {
- if (txtContraNueva.getText().equals(txtContraNueva1.getText())) {
- pass = txtContraNueva.getText();
+ if (txtContraNueva1.getText().equals(txtContraNueva2.getText())) {
+ pass = txtContraNueva1.getText();
} else {
JOptionPane.showMessageDialog(null, "Las contraseñas no coinciden, no se pudo efectuar el cambio de contraseña. Inténtelo de nuevo", "OK", JOptionPane.WARNING_MESSAGE);
+ txtContraNueva1.setText("");
+ txtContraNueva2.setText("");
return;
}
@@ -533,8 +539,8 @@ public class frmModificarUsuario extends javax.swing.JDialog {
DtCanal dtc = sys.obtenerCanalDeUsuario();
cargarDatosDelCanal(dtc);
ruta = user.getImagen();
- txtContraNueva.setText("");
txtContraNueva1.setText("");
+ txtContraNueva2.setText("");
} catch (Exception e) {
JOptionPane.showMessageDialog(null, "Ha ocurrido un error", "Error", JOptionPane.ERROR_MESSAGE);
@@ -544,14 +550,14 @@ public class frmModificarUsuario extends javax.swing.JDialog {
private void chkCambiarContraActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_chkCambiarContraActionPerformed
if (chkCambiarContra.isSelected()) {
- txtContraNueva.setEnabled(true);
txtContraNueva1.setEnabled(true);
+ txtContraNueva2.setEnabled(true);
lbCN.setEnabled(true);
lbRCN.setEnabled(true);
} else {
- txtContraNueva.setEnabled(false);
txtContraNueva1.setEnabled(false);
+ txtContraNueva2.setEnabled(false);
lbCN.setEnabled(false);
lbRCN.setEnabled(false);
} // TODO add your handling code here:
@@ -598,8 +604,8 @@ public class frmModificarUsuario extends javax.swing.JDialog {
private javax.swing.JRadioButton rbPrivado;
private javax.swing.JRadioButton rbPublico;
private javax.swing.JTextField txtApellido;
- private javax.swing.JTextField txtContraNueva;
- private javax.swing.JTextField txtContraNueva1;
+ private javax.swing.JPasswordField txtContraNueva1;
+ private javax.swing.JPasswordField txtContraNueva2;
private javax.swing.JTextField txtCorreo;
private javax.swing.JTextArea txtDescrpcion;
private javax.swing.JTextField txtNombre;