formating

.gitignore

@@ -7,7 +7,7 @@ nbactions.xml
 *.log
 docker.sock
 .DS_Store
-.settings/
 .classpath
 .factorypath
+.settings/
 .project

pom.xml

@@ -8,8 +8,8 @@
   <packaging>jar</packaging>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <maven.compiler.source>11</maven.compiler.source>
+    <maven.compiler.source>1.8</maven.compiler.source>
-    <maven.compiler.target>11</maven.compiler.target>
+    <maven.compiler.target>1.8</maven.compiler.target>
     <derby.version>10.14.2.0</derby.version>
   </properties>
   <dependencies>

src/main/java/com/unicenta/pos/admin/PeopleView.form

@@ -19,10 +19,93 @@
     <AuxValue name="FormSettings_listenerGenerationStyle" type="java.lang.Integer" value="0"/>
     <AuxValue name="FormSettings_variablesLocal" type="java.lang.Boolean" value="false"/>
     <AuxValue name="FormSettings_variablesModifier" type="java.lang.Integer" value="2"/>
-    <AuxValue name="designerSize" type="java.awt.Dimension" value="-84,-19,0,5,115,114,0,18,106,97,118,97,46,97,119,116,46,68,105,109,101,110,115,105,111,110,65,-114,-39,-41,-84,95,68,20,2,0,2,73,0,6,104,101,105,103,104,116,73,0,5,119,105,100,116,104,120,112,0,0,1,-128,0,0,1,-51"/>
   </AuxValues>
+
+  <Layout>
+    <DimensionLayout dim="0">
+      <Group type="103" groupAlignment="0" attributes="0">
+          <Group type="102" attributes="0">
+              <EmptySpace max="-2" attributes="0"/>
+              <Group type="103" groupAlignment="0" attributes="0">
+                  <Group type="102" attributes="0">
+                      <Component id="jLabel3" min="-2" max="-2" attributes="0"/>
+                      <EmptySpace type="separate" max="-2" attributes="0"/>
+                      <Component id="m_jVisible" min="-2" pref="207" max="-2" attributes="0"/>
+                  </Group>
+                  <Group type="102" alignment="0" attributes="0">
+                      <Component id="jLabel2" min="-2" max="-2" attributes="0"/>
+                      <EmptySpace type="unrelated" max="-2" attributes="0"/>
+                      <Component id="m_jRole" min="-2" pref="180" max="-2" attributes="0"/>
+                  </Group>
+                  <Group type="102" alignment="0" attributes="0">
+                      <Component id="jLabel4" min="-2" max="-2" attributes="0"/>
+                      <EmptySpace type="unrelated" max="-2" attributes="0"/>
+                      <Component id="m_jImage" min="-2" max="-2" attributes="0"/>
+                  </Group>
+                  <Group type="102" alignment="0" attributes="0">
+                      <Component id="jLblCardID" min="-2" max="-2" attributes="0"/>
+                      <EmptySpace type="unrelated" max="-2" attributes="0"/>
+                      <Component id="m_jcard" min="-2" pref="180" max="-2" attributes="0"/>
+                      <EmptySpace max="-2" attributes="0"/>
+                      <Component id="webCBSecurity" max="-2" attributes="0"/>
+                  </Group>
+                  <Group type="102" alignment="0" attributes="0">
+                      <Group type="103" groupAlignment="0" attributes="0">
+                          <Component id="jLabel1" min="-2" max="-2" attributes="0"/>
+                          <Component id="jLabel6" alignment="0" min="-2" max="-2" attributes="0"/>
+                      </Group>
+                      <EmptySpace type="unrelated" max="-2" attributes="0"/>
+                      <Group type="103" groupAlignment="0" attributes="0">
+                          <Component id="jButton1" min="-2" max="-2" attributes="0"/>
+                          <Component id="m_jName" min="-2" pref="180" max="-2" attributes="0"/>
+                      </Group>
+                  </Group>
+              </Group>
+              <EmptySpace max="-2" attributes="0"/>
+          </Group>
+      </Group>
+    </DimensionLayout>
+    <DimensionLayout dim="1">
+      <Group type="103" groupAlignment="0" attributes="0">
+          <Group type="102" alignment="1" attributes="0">
+              <EmptySpace type="separate" max="-2" attributes="0"/>
+              <Group type="103" groupAlignment="3" attributes="0">
+                  <Component id="jLabel1" alignment="3" min="-2" max="-2" attributes="0"/>
+                  <Component id="m_jName" alignment="3" min="-2" max="-2" attributes="0"/>
+              </Group>
+              <EmptySpace type="unrelated" max="-2" attributes="0"/>
+              <Group type="103" groupAlignment="2" attributes="0">
+                  <Component id="jLabel6" alignment="2" min="-2" max="-2" attributes="0"/>
+                  <Component id="jButton1" alignment="2" min="-2" max="-2" attributes="0"/>
+              </Group>
+              <EmptySpace type="unrelated" max="-2" attributes="0"/>
+              <Group type="103" groupAlignment="2" attributes="0">
+                  <Component id="jLblCardID" alignment="2" min="-2" max="-2" attributes="0"/>
+                  <Component id="m_jcard" alignment="2" min="-2" max="-2" attributes="0"/>
+                  <Component id="webCBSecurity" alignment="2" min="-2" max="-2" attributes="0"/>
+              </Group>
+              <EmptySpace type="unrelated" max="-2" attributes="0"/>
+              <Group type="103" groupAlignment="3" attributes="0">
+                  <Component id="jLabel2" alignment="3" min="-2" max="-2" attributes="0"/>
+                  <Component id="m_jRole" alignment="3" min="-2" max="-2" attributes="0"/>
+              </Group>
+              <EmptySpace type="unrelated" max="-2" attributes="0"/>
+              <Group type="103" groupAlignment="0" attributes="0">
+                  <Component id="jLabel3" min="-2" pref="25" max="-2" attributes="0"/>
+                  <Component id="m_jVisible" min="-2" pref="25" max="-2" attributes="0"/>
+              </Group>
+              <EmptySpace min="-2" pref="15" max="-2" attributes="0"/>
+              <Group type="103" groupAlignment="0" attributes="0">
+                  <Component id="m_jImage" min="-2" max="-2" attributes="0"/>
+                  <Component id="jLabel4" min="-2" max="-2" attributes="0"/>
+              </Group>
+              <EmptySpace max="32767" attributes="0"/>
+          </Group>
+      </Group>
+    </DimensionLayout>
+  </Layout>
   <SubComponents>
-    <Component class="javax.swing.JLabel" name="nameLabel">
+    <Component class="javax.swing.JLabel" name="jLabel1">
       <Properties>
         <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
           <Font name="Arial" size="14" style="0"/>
@@ -38,10 +121,10 @@
         </Property>
       </Properties>
       <Events>
-        <EventHandler event="mouseClicked" listener="java.awt.event.MouseListener" parameters="java.awt.event.MouseEvent" handler="nameLabelMouseClicked"/>
+        <EventHandler event="mouseClicked" listener="java.awt.event.MouseListener" parameters="java.awt.event.MouseEvent" handler="jLabel1MouseClicked"/>
       </Events>
     </Component>
-    <Component class="javax.swing.JTextField" name="nameTextField">
+    <Component class="javax.swing.JTextField" name="m_jName">
       <Properties>
         <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
           <Font name="Arial" size="14" style="0"/>
@@ -51,7 +134,7 @@
         </Property>
       </Properties>
     </Component>
-    <Component class="javax.swing.JCheckBox" name="isVisible">
+    <Component class="javax.swing.JCheckBox" name="m_jVisible">
       <Properties>
         <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
           <Font name="Arial" size="12" style="0"/>
@@ -61,7 +144,7 @@
         </Property>
       </Properties>
     </Component>
-    <Component class="javax.swing.JLabel" name="visiableLabel">
+    <Component class="javax.swing.JLabel" name="jLabel3">
       <Properties>
         <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
           <Font name="Arial" size="14" style="0"/>
@@ -74,7 +157,7 @@
         </Property>
       </Properties>
     </Component>
-    <Component class="javax.swing.JLabel" name="imageLabel">
+    <Component class="javax.swing.JLabel" name="jLabel4">
       <Properties>
         <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
           <Font name="Arial" size="14" style="0"/>
@@ -87,7 +170,7 @@
         </Property>
       </Properties>
     </Component>
-    <Component class="com.unicenta.data.gui.JImageEditor" name="imageEditor">
+    <Component class="com.unicenta.data.gui.JImageEditor" name="m_jImage">
       <Properties>
         <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
           <Font name="Arial" size="12" style="0"/>
@@ -127,7 +210,7 @@
         </Property>
       </Properties>
     </Component>
-    <Component class="javax.swing.JLabel" name="roleLabel">
+    <Component class="javax.swing.JLabel" name="jLabel2">
       <Properties>
         <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
           <Font name="Arial" size="14" style="0"/>
@@ -140,7 +223,7 @@
         </Property>
       </Properties>
     </Component>
-    <Component class="javax.swing.JTextField" name="cardIdTextField">
+    <Component class="javax.swing.JTextField" name="m_jcard">
       <Properties>
         <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
           <Font name="Arial" size="14" style="0"/>
@@ -150,7 +233,7 @@
         </Property>
       </Properties>
     </Component>
-    <Component class="javax.swing.JLabel" name="cardIdLabel">
+    <Component class="javax.swing.JLabel" name="jLblCardID">
       <Properties>
         <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
           <Font name="Arial" size="14" style="0"/>
@@ -163,7 +246,33 @@
         </Property>
       </Properties>
     </Component>
-    <Component class="javax.swing.JLabel" name="passwordLabel">
+    <Component class="com.alee.laf.combobox.WebComboBox" name="webCBSecurity">
+      <Properties>
+        <Property name="model" type="javax.swing.ComboBoxModel" editor="org.netbeans.modules.form.editors2.ComboBoxModelEditor">
+          <StringArray count="3">
+            <StringItem index="0" value="Generate new key"/>
+            <StringItem index="1" value="Delete exisitng key"/>
+            <StringItem index="2" value="Use iButton ID"/>
+          </StringArray>
+        </Property>
+        <Property name="selectedIndex" type="int" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
+          <Connection code="0" type="code"/>
+        </Property>
+        <Property name="toolTipText" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+          <ResourceString bundle="pos_messages.properties" key="tooltip.peoplesecurity" replaceFormat="AppLocal.getIntString(&quot;tooltip.peoplesecurity&quot;)"/>
+        </Property>
+        <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
+          <Font name="Arial" size="14" style="0"/>
+        </Property>
+        <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+          <Dimension value="[140, 45]"/>
+        </Property>
+      </Properties>
+      <Events>
+        <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="webCBSecurityActionPerformed"/>
+      </Events>
+    </Component>
+    <Component class="javax.swing.JLabel" name="jLabel6">
       <Properties>
         <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
           <Font name="Arial" size="14" style="0"/>
@@ -176,12 +285,5 @@
         </Property>
       </Properties>
     </Component>
-    <Component class="javax.swing.JLabel" name="taxIdLabel">
-      <Properties>
-        <Property name="text" type="java.lang.String" value="Tax ID"/>
-      </Properties>
-    </Component>
-    <Component class="javax.swing.JTextField" name="taxIdTextField">
-    </Component>
   </SubComponents>
 </Form>

src/main/java/com/unicenta/pos/admin/PeopleView.java

