diff --git a/nbproject/private/private.properties b/nbproject/private/private.properties index eebfb44..daad9b9 100644 --- a/nbproject/private/private.properties +++ b/nbproject/private/private.properties @@ -5,4 +5,4 @@ do.jlink=false javac.debug=true javadoc.preview=true jlink.strip=false -user.properties.file=C:\\Users\\ivanov.i\\AppData\\Roaming\\NetBeans\\20\\build.properties +user.properties.file=C:\\Users\\ivanov.i\\AppData\\Roaming\\NetBeans\\25\\build.properties diff --git a/nbproject/private/private.xml b/nbproject/private/private.xml index 9ce1721..de36bf3 100644 --- a/nbproject/private/private.xml +++ b/nbproject/private/private.xml @@ -3,9 +3,11 @@ - file:/O:/projects/Workspace_Java/GettextDB/src/tools/Download2.java - file:/O:/projects/Workspace_Java/GettextDB/src/potoxml/FileFinder.java + file:/O:/projects/Workspace_Java/GettextDB/src/potoxml/AssemblyJFrame.java file:/O:/projects/Workspace_Java/GettextDB/src/potoxml/NewJFrame.java + file:/O:/projects/Workspace_Java/GettextDB/src/tools/Tools.java + file:/O:/projects/Workspace_Java/GettextDB/src/tools/Net.java + file:/O:/projects/Workspace_Java/GettextDB/src/tools/Download2.java diff --git a/settings.ini b/settings.ini index d7b2951..82ed06f 100644 --- a/settings.ini +++ b/settings.ini @@ -1,19 +1,13 @@ [main] db_url = jdbc\:postgresql\://10.101.1.6\:5432/transit -db_user = translate -db_password = translate +db_user = app_translation_3 +db_password = Translate!1 [path0] -path = O\:\\projects\\Workspace_PHP\\transit.istt.kz +path = O:\\projects\\Workspace_Java\\kz.istransit.jwt-dev check = trt( -extensions = (.*\\.php$)||(.*\\.xml$)||(.*\\.js$) -pattern = [0-9|a-z|A-Z|_]+ -type = 5 - -[path1] -path = O:\\projects\\Workspace_PHP\\jwt.local -check = trt( -extensions = (.*\\.php$)||(.*\\.xml$)||(.*\\.js$) +extensions = (.*\\.java$)||(.*\\.xml$)||(.*\\.js$) pattern = [0-9|a-z|A-Z|_]+ type = 7 +system = 4 diff --git a/src/potoxml/AssemblyJFrame.form b/src/potoxml/AssemblyJFrame.form index d282f1d..4d79c6d 100644 --- a/src/potoxml/AssemblyJFrame.form +++ b/src/potoxml/AssemblyJFrame.form @@ -76,11 +76,12 @@ - +
- + +
diff --git a/src/potoxml/AssemblyJFrame.java b/src/potoxml/AssemblyJFrame.java index b40bdd5..ac13cba 100644 --- a/src/potoxml/AssemblyJFrame.java +++ b/src/potoxml/AssemblyJFrame.java @@ -64,11 +64,11 @@ public class AssemblyJFrame extends javax.swing.JFrame { }, new String [] { - "id", "lng 1", "lng 2", "lng 3" + "id", "lng 1", "lng 2", "Type", "Sub" } ) { Class[] types = new Class [] { - java.lang.String.class, java.lang.String.class, java.lang.String.class, java.lang.String.class + java.lang.String.class, java.lang.String.class, java.lang.String.class, java.lang.String.class, java.lang.String.class }; public Class getColumnClass(int columnIndex) { diff --git a/src/potoxml/FileFinder.java b/src/potoxml/FileFinder.java index 60df0da..c343e82 100644 --- a/src/potoxml/FileFinder.java +++ b/src/potoxml/FileFinder.java @@ -201,7 +201,7 @@ public class FileFinder throw new Exception("Ошибка: указанный путь не существует"); } //если задано регулярное выражение, создаем Pattern - if (!mask.equals("")) + if (!mask.isEmpty()) { p = Pattern.compile(mask, Pattern.CASE_INSENSITIVE | Pattern.COMMENTS); //Pattern.UNIcomment_CASE } diff --git a/src/potoxml/NewJFrame.form b/src/potoxml/NewJFrame.form index efd9cf6..b61acce 100644 --- a/src/potoxml/NewJFrame.form +++ b/src/potoxml/NewJFrame.form @@ -144,12 +144,13 @@ - +
+
diff --git a/src/potoxml/NewJFrame.java b/src/potoxml/NewJFrame.java index 602265e..655ffab 100644 --- a/src/potoxml/NewJFrame.java +++ b/src/potoxml/NewJFrame.java @@ -75,7 +75,8 @@ public class NewJFrame extends javax.swing.JFrame String extensions = ini.get("path"+i, "extensions"); String pattern = ini.get("path"+i, "pattern"); String type = ini.get("path"+i, "type"); - model.addRow(new Object[]{path, extensions, check, pattern, type }); + String system = ini.get("path"+i, "system"); + model.addRow(new Object[]{path, extensions, check, pattern, type, system }); System.out.print(path); } } @@ -127,11 +128,11 @@ public class NewJFrame extends javax.swing.JFrame }, new String [] { - "Файл/Путь", "Расширения файлов", "Название функции (", "Шаблон проверки", "ID типа слов" + "Файл/Путь", "Расширения файлов", "Название функции (", "Шаблон проверки", "ID типа слов", "Подсистема" } ) { Class[] types = new Class [] { - java.lang.String.class, java.lang.String.class, java.lang.String.class, java.lang.String.class, java.lang.Integer.class + java.lang.String.class, java.lang.String.class, java.lang.String.class, java.lang.String.class, java.lang.Integer.class, java.lang.Integer.class }; public Class getColumnClass(int columnIndex) { @@ -308,7 +309,7 @@ public class NewJFrame extends javax.swing.JFrame pack(); }// //GEN-END:initComponents - private void parse(Connection conn, String rootDir, String extensions, String check, String pattern, String type) + private void parse(Connection conn, String rootDir, String extensions, String check, String pattern, String type, String sybs) { // Просматриваем каталоги FileFinder finder = new FileFinder(); @@ -391,7 +392,7 @@ public class NewJFrame extends javax.swing.JFrame //Обновляю в базе if(conn!=null){ try (Statement stmt = conn.createStatement()) { - ResultSet rs = stmt.executeQuery("select main._update_translation_identifier('"+text+"',"+type+");"); + ResultSet rs = stmt.executeQuery("select main._update_translation_identifier('"+text+"',"+type+","+sybs+");"); } catch (SQLException e) { textArea1.append("Error write to DB\n "+e.getMessage()); } @@ -429,7 +430,7 @@ public class NewJFrame extends javax.swing.JFrame if(jCheckBox1.isSelected()){ String url = jTFDBURL.getText(); //"jdbc:postgresql://10.1.7.74:5432/pilot"; String user = jTFDBUser.getText(); //"translate"; - String password = jTFDBUser.getText(); //"translate"; + String password = jTFDBPassword.getText(); //"translate"; try { Class.forName("org.postgresql.Driver"); conn = DriverManager.getConnection(url, user, password); @@ -448,7 +449,8 @@ public class NewJFrame extends javax.swing.JFrame model.getValueAt(row,1).toString(), model.getValueAt(row,2).toString(), model.getValueAt(row,3).toString(), - model.getValueAt(row,4).toString() + model.getValueAt(row,4).toString(), + model.getValueAt(row,5).toString() ); } @@ -496,7 +498,7 @@ public class NewJFrame extends javax.swing.JFrame //Подключаюсь к базе данных String url = jTFDBURL.getText(); //"jdbc:postgresql://10.1.7.74:5432/pilot"; String user = jTFDBUser.getText(); //"translate"; - String password = jTFDBUser.getText(); //"translate"; + String password = jTFDBPassword.getText(); //"translate"; Connection conn = null; try { Class.forName("org.postgresql.Driver"); diff --git a/src/tools/Download2.java b/src/tools/Download2.java index 8e4fc80..85b4a1d 100644 --- a/src/tools/Download2.java +++ b/src/tools/Download2.java @@ -149,12 +149,12 @@ public class Download2 extends Observable implements Runnable } // Open file and seek to the end of it. - if (!fileName.equals("")) + if (!fileName.isEmpty()) { file = new RandomAccessFile(fileName, "rw"); file.seek(downloaded); } - if (fileName.equals("")) //фаил не задан сохраняем в буфер + if (fileName.isEmpty()) //фаил не задан сохраняем в буфер { this.buffer = new byte[size]; } @@ -162,7 +162,7 @@ public class Download2 extends Observable implements Runnable stream = connection.getInputStream(); while (status == DOWNLOADING) { - if (!fileName.equals("")) //если сохраняем в фаил + if (!fileName.isEmpty()) //если сохраняем в фаил { byte buffer[]; if (size - downloaded > MAX_BUFFER_SIZE) @@ -180,7 +180,7 @@ public class Download2 extends Observable implements Runnable file.write(buffer, 0, read); downloaded += read; } - if (fileName.equals("")) //если сохраняем в буфер + if (fileName.isEmpty()) //если сохраняем в буфер { byte buffer[]; if (size - downloaded > MAX_BUFFER_SIZE) @@ -244,11 +244,11 @@ public class Download2 extends Observable implements Runnable */ public DataInputStream getData() { - if (fileName.equals("")) //если сохраняем в буфер + if (fileName.isEmpty()) //если сохраняем в буфер { return new DataInputStream(new BufferedInputStream(new ByteArrayInputStream(buffer))); }else - if (!fileName.equals("")) //если сохраняем в буфер + if (!fileName.isEmpty()) //если сохраняем в буфер { try {