From 2ab11480cec9aa6100d2754b5d0405985aebfcdc Mon Sep 17 00:00:00 2001 From: Hugh Date: Fri, 9 Jan 2026 17:43:55 +0000 Subject: [PATCH] wip --- .gitignore | 4 + .../unicenta/data/loader/StaticSentence.java | 351 ++--- .../unicenta/pos/admin/DataLogicAdmin.java | 10 +- .../com/unicenta/pos/admin/PeopleView.java | 8 +- .../java/com/unicenta/pos/forms/AppUser.java | 2 +- .../unicenta/pos/forms/DataLogicSystem.java | 7 +- .../com/unicenta/pos/transfer/Transfer.java | 1207 +++++++++-------- .../com/unicenta/pos/scripts/Derby-create.sql | 1 + .../pos/scripts/Derby-upgrade_master.sql | 4 +- .../unicenta/pos/scripts/MariaDB-create.sql | 3 +- .../pos/scripts/MariaDB-upgrade_master.sql | 1 + .../com/unicenta/pos/scripts/MySQL-create.sql | 3 +- .../pos/scripts/MySQL-upgrade_master.sql | 63 +- src/main/resources/pos_messages.properties | 1 + .../resources/pos_messages_al_SQ.properties | 1 + src/main/resources/pos_messages_ar.properties | 1 + src/main/resources/pos_messages_da.properties | 1 + src/main/resources/pos_messages_de.properties | 1 + src/main/resources/pos_messages_el.properties | 1 + .../resources/pos_messages_en_US.properties | 1 + src/main/resources/pos_messages_es.properties | 3 +- .../resources/pos_messages_es_AR.properties | 1 + .../resources/pos_messages_es_MX.properties | 4 +- src/main/resources/pos_messages_et.properties | 1 + src/main/resources/pos_messages_fr.properties | 1 + src/main/resources/pos_messages_hr.properties | 1 + src/main/resources/pos_messages_it.properties | 1 + src/main/resources/pos_messages_nl.properties | 1 + src/main/resources/pos_messages_pt.properties | 1 + .../resources/pos_messages_pt_BR.properties | 1 + 30 files changed, 869 insertions(+), 817 deletions(-) diff --git a/.gitignore b/.gitignore index cab3207..7cd9e22 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,7 @@ nbactions.xml docker.sock .DS_Store +.classpath +.project +.factorypath +.settings diff --git a/src/main/java/com/unicenta/data/loader/StaticSentence.java b/src/main/java/com/unicenta/data/loader/StaticSentence.java index e7661d0..7625633 100644 --- a/src/main/java/com/unicenta/data/loader/StaticSentence.java +++ b/src/main/java/com/unicenta/data/loader/StaticSentence.java @@ -34,191 +34,192 @@ import java.util.regex.Pattern; @Slf4j public class StaticSentence extends JDBCSentence { + private ISQLBuilderStatic iSQLBuilder; - private ISQLBuilderStatic iSQLBuilder; + /** + * + */ + protected SerializerWrite m_SerWrite = null; - /** - * - */ - protected SerializerWrite m_SerWrite = null; + /** + * + */ + protected SerializerRead m_SerRead = null; - /** - * - */ - protected SerializerRead m_SerRead = null; + // Estado + private Statement statement; - // Estado - private Statement statement; + /** + * Creates a new instance of StaticSentence + * + * @param s + * @param sentence + * @param serread + * @param serwrite + */ + public StaticSentence(Session s, ISQLBuilderStatic sentence, SerializerWrite serwrite, SerializerRead serread) { + super(s); + iSQLBuilder = sentence; + m_SerWrite = serwrite; + m_SerRead = serread; + statement = null; + } - /** - * Creates a new instance of StaticSentence - * - * @param s - * @param sentence - * @param serread - * @param serwrite - */ - public StaticSentence(Session s, ISQLBuilderStatic sentence, SerializerWrite serwrite, SerializerRead serread) { - super(s); - iSQLBuilder = sentence; - m_SerWrite = serwrite; - m_SerRead = serread; + /** + * Creates a new instance of StaticSentence + * + * @param s + * @param sentence + */ + public StaticSentence(Session s, ISQLBuilderStatic sentence) { + this(s, sentence, null, null); + } + + /** + * Creates a new instance of StaticSentence + * + * @param s + * @param sentence + * @param serwrite + */ + public StaticSentence(Session s, ISQLBuilderStatic sentence, SerializerWrite serwrite) { + this(s, sentence, serwrite, null); + } + + /** + * Creates a new instance of StaticSentence + * + * @param s + * @param sentence + * @param serread + * @param serwrite + */ + public StaticSentence(Session s, String sentence, SerializerWrite serwrite, SerializerRead serread) { + this(s, new NormalBuilder(sentence), serwrite, serread); + } + + /** + * Creates a new instance of StaticSentence + * + * @param s + * @param sentence + * @param serwrite + */ + public StaticSentence(Session s, String sentence, SerializerWrite serwrite) { + this(s, new NormalBuilder(sentence), serwrite, null); + } + + /** + * Creates a new instance of StaticSentence + * + * @param s + * @param sentence + */ + public StaticSentence(Session s, String sentence) { + this(s, new NormalBuilder(sentence), null, null); + } + + public String fixSqliteDate(String sql) { + + try { + if (session.getURL().contains("sqlite") && sql.contains("{ts '")) { + StringBuilder sqliteSQL = new StringBuilder(); + + Pattern date = Pattern.compile("(?<=ts ).*(?=})"); + Matcher matchPattern = date.matcher(sql); + + if (matchPattern.find()) { + sqliteSQL.append(sql.replaceAll("\\{.*}", matchPattern.group(0))); + } + + return sqliteSQL.toString(); + } + + } catch (Exception e) { + log.error("Error fixing sql for sqlite {}", e.getMessage()); + return sql; + } + return sql; + } + + /** + * @param params + * @return + * @throws BasicException + */ + @Override + public DataResultSet openExec(Object params) throws BasicException { + // true -> un resultset + // false -> un updatecount (si -1 entonces se acabo) + + closeExec(); + + try { + // follow this to find the create category bug when importing a product csv + // https://unicenta.atlassian.net/browse/UOCL-317 + String sql = iSQLBuilder.getSQL(m_SerWrite, params); + String sentence = fixSqliteDate(sql); + // String sentence = iSQLBuilder.getSQL(m_SerWrite, params); + + statement = session.getConnection().createStatement(); + + log.debug("Executing static SQL: {}", sentence); + + if (statement.execute(sentence)) { + return new JDBCDataResultSet(statement.getResultSet(), m_SerRead); + } else { + int iUC = statement.getUpdateCount(); + if (iUC < 0) { + return null; + } else { + return new SentenceUpdateResultSet(iUC); + } + } + } catch (SQLException eSQL) { + throw new BasicException(eSQL); + } + } + + /** + * @throws BasicException + */ + @Override + public void closeExec() throws BasicException { + + if (statement != null) { + try { + statement.close(); + } catch (SQLException eSQL) { + throw new BasicException(eSQL); + } finally { statement = null; + } } + } - /** - * Creates a new instance of StaticSentence - * - * @param s - * @param sentence - */ - public StaticSentence(Session s, ISQLBuilderStatic sentence) { - this(s, sentence, null, null); - } - - /** - * Creates a new instance of StaticSentence - * - * @param s - * @param sentence - * @param serwrite - */ - public StaticSentence(Session s, ISQLBuilderStatic sentence, SerializerWrite serwrite) { - this(s, sentence, serwrite, null); - } - - /** - * Creates a new instance of StaticSentence - * - * @param s - * @param sentence - * @param serread - * @param serwrite - */ - public StaticSentence(Session s, String sentence, SerializerWrite serwrite, SerializerRead serread) { - this(s, new NormalBuilder(sentence), serwrite, serread); - } - - /** - * Creates a new instance of StaticSentence - * - * @param s - * @param sentence - * @param serwrite - */ - public StaticSentence(Session s, String sentence, SerializerWrite serwrite) { - this(s, new NormalBuilder(sentence), serwrite, null); - } - - /** - * Creates a new instance of StaticSentence - * - * @param s - * @param sentence - */ - public StaticSentence(Session s, String sentence) { - this(s, new NormalBuilder(sentence), null, null); - } - - public String fixSqliteDate(String sql) { - - try { - if (session.getURL().contains("sqlite") && sql.contains("{ts '")) { - StringBuilder sqliteSQL = new StringBuilder(); - - Pattern date = Pattern.compile("(?<=ts ).*(?=})"); - Matcher matchPattern = date.matcher(sql); - - if (matchPattern.find()) { - sqliteSQL.append(sql.replaceAll("\\{.*}", matchPattern.group(0))); - } - - return sqliteSQL.toString(); - } + /** + * @return + * @throws BasicException + */ + @Override + public DataResultSet moreResults() throws BasicException { + try { + if (statement.getMoreResults()) { + // tenemos resultset + return new JDBCDataResultSet(statement.getResultSet(), m_SerRead); + } else { + // tenemos updatecount o si devuelve -1 ya no hay mas + int iUC = statement.getUpdateCount(); + if (iUC < 0) { + return null; + } else { + return new SentenceUpdateResultSet(iUC); } - catch (Exception e) { - log.error("Error fixing sql for sqlite {}", e.getMessage()); - return sql; - } - return sql; - } - /** - * @param params - * @return - * @throws BasicException - */ - @Override - public DataResultSet openExec(Object params) throws BasicException { - // true -> un resultset - // false -> un updatecount (si -1 entonces se acabo) - - closeExec(); - - try { - - String sentence = fixSqliteDate(iSQLBuilder.getSQL(m_SerWrite, params)); - //String sentence = iSQLBuilder.getSQL(m_SerWrite, params); - - statement = session.getConnection().createStatement(); - - log.debug("Executing static SQL: {}", sentence); - - if (statement.execute(sentence)) { - return new JDBCDataResultSet(statement.getResultSet(), m_SerRead); - } else { - int iUC = statement.getUpdateCount(); - if (iUC < 0) { - return null; - } else { - return new SentenceUpdateResultSet(iUC); - } - } - } catch (SQLException eSQL) { - throw new BasicException(eSQL); - } - } - - /** - * @throws BasicException - */ - @Override - public void closeExec() throws BasicException { - - if (statement != null) { - try { - statement.close(); - } catch (SQLException eSQL) { - throw new BasicException(eSQL); - } finally { - statement = null; - } - } - } - - /** - * @return - * @throws BasicException - */ - @Override - public DataResultSet moreResults() throws BasicException { - - try { - if (statement.getMoreResults()) { - // tenemos resultset - return new JDBCDataResultSet(statement.getResultSet(), m_SerRead); - } else { - // tenemos updatecount o si devuelve -1 ya no hay mas - int iUC = statement.getUpdateCount(); - if (iUC < 0) { - return null; - } else { - return new SentenceUpdateResultSet(iUC); - } - } - } catch (SQLException eSQL) { - throw new BasicException(eSQL); - } + } + } catch (SQLException eSQL) { + throw new BasicException(eSQL); } + } } diff --git a/src/main/java/com/unicenta/pos/admin/DataLogicAdmin.java b/src/main/java/com/unicenta/pos/admin/DataLogicAdmin.java index 9c0596b..e8cf438 100644 --- a/src/main/java/com/unicenta/pos/admin/DataLogicAdmin.java +++ b/src/main/java/com/unicenta/pos/admin/DataLogicAdmin.java @@ -50,10 +50,12 @@ public class DataLogicAdmin extends BeanFactoryDataSingle { m_tpeople = new TableDefinition(s, "people" - , new String[] {"ID", "NAME", "APPPASSWORD", "ROLE", "VISIBLE", "CARD", "IMAGE"} - , new String[] {"ID", AppLocal.getIntString("label.peoplename"), AppLocal.getIntString("label.Password"), AppLocal.getIntString("label.role"), AppLocal.getIntString("label.peoplevisible"), AppLocal.getIntString("label.card"), AppLocal.getIntString("label.peopleimage")} - , new Datas[] {Datas.STRING, Datas.STRING, Datas.STRING, Datas.STRING, Datas.BOOLEAN, Datas.STRING, Datas.IMAGE} - , new Formats[] {Formats.STRING, Formats.STRING, Formats.STRING, Formats.STRING, Formats.BOOLEAN, Formats.STRING, Formats.NULL} + , new String[] {"ID", "NAME", "APPPASSWORD", "ROLE", "VISIBLE", "CARD", "IMAGE", "TAXID"} + , new String[] {"ID", AppLocal.getIntString("label.peoplename"), AppLocal.getIntString("label.Password"), + AppLocal.getIntString("label.role"), AppLocal.getIntString("label.peoplevisible"), + AppLocal.getIntString("label.card"), AppLocal.getIntString("label.peopleimage"), "tax ID"} + , new Datas[] {Datas.STRING, Datas.STRING, Datas.STRING, Datas.STRING, Datas.BOOLEAN, Datas.STRING, Datas.IMAGE, Datas.STRING} + , new Formats[] {Formats.STRING, Formats.STRING, Formats.STRING, Formats.STRING, Formats.BOOLEAN, Formats.STRING, Formats.NULL, Formats.STRING} , new int[] {0} ); diff --git a/src/main/java/com/unicenta/pos/admin/PeopleView.java b/src/main/java/com/unicenta/pos/admin/PeopleView.java index 7dbe234..35c10bb 100644 --- a/src/main/java/com/unicenta/pos/admin/PeopleView.java +++ b/src/main/java/com/unicenta/pos/admin/PeopleView.java @@ -139,6 +139,7 @@ public class PeopleView extends JPanel implements EditorRecord { m_jVisible.setSelected(((Boolean) people[4]).booleanValue()); m_jcard.setText(Formats.STRING.formatValue(people[5])); m_jImage.setImage((BufferedImage) people[6]); + taxIdTextField.setText(Formats.STRING.formatValue(people[7])); m_jName.setEnabled(false); m_jRole.setEnabled(false); @@ -163,13 +164,13 @@ public class PeopleView extends JPanel implements EditorRecord { m_jVisible.setSelected(((Boolean) people[4]).booleanValue()); m_jcard.setText(Formats.STRING.formatValue(people[5])); m_jImage.setImage((BufferedImage) people[6]); - + taxIdTextField.setText(Formats.STRING.formatValue(people[7])); if (m_jcard.getText().length() == 16) { jLblCardID.setText(AppLocal.getIntString("label.ibutton")); } else { jLblCardID.setText(AppLocal.getIntString("label.card")); } - System.out.println(m_jcard.getText().length()); +// System.out.println(m_jcard.getText().length()); m_jName.setEnabled(true); m_jRole.setEnabled(true); @@ -187,7 +188,7 @@ public class PeopleView extends JPanel implements EditorRecord { */ @Override public Object createValue() throws BasicException { - Object[] people = new Object[7]; + Object[] people = new Object[8]; people[0] = m_oId == null ? UUID.randomUUID().toString() : m_oId; people[1] = Formats.STRING.parseValue(m_jName.getText()); people[2] = Formats.STRING.parseValue(m_sPassword); @@ -195,6 +196,7 @@ public class PeopleView extends JPanel implements EditorRecord { people[4] = m_jVisible.isSelected(); people[5] = Formats.STRING.parseValue(m_jcard.getText()); people[6] = m_jImage.getImage(); + people[7] = Formats.STRING.parseValue(taxIdTextField.getText()); return people; } diff --git a/src/main/java/com/unicenta/pos/forms/AppUser.java b/src/main/java/com/unicenta/pos/forms/AppUser.java index 15f96a3..e92c71f 100644 --- a/src/main/java/com/unicenta/pos/forms/AppUser.java +++ b/src/main/java/com/unicenta/pos/forms/AppUser.java @@ -70,7 +70,7 @@ public class AppUser { * @param icon * @param role */ - public AppUser(String id, String name, String password, String card, String role, Icon icon) { + public AppUser(String id, String name, String password, String card, String role, Icon icon, String taxId) { m_sId = id; m_sName = name; m_sPassword = password; diff --git a/src/main/java/com/unicenta/pos/forms/DataLogicSystem.java b/src/main/java/com/unicenta/pos/forms/DataLogicSystem.java index b4357b8..19801d6 100644 --- a/src/main/java/com/unicenta/pos/forms/DataLogicSystem.java +++ b/src/main/java/com/unicenta/pos/forms/DataLogicSystem.java @@ -121,7 +121,8 @@ public class DataLogicSystem extends BeanFactoryDataSingle { dr.getString(3), dr.getString(4), dr.getString(5), - new ImageIcon(tnb.getThumbNail(ImageUtils.readImage(dr.getBytes(6))))); + new ImageIcon(tnb.getThumbNail(ImageUtils.readImage(dr.getBytes(6)))), + dr.getString(7)); // START OF PRODUCT ************************************************************ productIdRead =(DataRead dr) -> ( @@ -208,12 +209,12 @@ public class DataLogicSystem extends BeanFactoryDataSingle { // END OF CUSTOMER ****************************************************************** m_peoplevisible = new StaticSentence(s - , "SELECT ID, NAME, APPPASSWORD, CARD, ROLE, IMAGE FROM people WHERE VISIBLE = " + s.DB.TRUE() + " ORDER BY NAME" + , "SELECT ID, NAME, APPPASSWORD, CARD, ROLE, IMAGE, TAXID FROM people WHERE VISIBLE = " + s.DB.TRUE() + " ORDER BY NAME" , null , peopleread); m_peoplebycard = new PreparedSentence(s - , "SELECT ID, NAME, APPPASSWORD, CARD, ROLE, IMAGE FROM people WHERE CARD = ? AND VISIBLE = " + s.DB.TRUE() + , "SELECT ID, NAME, APPPASSWORD, CARD, ROLE, IMAGE, TAXID FROM people WHERE CARD = ? AND VISIBLE = " + s.DB.TRUE() , SerializerWriteString.INSTANCE , peopleread); diff --git a/src/main/java/com/unicenta/pos/transfer/Transfer.java b/src/main/java/com/unicenta/pos/transfer/Transfer.java index 6d95309..2e2adcf 100644 --- a/src/main/java/com/unicenta/pos/transfer/Transfer.java +++ b/src/main/java/com/unicenta/pos/transfer/Transfer.java @@ -19,7 +19,6 @@ package com.unicenta.pos.transfer; - import com.unicenta.basic.BasicException; import com.unicenta.data.gui.JMessageDialog; import com.unicenta.data.gui.MessageInf; @@ -178,9 +177,9 @@ public final class Transfer extends JPanel implements JPanelView { public Boolean getSource() { String db_url2 = jtxtDbType.getText() - + jtxtDbServerPort.getText() - + jtxtDbName.getText() - + jtxtDbParams.getText(); + + jtxtDbServerPort.getText() + + jtxtDbName.getText() + + jtxtDbParams.getText(); String db_user2 = txtDbUser.getText(); char[] pass = txtDbPass.getPassword(); String db_password2 = new String(pass); @@ -193,14 +192,14 @@ public final class Transfer extends JPanel implements JPanelView { Class.forName(jtxtDbDriver.getText()); ClassLoader cloader = new URLClassLoader( - new URL[]{ - new File(jtxtDbDriverLib.getText()).toURI().toURL() - }); + new URL[] { + new File(jtxtDbDriverLib.getText()).toURI().toURL() + }); DriverManager.registerDriver( - new DriverWrapper((Driver) Class.forName(jtxtDbDriver.getText(), - true, cloader).newInstance())); + new DriverWrapper((Driver) Class.forName(jtxtDbDriver.getText(), + true, cloader).newInstance())); con_source = (Connection) DriverManager.getConnection( - db_url2, db_user2, db_password2); + db_url2, db_user2, db_password2); session_source = new Session(db_url2, db_user2, db_password2); sDB_source = con_source.getMetaData().getDatabaseProductName(); @@ -211,27 +210,26 @@ public final class Transfer extends JPanel implements JPanelView { return (true); } catch (ClassNotFoundException - | MalformedURLException - | InstantiationException - | IllegalAccessException - | SQLException e) { + | MalformedURLException + | InstantiationException + | IllegalAccessException + | SQLException e) { JMessageDialog.showMessage(this, - new MessageInf(MessageInf.SGN_DANGER, - AppLocal.getIntString("database.UnableToConnect"), - e)); + new MessageInf(MessageInf.SGN_DANGER, + AppLocal.getIntString("database.UnableToConnect"), + e)); return (false); } } - /** * @return */ @SuppressWarnings("empty-statement") public Boolean createTargetDB() { -// Transfer is into current MySQL database in unicentaopos.properties + // Transfer is into current MySQL database in unicentaopos.properties targetCreate = "/com/unicenta/pos/scripts/" + sDB_target + "-create-transfer.sql"; targetFKadd = "/com/unicenta/pos/scripts/MySQL-FKeys.sql"; @@ -253,9 +251,9 @@ public final class Transfer extends JPanel implements JPanelView { if (l.size() > 0) { JMessageDialog.showMessage(this, - new MessageInf(MessageInf.SGN_WARNING, - AppLocal.getIntString("transfer.warning"), - l.toArray(new Throwable[l.size()]))); + new MessageInf(MessageInf.SGN_WARNING, + AppLocal.getIntString("transfer.warning"), + l.toArray(new Throwable[l.size()]))); } else { txtOut.append("Connected to Target OK" + "\n"); @@ -265,9 +263,9 @@ public final class Transfer extends JPanel implements JPanelView { } catch (BasicException e) { JMessageDialog.showMessage(this, - new MessageInf(MessageInf.SGN_DANGER, - AppLocal.getIntString("transfer.warningnodefault"), - e)); + new MessageInf(MessageInf.SGN_DANGER, + AppLocal.getIntString("transfer.warningnodefault"), + e)); session_source.close(); } finally { } @@ -291,9 +289,9 @@ public final class Transfer extends JPanel implements JPanelView { java.util.List l = bsentence.list(); if (l.size() > 0) { JMessageDialog.showMessage(this, - new MessageInf(MessageInf.SGN_WARNING, - AppLocal.getIntString("transfer.warning"), - l.toArray(new Throwable[l.size()]))); + new MessageInf(MessageInf.SGN_WARNING, + AppLocal.getIntString("transfer.warning"), + l.toArray(new Throwable[l.size()]))); txtOut.append("Foreign Key error" + "\n"); } else { txtOut.append("Foreign Keys completed" + "\n"); @@ -301,9 +299,9 @@ public final class Transfer extends JPanel implements JPanelView { } catch (BasicException e) { JMessageDialog.showMessage(this, - new MessageInf(MessageInf.SGN_DANGER, - AppLocal.getIntString("database.ScriptNotFound"), - e)); + new MessageInf(MessageInf.SGN_DANGER, + AppLocal.getIntString("database.ScriptNotFound"), + e)); session_source.close(); } finally { } @@ -325,13 +323,13 @@ public final class Transfer extends JPanel implements JPanelView { if ("true".equals(m_props.getProperty("db.multi"))) { ImageIcon icon = new ImageIcon("/com/unicenta/images/unicentaopos.png"); Object[] dbs = { - "0 - " + m_props.getProperty("db.name"), - "1 - " + m_props.getProperty("db1.name")}; + "0 - " + m_props.getProperty("db.name"), + "1 - " + m_props.getProperty("db1.name") }; Object s = (Object) JOptionPane.showInputDialog( - null, AppLocal.getIntString("message.databasechoose"), - "Selection", JOptionPane.OK_OPTION, - icon, dbs, m_props.getProperty("db.name")); + null, AppLocal.getIntString("message.databasechoose"), + "Selection", JOptionPane.OK_OPTION, + icon, dbs, m_props.getProperty("db.name")); if (s.toString().startsWith("1")) { db_url = (m_props.getProperty("db1.URL")); @@ -351,9 +349,9 @@ public final class Transfer extends JPanel implements JPanelView { jlblSource.setText(con_target.getCatalog()); } catch (SQLException e) { JMessageDialog.showMessage(this, - new MessageInf(MessageInf.SGN_DANGER, - AppLocal.getIntString("database.UnableToConnect"), - e)); + new MessageInf(MessageInf.SGN_DANGER, + AppLocal.getIntString("database.UnableToConnect"), + e)); } } else { @@ -374,9 +372,9 @@ public final class Transfer extends JPanel implements JPanelView { jlblSource.setText(con_target.getCatalog()); } catch (SQLException e) { JMessageDialog.showMessage(this, - new MessageInf(MessageInf.SGN_DANGER, - AppLocal.getIntString("database.UnableToConnect"), - e)); + new MessageInf(MessageInf.SGN_DANGER, + AppLocal.getIntString("database.UnableToConnect"), + e)); } } } else { @@ -397,9 +395,9 @@ public final class Transfer extends JPanel implements JPanelView { jlblSource.setText(con_target.getCatalog()); } catch (SQLException e) { JMessageDialog.showMessage(this, - new MessageInf(MessageInf.SGN_DANGER, - AppLocal.getIntString("database.UnableToConnect"), - e)); + new MessageInf(MessageInf.SGN_DANGER, + AppLocal.getIntString("database.UnableToConnect"), + e)); } } } @@ -511,8 +509,8 @@ public final class Transfer extends JPanel implements JPanelView { while (rs.next()) { SQL = "INSERT INTO attribute (" - + "ID, NAME) " - + "VALUES (?, ?)"; + + "ID, NAME) " + + "VALUES (?, ?)"; pstmt = con_target.prepareStatement(SQL); pstmt.setString(1, rs.getString("ID")); @@ -531,8 +529,8 @@ public final class Transfer extends JPanel implements JPanelView { while (rs.next()) { SQL = "INSERT INTO attributevalue (" - + "ID, ATTRIBUTE_ID, VALUE) " - + "VALUES (?, ?, ?)"; + + "ID, ATTRIBUTE_ID, VALUE) " + + "VALUES (?, ?, ?)"; pstmt = con_target.prepareStatement(SQL); pstmt.setString(1, rs.getString("ID")); pstmt.setString(2, rs.getString("ATTRIBUTE_ID")); @@ -551,8 +549,8 @@ public final class Transfer extends JPanel implements JPanelView { while (rs.next()) { SQL = "INSERT INTO attributeinstance (" - + "ID, ATTRIBUTESETINSTANCE_ID, ATTRIBUTE_ID, VALUE) " - + "VALUES (?, ?, ?, ?)"; + + "ID, ATTRIBUTESETINSTANCE_ID, ATTRIBUTE_ID, VALUE) " + + "VALUES (?, ?, ?, ?)"; pstmt = con_target.prepareStatement(SQL); pstmt.setString(1, rs.getString("ID")); @@ -573,8 +571,8 @@ public final class Transfer extends JPanel implements JPanelView { while (rs.next()) { SQL = "INSERT INTO attributesetinstance (" - + "ID, ATTRIBUTESET_ID, DESCRIPTION) " - + "VALUES (?, ?, ?)"; + + "ID, ATTRIBUTESET_ID, DESCRIPTION) " + + "VALUES (?, ?, ?)"; pstmt = con_target.prepareStatement(SQL); pstmt.setString(1, rs.getString("ID")); @@ -592,13 +590,13 @@ public final class Transfer extends JPanel implements JPanelView { SQL = "SELECT ID, ATTRIBUTESET_ID, ATTRIBUTE_ID FROM attributeuse"; rs = stmt_source.executeQuery(SQL); -// removed LINENO as weird bug in MySQL causes Lock Timeout -// only happens to this table, no other affected + // removed LINENO as weird bug in MySQL causes Lock Timeout + // only happens to this table, no other affected while (rs.next()) { SQL = "INSERT INTO attributeuse(" - + "ID, ATTRIBUTESET_ID, ATTRIBUTE_ID) " - + "VALUES (?, ?, ?)"; + + "ID, ATTRIBUTESET_ID, ATTRIBUTE_ID) " + + "VALUES (?, ?, ?)"; pstmt = con_target.prepareStatement(SQL); pstmt.setString(1, rs.getString("ID")); @@ -618,8 +616,8 @@ public final class Transfer extends JPanel implements JPanelView { while (rs.next()) { SQL = "INSERT INTO attributeset (" - + "ID, NAME) " - + "VALUES (?, ?)"; + + "ID, NAME) " + + "VALUES (?, ?)"; pstmt = con_target.prepareStatement(SQL); pstmt.setString(1, rs.getString("ID")); @@ -628,7 +626,7 @@ public final class Transfer extends JPanel implements JPanelView { pstmt.executeUpdate(); } rs.close(); -// introduced in 3.00 + // introduced in 3.00 if (Dbtversion >= 3.00) { Dbtname = "breaks"; rs = con_source.getMetaData().getTables(null, null, Dbtname, null); @@ -638,8 +636,8 @@ public final class Transfer extends JPanel implements JPanelView { while (rs.next()) { SQL = "INSERT INTO breaks(" - + "ID, NAME, NOTES, VISIBLE) " - + "VALUES (?, ?, ?, ?)"; + + "ID, NAME, NOTES, VISIBLE) " + + "VALUES (?, ?, ?, ?)"; pstmt = con_target.prepareStatement(SQL); pstmt.setString(1, rs.getString("ID")); @@ -664,10 +662,10 @@ public final class Transfer extends JPanel implements JPanelView { if (rs.getMetaData().getColumnCount() == 6) { while (rs.next()) { SQL = "INSERT INTO categories(" - + "ID, NAME, PARENTID, IMAGE, " - + "TEXTTIP, CATSHOWNAME) " - + "VALUES (?, ?, ?, ?, " - + "?, ?)"; + + "ID, NAME, PARENTID, IMAGE, " + + "TEXTTIP, CATSHOWNAME) " + + "VALUES (?, ?, ?, ?, " + + "?, ?)"; pstmt = con_target.prepareStatement(SQL); pstmt.setString(1, rs.getString("ID")); @@ -682,8 +680,8 @@ public final class Transfer extends JPanel implements JPanelView { } else { while (rs.next()) { SQL = "INSERT INTO categories(" - + "ID, NAME, PARENTID, IMAGE) " - + "VALUES (?, ?, ?, ?)"; + + "ID, NAME, PARENTID, IMAGE) " + + "VALUES (?, ?, ?, ?)"; pstmt = con_target.prepareStatement(SQL); pstmt.setString(1, rs.getString("ID")); @@ -710,10 +708,10 @@ public final class Transfer extends JPanel implements JPanelView { if (rs.getMetaData().getColumnCount() == 6) { while (rs.next()) { SQL = "INSERT INTO closedcash(" - + "MONEY, HOST, HOSTSEQUENCE, " - + "DATESTART, DATEEND, NOSALES) " - + "VALUES (?, ?, ?, " - + "?, ?, ?)"; + + "MONEY, HOST, HOSTSEQUENCE, " + + "DATESTART, DATEEND, NOSALES) " + + "VALUES (?, ?, ?, " + + "?, ?, ?)"; pstmt = con_target.prepareStatement(SQL); pstmt.setString(1, rs.getString("MONEY")); @@ -728,10 +726,10 @@ public final class Transfer extends JPanel implements JPanelView { } else { while (rs.next()) { SQL = "INSERT INTO closedcash(" - + "MONEY, HOST, HOSTSEQUENCE, " - + "DATESTART, DATEEND) " - + "VALUES (?, ?, ?, " - + "?, ?)"; + + "MONEY, HOST, HOSTSEQUENCE, " + + "DATESTART, DATEEND) " + + "VALUES (?, ?, ?, " + + "?, ?)"; pstmt = con_target.prepareStatement(SQL); pstmt.setString(1, rs.getString("MONEY")); @@ -755,19 +753,19 @@ public final class Transfer extends JPanel implements JPanelView { if (rs.getMetaData().getColumnCount() == 27) { while (rs.next()) { SQL = "INSERT INTO customers(" - + "ID, SEARCHKEY, TAXID, NAME, TAXCATEGORY, " - + "CARD, MAXDEBT,ADDRESS, ADDRESS2, POSTAL, " - + "CITY, REGION, COUNTRY, FIRSTNAME, LASTNAME," - + "EMAIL, PHONE, PHONE2, FAX, NOTES, " - + "VISIBLE, CURDATE, CURDEBT, IMAGE, ISVIP, " - + "DISCOUNT, MEMODATE)" - + " VALUES (" - + "?, ?, ?, ?, ?, " - + "?, ?, ?, ?, ?, " - + "?, ?, ?, ?, ?, " - + "?, ?, ?, ?, ?, " - + "?, ?, ?, ?, ?, " - + "?, ?)"; + + "ID, SEARCHKEY, TAXID, NAME, TAXCATEGORY, " + + "CARD, MAXDEBT,ADDRESS, ADDRESS2, POSTAL, " + + "CITY, REGION, COUNTRY, FIRSTNAME, LASTNAME," + + "EMAIL, PHONE, PHONE2, FAX, NOTES, " + + "VISIBLE, CURDATE, CURDEBT, IMAGE, ISVIP, " + + "DISCOUNT, MEMODATE)" + + " VALUES (" + + "?, ?, ?, ?, ?, " + + "?, ?, ?, ?, ?, " + + "?, ?, ?, ?, ?, " + + "?, ?, ?, ?, ?, " + + "?, ?, ?, ?, ?, " + + "?, ?)"; pstmt = con_target.prepareStatement(SQL); pstmt.setString(1, rs.getString("ID")); @@ -803,19 +801,19 @@ public final class Transfer extends JPanel implements JPanelView { } else { while (rs.next()) { SQL = "INSERT INTO customers(" - + "ID, SEARCHKEY, TAXID, NAME, " - + "TAXCATEGORY, CARD, MAXDEBT," - + "ADDRESS, ADDRESS2, POSTAL, CITY, " - + "REGION, COUNTRY, FIRSTNAME, LASTNAME, " - + "EMAIL, PHONE, PHONE2, FAX, " - + "NOTES, VISIBLE, CURDATE, CURDEBT)" - + " VALUES (" - + "?, ?, ?, ?, " - + "?, ?, ?, " - + "?, ?, ?, ?, " - + "?, ?, ?, ?, " - + "?, ?, ?, ?, " - + "?, ?, ?, ?)"; + + "ID, SEARCHKEY, TAXID, NAME, " + + "TAXCATEGORY, CARD, MAXDEBT," + + "ADDRESS, ADDRESS2, POSTAL, CITY, " + + "REGION, COUNTRY, FIRSTNAME, LASTNAME, " + + "EMAIL, PHONE, PHONE2, FAX, " + + "NOTES, VISIBLE, CURDATE, CURDEBT)" + + " VALUES (" + + "?, ?, ?, ?, " + + "?, ?, ?, " + + "?, ?, ?, ?, " + + "?, ?, ?, ?, " + + "?, ?, ?, ?, " + + "?, ?, ?, ?)"; pstmt = con_target.prepareStatement(SQL); pstmt.setString(1, rs.getString("ID")); @@ -847,7 +845,7 @@ public final class Transfer extends JPanel implements JPanelView { } rs.close(); -// introduced 3.50 + // introduced 3.50 if (Dbtversion >= 3.50) { Dbtname = "draweropened"; rs = con_source.getMetaData().getTables(null, null, Dbtname, null); @@ -858,8 +856,8 @@ public final class Transfer extends JPanel implements JPanelView { while (rs.next()) { SQL = "INSERT INTO draweropened(" - + "OPENDATE, NAME, TICKETID) " - + "VALUES (?, ?, ?)"; + + "OPENDATE, NAME, TICKETID) " + + "VALUES (?, ?, ?)"; pstmt = con_target.prepareStatement(SQL); pstmt.setString(1, rs.getString("OPENDATE")); @@ -879,8 +877,8 @@ public final class Transfer extends JPanel implements JPanelView { while (rs.next()) { SQL = "INSERT INTO floors (" - + "ID, NAME, IMAGE) " - + "VALUES (?, ?, ?)"; + + "ID, NAME, IMAGE) " + + "VALUES (?, ?, ?)"; pstmt = con_target.prepareStatement(SQL); pstmt.setString(1, rs.getString("ID")); @@ -891,7 +889,7 @@ public final class Transfer extends JPanel implements JPanelView { } rs.close(); -// introduced in 3.00 + // introduced in 3.00 if (Dbtversion >= 3.00) { Dbtname = "leaves"; rs = con_source.getMetaData().getTables(null, null, Dbtname, null); @@ -902,10 +900,10 @@ public final class Transfer extends JPanel implements JPanelView { while (rs.next()) { SQL = "INSERT INTO leaves (" - + "ID, PPLID, NAME, STARTDATE, " - + "ENDDATE, NOTES) " - + "VALUES (?, ?, ?, ?, " - + "?, ?)"; + + "ID, PPLID, NAME, STARTDATE, " + + "ENDDATE, NOTES) " + + "VALUES (?, ?, ?, ?, " + + "?, ?)"; pstmt = con_target.prepareStatement(SQL); pstmt.setString(1, rs.getString("ID")); @@ -922,7 +920,7 @@ public final class Transfer extends JPanel implements JPanelView { } rs.close(); -// introduced in 3.70 + // introduced in 3.70 if (Dbtversion >= 3.70) { Dbtname = "lineremoved"; rs = con_source.getMetaData().getTables(null, null, Dbtname, null); @@ -933,10 +931,10 @@ public final class Transfer extends JPanel implements JPanelView { while (rs.next()) { SQL = "INSERT INTO lineremoved (" - + "REMOVEDDATE, NAME, TICKETID, " - + "PRODUCTID, PRODUCTNAME, UNITS) " - + "VALUES (?, ?, ?, " - + "?, ?, ?)"; + + "REMOVEDDATE, NAME, TICKETID, " + + "PRODUCTID, PRODUCTNAME, UNITS) " + + "VALUES (?, ?, ?, " + + "?, ?, ?)"; pstmt = con_target.prepareStatement(SQL); pstmt.setTimestamp(1, rs.getTimestamp("REMOVEDDATE")); @@ -962,8 +960,8 @@ public final class Transfer extends JPanel implements JPanelView { while (rs.next()) { SQL = "INSERT INTO locations(" - + "ID, NAME, ADDRESS) " - + "VALUES (?, ?, ?)"; + + "ID, NAME, ADDRESS) " + + "VALUES (?, ?, ?)"; pstmt = con_target.prepareStatement(SQL); pstmt.setString(1, rs.getString("ID")); @@ -974,7 +972,7 @@ public final class Transfer extends JPanel implements JPanelView { } rs.close(); -// moorers introduced in 3.50 + // moorers introduced in 3.50 if (Dbtversion >= 3.50) { Dbtname = "moorers"; rs = con_source.getMetaData().getTables(null, null, Dbtname, null); @@ -985,8 +983,8 @@ public final class Transfer extends JPanel implements JPanelView { while (rs.next()) { SQL = "INSERT INTO moorers(" - + "VESSELNAME, SIZE, DAYS, POWER) " - + "VALUES (?, ?, ?, ?)"; + + "VESSELNAME, SIZE, DAYS, POWER) " + + "VALUES (?, ?, ?, ?)"; pstmt = con_target.prepareStatement(SQL); pstmt.setString(1, rs.getString("VESSELNAME")); @@ -1011,10 +1009,10 @@ public final class Transfer extends JPanel implements JPanelView { if (Dbtversion >= 3.02) { while (rs.next()) { SQL = "INSERT INTO payments(" - + "ID, RECEIPT, PAYMENT, TOTAL, " - + "TRANSID, RETURNMSG, NOTES, TENDERED) " - + "VALUES (?, ?, ?, ?, " - + "?, ?, ?, ?)"; + + "ID, RECEIPT, PAYMENT, TOTAL, " + + "TRANSID, RETURNMSG, NOTES, TENDERED) " + + "VALUES (?, ?, ?, ?, " + + "?, ?, ?, ?)"; pstmt = con_target.prepareStatement(SQL); pstmt.setString(1, rs.getString("ID")); @@ -1031,10 +1029,10 @@ public final class Transfer extends JPanel implements JPanelView { } else { while (rs.next()) { SQL = "INSERT INTO payments(" - + "ID, RECEIPT, PAYMENT, TOTAL, " - + "TRANSID, RETURNMSG) " - + "VALUES (?, ?, ?, ?, " - + "?, ?)"; + + "ID, RECEIPT, PAYMENT, TOTAL, " + + "TRANSID, RETURNMSG) " + + "VALUES (?, ?, ?, ?, " + + "?, ?)"; pstmt = con_target.prepareStatement(SQL); pstmt.setString(1, rs.getString("ID")); @@ -1065,25 +1063,24 @@ public final class Transfer extends JPanel implements JPanelView { while (rs.next()) { SQL = "INSERT INTO people(" - + "ID, NAME, APPPASSWORD, CARD, " - + "ROLE, VISIBLE, IMAGE) " - + "VALUES (?, ?, ?, ?, " - + "?, ?, ?)"; + + "ID, NAME, APPPASSWORD, TAXID, CARD, ROLE, VISIBLE, IMAGE)" + + "VALUES (?, ?, ?, ?, ?, ?, ?, ?)"; pstmt = con_target.prepareStatement(SQL); pstmt.setString(1, rs.getString("ID")); pstmt.setString(2, rs.getString("NAME")); pstmt.setString(3, rs.getString("APPPASSWORD")); - pstmt.setString(4, rs.getString("CARD")); - pstmt.setString(5, rs.getString("ROLE")); - pstmt.setBoolean(6, rs.getBoolean("VISIBLE")); - pstmt.setBytes(7, rs.getBytes("IMAGE")); + pstmt.setString(4, rs.getString("TAXID")); + pstmt.setString(5, rs.getString("CARD")); + pstmt.setString(6, rs.getString("ROLE")); + pstmt.setBoolean(7, rs.getBoolean("VISIBLE")); + pstmt.setBytes(8, rs.getBytes("IMAGE")); pstmt.executeUpdate(); } rs.close(); -// pickup_number introduced in 3.50 + // pickup_number introduced in 3.50 if (Dbtversion >= 3.50 && !jtxtDbType.getText().equals("jdbc:postgresql://")) { Dbtname = "pickup_number"; rs = con_source.getMetaData().getTables(null, null, Dbtname, null); @@ -1094,7 +1091,7 @@ public final class Transfer extends JPanel implements JPanelView { while (rs.next()) { SQL = "INSERT INTO pickup_number(ID) " - + "VALUES (?)"; + + "VALUES (?)"; pstmt = con_target.prepareStatement(SQL); pstmt.setString(1, rs.getString("ID")); @@ -1104,7 +1101,8 @@ public final class Transfer extends JPanel implements JPanelView { } else { txtOut.append("Pickup Number... skipped" + "\n"); } -// deliberately verbose chunk so can see diff's between PostgreSQL v9 & v10 sequence + // deliberately verbose chunk so can see diff's between PostgreSQL v9 & v10 + // sequence if (Dbtversion >= 3.50 && jtxtDbType.getText().equals("jdbc:postgresql://")) { Dbtname = "pickup_number"; rs = con_source.getMetaData().getTables(null, null, Dbtname, null); @@ -1139,12 +1137,12 @@ public final class Transfer extends JPanel implements JPanelView { if (rs.getMetaData().getColumnCount() == 9) { while (rs.next()) { SQL = "INSERT INTO places (" - + "ID, NAME, X, Y, FLOOR, " - + "CUSTOMER, WAITER, TICKETID, TABLEMOVED," - + "WIDTH, HEIGHT, GUESTS, OCCUPIED) " - + "VALUES (?, ?, ?, ?, ?, " - + "?, ?, ?, ?, " - + "?, ?, ?, ? )"; + + "ID, NAME, X, Y, FLOOR, " + + "CUSTOMER, WAITER, TICKETID, TABLEMOVED," + + "WIDTH, HEIGHT, GUESTS, OCCUPIED) " + + "VALUES (?, ?, ?, ?, ?, " + + "?, ?, ?, ?, " + + "?, ?, ?, ? )"; pstmt = con_target.prepareStatement(SQL); pstmt.setString(1, rs.getString("ID")); @@ -1157,18 +1155,18 @@ public final class Transfer extends JPanel implements JPanelView { pstmt.setString(8, rs.getString("TICKETID")); pstmt.setBoolean(9, rs.getBoolean("TABLEMOVED")); - pstmt.setInt(10, 90); // Width - pstmt.setInt(11, 45); // Height - pstmt.setInt(12, 1); // Guests - pstmt.setTimestamp(13, null); // Occupied + pstmt.setInt(10, 90); // Width + pstmt.setInt(11, 45); // Height + pstmt.setInt(12, 1); // Guests + pstmt.setTimestamp(13, null); // Occupied pstmt.executeUpdate(); } } else { while (rs.next()) { SQL = "INSERT INTO places (" - + "ID, NAME, X, Y, FLOOR) " - + "VALUES (?, ?, ?, ?, ?)"; + + "ID, NAME, X, Y, FLOOR) " + + "VALUES (?, ?, ?, ?, ?)"; pstmt = con_target.prepareStatement(SQL); pstmt.setString(1, rs.getString("ID")); @@ -1193,18 +1191,18 @@ public final class Transfer extends JPanel implements JPanelView { case 30: while (rs.next()) { SQL = "INSERT INTO products(" - + "ID, REFERENCE, CODE, CODETYPE, NAME, " - + "PRICEBUY, PRICESELL, CATEGORY, TAXCAT, ATTRIBUTESET_ID, " - + "STOCKCOST, STOCKVOLUME, IMAGE, ISCOM, ISSCALE, " - + "ISCONSTANT, PRINTKB, SENDSTATUS, ISSERVICE, ATTRIBUTES, " - + "DISPLAY, ISVPRICE, ISVERPATRIB, TEXTTIP, WARRANTY, " - + "STOCKUNITS, PRINTTO, SUPPLIER, UOM, MEMODATE) " - + "VALUES (?, ?, ?, ?, ?, " - + "?, ?, ?, ?, ?," - + "?, ?, ?, ?, ?," - + "?, ?, ?, ?, ?, " - + "?, ?, ?, ?, ?, " - + "?, ?, ?, ? ,?)"; + + "ID, REFERENCE, CODE, CODETYPE, NAME, " + + "PRICEBUY, PRICESELL, CATEGORY, TAXCAT, ATTRIBUTESET_ID, " + + "STOCKCOST, STOCKVOLUME, IMAGE, ISCOM, ISSCALE, " + + "ISCONSTANT, PRINTKB, SENDSTATUS, ISSERVICE, ATTRIBUTES, " + + "DISPLAY, ISVPRICE, ISVERPATRIB, TEXTTIP, WARRANTY, " + + "STOCKUNITS, PRINTTO, SUPPLIER, UOM, MEMODATE) " + + "VALUES (?, ?, ?, ?, ?, " + + "?, ?, ?, ?, ?," + + "?, ?, ?, ?, ?," + + "?, ?, ?, ?, ?, " + + "?, ?, ?, ?, ?, " + + "?, ?, ?, ? ,?)"; pstmt = con_target.prepareStatement(SQL); pstmt.setString(1, rs.getString("ID")); @@ -1244,18 +1242,18 @@ public final class Transfer extends JPanel implements JPanelView { case 29: while (rs.next()) { SQL = "INSERT INTO products(" - + "ID, REFERENCE, CODE, CODETYPE, NAME, " - + "PRICEBUY, PRICESELL, CATEGORY, TAXCAT, ATTRIBUTESET_ID, " - + "STOCKCOST, STOCKVOLUME, IMAGE, ISCOM, ISSCALE, " - + "ISCONSTANT, PRINTKB, SENDSTATUS, ISSERVICE, ATTRIBUTES, " - + "DISPLAY, ISVPRICE, ISVERPATRIB, TEXTTIP, WARRANTY, " - + "STOCKUNITS, PRINTTO, SUPPLIER, UOM) " - + "VALUES (?, ?, ?, ?, ?, " - + "?, ?, ?, ?, ?," - + "?, ?, ?, ?, ?," - + "?, ?, ?, ?, ?, " - + "?, ?, ?, ?, ?, " - + "?, ?, ?, ?)"; + + "ID, REFERENCE, CODE, CODETYPE, NAME, " + + "PRICEBUY, PRICESELL, CATEGORY, TAXCAT, ATTRIBUTESET_ID, " + + "STOCKCOST, STOCKVOLUME, IMAGE, ISCOM, ISSCALE, " + + "ISCONSTANT, PRINTKB, SENDSTATUS, ISSERVICE, ATTRIBUTES, " + + "DISPLAY, ISVPRICE, ISVERPATRIB, TEXTTIP, WARRANTY, " + + "STOCKUNITS, PRINTTO, SUPPLIER, UOM) " + + "VALUES (?, ?, ?, ?, ?, " + + "?, ?, ?, ?, ?," + + "?, ?, ?, ?, ?," + + "?, ?, ?, ?, ?, " + + "?, ?, ?, ?, ?, " + + "?, ?, ?, ?)"; pstmt = con_target.prepareStatement(SQL); pstmt.setString(1, rs.getString("ID")); @@ -1294,14 +1292,14 @@ public final class Transfer extends JPanel implements JPanelView { default: while (rs.next()) { SQL = "INSERT INTO products(" - + "ID, REFERENCE, CODE, CODETYPE, NAME, " - + "PRICEBUY, PRICESELL, CATEGORY, TAXCAT, " - + "ATTRIBUTESET_ID, STOCKCOST, STOCKVOLUME, IMAGE, " - + "ISCOM, ISSCALE, ATTRIBUTES, DISPLAY) " - + "VALUES (?, ?, ?, ?, ?, " - + "?, ?, ?, ?, " - + "?, ?, ?, ?, " - + "?, ?, ?, ?)"; + + "ID, REFERENCE, CODE, CODETYPE, NAME, " + + "PRICEBUY, PRICESELL, CATEGORY, TAXCAT, " + + "ATTRIBUTESET_ID, STOCKCOST, STOCKVOLUME, IMAGE, " + + "ISCOM, ISSCALE, ATTRIBUTES, DISPLAY) " + + "VALUES (?, ?, ?, ?, ?, " + + "?, ?, ?, ?, " + + "?, ?, ?, ?, " + + "?, ?, ?, ?)"; pstmt = con_target.prepareStatement(SQL); pstmt.setString(1, rs.getString("ID")); @@ -1339,8 +1337,8 @@ public final class Transfer extends JPanel implements JPanelView { while (rs.next()) { SQL = "INSERT INTO products_cat(" - + "PRODUCT, CATORDER) " - + "VALUES (?, ?)"; + + "PRODUCT, CATORDER) " + + "VALUES (?, ?)"; pstmt = con_target.prepareStatement(SQL); pstmt.setString(1, rs.getString("PRODUCT")); @@ -1359,8 +1357,8 @@ public final class Transfer extends JPanel implements JPanelView { while (rs.next()) { SQL = "INSERT INTO products_com(" - + "ID, PRODUCT, PRODUCT2) " - + "VALUES (?, ?, ?)"; + + "ID, PRODUCT, PRODUCT2) " + + "VALUES (?, ?, ?)"; pstmt = con_target.prepareStatement(SQL); pstmt.setString(1, rs.getString("ID")); @@ -1381,10 +1379,10 @@ public final class Transfer extends JPanel implements JPanelView { if (rs.getMetaData().getColumnCount() == 5) { while (rs.next()) { SQL = "INSERT INTO receipts(" - + "ID, MONEY, DATENEW, " - + "ATTRIBUTES, PERSON) " - + "VALUES (?, ?, ?, " - + "?, ?)"; + + "ID, MONEY, DATENEW, " + + "ATTRIBUTES, PERSON) " + + "VALUES (?, ?, ?, " + + "?, ?)"; pstmt = con_target.prepareStatement(SQL); pstmt.setString(1, rs.getString("ID")); @@ -1398,8 +1396,8 @@ public final class Transfer extends JPanel implements JPanelView { } else { while (rs.next()) { SQL = "INSERT INTO receipts(" - + "ID, MONEY, DATENEW, ATTRIBUTES) " - + "VALUES (?, ?, ?, ?)"; + + "ID, MONEY, DATENEW, ATTRIBUTES) " + + "VALUES (?, ?, ?, ?)"; pstmt = con_target.prepareStatement(SQL); pstmt.setString(1, rs.getString("ID")); @@ -1421,8 +1419,8 @@ public final class Transfer extends JPanel implements JPanelView { while (rs.next()) { SQL = "INSERT INTO reservation_customers(" - + "ID, CUSTOMER) " - + "VALUES (?, ?)"; + + "ID, CUSTOMER) " + + "VALUES (?, ?)"; pstmt = con_target.prepareStatement(SQL); pstmt.setString(1, rs.getString("ID")); @@ -1440,10 +1438,10 @@ public final class Transfer extends JPanel implements JPanelView { while (rs.next()) { SQL = "INSERT INTO reservations(" - + "ID, CREATED, DATENEW, TITLE, " - + "CHAIRS, ISDONE, DESCRIPTION) " - + "VALUES (?, ?, ?, ?, " - + "?, ?, ?)"; + + "ID, CREATED, DATENEW, TITLE, " + + "CHAIRS, ISDONE, DESCRIPTION) " + + "VALUES (?, ?, ?, ?, " + + "?, ?, ?)"; pstmt = con_target.prepareStatement(SQL); pstmt.setString(1, rs.getString("ID")); @@ -1467,8 +1465,8 @@ public final class Transfer extends JPanel implements JPanelView { while (rs.next()) { SQL = "INSERT INTO roles(" - + "ID, NAME, PERMISSIONS) " - + "VALUES (?, ?, ?)"; + + "ID, NAME, PERMISSIONS) " + + "VALUES (?, ?, ?)"; pstmt = con_target.prepareStatement(SQL); pstmt.setString(1, rs.getString("ID")); @@ -1479,7 +1477,7 @@ public final class Transfer extends JPanel implements JPanelView { } rs.close(); -// introduced in 3.00 + // introduced in 3.00 if (Dbtversion >= 3.00) { Dbtname = "shift_breaks"; rs = con_source.getMetaData().getTables(null, null, Dbtname, null); @@ -1490,10 +1488,10 @@ public final class Transfer extends JPanel implements JPanelView { while (rs.next()) { SQL = "INSERT INTO shift_breaks(" - + "ID, SHIFTID, BREAKID, " - + "STARTTIME, ENDTIME) " - + "VALUES (?, ?, ?, " - + "?, ?)"; + + "ID, SHIFTID, BREAKID, " + + "STARTTIME, ENDTIME) " + + "VALUES (?, ?, ?, " + + "?, ?)"; pstmt = con_target.prepareStatement(SQL); pstmt.setString(1, rs.getString("ID")); @@ -1509,7 +1507,7 @@ public final class Transfer extends JPanel implements JPanelView { } rs.close(); -// introduced in 3.00 + // introduced in 3.00 if (Dbtversion >= 3.00) { Dbtname = "shifts"; rs = con_source.getMetaData().getTables(null, null, Dbtname, null); @@ -1520,8 +1518,8 @@ public final class Transfer extends JPanel implements JPanelView { while (rs.next()) { SQL = "INSERT INTO shifts(" - + "ID, STARTSHIFT, ENDSHIFT, PPLID) " - + "VALUES (?, ?, ?, ?)"; + + "ID, STARTSHIFT, ENDSHIFT, PPLID) " + + "VALUES (?, ?, ?, ?)"; pstmt = con_target.prepareStatement(SQL); pstmt.setString(1, rs.getString("ID")); @@ -1544,10 +1542,10 @@ public final class Transfer extends JPanel implements JPanelView { while (rs.next()) { SQL = "INSERT INTO stockcurrent(" - + "LOCATION, PRODUCT, " - + "ATTRIBUTESETINSTANCE_ID, UNITS) " - + "VALUES (?, ?, " - + "?, ?)"; + + "LOCATION, PRODUCT, " + + "ATTRIBUTESETINSTANCE_ID, UNITS) " + + "VALUES (?, ?, " + + "?, ?)"; pstmt = con_target.prepareStatement(SQL); pstmt.setString(1, rs.getString("LOCATION")); @@ -1567,12 +1565,12 @@ public final class Transfer extends JPanel implements JPanelView { if (rs.getMetaData().getColumnCount() == 9) { while (rs.next()) { SQL = "INSERT INTO stockdiary(" - + "ID, DATENEW, REASON, LOCATION, " - + "PRODUCT, ATTRIBUTESETINSTANCE_ID, UNITS, " - + "PRICE, APPUSER) " - + "VALUES (?, ?, ?, ?, " - + "?, ?, ?, " - + "?, ?)"; + + "ID, DATENEW, REASON, LOCATION, " + + "PRODUCT, ATTRIBUTESETINSTANCE_ID, UNITS, " + + "PRICE, APPUSER) " + + "VALUES (?, ?, ?, ?, " + + "?, ?, ?, " + + "?, ?)"; pstmt = con_target.prepareStatement(SQL); pstmt.setString(1, rs.getString("ID")); @@ -1590,12 +1588,12 @@ public final class Transfer extends JPanel implements JPanelView { } else { while (rs.next()) { SQL = "INSERT INTO stockdiary(" - + "ID, DATENEW, REASON, LOCATION, " - + "PRODUCT, ATTRIBUTESETINSTANCE_ID, UNITS, " - + "PRICE) " - + "VALUES (?, ?, ?, ?, " - + "?, ?, ?, " - + "?)"; + + "ID, DATENEW, REASON, LOCATION, " + + "PRODUCT, ATTRIBUTESETINSTANCE_ID, UNITS, " + + "PRICE) " + + "VALUES (?, ?, ?, ?, " + + "?, ?, ?, " + + "?)"; pstmt = con_target.prepareStatement(SQL); pstmt.setString(1, rs.getString("ID")); @@ -1620,10 +1618,10 @@ public final class Transfer extends JPanel implements JPanelView { while (rs.next()) { SQL = "INSERT INTO stocklevel(" - + "ID, LOCATION, PRODUCT, " - + "STOCKSECURITY, STOCKMAXIMUM) " - + "VALUES (?, ?, ?, " - + "?, ?)"; + + "ID, LOCATION, PRODUCT, " + + "STOCKSECURITY, STOCKMAXIMUM) " + + "VALUES (?, ?, ?, " + + "?, ?)"; pstmt = con_target.prepareStatement(SQL); pstmt.setString(1, rs.getString("ID")); pstmt.setString(2, rs.getString("LOCATION")); @@ -1634,7 +1632,7 @@ public final class Transfer extends JPanel implements JPanelView { } rs.close(); -// introduced in 4 + // introduced in 4 if (Dbtversion >= 4.00) { Dbtname = "suppliers"; rs = con_source.getMetaData().getTables(null, null, Dbtname, null); @@ -1645,17 +1643,17 @@ public final class Transfer extends JPanel implements JPanelView { while (rs.next()) { SQL = "INSERT INTO suppliers(" - + "ID, SEARCHKEY, TAXID, NAME, MAXDEBT," - + "ADDRESS, ADDRESS2, POSTAL, CITY, " - + "REGION, COUNTRY, FIRSTNAME, LASTNAME, " - + "EMAIL, PHONE, PHONE2, FAX, " - + "NOTES, VISIBLE, CURDATE, CURDEBT, VATID)" - + " VALUES (" - + "?, ?, ?, ?, ?," - + "?, ?, ?, ?," - + "?, ?, ?, ?, " - + "?, ?, ?, ?, " - + "?, ?, ?, ?, ?)"; + + "ID, SEARCHKEY, TAXID, NAME, MAXDEBT," + + "ADDRESS, ADDRESS2, POSTAL, CITY, " + + "REGION, COUNTRY, FIRSTNAME, LASTNAME, " + + "EMAIL, PHONE, PHONE2, FAX, " + + "NOTES, VISIBLE, CURDATE, CURDEBT, VATID)" + + " VALUES (" + + "?, ?, ?, ?, ?," + + "?, ?, ?, ?," + + "?, ?, ?, ?, " + + "?, ?, ?, ?, " + + "?, ?, ?, ?, ?)"; pstmt = con_target.prepareStatement(SQL); pstmt.setString(1, rs.getString("ID")); @@ -1685,8 +1683,8 @@ public final class Transfer extends JPanel implements JPanelView { } } else { SQL = "INSERT INTO suppliers(" - + "ID, NAME, SEARCHKEY)" - + " VALUES ('0', 'uniCenta', 'unicenta')"; + + "ID, NAME, SEARCHKEY)" + + " VALUES ('0', 'uniCenta', 'unicenta')"; pstmt.executeUpdate(SQL); txtOut.append("Added Supplier... uniCenta" + "\n"); } @@ -1700,8 +1698,8 @@ public final class Transfer extends JPanel implements JPanelView { while (rs.next()) { SQL = "INSERT INTO taxcategories(" - + "ID, NAME) " - + "VALUES (?, ?)"; + + "ID, NAME) " + + "VALUES (?, ?)"; pstmt = con_target.prepareStatement(SQL); pstmt.setString(1, rs.getString("ID")); @@ -1719,8 +1717,8 @@ public final class Transfer extends JPanel implements JPanelView { while (rs.next()) { SQL = "INSERT INTO taxcustcategories(" - + "ID, NAME) " - + "VALUES (?, ?)"; + + "ID, NAME) " + + "VALUES (?, ?)"; pstmt = con_target.prepareStatement(SQL); pstmt.setString(1, rs.getString("ID")); @@ -1738,10 +1736,10 @@ public final class Transfer extends JPanel implements JPanelView { while (rs.next()) { SQL = "INSERT INTO taxes(" - + "ID, NAME, CATEGORY, CUSTCATEGORY, " - + "PARENTID, RATE, RATECASCADE, RATEORDER) " - + "VALUES (?, ?, ?, ?, " - + "?, ?, ?, ?)"; + + "ID, NAME, CATEGORY, CUSTCATEGORY, " + + "PARENTID, RATE, RATECASCADE, RATEORDER) " + + "VALUES (?, ?, ?, ?, " + + "?, ?, ?, ?)"; pstmt = con_target.prepareStatement(SQL); pstmt.setString(1, rs.getString("ID")); @@ -1765,8 +1763,8 @@ public final class Transfer extends JPanel implements JPanelView { while (rs.next()) { SQL = "INSERT INTO taxlines(" - + "ID, RECEIPT, TAXID, BASE, AMOUNT) " - + "VALUES (?, ?, ?, ?, ?)"; + + "ID, RECEIPT, TAXID, BASE, AMOUNT) " + + "VALUES (?, ?, ?, ?, ?)"; pstmt = con_target.prepareStatement(SQL); pstmt.setString(1, rs.getString("ID")); @@ -1787,14 +1785,14 @@ public final class Transfer extends JPanel implements JPanelView { while (rs.next()) { SQL = "INSERT INTO thirdparties(" - + "ID, CIF, NAME, ADDRESS, " - + "CONTACTCOMM, CONTACTFACT, PAYRULE, FAXNUMBER, " - + "PHONENUMBER, MOBILENUMBER, EMAIL, " - + "WEBPAGE, NOTES) " - + "VALUES (?, ?, ?, ?, " - + "?, ?, ?, ?, " - + "?, ?, ?, " - + "?, ?)"; + + "ID, CIF, NAME, ADDRESS, " + + "CONTACTCOMM, CONTACTFACT, PAYRULE, FAXNUMBER, " + + "PHONENUMBER, MOBILENUMBER, EMAIL, " + + "WEBPAGE, NOTES) " + + "VALUES (?, ?, ?, ?, " + + "?, ?, ?, ?, " + + "?, ?, ?, " + + "?, ?)"; pstmt = con_target.prepareStatement(SQL); pstmt.setString(1, rs.getString("ID")); @@ -1823,10 +1821,10 @@ public final class Transfer extends JPanel implements JPanelView { while (rs.next()) { SQL = "INSERT INTO ticketlines(" - + "TICKET, LINE, PRODUCT, ATTRIBUTESETINSTANCE_ID, " - + "UNITS, PRICE, TAXID, ATTRIBUTES) " - + "VALUES (?, ?, ?, ?, " - + "?, ?, ?, ?)"; + + "TICKET, LINE, PRODUCT, ATTRIBUTESETINSTANCE_ID, " + + "UNITS, PRICE, TAXID, ATTRIBUTES) " + + "VALUES (?, ?, ?, ?, " + + "?, ?, ?, ?)"; pstmt = con_target.prepareStatement(SQL); pstmt.setString(1, rs.getString("TICKET")); @@ -1850,10 +1848,10 @@ public final class Transfer extends JPanel implements JPanelView { while (rs.next()) { SQL = "INSERT INTO tickets(" - + "ID, TICKETTYPE, TICKETID, " - + "PERSON, CUSTOMER, STATUS) " - + "VALUES (?, ?, ?, " - + "?, ?, ?)"; + + "ID, TICKETTYPE, TICKETID, " + + "PERSON, CUSTOMER, STATUS) " + + "VALUES (?, ?, ?, " + + "?, ?, ?)"; pstmt = con_target.prepareStatement(SQL); pstmt.setString(1, rs.getString("ID")); @@ -1886,7 +1884,7 @@ public final class Transfer extends JPanel implements JPanelView { } else { txtOut.append("Ticket Number... skipped" + "\n"); } -// deliberately verbose chunk so can see diff's between PostgreSQL v9 & v10 + // deliberately verbose chunk so can see diff's between PostgreSQL v9 & v10 if (Dbtversion >= 3.50 && jtxtDbType.getText().equals("jdbc:postgresql://")) { Dbtname = "ticketsnum"; rs = con_source.getMetaData().getTables(null, null, Dbtname, null); @@ -1927,7 +1925,8 @@ public final class Transfer extends JPanel implements JPanelView { } else { txtOut.append("Ticket Payment... skipped" + "\n"); } -// deliberately verbose chunk so can see diff's between PostgreSQL v9 & v10 sequence + // deliberately verbose chunk so can see diff's between PostgreSQL v9 & v10 + // sequence if (Dbtversion >= 3.50 && jtxtDbType.getText().equals("jdbc:postgresql://")) { Dbtname = "ticketsnum_payment"; rs = con_source.getMetaData().getTables(null, null, Dbtname, null); @@ -1968,7 +1967,8 @@ public final class Transfer extends JPanel implements JPanelView { } else { txtOut.append("Ticket Refund... skipped" + "\n"); } -// deliberately verbose chunk so can see diff's between PostgreSQL v9 & v10 sequence + // deliberately verbose chunk so can see diff's between PostgreSQL v9 & v10 + // sequence if (Dbtversion >= 3.50 && jtxtDbType.getText().equals("jdbc:postgresql://")) { Dbtname = "ticketsnum_payment"; rs = con_source.getMetaData().getTables(null, null, Dbtname, null); @@ -1990,7 +1990,7 @@ public final class Transfer extends JPanel implements JPanelView { } rs.close(); -// introduced in 4 + // introduced in 4 if (Dbtversion >= 4.00) { Dbtname = "uom"; rs = con_source.getMetaData().getTables(null, null, Dbtname, null); @@ -2000,8 +2000,8 @@ public final class Transfer extends JPanel implements JPanelView { while (rs.next()) { SQL = "INSERT INTO uom(" - + "id, name) " - + "VALUES (?, ?)"; + + "id, name) " + + "VALUES (?, ?)"; pstmt = con_target.prepareStatement(SQL); pstmt.setString(1, rs.getString("id")); pstmt.setString(2, rs.getString("name")); @@ -2010,8 +2010,8 @@ public final class Transfer extends JPanel implements JPanelView { } } else { SQL = "INSERT INTO uom(" - + "ID, NAME)" - + " VALUES ('0', 'Each')"; + + "ID, NAME)" + + " VALUES ('0', 'Each')"; pstmt.executeUpdate(SQL); txtOut.append("Added UOM... Each" + "\n"); @@ -2027,10 +2027,10 @@ public final class Transfer extends JPanel implements JPanelView { while (rs.next()) { SQL = "INSERT INTO vouchers(" - + "id, voucher_number, customer, " - + "amount, status) " - + "VALUES (?, ?, ?, " - + "?, ?)"; + + "id, voucher_number, customer, " + + "amount, status) " + + "VALUES (?, ?, ?, " + + "?, ?)"; pstmt = con_target.prepareStatement(SQL); pstmt.setString(1, rs.getString("id")); pstmt.setString(2, rs.getString("voucher_number")); @@ -2051,11 +2051,9 @@ public final class Transfer extends JPanel implements JPanelView { log.error(ex.getMessage()); } -// Add ForeignKeys - JOptionPane.showMessageDialog(this - , AppLocal.getIntString("message.transfercomplete") - , AppLocal.getIntString("message.transfermessage") - , JOptionPane.WARNING_MESSAGE); + // Add ForeignKeys + JOptionPane.showMessageDialog(this, AppLocal.getIntString("message.transfercomplete"), + AppLocal.getIntString("message.transfermessage"), JOptionPane.WARNING_MESSAGE); FKeys(); txtOut.append("Data Transfer Complete" + "\n"); @@ -2064,10 +2062,8 @@ public final class Transfer extends JPanel implements JPanelView { webPBar.setBgBottom(Color.GREEN); jbtnTransfer.setEnabled(true); - JOptionPane.showMessageDialog(this - , AppLocal.getIntString("message.indexcomplete") - , AppLocal.getIntString("message.transfermessage") - , JOptionPane.WARNING_MESSAGE); + JOptionPane.showMessageDialog(this, AppLocal.getIntString("message.indexcomplete"), + AppLocal.getIntString("message.transfermessage"), JOptionPane.WARNING_MESSAGE); } catch (SQLException | HeadlessException e) { session_source.close(); @@ -2076,16 +2072,14 @@ public final class Transfer extends JPanel implements JPanelView { } } else { JFrame frame = new JFrame(); - JOptionPane.showMessageDialog(frame - , AppLocal.getIntString("message.transfernotsupported") - , AppLocal.getIntString("message.transfermessage") - , JOptionPane.WARNING_MESSAGE); + JOptionPane.showMessageDialog(frame, AppLocal.getIntString("message.transfernotsupported"), + AppLocal.getIntString("message.transfermessage"), JOptionPane.WARNING_MESSAGE); } SQL = "COMMIT;\n" + - "SET autocommit=1;\n" + - "SET unique_checks=1;\n" + - "SET foreign_key_checks=1;"; + "SET autocommit=1;\n" + + "SET unique_checks=1;\n" + + "SET foreign_key_checks=1;"; pstmt.executeUpdate(SQL); session_source.close(); @@ -2093,7 +2087,8 @@ public final class Transfer extends JPanel implements JPanelView { } public void fillSchema() { - /* Use existing session credentials but declare new session and connection + /* + * Use existing session credentials but declare new session and connection * to keep separated from current session instance as database could * be a different server */ @@ -2106,19 +2101,18 @@ public final class Transfer extends JPanel implements JPanelView { String driverlib = jtxtDbDriverLib.getText(); String driver = jtxtDbDriver.getText(); String url = jtxtDbType.getText() + - jtxtDbServerPort.getText() + - jtxtDbName.getText() + - jtxtDbParams.getText(); + jtxtDbServerPort.getText() + + jtxtDbName.getText() + + jtxtDbParams.getText(); String user = txtDbUser.getText(); String password = new String(txtDbPass.getPassword()); - ClassLoader cloader = new URLClassLoader(new URL[]{ - new File(driverlib).toURI().toURL() + ClassLoader cloader = new URLClassLoader(new URL[] { + new File(driverlib).toURI().toURL() }); DriverManager.registerDriver( - new DriverWrapper((Driver) - Class.forName(driver, true, cloader).newInstance())); + new DriverWrapper((Driver) Class.forName(driver, true, cloader).newInstance())); Session session1 = new Session(url, user, password); @@ -2140,13 +2134,13 @@ public final class Transfer extends JPanel implements JPanelView { jCBSchema.setEnabled(true); jCBSchema.setSelectedIndex(0); } catch (MalformedURLException | ClassNotFoundException | SQLException - | InstantiationException | IllegalAccessException ex) { + | InstantiationException | IllegalAccessException ex) { log.error(ex.getMessage()); } } public void reset() { -// Main Panel + // Main Panel jtxtDbDriver.setText("com.mysql.jdbc.Driver"); jtxtDbType.setText("jdbc:mysql://"); jtxtDbServerPort.setText("localhost:3306/"); @@ -2154,7 +2148,7 @@ public final class Transfer extends JPanel implements JPanelView { txtDbPass.setText(null); jbtnConnect.setEnabled(true); -// TransferPanel + // TransferPanel jCBSchema.removeAllItems(); jtxtDbName.setText(null); jtxtDbParams.setText("?zeroDateTimeBehavior=convertToNull"); @@ -2169,7 +2163,8 @@ public final class Transfer extends JPanel implements JPanelView { * WARNING: Do NOT modify this code. The content of this method is always * regenerated by the Form Editor. */ - // //GEN-BEGIN:initComponents + // //GEN-BEGIN:initComponents private void initComponents() { jLabel5 = new javax.swing.JLabel(); @@ -2502,76 +2497,111 @@ public final class Transfer extends JPanel implements JPanelView { javax.swing.GroupLayout jTransferPanelLayout = new javax.swing.GroupLayout(jTransferPanel); jTransferPanel.setLayout(jTransferPanelLayout); jTransferPanelLayout.setHorizontalGroup( - jTransferPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + jTransferPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGroup(jTransferPanelLayout.createSequentialGroup() + .addContainerGap() + .addGroup(jTransferPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(jTransferPanelLayout.createSequentialGroup() - .addContainerGap() - .addGroup(jTransferPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(jTransferPanelLayout.createSequentialGroup() - .addGroup(jTransferPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(jLabel7, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addComponent(jtxtDbName, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) - .addGap(7, 7, 7) - .addGroup(jTransferPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING, false) - .addGroup(jTransferPanelLayout.createSequentialGroup() - .addComponent(jlblVersion, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(jLabel11, javax.swing.GroupLayout.PREFERRED_SIZE, 100, javax.swing.GroupLayout.PREFERRED_SIZE) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(jlblDBSize, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) - .addGroup(jTransferPanelLayout.createSequentialGroup() - .addComponent(jbtnSet, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) - .addComponent(jbtnTransfer, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(jbtnReset1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) - .addGroup(jTransferPanelLayout.createSequentialGroup() - .addGroup(jTransferPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false) - .addGroup(jTransferPanelLayout.createSequentialGroup() - .addComponent(jLabel13, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(jCBSchema, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) - .addComponent(jLabel15, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addGroup(jTransferPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false) - .addComponent(webMemoryBar, javax.swing.GroupLayout.PREFERRED_SIZE, 125, javax.swing.GroupLayout.PREFERRED_SIZE) - .addComponent(jLabel10, javax.swing.GroupLayout.PREFERRED_SIZE, 1, Short.MAX_VALUE))) - .addGroup(jTransferPanelLayout.createSequentialGroup() - .addComponent(jLabel14, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(jtxtDbParams, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))) - .addContainerGap()) - ); + .addGroup(jTransferPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addComponent(jLabel7, javax.swing.GroupLayout.DEFAULT_SIZE, + javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) + .addComponent(jtxtDbName, javax.swing.GroupLayout.PREFERRED_SIZE, + javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) + .addGap(7, 7, 7) + .addGroup( + jTransferPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING, false) + .addGroup(jTransferPanelLayout.createSequentialGroup() + .addComponent(jlblVersion, javax.swing.GroupLayout.PREFERRED_SIZE, + javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addComponent(jLabel11, javax.swing.GroupLayout.PREFERRED_SIZE, 100, + javax.swing.GroupLayout.PREFERRED_SIZE) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addComponent(jlblDBSize, javax.swing.GroupLayout.PREFERRED_SIZE, + javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) + .addGroup(jTransferPanelLayout.createSequentialGroup() + .addComponent(jbtnSet, javax.swing.GroupLayout.PREFERRED_SIZE, + javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, + javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) + .addComponent(jbtnTransfer, javax.swing.GroupLayout.PREFERRED_SIZE, + javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addComponent(jbtnReset1, javax.swing.GroupLayout.PREFERRED_SIZE, + javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) + .addGroup(jTransferPanelLayout.createSequentialGroup() + .addGroup( + jTransferPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false) + .addGroup(jTransferPanelLayout.createSequentialGroup() + .addComponent(jLabel13, javax.swing.GroupLayout.DEFAULT_SIZE, + javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addComponent(jCBSchema, javax.swing.GroupLayout.PREFERRED_SIZE, + javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) + .addComponent(jLabel15, javax.swing.GroupLayout.DEFAULT_SIZE, + javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addGroup( + jTransferPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false) + .addComponent(webMemoryBar, javax.swing.GroupLayout.PREFERRED_SIZE, 125, + javax.swing.GroupLayout.PREFERRED_SIZE) + .addComponent(jLabel10, javax.swing.GroupLayout.PREFERRED_SIZE, 1, Short.MAX_VALUE))) + .addGroup(jTransferPanelLayout.createSequentialGroup() + .addComponent(jLabel14, javax.swing.GroupLayout.DEFAULT_SIZE, + javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addComponent(jtxtDbParams, javax.swing.GroupLayout.PREFERRED_SIZE, + javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))) + .addContainerGap())); jTransferPanelLayout.setVerticalGroup( - jTransferPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(jTransferPanelLayout.createSequentialGroup() - .addContainerGap() - .addGroup(jTransferPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) - .addComponent(jLabel15, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addComponent(jLabel10, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addGroup(jTransferPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) - .addComponent(jLabel13, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addComponent(jCBSchema, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addComponent(webMemoryBar, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addGroup(jTransferPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) - .addComponent(jtxtDbParams, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addComponent(jLabel14, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addGroup(jTransferPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(jlblVersion, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addComponent(jLabel11, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addComponent(jLabel7, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addComponent(jlblDBSize, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) - .addGroup(jTransferPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(jTransferPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) - .addComponent(jbtnTransfer, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addComponent(jbtnSet, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addComponent(jtxtDbName, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) - .addComponent(jbtnReset1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) - .addContainerGap()) - ); + jTransferPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGroup(jTransferPanelLayout.createSequentialGroup() + .addContainerGap() + .addGroup(jTransferPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) + .addComponent(jLabel15, javax.swing.GroupLayout.PREFERRED_SIZE, + javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) + .addComponent(jLabel10, javax.swing.GroupLayout.PREFERRED_SIZE, + javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addGroup(jTransferPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) + .addComponent(jLabel13, javax.swing.GroupLayout.PREFERRED_SIZE, + javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) + .addComponent(jCBSchema, javax.swing.GroupLayout.PREFERRED_SIZE, + javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) + .addComponent(webMemoryBar, javax.swing.GroupLayout.PREFERRED_SIZE, + javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addGroup(jTransferPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) + .addComponent(jtxtDbParams, javax.swing.GroupLayout.PREFERRED_SIZE, + javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) + .addComponent(jLabel14, javax.swing.GroupLayout.PREFERRED_SIZE, + javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addGroup(jTransferPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addComponent(jlblVersion, javax.swing.GroupLayout.Alignment.TRAILING, + javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, + javax.swing.GroupLayout.PREFERRED_SIZE) + .addComponent(jLabel11, javax.swing.GroupLayout.Alignment.TRAILING, + javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, + javax.swing.GroupLayout.PREFERRED_SIZE) + .addComponent(jLabel7, javax.swing.GroupLayout.Alignment.TRAILING, + javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, + javax.swing.GroupLayout.PREFERRED_SIZE) + .addComponent(jlblDBSize, javax.swing.GroupLayout.Alignment.TRAILING, + javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, + javax.swing.GroupLayout.PREFERRED_SIZE)) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) + .addGroup(jTransferPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGroup(jTransferPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) + .addComponent(jbtnTransfer, javax.swing.GroupLayout.PREFERRED_SIZE, + javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) + .addComponent(jbtnSet, javax.swing.GroupLayout.PREFERRED_SIZE, + javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) + .addComponent(jtxtDbName, javax.swing.GroupLayout.PREFERRED_SIZE, + javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) + .addComponent(jbtnReset1, javax.swing.GroupLayout.PREFERRED_SIZE, + javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) + .addContainerGap())); jbtnReset.setFont(new java.awt.Font("Arial", 0, 12)); // NOI18N jbtnReset.setIcon(new javax.swing.ImageIcon(getClass().getResource("/com/unicenta/images/reload.png"))); // NOI18N @@ -2593,135 +2623,190 @@ public final class Transfer extends JPanel implements JPanelView { javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this); this.setLayout(layout); layout.setHorizontalGroup( - layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGroup(layout.createSequentialGroup() + .addContainerGap() + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(layout.createSequentialGroup() - .addContainerGap() - .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addComponent(jLabel9, 0, 0, javax.swing.GroupLayout.PREFERRED_SIZE) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGroup(layout.createSequentialGroup() + .addComponent(jLabel5, javax.swing.GroupLayout.PREFERRED_SIZE, + javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addComponent(cbSource, javax.swing.GroupLayout.PREFERRED_SIZE, + javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) + .addGroup(layout.createSequentialGroup() + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addComponent(jLabel2, javax.swing.GroupLayout.DEFAULT_SIZE, + javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) + .addComponent(jLabel12, javax.swing.GroupLayout.DEFAULT_SIZE, + javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addComponent(jtxtDbType, javax.swing.GroupLayout.PREFERRED_SIZE, + javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) + .addComponent(jtxtDbServerPort, 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(jLabel18, javax.swing.GroupLayout.DEFAULT_SIZE, + javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) + .addComponent(jLabel1, javax.swing.GroupLayout.PREFERRED_SIZE, + javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addComponent(jtxtDbDriver, javax.swing.GroupLayout.PREFERRED_SIZE, + javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) .addGroup(layout.createSequentialGroup() - .addComponent(jLabel9, 0, 0, javax.swing.GroupLayout.PREFERRED_SIZE) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(layout.createSequentialGroup() - .addComponent(jLabel5, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(cbSource, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) - .addGroup(layout.createSequentialGroup() - .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(jLabel2, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addComponent(jLabel12, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(jtxtDbType, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addComponent(jtxtDbServerPort, 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(jLabel18, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addComponent(jLabel1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(jtxtDbDriver, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addGroup(layout.createSequentialGroup() - .addComponent(jtxtDbDriverLib, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(jbtnDbDriverLib, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) - .addGroup(layout.createSequentialGroup() - .addGap(366, 366, 366) - .addComponent(jbtnReset, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)))) - .addGroup(layout.createSequentialGroup() - .addComponent(jLabel3, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false) - .addComponent(jbtnConnect, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addGroup(layout.createSequentialGroup() - .addComponent(txtDbUser, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(jLabel4, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(txtDbPass, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) - .addComponent(jTransferPanel, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))) + .addComponent(jtxtDbDriverLib, javax.swing.GroupLayout.PREFERRED_SIZE, + javax.swing.GroupLayout.DEFAULT_SIZE, + javax.swing.GroupLayout.PREFERRED_SIZE) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addComponent(jbtnDbDriverLib, javax.swing.GroupLayout.PREFERRED_SIZE, + javax.swing.GroupLayout.DEFAULT_SIZE, + javax.swing.GroupLayout.PREFERRED_SIZE)) .addGroup(layout.createSequentialGroup() - .addComponent(jLabel6, javax.swing.GroupLayout.PREFERRED_SIZE, 202, javax.swing.GroupLayout.PREFERRED_SIZE) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(jlblSource, javax.swing.GroupLayout.PREFERRED_SIZE, 316, javax.swing.GroupLayout.PREFERRED_SIZE)) - .addComponent(jLabel16, javax.swing.GroupLayout.PREFERRED_SIZE, 278, javax.swing.GroupLayout.PREFERRED_SIZE)) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGap(366, 366, 366) + .addComponent(jbtnReset, javax.swing.GroupLayout.PREFERRED_SIZE, + javax.swing.GroupLayout.DEFAULT_SIZE, + javax.swing.GroupLayout.PREFERRED_SIZE)))) + .addGroup(layout.createSequentialGroup() + .addComponent(jLabel3, javax.swing.GroupLayout.PREFERRED_SIZE, + javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false) + .addComponent(jbtnConnect, javax.swing.GroupLayout.PREFERRED_SIZE, + javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) .addGroup(layout.createSequentialGroup() - .addComponent(jLabel8, javax.swing.GroupLayout.PREFERRED_SIZE, 125, javax.swing.GroupLayout.PREFERRED_SIZE) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(webPBar, javax.swing.GroupLayout.PREFERRED_SIZE, 109, javax.swing.GroupLayout.PREFERRED_SIZE) - .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) - .addGroup(layout.createSequentialGroup() - .addGap(18, 18, 18) - .addComponent(jScrollPane1, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) - .addContainerGap()))) - ); + .addComponent(txtDbUser, javax.swing.GroupLayout.DEFAULT_SIZE, + javax.swing.GroupLayout.DEFAULT_SIZE, + javax.swing.GroupLayout.PREFERRED_SIZE) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addComponent(jLabel4, javax.swing.GroupLayout.PREFERRED_SIZE, + javax.swing.GroupLayout.DEFAULT_SIZE, + javax.swing.GroupLayout.PREFERRED_SIZE))) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addComponent(txtDbPass, javax.swing.GroupLayout.PREFERRED_SIZE, + javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) + .addComponent(jTransferPanel, javax.swing.GroupLayout.PREFERRED_SIZE, + javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))) + .addGroup(layout.createSequentialGroup() + .addComponent(jLabel6, javax.swing.GroupLayout.PREFERRED_SIZE, 202, + javax.swing.GroupLayout.PREFERRED_SIZE) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addComponent(jlblSource, javax.swing.GroupLayout.PREFERRED_SIZE, 316, + javax.swing.GroupLayout.PREFERRED_SIZE)) + .addComponent(jLabel16, javax.swing.GroupLayout.PREFERRED_SIZE, 278, + javax.swing.GroupLayout.PREFERRED_SIZE)) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGroup(layout.createSequentialGroup() + .addComponent(jLabel8, javax.swing.GroupLayout.PREFERRED_SIZE, 125, + javax.swing.GroupLayout.PREFERRED_SIZE) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addComponent(webPBar, javax.swing.GroupLayout.PREFERRED_SIZE, 109, + javax.swing.GroupLayout.PREFERRED_SIZE) + .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) + .addGroup(layout.createSequentialGroup() + .addGap(18, 18, 18) + .addComponent(jScrollPane1, javax.swing.GroupLayout.DEFAULT_SIZE, + javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) + .addContainerGap())))); layout.setVerticalGroup( - layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup() - .addContainerGap() - .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING) - .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(webPBar, javax.swing.GroupLayout.PREFERRED_SIZE, 32, javax.swing.GroupLayout.PREFERRED_SIZE) - .addComponent(jLabel8, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addComponent(jLabel6, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) - .addComponent(jlblSource, 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) - .addGroup(layout.createSequentialGroup() - .addComponent(jLabel16, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(layout.createSequentialGroup() - .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(cbSource, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addComponent(jLabel5, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.CENTER) - .addComponent(jLabel18, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addComponent(jtxtDbDriverLib, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) - .addComponent(jbtnDbDriverLib, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .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(jtxtDbDriver, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(jtxtDbType, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addComponent(jLabel2, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) - .addComponent(jLabel12, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addComponent(jtxtDbServerPort, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) - .addComponent(jLabel3, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addComponent(txtDbUser, 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) - .addComponent(txtDbPass, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(jbtnConnect, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addComponent(jbtnReset, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))) - .addComponent(jLabel9, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(jTransferPanel, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addGap(0, 0, Short.MAX_VALUE)) - .addComponent(jScrollPane1, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) - .addContainerGap()) - ); + layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup() + .addContainerGap() + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING) + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addComponent(webPBar, javax.swing.GroupLayout.PREFERRED_SIZE, 32, + javax.swing.GroupLayout.PREFERRED_SIZE) + .addComponent(jLabel8, javax.swing.GroupLayout.PREFERRED_SIZE, + javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) + .addComponent(jLabel6, javax.swing.GroupLayout.Alignment.TRAILING, + javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, + javax.swing.GroupLayout.PREFERRED_SIZE)) + .addComponent(jlblSource, 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) + .addGroup(layout.createSequentialGroup() + .addComponent(jLabel16, javax.swing.GroupLayout.PREFERRED_SIZE, + javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGroup(layout.createSequentialGroup() + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addComponent(cbSource, javax.swing.GroupLayout.PREFERRED_SIZE, + javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) + .addComponent(jLabel5, javax.swing.GroupLayout.PREFERRED_SIZE, + javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.CENTER) + .addComponent(jLabel18, javax.swing.GroupLayout.PREFERRED_SIZE, + javax.swing.GroupLayout.DEFAULT_SIZE, + javax.swing.GroupLayout.PREFERRED_SIZE) + .addComponent(jtxtDbDriverLib, javax.swing.GroupLayout.PREFERRED_SIZE, + javax.swing.GroupLayout.DEFAULT_SIZE, + javax.swing.GroupLayout.PREFERRED_SIZE)) + .addComponent(jbtnDbDriverLib, javax.swing.GroupLayout.PREFERRED_SIZE, + javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .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(jtxtDbDriver, javax.swing.GroupLayout.PREFERRED_SIZE, + javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addComponent(jtxtDbType, javax.swing.GroupLayout.PREFERRED_SIZE, + javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) + .addComponent(jLabel2, javax.swing.GroupLayout.PREFERRED_SIZE, + javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) + .addComponent(jLabel12, javax.swing.GroupLayout.PREFERRED_SIZE, + javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) + .addComponent(jtxtDbServerPort, javax.swing.GroupLayout.PREFERRED_SIZE, + javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) + .addComponent(jLabel3, javax.swing.GroupLayout.PREFERRED_SIZE, + javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) + .addComponent(txtDbUser, 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) + .addComponent(txtDbPass, javax.swing.GroupLayout.PREFERRED_SIZE, + javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addComponent(jbtnConnect, javax.swing.GroupLayout.PREFERRED_SIZE, + javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) + .addComponent(jbtnReset, javax.swing.GroupLayout.PREFERRED_SIZE, + javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))) + .addComponent(jLabel9, javax.swing.GroupLayout.PREFERRED_SIZE, + javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addComponent(jTransferPanel, javax.swing.GroupLayout.PREFERRED_SIZE, + javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) + .addGap(0, 0, Short.MAX_VALUE)) + .addComponent(jScrollPane1, javax.swing.GroupLayout.DEFAULT_SIZE, + javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) + .addContainerGap())); jLabel1.getAccessibleContext().setAccessibleName("DBDriver"); }// //GEN-END:initComponents - private void jbtnTransferActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jbtnTransferActionPerformed + private void jbtnTransferActionPerformed(java.awt.event.ActionEvent evt) {// GEN-FIRST:event_jbtnTransferActionPerformed if (JOptionPane.showConfirmDialog(this, - AppLocal.getIntString("message.transfer"), - AppLocal.getIntString("message.transfertitle"), - JOptionPane.YES_NO_OPTION, - JOptionPane.QUESTION_MESSAGE) == JOptionPane.YES_OPTION) { + AppLocal.getIntString("message.transfer"), + AppLocal.getIntString("message.transfertitle"), + JOptionPane.YES_NO_OPTION, + JOptionPane.QUESTION_MESSAGE) == JOptionPane.YES_OPTION) { ExecutorService customExecutor = Executors.newCachedThreadPool(); SwingWorker worker = new SwingWorker() { @@ -2734,22 +2819,22 @@ public final class Transfer extends JPanel implements JPanelView { } }; - //worker.execute(); + // worker.execute(); customExecutor.submit(worker); } System.gc(); - }//GEN-LAST:event_jbtnTransferActionPerformed + }// GEN-LAST:event_jbtnTransferActionPerformed - private void jbtnResetActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jbtnResetActionPerformed + private void jbtnResetActionPerformed(java.awt.event.ActionEvent evt) {// GEN-FIRST:event_jbtnResetActionPerformed reset(); deactivate(); - }//GEN-LAST:event_jbtnResetActionPerformed + }// GEN-LAST:event_jbtnResetActionPerformed - private void jbtnConnectjButtonTestConnectionActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jbtnConnectjButtonTestConnectionActionPerformed + private void jbtnConnectjButtonTestConnectionActionPerformed(java.awt.event.ActionEvent evt) {// GEN-FIRST:event_jbtnConnectjButtonTestConnectionActionPerformed if (!jtxtDbName.getText().equalsIgnoreCase(jlblSource.getText())) { try { @@ -2761,24 +2846,24 @@ public final class Transfer extends JPanel implements JPanelView { } String url = jtxtDbType.getText() + - jtxtDbServerPort.getText() + - jtxtDbName.getText() + - jtxtDbParams.getText(); + jtxtDbServerPort.getText() + + jtxtDbName.getText() + + jtxtDbParams.getText(); String user = txtDbUser.getText(); String password = new String(txtDbPass.getPassword()); - ClassLoader cloader = new URLClassLoader(new URL[]{ - new File(driverlib).toURI().toURL() + ClassLoader cloader = new URLClassLoader(new URL[] { + new File(driverlib).toURI().toURL() }); DriverManager.registerDriver( - new DriverWrapper((Driver) - Class.forName(driver, true, cloader).newInstance())); + new DriverWrapper((Driver) Class.forName(driver, true, cloader).newInstance())); Session session_source = new Session(url, user, password); Connection connection = session_source.getConnection(); boolean isValid = (connection == null) - ? false : connection.isValid(1000); + ? false + : connection.isValid(1000); if (isValid) { if (!"Derby".equals(cbSource.getSelectedItem())) { @@ -2796,44 +2881,41 @@ public final class Transfer extends JPanel implements JPanelView { jTransferPanel.setVisible(true); JOptionPane.showMessageDialog(this, - AppLocal.getIntString("message.databaseconnectsuccess"), - "Connection Test" - , JOptionPane.INFORMATION_MESSAGE); + AppLocal.getIntString("message.databaseconnectsuccess"), + "Connection Test", JOptionPane.INFORMATION_MESSAGE); } else { reset(); JMessageDialog.showMessage(this, - new MessageInf(MessageInf.SGN_WARNING, "Connection Error")); + new MessageInf(MessageInf.SGN_WARNING, "Connection Error")); } } catch (InstantiationException - | IllegalAccessException - | MalformedURLException - | ClassNotFoundException e) { + | IllegalAccessException + | MalformedURLException + | ClassNotFoundException e) { JMessageDialog.showMessage(this, - new MessageInf(MessageInf.SGN_WARNING, - AppLocal.getIntString("message.databasedrivererror"), e)); + new MessageInf(MessageInf.SGN_WARNING, + AppLocal.getIntString("message.databasedrivererror"), e)); } catch (SQLException e) { JMessageDialog.showMessage(this, - new MessageInf(MessageInf.SGN_WARNING, - AppLocal.getIntString("message.databaseconnectionerror"), e)); + new MessageInf(MessageInf.SGN_WARNING, + AppLocal.getIntString("message.databaseconnectionerror"), e)); } catch (Exception e) { JMessageDialog.showMessage(this, - new MessageInf(MessageInf.SGN_WARNING, "Unknown exception", e)); + new MessageInf(MessageInf.SGN_WARNING, "Unknown exception", e)); } } else { - JOptionPane.showMessageDialog(this - , AppLocal.getIntString("message.transfercheck") - , AppLocal.getIntString("message.transfertitle") - , JOptionPane.WARNING_MESSAGE); + JOptionPane.showMessageDialog(this, AppLocal.getIntString("message.transfercheck"), + AppLocal.getIntString("message.transfertitle"), JOptionPane.WARNING_MESSAGE); jtxtDbName.setText(""); } - }//GEN-LAST:event_jbtnConnectjButtonTestConnectionActionPerformed + }// GEN-LAST:event_jbtnConnectjButtonTestConnectionActionPerformed - private void cbSourceActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_cbSourceActionPerformed + private void cbSourceActionPerformed(java.awt.event.ActionEvent evt) {// GEN-FIRST:event_cbSourceActionPerformed reset(); @@ -2841,23 +2923,19 @@ public final class Transfer extends JPanel implements JPanelView { dirname = dirname == null ? "./" : dirname; if ("Derby".equals(cbSource.getSelectedItem())) { - jtxtDbDriverLib.setText(new File(new File(dirname) - , "/lib/derby-10.10.2.0.jar").getAbsolutePath()); + jtxtDbDriverLib.setText(new File(new File(dirname), "/lib/derby-10.10.2.0.jar").getAbsolutePath()); jtxtDbDriver.setText("org.apache.derby.jdbc.EmbeddedDriver"); jtxtDbType.setText("jdbc:derby:"); - jtxtDbServerPort.setText("" + new File(new File(System.getProperty("user.home")) - , "")); + jtxtDbServerPort.setText("" + new File(new File(System.getProperty("user.home")), "")); jtxtDbParams.setText(""); } else if ("PostgreSQL".equals(cbSource.getSelectedItem())) { - jtxtDbDriverLib.setText(new File(new File(dirname) - , "/lib/postgresql-9.4-1208.jdbc4.jar").getAbsolutePath()); + jtxtDbDriverLib.setText(new File(new File(dirname), "/lib/postgresql-9.4-1208.jdbc4.jar").getAbsolutePath()); jtxtDbDriver.setText("org.postgresql.Driver"); jtxtDbType.setText("jdbc:postgresql://"); jtxtDbServerPort.setText("localhost:5432/"); jtxtDbParams.setText(""); } else { - jtxtDbDriverLib.setText(new File(new File(dirname) - , "/lib/mysql-connector-java-5.1.39.jar").getAbsolutePath()); + jtxtDbDriverLib.setText(new File(new File(dirname), "/lib/mysql-connector-java-5.1.39.jar").getAbsolutePath()); jtxtDbDriver.setText("com.mysql.jdbc.Driver"); jtxtDbType.setText("jdbc:mysql://"); jtxtDbServerPort.setText("localhost:3306/"); @@ -2868,9 +2946,9 @@ public final class Transfer extends JPanel implements JPanelView { txtDbPass.setText(""); jlblVersion.setText(""); jlblDBSize.setText(""); - }//GEN-LAST:event_cbSourceActionPerformed + }// GEN-LAST:event_cbSourceActionPerformed - private void jbtnSetActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jbtnSetActionPerformed + private void jbtnSetActionPerformed(java.awt.event.ActionEvent evt) {// GEN-FIRST:event_jbtnSetActionPerformed String driverlib; String driver; String url; @@ -2883,27 +2961,26 @@ public final class Transfer extends JPanel implements JPanelView { if ("Derby".equals(cbSource.getSelectedItem())) { url = jtxtDbType.getText() + - jtxtDbServerPort.getText() + - jtxtDbParams.getText() + - jtxtDbName.getText(); + jtxtDbServerPort.getText() + + jtxtDbParams.getText() + + jtxtDbName.getText(); } else { url = jtxtDbType.getText() + - jtxtDbServerPort.getText() + - jCBSchema.getSelectedItem().toString() + - jtxtDbParams.getText(); + jtxtDbServerPort.getText() + + jCBSchema.getSelectedItem().toString() + + jtxtDbParams.getText(); } user = txtDbUser.getText(); password = new String(txtDbPass.getPassword()); try { - ClassLoader cloader = new URLClassLoader(new URL[]{ - new File(driverlib).toURI().toURL() + ClassLoader cloader = new URLClassLoader(new URL[] { + new File(driverlib).toURI().toURL() }); DriverManager.registerDriver( - new DriverWrapper((Driver) - Class.forName(driver, true, cloader).newInstance())); + new DriverWrapper((Driver) Class.forName(driver, true, cloader).newInstance())); Session session_source1 = new Session(url, user, password); Connection connection = session_source1.getConnection(); @@ -2926,20 +3003,20 @@ public final class Transfer extends JPanel implements JPanelView { switch (jtxtDbType.getText()) { case "jdbc:mysql://": SQL = "SELECT sum(round(((data_length + index_length) " + - "/ 1024 / 1024), 2)), LEFT(VERSION(),3) " + - "FROM information_schema.TABLES " + - "WHERE table_schema = " + "'" + selected + "'"; + "/ 1024 / 1024), 2)), LEFT(VERSION(),3) " + + "FROM information_schema.TABLES " + + "WHERE table_schema = " + "'" + selected + "'"; rs = stmt.executeQuery(SQL); rs.next(); jlblDBSize.setText(rs.getString(1) + "MB"); break; case "jdbc:derby:": SQL = "SELECT SUM((numallocatedpages * pagesize) /1024) /1024 " + - "FROM SYS.SYSTABLES systabs, SYS.SYSSCHEMAS sysschemas, " + - "TABLE (SYSCS_DIAG.SPACE_TABLE()) AS T2 " + - "WHERE systabs.tabletype = 'T' " + - "AND sysschemas.schemaid = systabs.schemaid " + - "AND systabs.tableid = T2.tableid"; + "FROM SYS.SYSTABLES systabs, SYS.SYSSCHEMAS sysschemas, " + + "TABLE (SYSCS_DIAG.SPACE_TABLE()) AS T2 " + + "WHERE systabs.tabletype = 'T' " + + "AND sysschemas.schemaid = systabs.schemaid " + + "AND systabs.tableid = T2.tableid"; rs = stmt.executeQuery(SQL); rs.next(); jlblDBSize.setText(rs.getString(1) + "MB"); @@ -2957,23 +3034,23 @@ public final class Transfer extends JPanel implements JPanelView { } catch (InstantiationException | IllegalAccessException | MalformedURLException | ClassNotFoundException e) { JMessageDialog.showMessage(this, - new MessageInf(MessageInf.SGN_WARNING, - AppLocal.getIntString("message.databasedrivererror"), e)); + new MessageInf(MessageInf.SGN_WARNING, + AppLocal.getIntString("message.databasedrivererror"), e)); } catch (SQLException e) { JMessageDialog.showMessage(this, - new MessageInf(MessageInf.SGN_WARNING, - AppLocal.getIntString("message.databaseconnectionerror"), e)); + new MessageInf(MessageInf.SGN_WARNING, + AppLocal.getIntString("message.databaseconnectionerror"), e)); } catch (Exception e) { JMessageDialog.showMessage(this, - new MessageInf(MessageInf.SGN_WARNING, "Unknown exception", e)); + new MessageInf(MessageInf.SGN_WARNING, "Unknown exception", e)); } - }//GEN-LAST:event_jbtnSetActionPerformed + }// GEN-LAST:event_jbtnSetActionPerformed - private void jbtnReset1ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jbtnReset1ActionPerformed + private void jbtnReset1ActionPerformed(java.awt.event.ActionEvent evt) {// GEN-FIRST:event_jbtnReset1ActionPerformed reset(); deactivate(); - }//GEN-LAST:event_jbtnReset1ActionPerformed + }// GEN-LAST:event_jbtnReset1ActionPerformed // Variables declaration - do not modify//GEN-BEGIN:variables private com.alee.laf.combobox.WebComboBox cbSource; @@ -3019,4 +3096,4 @@ public final class Transfer extends JPanel implements JPanelView { private com.alee.laf.progressbar.WebProgressBar webPBar; // End of variables declaration//GEN-END:variables -} \ No newline at end of file +} diff --git a/src/main/resources/com/unicenta/pos/scripts/Derby-create.sql b/src/main/resources/com/unicenta/pos/scripts/Derby-create.sql index 89b610f..00194f4 100644 --- a/src/main/resources/com/unicenta/pos/scripts/Derby-create.sql +++ b/src/main/resources/com/unicenta/pos/scripts/Derby-create.sql @@ -205,6 +205,7 @@ CREATE TABLE people ( id varchar(255) NOT NULL, name varchar(255) NOT NULL, apppassword varchar(255) default NULL, + taxId varchar(255) default NULL, card varchar(255) default NULL, role varchar(255) NOT NULL, visible smallint NOT NULL, diff --git a/src/main/resources/com/unicenta/pos/scripts/Derby-upgrade_master.sql b/src/main/resources/com/unicenta/pos/scripts/Derby-upgrade_master.sql index 09a315e..680bf70 100644 --- a/src/main/resources/com/unicenta/pos/scripts/Derby-upgrade_master.sql +++ b/src/main/resources/com/unicenta/pos/scripts/Derby-upgrade_master.sql @@ -1 +1,3 @@ -UPDATE applications SET version = $APP_VERSION{} WHERE id = $APP_ID{}; \ No newline at end of file +ALTER TABLE people ADD COLUMN IF NOT EXISTS taxId VARCHAR(255) AFTER apppassword; +--ALTER TABLE people ADD COLUMN taxId VARCHAR(100); +UPDATE applications SET version = $APP_VERSION{} WHERE id = $APP_ID{}; diff --git a/src/main/resources/com/unicenta/pos/scripts/MariaDB-create.sql b/src/main/resources/com/unicenta/pos/scripts/MariaDB-create.sql index db99881..5ee1626 100644 --- a/src/main/resources/com/unicenta/pos/scripts/MariaDB-create.sql +++ b/src/main/resources/com/unicenta/pos/scripts/MariaDB-create.sql @@ -271,6 +271,7 @@ CREATE TABLE `people` ( `id` varchar(255) NOT NULL, `name` varchar(255) NOT NULL, `apppassword` varchar(255) default NULL, + `taxId` varchar(255) default NULL, `card` varchar(255) default NULL, `role` varchar(255) NOT NULL, `visible` bit(1) NOT NULL, @@ -1000,4 +1001,4 @@ INSERT INTO ticketsnum_refund VALUES(1); INSERT INTO ticketsnum_payment VALUES(1); -- ADD APPLICATION VERSION -INSERT INTO applications(id, name, version) VALUES($APP_ID{}, $APP_NAME{}, $APP_VERSION{}); \ No newline at end of file +INSERT INTO applications(id, name, version) VALUES($APP_ID{}, $APP_NAME{}, $APP_VERSION{}); diff --git a/src/main/resources/com/unicenta/pos/scripts/MariaDB-upgrade_master.sql b/src/main/resources/com/unicenta/pos/scripts/MariaDB-upgrade_master.sql index 999675f..6021f90 100644 --- a/src/main/resources/com/unicenta/pos/scripts/MariaDB-upgrade_master.sql +++ b/src/main/resources/com/unicenta/pos/scripts/MariaDB-upgrade_master.sql @@ -1,2 +1,3 @@ +ALTER TABLE people ADD COLUMN IF NOT EXISTS taxId VARCHAR(255) AFTER apppassword; UPDATE applications SET version = $APP_VERSION{} WHERE id = $APP_ID{}; COMMIT; diff --git a/src/main/resources/com/unicenta/pos/scripts/MySQL-create.sql b/src/main/resources/com/unicenta/pos/scripts/MySQL-create.sql index 3148f6c..35aacb0 100644 --- a/src/main/resources/com/unicenta/pos/scripts/MySQL-create.sql +++ b/src/main/resources/com/unicenta/pos/scripts/MySQL-create.sql @@ -246,6 +246,7 @@ CREATE TABLE `people` ( `id` varchar(255) NOT NULL, `name` varchar(255) NOT NULL, `apppassword` varchar(255) default NULL, + `taxId` varchar(255) default NULL, `card` varchar(255) default NULL, `role` varchar(255) NOT NULL, `visible` bit(1) NOT NULL, @@ -975,4 +976,4 @@ INSERT INTO ticketsnum_refund VALUES(1); INSERT INTO ticketsnum_payment VALUES(1); -- ADD APPLICATION VERSION -INSERT INTO applications(id, name, version) VALUES($APP_ID{}, $APP_NAME{}, $APP_VERSION{}); \ No newline at end of file +INSERT INTO applications(id, name, version) VALUES($APP_ID{}, $APP_NAME{}, $APP_VERSION{}); diff --git a/src/main/resources/com/unicenta/pos/scripts/MySQL-upgrade_master.sql b/src/main/resources/com/unicenta/pos/scripts/MySQL-upgrade_master.sql index 5b58e05..6021f90 100644 --- a/src/main/resources/com/unicenta/pos/scripts/MySQL-upgrade_master.sql +++ b/src/main/resources/com/unicenta/pos/scripts/MySQL-upgrade_master.sql @@ -1,62 +1,3 @@ --- CLEAR THE DECKS -DELETE FROM sharedtickets; - --- Switch OFF table foreign key relationships -set foreign_key_checks = 0; - --- RECREATE applications table -DROP TABLE `applications`; -CREATE TABLE IF NOT EXISTS `applications` ( - `id` varchar(255) NOT NULL, - `name` varchar(255) NOT NULL, - `version` varchar(255) NOT NULL, - `instdate` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, - PRIMARY KEY ( `id` ) -) ENGINE = InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT = Compact; - - --- SYSTEM -DELETE FROM resources WHERE name = 'script.posapps'; - - -DELETE FROM resources WHERE id = '0'; -DELETE FROM resources WHERE id = '00'; -INSERT INTO resources(id, name, restype, content) VALUES('00', 'Menu.Root', 0, $FILE{/com/unicenta/pos/templates/Menu.Root.txt}); - -UPDATE resources SET content = $FILE{/com/unicenta/pos/templates/Ticket.Buttons.xml} WHERE name = 'Ticket.Buttons'; +ALTER TABLE people ADD COLUMN IF NOT EXISTS taxId VARCHAR(255) AFTER apppassword; +UPDATE applications SET version = $APP_VERSION{} WHERE id = $APP_ID{}; COMMIT; - -UPDATE resources SET content = $FILE{/com/unicenta/pos/templates/Printer.Ticket.xml} WHERE name = 'Printer.Ticket'; -COMMIT; - -UPDATE resources SET content = $FILE{/com/unicenta/pos/templates/Ticket.Close.xml} WHERE name = 'Ticket.Close'; -COMMIT; - -UPDATE resources SET content = $FILE{/com/unicenta/pos/templates/Cash.Close.xml} WHERE name = 'Cash.Close'; -COMMIT; - -UPDATE resources SET content = $FILE{/com/unicenta/pos/templates/customer.created.xml} WHERE name = 'Customer.Created'; -COMMIT; - -UPDATE resources SET content = $FILE{/com/unicenta/pos/templates/customer.deleted.xml} WHERE name = 'Customer.Deleted'; -COMMIT; - -UPDATE resources SET content = $FILE{/com/unicenta/pos/templates/customer.updated.xml} WHERE name = 'Customer.Updated'; -COMMIT; - - --- ROLES -DELETE FROM roles WHERE id = '0'; -INSERT INTO roles(id, name, permissions) VALUES('0', 'Administrator role', $FILE{/com/unicenta/pos/templates/Role.Administrator.xml} ); -DELETE FROM roles WHERE id = '1'; -INSERT INTO roles(id, name, permissions) VALUES('1', 'Manager role', $FILE{/com/unicenta/pos/templates/Role.Manager.xml} ); -DELETE FROM roles WHERE id = '2'; -INSERT INTO roles(id, name, permissions) VALUES('2', 'Employee role', $FILE{/com/unicenta/pos/templates/Role.Employee.xml} ); - - --- Switch ON table foreign key relationships -set foreign_key_checks = 1; - -INSERT INTO applications(id, name, version) VALUES($APP_ID{}, $APP_NAME{}, '5.3.1'); - -COMMIT; \ No newline at end of file diff --git a/src/main/resources/pos_messages.properties b/src/main/resources/pos_messages.properties index 5a9b3cb..c805669 100644 --- a/src/main/resources/pos_messages.properties +++ b/src/main/resources/pos_messages.properties @@ -1207,3 +1207,4 @@ tooltip.config.db.databaseset1=
Set the optional secondary DB 2 dat tooltip.config.db.reset=
Clear the settings of the main DB 1 Database Server tooltip.config.db.reset1=
Clear the settings of the optional DB 2 Database Server\t label.pickupcurrent=Current Pickup Number +label.peopletaxid=Tax ID diff --git a/src/main/resources/pos_messages_al_SQ.properties b/src/main/resources/pos_messages_al_SQ.properties index a9cdd0e..d89e488 100644 --- a/src/main/resources/pos_messages_al_SQ.properties +++ b/src/main/resources/pos_messages_al_SQ.properties @@ -662,3 +662,4 @@ transpayment.slip=Slip transpayment.voucherin=Note Input transpayment.voucherout=Note Output Visor.Title=uniCenta oPOS +label.peopletaxid=Tax ID diff --git a/src/main/resources/pos_messages_ar.properties b/src/main/resources/pos_messages_ar.properties index de54891..c9b848d 100644 --- a/src/main/resources/pos_messages_ar.properties +++ b/src/main/resources/pos_messages_ar.properties @@ -542,3 +542,4 @@ label.department=\u0642\u0633\u0645\u060c \u0623\u0642\u0633\u0627\u0645 message.resetpickup=\u0647\u0644 \u062a\u0631\u064a\u062f \u062d\u0642\u0627 \u0623\u0646 \u0625\u0639\u0627\u062f\u0629 \u062a\u0631\u062a\u064a\u0628 \u0639\u062f\u062f \u0628\u064a\u0643 \u0623\u0628 0\u061f label.currentstock=\u0645\u062a\u0627\u062d Menu.CSVStockQty=Products
Scanner Import +label.peopletaxid=Tax ID diff --git a/src/main/resources/pos_messages_da.properties b/src/main/resources/pos_messages_da.properties index 1dc9d0c..8e95e2e 100644 --- a/src/main/resources/pos_messages_da.properties +++ b/src/main/resources/pos_messages_da.properties @@ -1008,3 +1008,4 @@ transpayment.ccardrefund=Kort tilbagef\u00f8rsel transpayment.ticket=Salgskvittering transpayment.voucher=Gavekort Visor.Title=uniCenta oPOS +label.peopletaxid=Tax ID diff --git a/src/main/resources/pos_messages_de.properties b/src/main/resources/pos_messages_de.properties index 6799b1b..9e9755d 100644 --- a/src/main/resources/pos_messages_de.properties +++ b/src/main/resources/pos_messages_de.properties @@ -902,3 +902,4 @@ transpayment.voucher=Gutschein transpayment.voucherin=Gutschein Eingabe transpayment.voucherout=Gutschein Ausgabe Visor.Title=uniCenta oPOS +label.peopletaxid=Tax ID diff --git a/src/main/resources/pos_messages_el.properties b/src/main/resources/pos_messages_el.properties index 6798c64..4096ca6 100644 --- a/src/main/resources/pos_messages_el.properties +++ b/src/main/resources/pos_messages_el.properties @@ -548,3 +548,4 @@ transpayment.ticket=\u0391\u03c0\u03cc\u03b4\u03b5\u03b9\u03be\u03b7 transpayment.voucherin=\u039a\u03bf\u03c5\u03c0\u03cc\u03bd\u03b9 transpayment.voucherout=\u039a\u03bf\u03c5\u03c0\u03cc\u03bd\u03b9 Visor.Title=uniCenta oPOS +label.peopletaxid=Tax ID diff --git a/src/main/resources/pos_messages_en_US.properties b/src/main/resources/pos_messages_en_US.properties index daa13ad..0fc455b 100644 --- a/src/main/resources/pos_messages_en_US.properties +++ b/src/main/resources/pos_messages_en_US.properties @@ -1116,3 +1116,4 @@ label.override=Use Override? title.override.enterpin=Enter PIN Number message.override.badpin=

PIN Number Incorrect Menu.CustomersExport=Customer Export +label.peopletaxid=Tax ID diff --git a/src/main/resources/pos_messages_es.properties b/src/main/resources/pos_messages_es.properties index 0ed5280..0fb9a51 100644 --- a/src/main/resources/pos_messages_es.properties +++ b/src/main/resources/pos_messages_es.properties @@ -1187,4 +1187,5 @@ label.csvclear=Diario de importaci\u00f3n message.eolupdate=

uniCenta oPOS Versi\u00f3n {0} detectada!

\u00a1Las actualizaciones de la versi\u00f3n est\u00e1n cambiando!

Si su versi\u00f3n es 4.5 o posterior, elija S\u00cd para continuar.

Para versiones anteriores, haga clic en NO para abrir Opciones de configuraci\u00f3n ahora.

Lea la Gu\u00eda de transferencia de datos de uniCenta oPOS label.find=Buscar label.create=Crear -label.cancel=Cancelar \ No newline at end of file +label.cancel=Cancelar +label.peopletaxid=ID de impuesto diff --git a/src/main/resources/pos_messages_es_AR.properties b/src/main/resources/pos_messages_es_AR.properties index 0416757..692c810 100644 --- a/src/main/resources/pos_messages_es_AR.properties +++ b/src/main/resources/pos_messages_es_AR.properties @@ -484,3 +484,4 @@ transpayment.ccardrefund=Devoluci\u00f3n con tarjeta transpayment.voucherin=Vales cobrados transpayment.voucherout=Vales emitidos Visor.Title=uniCenta oPOS +label.peopletaxid=Tax ID diff --git a/src/main/resources/pos_messages_es_MX.properties b/src/main/resources/pos_messages_es_MX.properties index 9ccac1c..f00cf8d 100644 --- a/src/main/resources/pos_messages_es_MX.properties +++ b/src/main/resources/pos_messages_es_MX.properties @@ -468,4 +468,6 @@ transpayment.ticket=Ticket transpayment.voucherin=Vales cobrados transpayment.voucherout=Vales emitidos Visor.Title=uniCenta oPOS -message.eolupdate=

uniCenta oPOS Versi\u00f3n {0} detectada!

\u00a1Las actualizaciones de la versi\u00f3n est\u00e1n cambiando!

Si su versi\u00f3n es 5.3 o posterior, elija S\u00cd para continuar.

Para versiones anteriores, haga clic en NO para abrir Opciones de configuraci\u00f3n ahora.

Lea la Gu\u00eda de transferencia de datos de uniCenta oPOS \ No newline at end of file +message.eolupdate=

uniCenta oPOS Versi\u00f3n {0} detectada!

\u00a1Las actualizaciones de la versi\u00f3n est\u00e1n cambiando!

Si su versi\u00f3n es 5.3 o posterior, elija S\u00cd para continuar.

Para versiones anteriores, haga clic en NO para abrir Opciones de configuraci\u00f3n ahora.

Lea la Gu\u00eda de transferencia de datos de uniCenta oPOS +label.peopletaxid=Identificador de taxi + diff --git a/src/main/resources/pos_messages_et.properties b/src/main/resources/pos_messages_et.properties index 677bc45..d5a8dfe 100644 --- a/src/main/resources/pos_messages_et.properties +++ b/src/main/resources/pos_messages_et.properties @@ -502,3 +502,4 @@ transpayment.ccardrefund=Kaardimakse tagastus transpayment.voucherin=Kupongimakse transpayment.voucherout=Kupong v\u00e4lja Visor.Title=uniCenta oPOS +label.peopletaxid=Tax ID diff --git a/src/main/resources/pos_messages_fr.properties b/src/main/resources/pos_messages_fr.properties index 2b34bb2..3556cc0 100644 --- a/src/main/resources/pos_messages_fr.properties +++ b/src/main/resources/pos_messages_fr.properties @@ -1083,3 +1083,4 @@ label.add=Ajouter label.cancel=Annuler label.create=Cr\u00e9er label.find=Trouver +label.peopletaxid=Tax ID diff --git a/src/main/resources/pos_messages_hr.properties b/src/main/resources/pos_messages_hr.properties index 52f54f3..39bd6b0 100644 --- a/src/main/resources/pos_messages_hr.properties +++ b/src/main/resources/pos_messages_hr.properties @@ -482,3 +482,4 @@ transpayment.ccardrefund=Povrat kartice transpayment.voucherin=Bilje\u0161ka - ulaz transpayment.voucherout=Bilje\u0161ka - izlaz Visor.Title=uniCenta oPOS +label.peopletaxid=Tax ID diff --git a/src/main/resources/pos_messages_it.properties b/src/main/resources/pos_messages_it.properties index 0f32a2b..a2b09ae 100644 --- a/src/main/resources/pos_messages_it.properties +++ b/src/main/resources/pos_messages_it.properties @@ -753,3 +753,4 @@ transpayment.ticket=Fattura transpayment.voucherin=Nota Ingresso transpayment.voucherout=Nota Uscita Visor.Title=uniCenta oPOS +label.peopletaxid=Tax ID diff --git a/src/main/resources/pos_messages_nl.properties b/src/main/resources/pos_messages_nl.properties index 835b207..d295cbe 100644 --- a/src/main/resources/pos_messages_nl.properties +++ b/src/main/resources/pos_messages_nl.properties @@ -1175,3 +1175,4 @@ button.setTransfer=SET message.transfersamedatabase=

Not able to transfer database into itself label.configURL=Click this link to see how to create a Database Schema tooltip.pickupbarcode=Find Pickup ID +label.peopletaxid=Tax ID diff --git a/src/main/resources/pos_messages_pt.properties b/src/main/resources/pos_messages_pt.properties index d145f57..ff3ff53 100644 --- a/src/main/resources/pos_messages_pt.properties +++ b/src/main/resources/pos_messages_pt.properties @@ -462,3 +462,4 @@ transpayment.ticket=Recibo transpayment.voucherin=Entrada de nota transpayment.voucherout=Sa\u00edda de nota Visor.Title=uniCenta oPOS +label.peopletaxid=Tax ID diff --git a/src/main/resources/pos_messages_pt_BR.properties b/src/main/resources/pos_messages_pt_BR.properties index 55bda06..b8e54fa 100644 --- a/src/main/resources/pos_messages_pt_BR.properties +++ b/src/main/resources/pos_messages_pt_BR.properties @@ -404,3 +404,4 @@ transpayment.ticket=Cupom transpayment.voucherin=Nota entrada transpayment.voucherout=Nota sa\u00edda Visor.Title=uniCenta POS +label.peopletaxid=Tax ID