@@ -42,368 +42,426 @@ import javax.swing.*;
  */
 public class PeopleView extends JPanel implements EditorRecord {
 
-  private Object m_oId;
+    private Object m_oId;
-  private String m_sPassword;
+    private String m_sPassword;
     
-  private final DirtyManager m_Dirty;
+    private final DirtyManager m_Dirty;
     
-  private final SentenceList m_sentrole;
+    private final SentenceList m_sentrole;
-  private ComboBoxValModel m_RoleModel;
+    private ComboBoxValModel m_RoleModel;  
     
-  private final ComboBoxValModel m_ReasonModel;
+    private final ComboBoxValModel m_ReasonModel;        
     
-  /**
+    /** Creates new form PeopleEditor
-   * Creates new form PeopleEditor
+     * @param dlAdmin
-   * 
+     * @param dirty */
-   * @param dlAdmin
+    public PeopleView(DataLogicAdmin dlAdmin, DirtyManager dirty) {
-   * @param dirty
-   */
-  public PeopleView(DataLogicAdmin dlAdmin, DirtyManager dirty) {
 
-    initComponents();
+        initComponents();
                 
-    // El modelo de roles
+        // El modelo de roles
-    m_sentrole = dlAdmin.getRolesList();
+        m_sentrole = dlAdmin.getRolesList();
-    m_RoleModel = new ComboBoxValModel();
+        m_RoleModel = new ComboBoxValModel();
         
-    m_Dirty = dirty;
+        m_Dirty = dirty;
-    nameTextField.getDocument().addDocumentListener(dirty);
+        m_jName.getDocument().addDocumentListener(dirty);
-    m_jRole.addActionListener(dirty);
+        m_jRole.addActionListener(dirty);
-    isVisible.addActionListener(dirty);
+        m_jVisible.addActionListener(dirty);
-    imageEditor.addPropertyChangeListener("image", dirty);
+        m_jImage.addPropertyChangeListener("image", dirty);
-    cardIdTextField.getDocument().addDocumentListener(dirty);
+        m_jcard.getDocument().addDocumentListener(dirty);
 
-    m_ReasonModel = new ComboBoxValModel();
+        m_ReasonModel = new ComboBoxValModel();
-    m_ReasonModel.add(AppLocal.getIntString("cboption.generate"));
+        m_ReasonModel.add(AppLocal.getIntString("cboption.generate"));
-    m_ReasonModel.add(AppLocal.getIntString("cboption.clear"));
+        m_ReasonModel.add(AppLocal.getIntString("cboption.clear"));              
-    m_ReasonModel.add(AppLocal.getIntString("cboption.iButton"));
+        m_ReasonModel.add(AppLocal.getIntString("cboption.iButton"));                      
         
-    webCBSecurity.setModel(m_ReasonModel);
+        webCBSecurity.setModel(m_ReasonModel);
         
-    writeValueEOF();
+        writeValueEOF();
-  }
-
-  /**
-   *
-   */
-  @Override
-  public void writeValueEOF() {
-    m_oId = null;
-    nameTextField.setText(null);
-    m_sPassword = null;
-    m_RoleModel.setSelectedKey(null);
-    isVisible.setSelected(false);
-    cardIdTextField.setText(null);
-    imageEditor.setImage(null);
-    nameTextField.setEnabled(false);
-    m_jRole.setEnabled(false);
-    isVisible.setEnabled(false);
-    cardIdTextField.setEnabled(false);
-    imageEditor.setEnabled(false);
-    jButton1.setEnabled(false);
-    webCBSecurity.setEnabled(false);
-  }
-
-  /**
-   *
-   */
-  @Override
-  public void writeValueInsert() {
-    m_oId = null;
-    nameTextField.setText(null);
-    m_sPassword = null;
-    m_RoleModel.setSelectedKey(null);
-    isVisible.setSelected(true);
-    cardIdTextField.setText(null);
-    imageEditor.setImage(null);
-    nameTextField.setEnabled(true);
-    m_jRole.setEnabled(true);
-    isVisible.setEnabled(true);
-    cardIdTextField.setEnabled(true);
-    imageEditor.setEnabled(true);
-    jButton1.setEnabled(true);
-    webCBSecurity.setEnabled(true);
-  }
-
-  /**
-   *
-   * @param value
-   */
-  @Override
-  public void writeValueDelete(Object value) {
-    Object[] people = (Object[]) value;
-    m_oId = people[0];
-    nameTextField.setText(Formats.STRING.formatValue(people[1]));
-    m_sPassword = Formats.STRING.formatValue(people[2]);
-    m_RoleModel.setSelectedKey(people[3]);
-    isVisible.setSelected(((Boolean) people[4]).booleanValue());
-    cardIdTextField.setText(Formats.STRING.formatValue(people[5]));
-    imageEditor.setImage((BufferedImage) people[6]);
-
-    nameTextField.setEnabled(false);
-    m_jRole.setEnabled(false);
-    isVisible.setEnabled(false);
-    cardIdTextField.setEnabled(false);
-    imageEditor.setEnabled(false);
-    jButton1.setEnabled(false);
-    webCBSecurity.setEnabled(false);
-  }
-
-  /**
-   *
-   * @param value
-   */
-  @Override
-  public void writeValueEdit(Object value) {
-    Object[] people = (Object[]) value;
-    m_oId = people[0];
-    nameTextField.setText(Formats.STRING.formatValue(people[1]));
-    m_sPassword = Formats.STRING.formatValue(people[2]);
-    m_RoleModel.setSelectedKey(people[3]);
-    isVisible.setSelected(((Boolean) people[4]).booleanValue());
-    cardIdTextField.setText(Formats.STRING.formatValue(people[5]));
-    imageEditor.setImage((BufferedImage) people[6]);
-
-    if (cardIdTextField.getText().length() == 16) {
-      cardIdLabel.setText(AppLocal.getIntString("label.ibutton"));
-    } else {
-      cardIdLabel.setText(AppLocal.getIntString("label.card"));
-    }
-    System.out.println(cardIdTextField.getText().length());
-
-    nameTextField.setEnabled(true);
-    m_jRole.setEnabled(true);
-    isVisible.setEnabled(true);
-    cardIdTextField.setEnabled(true);
-    imageEditor.setEnabled(true);
-    jButton1.setEnabled(true);
-    webCBSecurity.setEnabled(true);
-  }
-
-  /**
-   *
-   * @return
-   * @throws BasicException
-   */
-  @Override
-  public Object createValue() throws BasicException {
-    Object[] people = new Object[7];
-    people[0] = m_oId == null ? UUID.randomUUID().toString() : m_oId;
-    people[1] = Formats.STRING.parseValue(nameTextField.getText());
-    people[2] = Formats.STRING.parseValue(m_sPassword);
-    people[3] = m_RoleModel.getSelectedKey();
-    people[4] = isVisible.isSelected();
-    people[5] = Formats.STRING.parseValue(cardIdTextField.getText());
-    people[6] = imageEditor.getImage();
-    return people;
-  }
-
-  /**
-   *
-   * @return
-   */
-  @Override
-  public Component getComponent() {
-    return this;
-  }
-
-  /**
-   *
-   * @throws BasicException
-   */
-  public void activate() throws BasicException {
-
-    m_RoleModel = new ComboBoxValModel(m_sentrole.list());
-    m_jRole.setModel(m_RoleModel);
-  }
-
-  /**
-   *
-   */
-  @Override
-  public void refresh() {
-  }
-
-  /**
-   * This method is called from within the constructor to
-   * initialize the form.
-   * WARNING: Do NOT modify this code. The content of this method is
-   * always regenerated by the Form Editor.
-   */
-  // <editor-fold defaultstate="collapsed" desc="Generated
-  // Code">//GEN-BEGIN:initComponents
-  private void initComponents() {
-
-    nameLabel = new javax.swing.JLabel();
-    nameTextField = new javax.swing.JTextField();
-    isVisible = new javax.swing.JCheckBox();
-    visiableLabel = new javax.swing.JLabel();
-    imageLabel = new javax.swing.JLabel();
-    imageEditor = new com.unicenta.data.gui.JImageEditor();
-    jButton1 = new javax.swing.JButton();
-    m_jRole = new javax.swing.JComboBox();
-    roleLabel = new javax.swing.JLabel();
-    cardIdTextField = new javax.swing.JTextField();
-    cardIdLabel = new javax.swing.JLabel();
-    passwordLabel = new javax.swing.JLabel();
-    taxIdLabel = new javax.swing.JLabel();
-    taxIdTextField = new javax.swing.JTextField();
-
-    setFont(new java.awt.Font("Arial", 0, 12)); // NOI18N
-    setPreferredSize(new java.awt.Dimension(500, 500));
-
-    nameLabel.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
-    nameLabel.setIcon(new javax.swing.ImageIcon(getClass().getResource("/com/unicenta/images/info.png"))); // NOI18N
-    nameLabel.setText(AppLocal.getIntString("label.peoplenamem")); // NOI18N
-    nameLabel.setPreferredSize(new java.awt.Dimension(110, 30));
-    nameLabel.addMouseListener(new java.awt.event.MouseAdapter() {
-      public void mouseClicked(java.awt.event.MouseEvent evt) {
-        nameLabelMouseClicked(evt);
-      }
-    });
-    add(nameLabel);
-
-    nameTextField.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
-    nameTextField.setPreferredSize(new java.awt.Dimension(0, 30));
-    add(nameTextField);
-
-    isVisible.setFont(new java.awt.Font("Arial", 0, 12)); // NOI18N
-    isVisible.setPreferredSize(new java.awt.Dimension(0, 30));
-    add(isVisible);
-
-    visiableLabel.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
-    visiableLabel.setText(AppLocal.getIntString("label.peoplevisible")); // NOI18N
-    visiableLabel.setPreferredSize(new java.awt.Dimension(110, 30));
-    add(visiableLabel);
-
-    imageLabel.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
-    imageLabel.setText(AppLocal.getIntString("label.peopleimage")); // NOI18N
-    imageLabel.setPreferredSize(new java.awt.Dimension(110, 30));
-    add(imageLabel);
-
-    imageEditor.setFont(new java.awt.Font("Arial", 0, 12)); // NOI18N
-    imageEditor.setPreferredSize(new java.awt.Dimension(300, 250));
-    add(imageEditor);
-
-    jButton1.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
-    jButton1.setIcon(new javax.swing.ImageIcon(getClass().getResource("/com/unicenta/images/password.png"))); // NOI18N
-    jButton1.setText(AppLocal.getIntString("button.peoplepassword")); // NOI18N
-    jButton1.setToolTipText("");
-    jButton1.setPreferredSize(new java.awt.Dimension(80, 45));
-    jButton1.addActionListener(new java.awt.event.ActionListener() {
-      public void actionPerformed(java.awt.event.ActionEvent evt) {
-        jButton1ActionPerformed(evt);
-      }
-    });
-    add(jButton1);
-
-    m_jRole.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
-    m_jRole.setPreferredSize(new java.awt.Dimension(0, 30));
-    add(m_jRole);
-
-    roleLabel.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
-    roleLabel.setText(AppLocal.getIntString("label.rolem")); // NOI18N
-    roleLabel.setPreferredSize(new java.awt.Dimension(110, 30));
-    add(roleLabel);
-
-    cardIdTextField.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
-    cardIdTextField.setPreferredSize(new java.awt.Dimension(0, 30));
-    add(cardIdTextField);
-
-    cardIdLabel.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
-    cardIdLabel.setText(AppLocal.getIntString("label.card")); // NOI18N
-    cardIdLabel.setPreferredSize(new java.awt.Dimension(110, 30));
-    add(cardIdLabel);
-
-    passwordLabel.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
-    passwordLabel.setText(AppLocal.getIntString("label.Password")); // NOI18N
-    passwordLabel.setPreferredSize(new java.awt.Dimension(110, 30));
-    add(passwordLabel);
-
-    taxIdLabel.setText("Tax ID");
-    add(taxIdLabel);
-    add(taxIdTextField);
-  }// </editor-fold>//GEN-END:initComponents
-
-  private void jButton1ActionPerformed(java.awt.event.ActionEvent evt) {// GEN-FIRST:event_jButton1ActionPerformed
-
-    String sNewPassword = Hashcypher.changePassword(this);
-    if (sNewPassword != null) {
-      m_sPassword = sNewPassword;
-      m_Dirty.setDirty(true);
     }
 
-  }// GEN-LAST:event_jButton1ActionPerformed
+    /**
-
+     *
-  private void webCBSecurityActionPerformed(java.awt.event.ActionEvent evt) {// GEN-FIRST:event_webCBSecurityActionPerformed
+     */
-
+    @Override
-    if (webCBSecurity.getSelectedIndex() == 0) {
+    public void writeValueEOF() {
-      if (JOptionPane.showConfirmDialog(this,
+        m_oId = null;
-          AppLocal.getIntString("message.cardnew"),
+        m_jName.setText(null);
-          AppLocal.getIntString("title.editor"),
+        m_sPassword = null;
-          JOptionPane.YES_NO_OPTION,
+        m_RoleModel.setSelectedKey(null);
-          JOptionPane.QUESTION_MESSAGE) == JOptionPane.YES_OPTION) {
+        m_jVisible.setSelected(false);
-        cardIdTextField.setText("C" + StringUtils.getCardNumber());
+        m_jcard.setText(null);
-        m_Dirty.setDirty(true);
+        m_jImage.setImage(null);
-      }
+        m_jName.setEnabled(false);
+        m_jRole.setEnabled(false);
+        m_jVisible.setEnabled(false);
+        m_jcard.setEnabled(false);
+        m_jImage.setEnabled(false);
+        jButton1.setEnabled(false);
+        webCBSecurity.setEnabled(false);
     }
     
-    if (webCBSecurity.getSelectedIndex() == 1) {
+    /**
-      if (JOptionPane.showConfirmDialog(this,
+     *
-          AppLocal.getIntString("message.cardremove"),
+     */
-          AppLocal.getIntString("title.editor"),
+    @Override
-          JOptionPane.YES_NO_OPTION,
+    public void writeValueInsert() {
-          JOptionPane.QUESTION_MESSAGE) == JOptionPane.YES_OPTION) {
+        m_oId = null;
-        cardIdTextField.setText(null);
+        m_jName.setText(null);
-        m_Dirty.setDirty(true);
+        m_sPassword = null;
-      }
+        m_RoleModel.setSelectedKey(null);
+        m_jVisible.setSelected(true);
+        m_jcard.setText(null);
+        m_jImage.setImage(null);
+        m_jName.setEnabled(true);
+        m_jRole.setEnabled(true);
+        m_jVisible.setEnabled(true);
+        m_jcard.setEnabled(true);
+        m_jImage.setEnabled(true);
+        jButton1.setEnabled(true);
+        webCBSecurity.setEnabled(true);        
     }
     
-    if (webCBSecurity.getSelectedIndex() == 2) {
+    /**
-      if (JOptionPane.showConfirmDialog(this,
+     *
-          AppLocal.getIntString("message.ibuttonassign"),
+     * @param value
-          AppLocal.getIntString("title.editor"),
+     */
-          JOptionPane.OK_CANCEL_OPTION,
+    @Override
-          JOptionPane.INFORMATION_MESSAGE) == JOptionPane.OK_OPTION)
+    public void writeValueDelete(Object value) {
-
+        Object[] people = (Object[]) value;
-      {
+        m_oId = people[0];
-        cardIdTextField.setText(uOWWatch.getibuttonid());
+        m_jName.setText(Formats.STRING.formatValue(people[1]));
-        cardIdLabel.setText(AppLocal.getIntString("label.ibutton"));
+        m_sPassword = Formats.STRING.formatValue(people[2]);
-        m_Dirty.setDirty(true);
+        m_RoleModel.setSelectedKey(people[3]);
-      }
+        m_jVisible.setSelected(((Boolean) people[4]).booleanValue());
+        m_jcard.setText(Formats.STRING.formatValue(people[5]));
+        m_jImage.setImage((BufferedImage) people[6]);
         
+        m_jName.setEnabled(false);
+        m_jRole.setEnabled(false);
+        m_jVisible.setEnabled(false);
+        m_jcard.setEnabled(false);
+        m_jImage.setEnabled(false);        
+        jButton1.setEnabled(false);
+        webCBSecurity.setEnabled(false);        
     }
 
-  }// GEN-LAST:event_webCBSecurityActionPerformed
+    /**
+     *
+     * @param value
+     */
+    @Override
+    public void writeValueEdit(Object value) {
+        Object[] people = (Object[]) value;
+        m_oId = people[0];
+        m_jName.setText(Formats.STRING.formatValue(people[1]));
+        m_sPassword = Formats.STRING.formatValue(people[2]);
+        m_RoleModel.setSelectedKey(people[3]);
+        m_jVisible.setSelected(((Boolean) people[4]).booleanValue());
+        m_jcard.setText(Formats.STRING.formatValue(people[5]));
+        m_jImage.setImage((BufferedImage) people[6]);
         
-  private void nameLabelMouseClicked(java.awt.event.MouseEvent evt) {// GEN-FIRST:event_nameLabelMouseClicked
+        if (m_jcard.getText().length() == 16) {
-    if (evt.getClickCount() == 2) {
+            jLblCardID.setText(AppLocal.getIntString("label.ibutton"));
-      String uuidString = m_oId.toString();
+        } else {
-      StringSelection stringSelection = new StringSelection(uuidString);
+            jLblCardID.setText(AppLocal.getIntString("label.card"));            
-      Clipboard clpbrd = Toolkit.getDefaultToolkit().getSystemClipboard();
+        }
-      clpbrd.setContents(stringSelection, null);
+        System.out.println(m_jcard.getText().length());        
         
-      JOptionPane.showMessageDialog(null,
+        m_jName.setEnabled(true);
-          AppLocal.getIntString("message.uuidcopy"));
+        m_jRole.setEnabled(true);
+        m_jVisible.setEnabled(true);
+        m_jcard.setEnabled(true);
+        m_jImage.setEnabled(true);
+        jButton1.setEnabled(true);
+        webCBSecurity.setEnabled(true);        
     }
-  }// GEN-LAST:event_nameLabelMouseClicked
     
-  // Variables declaration - do not modify//GEN-BEGIN:variables
+    /**
-  private javax.swing.JLabel cardIdLabel;
+     *
-  private javax.swing.JTextField cardIdTextField;
+     * @return
-  private com.unicenta.data.gui.JImageEditor imageEditor;
+     * @throws BasicException
-  private javax.swing.JLabel imageLabel;
+     */
-  private javax.swing.JCheckBox isVisible;
+    @Override
-  private javax.swing.JButton jButton1;
+    public Object createValue() throws BasicException {
-  private javax.swing.JComboBox m_jRole;
+        Object[] people = new Object[7];
-  private javax.swing.JLabel nameLabel;
+        people[0] = m_oId == null ? UUID.randomUUID().toString() : m_oId;
-  private javax.swing.JTextField nameTextField;
+        people[1] = Formats.STRING.parseValue(m_jName.getText());
-  private javax.swing.JLabel passwordLabel;
+        people[2] = Formats.STRING.parseValue(m_sPassword);
-  private javax.swing.JLabel roleLabel;
+        people[3] = m_RoleModel.getSelectedKey();
-  private javax.swing.JLabel taxIdLabel;
+        people[4] = m_jVisible.isSelected();
-  private javax.swing.JTextField taxIdTextField;
+        people[5] = Formats.STRING.parseValue(m_jcard.getText());
-  private javax.swing.JLabel visiableLabel;
+        people[6] = m_jImage.getImage();
-  private com.alee.laf.combobox.WebComboBox webCBSecurity;
+        return people;
-  // End of variables declaration//GEN-END:variables
+    }
+
+    /**
+     *
+     * @return
+     */
+    @Override
+    public Component getComponent() {
+        return this;
+    }
+
+    /**
+     *
+     * @throws BasicException
+     */
+    public void activate() throws BasicException {
+        
+        m_RoleModel = new ComboBoxValModel(m_sentrole.list());
+        m_jRole.setModel(m_RoleModel);
+    }
+    
+   
+    /**
+     *
+     */
+    @Override
+    public void refresh() {
+    }
+     
+    /** This method is called from within the constructor to
+     * initialize the form.
+     * WARNING: Do NOT modify this code. The content of this method is
+     * always regenerated by the Form Editor.
+     */
+    // <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents
+    private void initComponents() {
+
+        jLabel1 = new javax.swing.JLabel();
+        m_jName = new javax.swing.JTextField();
+        m_jVisible = new javax.swing.JCheckBox();
+        jLabel3 = new javax.swing.JLabel();
+        jLabel4 = new javax.swing.JLabel();
+        m_jImage = new com.unicenta.data.gui.JImageEditor();
+        jButton1 = new javax.swing.JButton();
+        m_jRole = new javax.swing.JComboBox();
+        jLabel2 = new javax.swing.JLabel();
+        m_jcard = new javax.swing.JTextField();
+        jLblCardID = new javax.swing.JLabel();
+        webCBSecurity = new com.alee.laf.combobox.WebComboBox();
+        jLabel6 = new javax.swing.JLabel();
+
+        setFont(new java.awt.Font("Arial", 0, 12)); // NOI18N
+        setPreferredSize(new java.awt.Dimension(500, 500));
+
+        jLabel1.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
+        jLabel1.setIcon(new javax.swing.ImageIcon(getClass().getResource("/com/unicenta/images/info.png"))); // NOI18N
+        jLabel1.setText(AppLocal.getIntString("label.peoplenamem")); // NOI18N
+        jLabel1.setPreferredSize(new java.awt.Dimension(110, 30));
+        jLabel1.addMouseListener(new java.awt.event.MouseAdapter() {
+            public void mouseClicked(java.awt.event.MouseEvent evt) {
+                jLabel1MouseClicked(evt);
+            }
+        });
+
+        m_jName.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
+        m_jName.setPreferredSize(new java.awt.Dimension(0, 30));
+
+        m_jVisible.setFont(new java.awt.Font("Arial", 0, 12)); // NOI18N
+        m_jVisible.setPreferredSize(new java.awt.Dimension(0, 30));
+
+        jLabel3.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
+        jLabel3.setText(AppLocal.getIntString("label.peoplevisible")); // NOI18N
+        jLabel3.setPreferredSize(new java.awt.Dimension(110, 30));
+
+        jLabel4.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
+        jLabel4.setText(AppLocal.getIntString("label.peopleimage")); // NOI18N
+        jLabel4.setPreferredSize(new java.awt.Dimension(110, 30));
+
+        m_jImage.setFont(new java.awt.Font("Arial", 0, 12)); // NOI18N
+        m_jImage.setPreferredSize(new java.awt.Dimension(300, 250));
+
+        jButton1.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
+        jButton1.setIcon(new javax.swing.ImageIcon(getClass().getResource("/com/unicenta/images/password.png"))); // NOI18N
+        jButton1.setText(AppLocal.getIntString("button.peoplepassword")); // NOI18N
+        jButton1.setToolTipText("");
+        jButton1.setPreferredSize(new java.awt.Dimension(80, 45));
+        jButton1.addActionListener(new java.awt.event.ActionListener() {
+            public void actionPerformed(java.awt.event.ActionEvent evt) {
+                jButton1ActionPerformed(evt);
+            }
+        });
+
+        m_jRole.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
+        m_jRole.setPreferredSize(new java.awt.Dimension(0, 30));
+
+        jLabel2.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
+        jLabel2.setText(AppLocal.getIntString("label.rolem")); // NOI18N
+        jLabel2.setPreferredSize(new java.awt.Dimension(110, 30));
+
+        m_jcard.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
+        m_jcard.setPreferredSize(new java.awt.Dimension(0, 30));
+
+        jLblCardID.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
+        jLblCardID.setText(AppLocal.getIntString("label.card")); // NOI18N
+        jLblCardID.setPreferredSize(new java.awt.Dimension(110, 30));
+
+        webCBSecurity.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "Generate new key", "Delete exisitng key", "Use iButton ID" }));
+        webCBSecurity.setSelectedIndex(0);
+        webCBSecurity.setToolTipText(AppLocal.getIntString("tooltip.peoplesecurity")); // NOI18N
+        webCBSecurity.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
+        webCBSecurity.setPreferredSize(new java.awt.Dimension(140, 45));
+        webCBSecurity.addActionListener(new java.awt.event.ActionListener() {
+            public void actionPerformed(java.awt.event.ActionEvent evt) {
+                webCBSecurityActionPerformed(evt);
+            }
+        });
+
+        jLabel6.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
+        jLabel6.setText(AppLocal.getIntString("label.Password")); // NOI18N
+        jLabel6.setPreferredSize(new java.awt.Dimension(110, 30));
+
+        javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);
+        this.setLayout(layout);
+        layout.setHorizontalGroup(
+            layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+            .addGroup(layout.createSequentialGroup()
+                .addContainerGap()
+                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+                    .addGroup(layout.createSequentialGroup()
+                        .addComponent(jLabel3, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                        .addGap(18, 18, 18)
+                        .addComponent(m_jVisible, javax.swing.GroupLayout.PREFERRED_SIZE, 207, javax.swing.GroupLayout.PREFERRED_SIZE))
+                    .addGroup(layout.createSequentialGroup()
+                        .addComponent(jLabel2, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
+                        .addComponent(m_jRole, javax.swing.GroupLayout.PREFERRED_SIZE, 180, javax.swing.GroupLayout.PREFERRED_SIZE))
+                    .addGroup(layout.createSequentialGroup()
+                        .addComponent(jLabel4, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
+                        .addComponent(m_jImage, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+                    .addGroup(layout.createSequentialGroup()
+                        .addComponent(jLblCardID, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
+                        .addComponent(m_jcard, javax.swing.GroupLayout.PREFERRED_SIZE, 180, javax.swing.GroupLayout.PREFERRED_SIZE)
+                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                        .addComponent(webCBSecurity, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+                    .addGroup(layout.createSequentialGroup()
+                        .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+                            .addComponent(jLabel1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                            .addComponent(jLabel6, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
+                        .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+                            .addComponent(jButton1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                            .addComponent(m_jName, javax.swing.GroupLayout.PREFERRED_SIZE, 180, javax.swing.GroupLayout.PREFERRED_SIZE))))
+                .addContainerGap())
+        );
+        layout.setVerticalGroup(
+            layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+            .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup()
+                .addGap(18, 18, 18)
+                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+                    .addComponent(jLabel1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                    .addComponent(m_jName, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
+                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.CENTER)
+                    .addComponent(jLabel6, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                    .addComponent(jButton1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
+                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.CENTER)
+                    .addComponent(jLblCardID, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                    .addComponent(m_jcard, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                    .addComponent(webCBSecurity, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
+                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+                    .addComponent(jLabel2, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                    .addComponent(m_jRole, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
+                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+                    .addComponent(jLabel3, javax.swing.GroupLayout.PREFERRED_SIZE, 25, javax.swing.GroupLayout.PREFERRED_SIZE)
+                    .addComponent(m_jVisible, javax.swing.GroupLayout.PREFERRED_SIZE, 25, javax.swing.GroupLayout.PREFERRED_SIZE))
+                .addGap(15, 15, 15)
+                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+                    .addComponent(m_jImage, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                    .addComponent(jLabel4, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+                .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
+        );
+    }// </editor-fold>//GEN-END:initComponents
+
+    private void jButton1ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jButton1ActionPerformed
+
+        String sNewPassword = Hashcypher.changePassword(this);
+        if (sNewPassword != null) {
+            m_sPassword = sNewPassword;
+            m_Dirty.setDirty(true);
+        }
+
+    }//GEN-LAST:event_jButton1ActionPerformed
+
+    private void webCBSecurityActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_webCBSecurityActionPerformed
+
+
+        if(webCBSecurity.getSelectedIndex() == 0){
+            if (JOptionPane.showConfirmDialog(this, 
+                AppLocal.getIntString("message.cardnew"), 
+                AppLocal.getIntString("title.editor"), 
+                JOptionPane.YES_NO_OPTION, 
+                JOptionPane.QUESTION_MESSAGE) == JOptionPane.YES_OPTION) 
+            {  
+                m_jcard.setText("C" + StringUtils.getCardNumber());
+                m_Dirty.setDirty(true);
+            }        
+        }         
+
+        if(webCBSecurity.getSelectedIndex() == 1){
+            if (JOptionPane.showConfirmDialog(this, 
+                AppLocal.getIntString("message.cardremove"), 
+                AppLocal.getIntString("title.editor"), 
+                JOptionPane.YES_NO_OPTION, 
+                JOptionPane.QUESTION_MESSAGE) == JOptionPane.YES_OPTION) 
+            {  
+                m_jcard.setText(null);
+                m_Dirty.setDirty(true);
+            }
+        }
+        
+        if(webCBSecurity.getSelectedIndex() == 2){
+            if (JOptionPane.showConfirmDialog(this, 
+                AppLocal.getIntString("message.ibuttonassign"), 
+                AppLocal.getIntString("title.editor"), 
+                JOptionPane.OK_CANCEL_OPTION, 
+                JOptionPane.INFORMATION_MESSAGE) == JOptionPane.OK_OPTION) 
+
+            {  
+                m_jcard.setText( uOWWatch.getibuttonid() );
+                jLblCardID.setText(AppLocal.getIntString("label.ibutton"));
+                m_Dirty.setDirty(true);
+            }
+
+        }                
+               
+    }//GEN-LAST:event_webCBSecurityActionPerformed
+
+    private void jLabel1MouseClicked(java.awt.event.MouseEvent evt) {//GEN-FIRST:event_jLabel1MouseClicked
+        if (evt.getClickCount() == 2) {
+            String uuidString = m_oId.toString();
+            StringSelection stringSelection = new StringSelection(uuidString);
+            Clipboard clpbrd = Toolkit.getDefaultToolkit().getSystemClipboard();
+            clpbrd.setContents(stringSelection, null);
+        
+            JOptionPane.showMessageDialog(null, 
+                AppLocal.getIntString("message.uuidcopy"));
+        }
+    }//GEN-LAST:event_jLabel1MouseClicked
+    
+    
+    // Variables declaration - do not modify//GEN-BEGIN:variables
+    private javax.swing.JButton jButton1;
+    private javax.swing.JLabel jLabel1;
+    private javax.swing.JLabel jLabel2;
+    private javax.swing.JLabel jLabel3;
+    private javax.swing.JLabel jLabel4;
+    private javax.swing.JLabel jLabel6;
+    private javax.swing.JLabel jLblCardID;
+    private com.unicenta.data.gui.JImageEditor m_jImage;
+    private javax.swing.JTextField m_jName;
+    private javax.swing.JComboBox m_jRole;
+    private javax.swing.JCheckBox m_jVisible;
+    private javax.swing.JTextField m_jcard;
+    private com.alee.laf.combobox.WebComboBox webCBSecurity;
+    // End of variables declaration//GEN-END:variables
     
 }

src/main/java/com/unicenta/pos/sales/DataLogicReceipts.java

@@ -38,329 +38,347 @@ import java.util.List;
  */
 public class DataLogicReceipts extends BeanFactoryDataSingle {
     
-  private Session s;
+    private Session s;
     
-  /** Creates a new instance of DataLogicReceipts */
+    /** Creates a new instance of DataLogicReceipts */
-  public DataLogicReceipts() {
+    public DataLogicReceipts() {
-  }
-
-  /**
-   *
-   * @param s
-   */
-  @Override
-  public void init(Session s) {
-    this.s = s;
-  }
-
-  /**
-   *
-   * @param Id
-   * @return
-   * @throws BasicException
-   */
-  public final TicketInfo getSharedTicket(String Id) throws BasicException {
-
-    if (Id == null) {
-      return null;
-    } else {
-      Object[] record = (Object[]) new StaticSentence(s, "SELECT CONTENT, LOCKED FROM sharedtickets WHERE ID = ?",
-          SerializerWriteString.INSTANCE, new SerializerReadBasic(new Datas[] {
-              Datas.SERIALIZABLE }))
-          .find(Id);
-      return record == null ? null : (TicketInfo) record[0];
     }
-  }
     
-  /**
+    /**
-   *
+     *
-   * @param pickupId
+     * @param s
-   * @return
+     */
-   * @throws BasicException
+    @Override
-   */
+    public void init(Session s){
-  public final TicketInfo getSharedTicketPickupId(String pickupId) throws BasicException {
+        this.s = s;
-
-    if (pickupId == null) {
-      return null;
-    } else {
-      Object[] record = (Object[]) new StaticSentence(s, "SELECT CONTENT, LOCKED FROM sharedtickets WHERE PICKUPID = ?",
-          SerializerWriteString.INSTANCE, new SerializerReadBasic(new Datas[] {
-              Datas.SERIALIZABLE }))
-          .find(pickupId);
-      return record == null ? null : (TicketInfo) record[0];
     }
-  }
      
-  /**
+    /**
-   * JG Dec 14 Administrator and Manager Roles always have access to ALL
+     *
-   * SHAREDtickets
+     * @param Id
-   * 
+     * @return
-   * @return
+     * @throws BasicException
-   * @throws BasicException
+     */
-   */
+    public final TicketInfo getSharedTicket(String Id) throws BasicException {
-  public final List<SharedTicketInfo> getSharedTicketList() throws BasicException {
         
-    return (List<SharedTicketInfo>) new StaticSentence(s
+        if (Id == null) {
-    // , "SELECT ID, NAME, CONTENT, APPUSER, PICKUPID, LOCKED FROM sharedtickets
+            return null; 
-    // ORDER BY ID"
+        } else {
-        , "SELECT ID, NAME, CONTENT, APPUSER, PICKUPID, LOCKED "
+            Object[]record = (Object[]) new StaticSentence(s
-            + "FROM sharedtickets ORDER BY PICKUPID",
+                    , "SELECT CONTENT, LOCKED FROM sharedtickets WHERE ID = ?"
-        null, new SerializerReadClass(SharedTicketInfo.class)).list();
+                    , SerializerWriteString.INSTANCE
-  }
+                    , new SerializerReadBasic(new Datas[] {
-
+                        Datas.SERIALIZABLE})).find(Id);
-  /**
+            return record == null ? null : (TicketInfo) record[0];
-   * Return only current APPUSER SHAREDtickets
+        }
-   * 
-   * @param appuser
-   * @return
-   * @throws BasicException
-   */
-  public final List<SharedTicketInfo> getUserSharedTicketList(String appuser) throws BasicException {
-    String sql = "SELECT ID, NAME, CONTENT, APPUSER, PICKUPID, LOCKED "
-        + "FROM sharedtickets "
-        + "WHERE APPUSER =\"" + appuser + "\" ORDER BY PICKUPID";
-
-    return (List<SharedTicketInfo>) new StaticSentence(s, sql, null, new SerializerReadClass(SharedTicketInfo.class))
-        .list();
-  }
-
-  /**
-   * For Standard View
-   * 
-   * @param id
-   * @param ticket
-   * @param pickupid
-   * @throws BasicException
-   */
-  public final void insertSharedTicket(final String id, final TicketInfo ticket, int pickupid) throws BasicException {
-
-    Object[] values = new Object[] {
-        id,
-        ticket.getName(),
-        ticket,
-        ticket.getUserInfo().getId(),
-        pickupid
-
-    };
-    Datas[] datas;
-    datas = new Datas[] {
-        Datas.STRING,
-        Datas.STRING,
-        Datas.SERIALIZABLE,
-        Datas.STRING,
-        Datas.INT
-
-    };
-    new PreparedSentence(s, "INSERT INTO sharedtickets ("
-        + "ID, "
-        + "NAME, "
-        + "CONTENT, "
-        + "APPUSER, "
-        + "PICKUPID) "
-        + "VALUES (?, ?, ?, ?, ?)", new SerializerWriteBasicExt(datas, new int[] { 0, 1, 2, 3, 4 })).exec(values);
-  }
-
-  /**
-   *
-   * @param id
-   * @param ticket
-   * @param pickupid
-   * @throws BasicException
-   */
-  public final void updateSharedTicket(final String id, final TicketInfo ticket, int pickupid) throws BasicException {
-
-    Object[] values = new Object[] {
-        id,
-        ticket.getName(),
-        ticket,
-        ticket.getUserInfo().getId(),
-        pickupid
-    };
-    Datas[] datas = new Datas[] {
-        Datas.STRING,
-        Datas.STRING,
-        Datas.SERIALIZABLE,
-        Datas.STRING,
-        Datas.INT
-    };
-    new PreparedSentence(s, "UPDATE sharedtickets SET "
-        + "NAME = ?, "
-        + "CONTENT = ?, "
-        + "APPUSER = ?, "
-        + "PICKUPID = ? "
-        + "WHERE ID = ?",
-        new SerializerWriteBasicExt(datas,
-            new int[] {
-                1, 2, 3, 4, 0 }))
-        .exec(values);
-  }
-
-  /**
-   *
-   * @param id
-   * @param ticket
-   * @param pickupid
-   * @throws BasicException
-   */
-  public final void updateRSharedTicket(
-      final String id,
-      final TicketInfo ticket,
-      int pickupid) throws BasicException {
-
-    Object[] values = new Object[] {
-        id,
-        ticket.getName(),
-        ticket,
-        pickupid
-    };
-    Datas[] datas = new Datas[] {
-        Datas.STRING,
-        Datas.STRING,
-        Datas.SERIALIZABLE,
-        Datas.INT
-    };
-    new PreparedSentence(s, "UPDATE sharedtickets SET "
-        + "NAME = ?, "
-        + "CONTENT = ?, "
-        + "PICKUPID = ? "
-        + "WHERE ID = ?", new SerializerWriteBasicExt(datas, new int[] { 1, 2, 3, 0 })).exec(values);
-  }
-
-  /**
-   * In place for multi-purposing like containing data from elsewhere and/or
-   * using Place and User for Notifications
-   * 
-   * @param id
-   * @param locked
-   * @throws BasicException
-   */
-  public final void lockSharedTicket(final String id, final String locked) throws BasicException {
-
-    Object[] values = new Object[] {
-        id,
-        locked
-    };
-    Datas[] datas = new Datas[] {
-        Datas.STRING,
-        Datas.STRING
-    };
-    new PreparedSentence(s, "UPDATE sharedtickets SET "
-        + "LOCKED = ? "
-        + "WHERE ID = ?", new SerializerWriteBasicExt(datas, new int[] { 1, 0 })).exec(values);
-  }
-
-  /**
-   * In place for multi-purposing like flushing locks from elsewhere and/or
-   * using Place and User for Notifications
-   * 
-   * @param id
-   * @param unlocked
-   * @throws BasicException
-   */
-  public final void unlockSharedTicket(final String id, final String unlocked) throws BasicException {
-
-    Object[] values = new Object[] {
-        id,
-        unlocked
-    };
-    Datas[] datas = new Datas[] {
-        Datas.STRING,
-        Datas.STRING
-    };
-    new PreparedSentence(s, "UPDATE sharedtickets SET "
-        + "LOCKED = ? "
-        + "WHERE ID = ?", new SerializerWriteBasicExt(datas, new int[] { 1, 0 })).exec(values);
-  }
-
-  /**
-   * For Restaurant View
-   * 
-   * @param id
-   * @param ticket
-   * @param pickupid
-   * @throws BasicException
-   */
-  public final void insertRSharedTicket(
-      final String id,
-      final TicketInfo ticket,
-      int pickupid) throws BasicException {
-
-    Object[] values = new Object[] {
-        id,
-        ticket.getName(),
-        ticket,
-        ticket.getUserInfo(),
-        ticket.getPickupId(),
-        ticket.getHost()
-    };
-    Datas[] datas;
-    datas = new Datas[] {
-        Datas.STRING,
-        Datas.STRING,
-        Datas.SERIALIZABLE,
-        Datas.STRING,
-        Datas.INT
-
-    };
-    new PreparedSentence(s, "INSERT INTO sharedtickets ("
-        + "ID, "
-        + "NAME, "
-        + "CONTENT, "
-        + "APPUSER, "
-        + "PICKUPID) "
-        + "VALUES (?, ?, ?, ?, ?)", new SerializerWriteBasicExt(datas, new int[] { 0, 1, 2, 3, 4 })).exec(values);
-  }
-
-  /**
-   * 
-   * @param id
-   * @throws BasicException
-   */
-  public final void deleteSharedTicket(final String id) throws BasicException {
-
-    new StaticSentence(s, "DELETE FROM sharedtickets WHERE ID = ?", SerializerWriteString.INSTANCE).exec(id);
-  }
-
-  /**
-   *
-   * @param Id
-   * @return
-   * @throws BasicException
-   */
-  public final Integer getPickupId(String Id) throws BasicException {
-
-    if (Id == null) {
-      return null;
-    } else {
-      Object[] record = (Object[]) new StaticSentence(s, "SELECT PICKUPID FROM sharedtickets WHERE ID = ?",
-          SerializerWriteString.INSTANCE, new SerializerReadBasic(new Datas[] { Datas.INT })).find(Id);
-      return record == null ? 0 : (Integer) record[0];
     }
-  }
     
-  public final String getUserId(final String id) throws BasicException {
+        /**
-    Object[] userID = (Object[]) new StaticSentence(s, "SELECT APPUSER FROM sharedtickets WHERE ID = ?",
+     *
-        SerializerWriteString.INSTANCE, new SerializerReadBasic(new Datas[] { Datas.STRING })).find(id);
+     * @param pickupId
-    if (userID == null) {
+     * @return
-      return null;
+     * @throws BasicException
-    } else {
+     */
-      return (String) userID[0];
+    public final TicketInfo getSharedTicketPickupId(String pickupId) throws BasicException {
+        
+        if (pickupId == null) {
+            return null; 
+        } else {
+            Object[]record = (Object[]) new StaticSentence(s
+                    , "SELECT CONTENT, LOCKED FROM sharedtickets WHERE PICKUPID = ?"
+                    , SerializerWriteString.INSTANCE
+                    , new SerializerReadBasic(new Datas[] {
+                        Datas.SERIALIZABLE})).find(pickupId);
+            return record == null ? null : (TicketInfo) record[0];
+        }
     } 
-  }
 
-  public final String getLockState(final String id, String lockState) throws BasicException {
+    /**
-    Object[] state = (Object[]) new StaticSentence(s, "SELECT LOCKED FROM sharedtickets WHERE ID = ?",
+     * JG Dec 14 Administrator and Manager Roles always have access to ALL SHAREDtickets
-        SerializerWriteString.INSTANCE, new SerializerReadBasic(new Datas[] {
+     * @return
+     * @throws BasicException
+     */
+    public final List<SharedTicketInfo> getSharedTicketList() throws BasicException {
+        
+        return (List<SharedTicketInfo>) new StaticSentence(s
+//                , "SELECT ID, NAME, CONTENT, APPUSER, PICKUPID, LOCKED FROM sharedtickets ORDER BY ID"
+                , "SELECT ID, NAME, CONTENT, APPUSER, PICKUPID, LOCKED "
+                        + "FROM sharedtickets ORDER BY PICKUPID" 
+                , null
+                , new SerializerReadClass(SharedTicketInfo.class)).list();
+    }
+    
+    /**
+     * Return only current APPUSER SHAREDtickets
+     * @param appuser
+     * @return
+     * @throws BasicException
+     */
+    public final List<SharedTicketInfo> getUserSharedTicketList(String appuser) throws BasicException {
+        String sql = "SELECT ID, NAME, CONTENT, APPUSER, PICKUPID, LOCKED " 
+                + "FROM sharedtickets "
+                + "WHERE APPUSER =\""+ appuser +"\" ORDER BY PICKUPID";
+        
+            return (List<SharedTicketInfo>) new StaticSentence(s
+            , sql
+            , null
+            , new SerializerReadClass(SharedTicketInfo.class)).list();
+    }
+    
+    /**
+     * For Standard View
+     * @param id
+     * @param ticket
+     * @param pickupid
+     * @throws BasicException
+     */
+    public final void insertSharedTicket(final String id, final TicketInfo ticket, int pickupid) throws BasicException {
+        
+        Object[] values = new Object[] {
+            id, 
+            ticket.getName(), 
+            ticket,
+            ticket.getUser().getId(),
+            pickupid
+
+        };
+        Datas[] datas;
+        datas = new Datas[] {
+            Datas.STRING, 
+            Datas.STRING, 
+            Datas.SERIALIZABLE, 
+            Datas.STRING,            
+            Datas.INT
+
+        };
+        new PreparedSentence(s
+            , "INSERT INTO sharedtickets ("
+                + "ID, "
+                + "NAME, "
+                + "CONTENT, "
+                + "APPUSER, "                    
+                + "PICKUPID) "
+                + "VALUES (?, ?, ?, ?, ?)"                
+            , new SerializerWriteBasicExt(datas, new int[] {0, 1, 2, 3, 4})).exec(values);                
+    }
+    
+    /**
+     *
+     * @param id
+     * @param ticket
+     * @param pickupid
+     * @throws BasicException
+     */
+    public final void updateSharedTicket(final String id, final TicketInfo ticket, int pickupid) throws BasicException {
+            
+        Object[] values = new Object[] {
+            id, 
+            ticket.getName(), 
+            ticket, 
+            ticket.getUser().getId(),
+            pickupid
+        };
+        Datas[] datas = new Datas[] {
+            Datas.STRING, 
+            Datas.STRING, 
+            Datas.SERIALIZABLE, 
+            Datas.STRING,
+            Datas.INT
+        };
+        new PreparedSentence(s
+                , "UPDATE sharedtickets SET "
+                + "NAME = ?, "
+                + "CONTENT = ?, "
+                + "APPUSER = ?, "                        
+                + "PICKUPID = ? "
+                + "WHERE ID = ?"
+                , new SerializerWriteBasicExt(datas, 
+                        new int[] {
+                            1, 2, 3, 4, 0})).exec(values);
+    }
+
+    /**
+     *
+     * @param id
+     * @param ticket
+     * @param pickupid
+     * @throws BasicException
+     */
+    public final void updateRSharedTicket(
+            final String id, 
+            final TicketInfo ticket, 
+            int pickupid) throws BasicException {
+            
+        Object[] values = new Object[] {
+            id, 
+            ticket.getName(), 
+            ticket, 
+            pickupid
+        };
+        Datas[] datas = new Datas[] {
+            Datas.STRING, 
+            Datas.STRING, 
+            Datas.SERIALIZABLE, 
+            Datas.INT
+        };
+        new PreparedSentence(s
+                , "UPDATE sharedtickets SET "
+                + "NAME = ?, "
+                + "CONTENT = ?, "
+                + "PICKUPID = ? "
+                + "WHERE ID = ?"
+                , new SerializerWriteBasicExt(datas, new int[] {1, 2, 3, 0})).exec(values);                
+    }
+    
+     /**
+     * In place for multi-purposing like containing data from elsewhere and/or
+     * using Place and User for Notifications
+     * @param id
+     * @param locked
+     * @throws BasicException
+     */
+    public final void lockSharedTicket(final String id, final String locked) throws BasicException {
+            
+        Object[] values = new Object[] {
+            id, 
+            locked
+        };
+        Datas[] datas = new Datas[] {
+            Datas.STRING, 
             Datas.STRING
-        })).find(id);
+        };
-    return (String) state[0];
+        new PreparedSentence(s
-  }
+                , "UPDATE sharedtickets SET "
+                + "LOCKED = ? "
+                + "WHERE ID = ?"
+                , new SerializerWriteBasicExt(datas, new int[] {1, 0})).exec(values);
+    }
 
-  public final String getServer(final String id, String user) throws BasicException {
+     /**
-    Object[] server = (Object[]) new StaticSentence(s, "SELECT appuser FROM sharedtickets WHERE ID = ?",
+     * In place for multi-purposing like flushing locks from elsewhere and/or
-        SerializerWriteString.INSTANCE, new SerializerReadBasic(new Datas[] {
+     * using Place and User for Notifications
+     * @param id
+     * @param unlocked
+     * @throws BasicException
+     */
+    public final void unlockSharedTicket(final String id, final String unlocked) throws BasicException {
+            
+        Object[] values = new Object[] {
+            id, 
+            unlocked
+        };
+        Datas[] datas = new Datas[] {
+            Datas.STRING, 
             Datas.STRING
-        })).find(id);
+        };
-    return (String) server[0];
+        new PreparedSentence(s
-  }
+                , "UPDATE sharedtickets SET "
+                + "LOCKED = ? "
+                + "WHERE ID = ?"
+                , new SerializerWriteBasicExt(datas, new int[] {1, 0})).exec(values);
+    }    
+    
+    /**
+     * For Restaurant View
+     * @param id
+     * @param ticket
+     * @param pickupid
+     * @throws BasicException
+     */
+    public final void insertRSharedTicket(
+            final String id, 
+            final TicketInfo ticket, 
+            int pickupid) throws BasicException {
+        
+        Object[] values = new Object[] {
+            id, 
+            ticket.getName(), 
+            ticket,
+            ticket.getUser(),
+            ticket.getPickupId(),
+            ticket.getHost()                          
+        };
+        Datas[] datas;
+        datas = new Datas[] {
+            Datas.STRING, 
+            Datas.STRING, 
+            Datas.SERIALIZABLE, 
+            Datas.STRING,            
+            Datas.INT
+
+        };
+        new PreparedSentence(s
+            , "INSERT INTO sharedtickets ("
+                + "ID, "
+                + "NAME, "
+                + "CONTENT, "
+                + "APPUSER, "                    
+                + "PICKUPID) "
+                + "VALUES (?, ?, ?, ?, ?)"                
+            , new SerializerWriteBasicExt(datas, new int[] {0, 1, 2, 3, 4})).exec(values);                
+    }    
+
+    /**
+     * 
+     * @param id
+     * @throws BasicException
+     */
+    public final void deleteSharedTicket(final String id) throws BasicException {
+
+        new StaticSentence(s
+            , "DELETE FROM sharedtickets WHERE ID = ?"
+            , SerializerWriteString.INSTANCE).exec(id);      
+    }
+
+    /**
+     *
+     * @param Id
+     * @return
+     * @throws BasicException
+     */
+    public final Integer getPickupId(String Id) throws BasicException {
+        
+        if (Id == null) {
+            return null; 
+        } else {
+            Object[]record = (Object[]) new StaticSentence(s
+                    , "SELECT PICKUPID FROM sharedtickets WHERE ID = ?"
+                    , SerializerWriteString.INSTANCE
+                    , new SerializerReadBasic(new Datas[] {Datas.INT})).find(Id);
+            return record == null ? 0 : (Integer)record[0];
+        }
+    } 
+
+
+    public final String getUserId(final String id) throws BasicException {
+        Object[] userID = (Object []) new StaticSentence(s
+            , "SELECT APPUSER FROM sharedtickets WHERE ID = ?"
+            , SerializerWriteString.INSTANCE
+            , new SerializerReadBasic(new Datas[] {Datas.STRING})).find(id);
+            if( userID == null ) {
+                return null;
+            } else {
+                return (String) userID[0];
+        }
+    }
+    
+    public final String getLockState(final String id, String lockState) throws BasicException {
+        Object[] state = (Object[]) new StaticSentence(s
+            , "SELECT LOCKED FROM sharedtickets WHERE ID = ?"
+            , SerializerWriteString.INSTANCE
+            , new SerializerReadBasic(new Datas[] {
+                Datas.STRING
+            })).find(id);
+                return (String) state[0];
+    }
+
+    public final String getServer(final String id, String user) throws BasicException {
+        Object[] server = (Object[]) new StaticSentence(s
+            , "SELECT appuser FROM sharedtickets WHERE ID = ?"
+            , SerializerWriteString.INSTANCE
+            , new SerializerReadBasic(new Datas[] {
+                Datas.STRING
+            })).find(id);
+                return (String) server[0];
+    }    
 }

src/main/java/com/unicenta/pos/ticket/TicketLineInfo.java

@@ -37,509 +37,455 @@ import java.util.Properties;
  */
 public class TicketLineInfo implements SerializableWrite, SerializableRead, Serializable {
 
-  private static final long serialVersionUID = 6608012948284450199L;
+    private static final long serialVersionUID = 6608012948284450199L;
-  private String m_sTicket;
+    private String m_sTicket;
-  private int m_iLine;
+    private int m_iLine;
-  private double multiply;
+    private double multiply;
 
-  @Override
+    @Override
-  public String toString() {
+    public String toString() {
-    return new Gson().toJson(this);
+        return new Gson().toJson(this);
-  }
-
-  private double price;
-  private TaxInfo tax;
-  private Properties attributes;
-  private String productid;
-  private String attsetinstid;
-  private Boolean updated = false;
-
-  private double newprice = 0.0;
-
-  /**
-   * Creates new TicketLineInfo
-   * 
-   * @param productid
-   * @param dMultiply
-   * @param dPrice
-   * @param tax
-   * @param props
-   */
-  public TicketLineInfo(String productid, double dMultiply, double dPrice, TaxInfo tax, Properties props) {
-    init(productid, null, dMultiply, dPrice, tax, props);
-  }
-
-  /**
-   *
-   * @param productid
-   * @param dMultiply
-   * @param dPrice
-   * @param tax
-   */
-  public TicketLineInfo(String productid, double dMultiply, double dPrice, TaxInfo tax) {
-    init(productid, null, dMultiply, dPrice, tax, new Properties());
-  }
-
-  /**
-   * Example: Call from script.TotalDiscount event
-   * 
-   * @param productid
-   * @param productname
-   * @param producttaxcategory
-   * @param productprinter
-   * @param dMultiply
-   * @param dPrice
-   * @param tax
-   */
-  public TicketLineInfo(String productid, String productname, String producttaxcategory, String productprinter,
-      double dMultiply, double dPrice, TaxInfo tax) {
-    Properties props = new Properties();
-    props.setProperty("product.name", productname);
-    props.setProperty("product.taxcategoryid", producttaxcategory);
-    props.setProperty("product.printer", productprinter); // added to props as may introduce printer redirect
-
-    init(productid, null, dMultiply, dPrice, tax, props);
-  }
-
-  /**
-   * Example: Call from script.LineDiscount event
-   * 
-   * @param productname
-   * @param producttaxcategory
-   * @param productprinter     //added to props as may introduce printer redirect
-   * @param dMultiply
-   * @param dPrice
-   * @param tax
-   */
-  public TicketLineInfo(String productname, String producttaxcategory, String productprinter, double dMultiply,
-      double dPrice, TaxInfo tax) {
-
-    Properties props = new Properties();
-    props.setProperty("product.name", productname);
-    props.setProperty("product.taxcategoryid", producttaxcategory);
-    props.setProperty("product.printer", productprinter);
-
-    init(null, null, dMultiply, dPrice, tax, props);
-  }
-
-  /**
-   *
-   */
-  public TicketLineInfo() {
-    init(null, null, 0.0, 0.0, null, new Properties());
-  }
-
-  /**
-   *
-   * @param product
-   * @param dMultiply
-   * @param dPrice
-   * @param tax
-   * @param attributes
-   */
-  public TicketLineInfo(ProductInfoExt product, double dMultiply, double dPrice, TaxInfo tax, Properties attributes) {
-
-    String pid;
-
-    if (product == null) {
-      pid = null;
-      tax = null;
-    } else {
-      pid = product.getID();
-      attributes.setProperty("product.name", product.getName());
-      attributes.setProperty("product.reference", product.getReference());
-      attributes.setProperty("product.code", product.getCode());
-
-      if (product.getMemoDate() == null) {
-        attributes.setProperty("product.memodate", "1900-01-01 00:00:01");
-      } else {
-        attributes.setProperty("product.memodate", product.getMemoDate());
-      }
-
-      attributes.setProperty("product.com", product.isCom() ? "true" : "false");
-      attributes.setProperty("product.constant", product.isConstant() ? "true" : "false");
-
-      if (product.getPrinter() != null) {
-        attributes.setProperty("product.printer", product.getPrinter());
-      } else {
-        attributes.setProperty("product.printer", "1");
-      }
-
-      attributes.setProperty("product.service", product.isService() ? "true" : "false");
-      attributes.setProperty("product.vprice", product.isVprice() ? "true" : "false");
-      attributes.setProperty("product.verpatrib", product.isVerpatrib() ? "true" : "false");
-
-      if (product.getTextTip() != null) {
-        attributes.setProperty("product.texttip", product.getTextTip());
-      }
-
-      attributes.setProperty("product.warranty", product.getWarranty() ? "true" : "false");
-
-      if (product.getAttributeSetID() != null) {
-        attributes.setProperty("product.attsetid", product.getAttributeSetID());
-      }
-
-      attributes.setProperty("product.taxcategoryid", product.getTaxCategoryID());
-
-      if (product.getCategoryID() != null) {
-        attributes.setProperty("product.categoryid", product.getCategoryID());
-      }
-
-      if ("true".equals(attributes.getProperty("ticket.updated"))) {
-        attributes.setProperty("ticket.updated", "false");
-      } else {
-        attributes.setProperty("ticket.updated", "true");
-      }
     }
 
-    init(pid, null, dMultiply, dPrice, tax, attributes);
+    private double price;
-  }
+    private TaxInfo tax;
+    private Properties attributes;
+    private String productid;
+    private String attsetinstid;
+    private Boolean updated = false;
     
-  /**
+    private double newprice = 0.0;
-   *
-   * @param oProduct
-   * @param dPrice
-   * @param tax
-   * @param attributes
-   */
-  public TicketLineInfo(ProductInfoExt oProduct, double dPrice, TaxInfo tax, Properties attributes) {
-    this(oProduct, 1.0, dPrice, tax, attributes);
-  }
     
-  /**
+    /** Creates new TicketLineInfo
-   *
+     * @param productid
-   * @param line
+     * @param dMultiply
-   */
+     * @param dPrice
-  public TicketLineInfo(TicketLineInfo line) {
+     * @param tax
-    init(line.productid, line.attsetinstid, line.multiply, line.price,
+     * @param props */
-        line.tax, (Properties) line.attributes.clone());
+    public TicketLineInfo(String productid, double dMultiply, double dPrice, TaxInfo tax, Properties props) {
-  }
+        init(productid, null, dMultiply, dPrice, tax, props);
-
-  private void init(String productid, String attsetinstid, double dMultiply, double dPrice, TaxInfo tax,
-      Properties attributes) {
-
-    this.productid = productid;
-    this.attsetinstid = attsetinstid;
-    multiply = dMultiply;
-    price = dPrice;
-    this.tax = tax;
-    this.attributes = attributes;
-
-    m_sTicket = null;
-    m_iLine = -1;
-  }
-
-  void setTicket(String ticket, int line) {
-    m_sTicket = ticket;
-    m_iLine = line;
-  }
-
-  /**
-   *
-   * @param dp
-   * @throws BasicException
-   */
-  @Override
-  public void writeValues(DataWrite dp) throws BasicException {
-    dp.setString(1, m_sTicket);
-    dp.setInt(2, m_iLine);
-    dp.setString(3, productid);
-    dp.setString(4, attsetinstid);
-    dp.setDouble(5, multiply);
-    dp.setDouble(6, price);
-    dp.setString(7, tax.getId());
-
-    try {
-      ByteArrayOutputStream o = new ByteArrayOutputStream();
-      attributes.storeToXML(o, AppLocal.APP_NAME, "UTF-8");
-      dp.setBytes(8, o.toByteArray());
-    } catch (IOException e) {
-      dp.setBytes(8, null);
     }
-  }
 
-  /**
+    /**
-   *
+     *
-   * @param dr
+     * @param productid
-   * @throws BasicException
+     * @param dMultiply
-   */
+     * @param dPrice
-  @Override
+     * @param tax
-  public void readValues(DataRead dr) throws BasicException {
+     */
-    m_sTicket = dr.getString(1);
+    public TicketLineInfo(String productid, double dMultiply, double dPrice, TaxInfo tax) {
-    m_iLine = dr.getInt(2);
+        init(productid, null, dMultiply, dPrice, tax, new Properties());
-    productid = dr.getString(3);
-    attsetinstid = dr.getString(4);
-    multiply = dr.getDouble(5);
-    price = dr.getDouble(6);
-    tax = new TaxInfo(
-        dr.getString(7),
-        dr.getString(8),
-        dr.getString(9),
-        dr.getString(10),
-        dr.getString(11),
-        dr.getDouble(12),
-        dr.getBoolean(13),
-        dr.getInt(14));
-    attributes = new Properties();
-
-    try {
-      byte[] img = dr.getBytes(15);
-      if (img != null) {
-        attributes.loadFromXML(new ByteArrayInputStream(img));
-      }
-    } catch (IOException e) {
     }
-  }
 
-  /**
+    /**
-   *
+     * Example: Call from script.TotalDiscount event
-   * @return
+     * @param productid
-   */
+     * @param productname
-  public TicketLineInfo copyTicketLine() {
+     * @param producttaxcategory
-    TicketLineInfo l = new TicketLineInfo();
+     * @param productprinter
-    l.productid = productid;
+     * @param dMultiply
-    l.attsetinstid = attsetinstid;
+     * @param dPrice
-    l.multiply = multiply;
+     * @param tax
-    l.price = price;
+     */
-    l.tax = tax;
+    public TicketLineInfo(String productid, String productname, String producttaxcategory, String productprinter, double dMultiply, double dPrice, TaxInfo tax) {
-    l.attributes = (Properties) attributes.clone();
+        Properties props = new Properties();
+        props.setProperty("product.name", productname);
+        props.setProperty("product.taxcategoryid", producttaxcategory);
+        props.setProperty("product.printer", productprinter);   //added to props as may introduce printer redirect
         
-    return l;
+        init(productid, null, dMultiply, dPrice, tax, props);
-  }
-
-  /**
-   *
-   * @return
-   */
-  public int getTicketLine() {
-    return m_iLine;
-  }
-
-  // These are the Lookups
-  public String getProductID() {
-    return productid;
-  }
-
-  public String getProductCategoryID() {
-    return (attributes.getProperty("product.categoryid"));
-  }
-
-  public String getProductAttSetId() {
-    return attributes.getProperty("product.attsetid");
-  }
-
-  public String getProductAttSetInstId() {
-    return attsetinstid;
-  }
-
-  public String getProductAttSetInstDesc() {
-    return attributes.getProperty("product.attsetdesc", "");
-  }
-
-  public String getProductTaxCategoryID() {
-    return (attributes.getProperty("product.taxcategoryid"));
-  }
-
-  public String getTicketUpdated() {
-    return (attributes.getProperty("ticket.updated"));
-  }
-
-  public TaxInfo getTaxInfo() {
-    return tax;
-  }
-
-  public void setTaxInfo(TaxInfo oTaxInfo) {
-    tax = oTaxInfo;
-  }
-
-  // These appear on Printed TicketLine
-  public String getProductName() {
-    return attributes.getProperty("product.name");
-  }
-
-  public String getProductMemoDate() {
-    return attributes.getProperty("product.memodate");
-  }
-
-  public double getPrice() {
-    return price;
-  }
-
-  public double getMultiply() {
-    return multiply;
-  }
-
-  public double getTaxRate() {
-    return tax == null ? 0.0 : tax.getRate();
-  }
-
-  public double getNewPrice() {
-    newprice = price * (1.0 + getTaxRate());
-    return price;
-  }
-
-  public String getProductPrinter() {
-    return attributes.getProperty("product.printer");
-  }
-
-  // These are the Summaries
-  public double getPriceTax() {
-    return price * (1.0 + getTaxRate());
-  }
-
-  public Properties getProperties() {
-    return attributes;
-  }
-
-  public String getProperty(String key) {
-    return attributes.getProperty(key);
-  }
-
-  public String getProperty(String key, String defaultvalue) {
-    return attributes.getProperty(key, defaultvalue);
-  }
-
-  // These are Ticket Totals
-  public double getTax() {
-    return price * multiply * getTaxRate();
-  }
-
-  public double getValue() {
-    return price * multiply * (1.0 + getTaxRate());
-  }
-
-  public double getSubValue() {
-    return price * multiply;
-  }
-
-  // SETTERS
-  public void setPrice(double dValue) {
-    price = dValue;
-  }
-
-  public void setPriceTax(double dValue) {
-    price = dValue / (1.0 + getTaxRate());
-  }
-
-  public void setMultiply(double dValue) {
-    multiply = dValue;
-  }
-
-  public void setProperty(String key, String value) {
-    attributes.setProperty(key, value);
-  }
-
-  public void setProductTaxCategoryID(String taxID) {
-    attributes.setProperty("product.taxcategoryid", taxID);
-  }
-
-  public void setProductAttSetInstId(String value) {
-    attsetinstid = value;
-  }
-
-  public void setProductAttSetInstDesc(String value) {
-    if (value == null) {
-      attributes.remove(value);
-    } else {
-      attributes.setProperty("product.attsetdesc", value);
     }
-  }
 
-  public void setTicketUpdated(String key, String value) {
+    /**
-    attributes.setProperty("ticket.updated", value);
+     * Example: Call from script.LineDiscount event
-  }
+     * @param productname
+     * @param producttaxcategory
+     * @param productprinter    //added to props as may introduce printer redirect
+     * @param dMultiply
+     * @param dPrice
+     * @param tax
+     */
+    public TicketLineInfo(String productname, String producttaxcategory, String productprinter, double dMultiply, double dPrice, TaxInfo tax) {
 
-  public void setProductPrinter(String value) {
+        Properties props = new Properties();
-    if (value == null) {
+        props.setProperty("product.name", productname);
-      attributes.remove(value);
+        props.setProperty("product.taxcategoryid", producttaxcategory);
-    } else {
+        props.setProperty("product.printer", productprinter);
-      attributes.setProperty("product.printer", value);
+        
+        init(null, null, dMultiply, dPrice, tax, props);
     }
-  }
 
-  /**
+    /**
-   *
+     *
-   * @return
+     */
-   */
+    public TicketLineInfo() {
-  // Print to actual ${ticketline
+        init(null, null, 0.0, 0.0, null, new Properties());
-  public String printReference() {
+    }
-    return StringUtils.encodeXML(attributes.getProperty("product.reference"));
-  }
 
-  public String printCode() {
+    /**
-    return StringUtils.encodeXML(attributes.getProperty("product.code"));
+     *
-  }
+     * @param product
+     * @param dMultiply
+     * @param dPrice
+     * @param tax
+     * @param attributes
+     */
+    public TicketLineInfo(ProductInfoExt product, double dMultiply, double dPrice, TaxInfo tax, Properties attributes) {
 
-  public String printName() {
+        String pid;
-    return StringUtils.encodeXML(attributes.getProperty("product.name"));
-  }
 
-  public String printProductMemoDate() {
+        if (product == null) {
-    return StringUtils.encodeXML(attributes.getProperty("product.memodate"));
+            pid = null;
-  }
+            tax = null;
+        } else {
+            pid = product.getID();
+            attributes.setProperty("product.name", product.getName());
+            attributes.setProperty("product.reference", product.getReference());
+            attributes.setProperty("product.code", product.getCode());
 
-  public String printPrice() {
+            if (product.getMemoDate() == null) {
-    return Formats.CURRENCY.formatValue(getPrice());
+                attributes.setProperty("product.memodate", "1900-01-01 00:00:01");                
-  }
+            } else {
+                attributes.setProperty("product.memodate", product.getMemoDate());                
+            }
          
-  public String printPriceTax() {
+            attributes.setProperty("product.com", product.isCom() ? "true" : "false");
-    return Formats.CURRENCY.formatValue(getPriceTax());
+            attributes.setProperty("product.constant", product.isConstant() ? "true" : "false");
-  }
 
-  public String printMultiply() {
+            if (product.getPrinter() != null) {
-    return Formats.DOUBLE.formatValue(multiply);
+                attributes.setProperty("product.printer", product.getPrinter());
-  }
+            } else {
+                attributes.setProperty("product.printer", "1");
+            }    
             
-  public String printValue() {
+            attributes.setProperty("product.service", product.isService() ? "true" : "false");
-    return Formats.CURRENCY.formatValue(getValue());
+            attributes.setProperty("product.vprice", product.isVprice() ? "true" : "false");
-  }
+            attributes.setProperty("product.verpatrib", product.isVerpatrib() ? "true" : "false");
 
-  public String printTaxRate() {
+            if (product.getTextTip() != null) {
-    return Formats.PERCENT.formatValue(getTaxRate());
+                attributes.setProperty("product.texttip", product.getTextTip());
-  }
+            }
  
-  public String printSubValue() {
+            attributes.setProperty("product.warranty", product.getWarranty()? "true" : "false");        
-    return Formats.CURRENCY.formatValue(getSubValue());
-  }
        
-  public String printTax() {
+            if (product.getAttributeSetID() != null) {
-    return Formats.CURRENCY.formatValue(getTax());
+                attributes.setProperty("product.attsetid", product.getAttributeSetID());
-  }
+            }
             
-  public String printTextTip() {
+            attributes.setProperty("product.taxcategoryid", product.getTaxCategoryID());
-    return attributes.getProperty("product.texttip");
-  }
         
-  public String printPrinter() {
+            if (product.getCategoryID() != null) {
-    return StringUtils.encodeXML(attributes.getProperty("product.printer"));
+                attributes.setProperty("product.categoryid", product.getCategoryID());
-  }
+            }
 
-  public boolean isProductCom() {
+            if ("true".equals(attributes.getProperty("ticket.updated"))) {
-    return "true".equals(attributes.getProperty("product.com"));
+                attributes.setProperty("ticket.updated", "false");                
-  }
+            } else {
+                attributes.setProperty("ticket.updated", "true");                
+            }
+        }
 
-  public boolean isProductService() {
+        init(pid, null, dMultiply, dPrice, tax, attributes);
-    return "true".equals(attributes.getProperty("product.service"));
+    }
-  }
 
-  public boolean isProductVprice() {
+    /**
-    return "true".equals(attributes.getProperty("product.vprice"));
+     *
-  }
+     * @param oProduct
+     * @param dPrice
+     * @param tax
+     * @param attributes
+     */
+    public TicketLineInfo(ProductInfoExt oProduct, double dPrice, TaxInfo tax, Properties attributes) {
+        this(oProduct, 1.0, dPrice, tax, attributes);
+    }
 
-  public boolean isProductVerpatrib() {
+    /**
-    return "true".equals(attributes.getProperty("product.verpatrib"));
+     *
-  }
+     * @param line
+     */
+    public TicketLineInfo(TicketLineInfo line) {
+        init(line.productid, line.attsetinstid, line.multiply, line.price, 
+            line.tax, (Properties) line.attributes.clone());
+    }
 
-  public boolean isProductWarranty() {
+    private void init(String productid, String attsetinstid, double dMultiply, double dPrice, TaxInfo tax, Properties attributes) {
-    return "true".equals(attributes.getProperty("product.warranty"));
-  }
 
-  public boolean getUpdated() {
+        this.productid = productid;
-    return "true".equals(attributes.getProperty("ticket.updated"));
+        this.attsetinstid = attsetinstid;
-  }
+        multiply = dMultiply;
+        price = dPrice;
+        this.tax = tax;  
+        this.attributes = attributes;
     
-  public void setUpdated(Boolean value) {
+        m_sTicket = null;
-    updated = value;
+        m_iLine = -1;
-  }
+    }
+
+    void setTicket(String ticket, int line) {
+        m_sTicket = ticket;
+        m_iLine = line;
+    }
+
+    /**
+     *
+     * @param dp
+     * @throws BasicException
+     */
+    @Override
+    public void writeValues(DataWrite dp) throws BasicException {
+        dp.setString(1, m_sTicket);
+        dp.setInt(2, m_iLine);
+        dp.setString(3, productid);
+        dp.setString(4, attsetinstid);
+        dp.setDouble(5, multiply);
+        dp.setDouble(6, price);
+        dp.setString(7, tax.getId());
+
+        try {
+            ByteArrayOutputStream o = new ByteArrayOutputStream();
+            attributes.storeToXML(o, AppLocal.APP_NAME, "UTF-8");
+            dp.setBytes(8, o.toByteArray());
+        } catch (IOException e) {
+            dp.setBytes(8, null);
+        }
+    }
+
+    /**
+     *
+     * @param dr
+     * @throws BasicException
+     */
+    @Override
+    public void readValues(DataRead dr) throws BasicException {
+        m_sTicket = dr.getString(1);
+        m_iLine = dr.getInt(2);
+        productid = dr.getString(3);
+        attsetinstid = dr.getString(4);
+        multiply = dr.getDouble(5);
+        price = dr.getDouble(6);
+        tax = new TaxInfo(
+            dr.getString(7), 
+            dr.getString(8), 
+            dr.getString(9), 
+            dr.getString(10), 
+            dr.getString(11), 
+            dr.getDouble(12), 
+            dr.getBoolean(13), 
+            dr.getInt(14));
+        attributes = new Properties();
+
+        try {
+            byte[] img = dr.getBytes(15);
+            if (img != null) {
+                attributes.loadFromXML(new ByteArrayInputStream(img));
+            }
+        } catch (IOException e) {
+        }
+    }
+
+    /**
+     *
+     * @return
+     */
+    public TicketLineInfo copyTicketLine() {
+        TicketLineInfo l = new TicketLineInfo();
+        l.productid = productid;
+        l.attsetinstid = attsetinstid;
+        l.multiply = multiply;
+        l.price = price;
+        l.tax = tax; 
+        l.attributes = (Properties) attributes.clone();
+
+        return l;
+    }
+
+    /**
+     *
+     * @return
+     */
+    public int getTicketLine() {
+        return m_iLine;
+    }
+// These are the Lookups   
+    public String getProductID() {
+        return productid;
+    }
+    public String getProductCategoryID() {
+        return (attributes.getProperty("product.categoryid"));
+    }
+    public String getProductAttSetId() {
+        return attributes.getProperty("product.attsetid");
+    }
+    public String getProductAttSetInstId() {
+        return attsetinstid;
+    }    
+    public String getProductAttSetInstDesc() {
+        return attributes.getProperty("product.attsetdesc", "");
+    }
+    public String getProductTaxCategoryID() {
+        return (attributes.getProperty("product.taxcategoryid"));
+    }
+    public String getTicketUpdated() {
+        return (attributes.getProperty("ticket.updated"));
+    }
+    public TaxInfo getTaxInfo() {
+        return tax;
+    }    
+    public void setTaxInfo(TaxInfo oTaxInfo) {
+        tax = oTaxInfo;
+    }     
+        
+// These appear on Printed TicketLine
+    public String getProductName() {
+        return attributes.getProperty("product.name");
+    }
+    public String getProductMemoDate() {
+        return attributes.getProperty("product.memodate");
+    }
+    public double getPrice() {
+        return price;
+    }
+    public double getMultiply() {
+        return multiply;
+    }
+    public double getTaxRate() {
+        return tax == null ? 0.0 : tax.getRate();
+    }
+    public double getNewPrice() {
+        newprice = price * (1.0 + getTaxRate());
+        return price;
+    }
+    public String getProductPrinter() {
+        return attributes.getProperty("product.printer");
+    }    
+
+// These are the Summaries    
+    public double getPriceTax() {
+        return price * (1.0 + getTaxRate());
+    }
+
+    public Properties getProperties() {
+        return attributes;
+    }
+    public String getProperty(String key) {
+        return attributes.getProperty(key);
+    }
+    public String getProperty(String key, String defaultvalue) {
+        return attributes.getProperty(key, defaultvalue);
+    }
+
+// These are Ticket Totals    
+    public double getTax() {
+        return price * multiply * getTaxRate();
+    }
+    public double getValue() {
+        return price * multiply * (1.0 + getTaxRate());
+    }
+    public double getSubValue() {
+        return price * multiply;
+    }    
+
+// SETTERS
+    public void setPrice(double dValue) {
+        price = dValue;
+    }
+    public void setPriceTax(double dValue) {
+        price = dValue / (1.0 + getTaxRate());               
+    }
+    public void setMultiply(double dValue) {
+        multiply = dValue;
+    }
+    public void setProperty(String key, String value) {
+        attributes.setProperty(key, value);
+    }    
+    public void setProductTaxCategoryID(String taxID){
+        attributes.setProperty("product.taxcategoryid",taxID);
+    }
+    public void setProductAttSetInstId(String value) {
+        attsetinstid = value;
+    }
+    public void setProductAttSetInstDesc(String value) {
+        if (value == null) {
+            attributes.remove(value);
+        } else {
+            attributes.setProperty("product.attsetdesc", value);
+        }
+    }
+    public void setTicketUpdated(String key, String value){
+        attributes.setProperty("ticket.updated",value);
+    }
+    public void setProductPrinter(String value) {
+        if (value == null) {
+            attributes.remove(value);
+        } else {
+            attributes.setProperty("product.printer", value);
+        }
+    }    
+    
+    /**
+     *
+     * @return
+     */
+    // Print to actual ${ticketline
+    public String printReference() {
+        return StringUtils.encodeXML(attributes.getProperty("product.reference"));
+    }
+    public String printCode() {
+        return StringUtils.encodeXML(attributes.getProperty("product.code"));
+    }
+    public String printName() {
+        return StringUtils.encodeXML(attributes.getProperty("product.name"));
+    }
+    public String printProductMemoDate() {
+        return StringUtils.encodeXML(attributes.getProperty("product.memodate"));
+    }         
+    public String printPrice() {
+        return Formats.CURRENCY.formatValue(getPrice());
+    }
+    public String printPriceTax() {
+        return Formats.CURRENCY.formatValue(getPriceTax());
+    }
+    public String printMultiply() {
+        return Formats.DOUBLE.formatValue(multiply);
+    }
+    public String printValue() {
+        return Formats.CURRENCY.formatValue(getValue());
+    }
+    public String printTaxRate() {
+        return Formats.PERCENT.formatValue(getTaxRate());
+    }
+    public String printSubValue() {
+        return Formats.CURRENCY.formatValue(getSubValue());
+    }
+    public String printTax() {
+        return Formats.CURRENCY.formatValue(getTax());
+    }
+    public String printTextTip() {
+	return attributes.getProperty("product.texttip");
+    }
+    public String printPrinter() {
+        return StringUtils.encodeXML(attributes.getProperty("product.printer"));
+    }      
+    public boolean isProductCom() {
+       return "true".equals(attributes.getProperty("product.com"));
+    }
+    public boolean isProductService() {
+	return "true".equals(attributes.getProperty("product.service"));
+    }
+    public boolean isProductVprice() {
+	return "true".equals(attributes.getProperty("product.vprice"));
+    }
+    public boolean isProductVerpatrib() {
+	return "true".equals(attributes.getProperty("product.verpatrib"));
+    }
+    public boolean isProductWarranty() {
+	return "true".equals(attributes.getProperty("product.warranty"));
+    }    
+    public boolean getUpdated() {
+        return "true".equals(attributes.getProperty("ticket.updated"));
+    }
+    public void setUpdated(Boolean value) {
+        updated = value;
+    }
    
 }

src/main/java/com/unicenta/pos/voucher/VoucherInfo.java

@@ -24,124 +24,120 @@ import com.unicenta.data.loader.DataRead;
 import com.unicenta.data.loader.IKeyed;
 import com.unicenta.data.loader.SerializerRead;
 
-
 public class VoucherInfo implements IKeyed {
-    private String id;
+  private String id;
-    private String voucherNumber;
+  private String voucherNumber;
-    private String customerName;
+  private String customerName;
-    private double amount;
+  private double amount;
-    private String status;
+  private String status;
 
-    public VoucherInfo() {
+  public VoucherInfo() {
-    }
+  }
 
-    public VoucherInfo(
+  public VoucherInfo(
-        String id, 
+      String id,
-        String voucherNumber, 
+      String voucherNumber,
-        String customerName,
+      String customerName,
-        double amount, 
+      double amount,
-        String status) 
+      String status) {
-    {
+    this.id = id;
-        this.id = id;
+    this.voucherNumber = voucherNumber;
-        this.voucherNumber = voucherNumber;
+    this.customerName = customerName;
-        this.customerName = customerName;
+    this.amount = amount;
-        this.amount = amount;
+    this.status = status;
-        this.status = status;
+  }
-    }
 
+  @Override
+  public Object getKey() {
+    return getId();
+  }
 
-    @Override
+  /**
-    public Object getKey() {
+   * @return the id
-        return getId();
+   */
-    }
+  public String getId() {
+    return id;
+  }
 
-    /**
+  /**
-     * @return the id
+   * @param id the id to set
-     */
+   */
-    public String getId() {
+  public void setId(String id) {
-        return id;
+    this.id = id;
-    }
+  }
 
-    /**
+  /**
-     * @param id the id to set
+   * @return the voucherNumber
-     */
+   */
-    public void setId(String id) {
+  public String getVoucherNumber() {
-        this.id = id;
+    return voucherNumber;
-    }
+  }
 
-    /**
+  /**
-     * @return the voucherNumber
+   * @param voucherNumber the voucherNumber to set
-     */
+   */
-    public String getVoucherNumber() {
+  public void setVoucherNumber(String voucherNumber) {
-        return voucherNumber;
+    this.voucherNumber = voucherNumber;
-    }
+  }
 
-    /**
+  /**
-     * @param voucherNumber the voucherNumber to set
+   * @return the customerName
-     */
+   */
-    public void setVoucherNumber(String voucherNumber) {
+  public String getCustomerName() {
-        this.voucherNumber = voucherNumber;
+    return customerName;
-    }
+  }
 
-    /**
+  /**
-     * @return the customerName
+   * @param customerName the customerName to set
-     */
+   */
-    public String getCustomerName() {
+  public void setCustomerName(String customerName) {
-        return customerName;
+    this.customerName = customerName;
-    }
+  }
 
-    /**
+  /**
-     * @param customerName the customerName to set
+   * @return the amount
-     */
+   */
-    public void setCustomerName(String customerName) {
+  public double getAmount() {
-        this.customerName = customerName;
+    return amount;
-    }
+  }
 
-    /**
+  /**
-     * @return the amount
+   * @param amount the amount to set
-     */
+   */
-    public double getAmount() {
+  public void setAmount(double amount) {
-        return amount;
+    this.amount = amount;
-    }
+  }
 
-    /**
+  @Override
-     * @param amount the amount to set
+  public String toString() {
-     */
+    return voucherNumber;
-    public void setAmount(double amount) {
+  }
-        this.amount = amount;
-    }
 
+  /**
+   * @return the status
+   */
+  public String getStatus() {
+    return status;
+  }
 
-     @Override
+  /**
-    public String toString() {
+   * @param status the status to set
-        return voucherNumber;
+   */
-    }
+  public void setStatus(String status) {
+    this.status = status;
+  }
 
-    /**
+  public static SerializerRead getSerializerRead() {
-     * @return the status
+    return new SerializerRead() {
-     */
+      @Override
-    public String getStatus() {
+      public Object readValues(DataRead dr) throws BasicException {
-        return status;
+        return new VoucherInfo(
-    }
+            dr.getString(1),
-
+            dr.getString(2),
-    /**
+            dr.getString(3),
-     * @param status the status to set
+            dr.getDouble(4),
-     */
+            dr.getString(5));
-    public void setStatus(String status) {
+      }
-        this.status = status;
+    };
-    }
+  }
-
-    public static SerializerRead getSerializerRead() {
-        return new SerializerRead() 
-        {
-            @Override
-        public Object readValues(DataRead dr) throws BasicException {
-            return new VoucherInfo(
-                    dr.getString(1), 
-                    dr.getString(2), 
-                    dr.getString(3),
-                    dr.getDouble(4),
-                    dr.getString(5));            
-        }};
-    }    
 }