igor/GettextDB
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Правки с работы

Browse Source
This commit is contained in:
igor
2025-05-01 20:03:12 +05:00
parent 24305015aa
commit cac9c6e88d
9 changed files with 34 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
nbproject/private/private.properties
View File

@ -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

6
nbproject/private/private.xml
View File

@ -3,9 +3,11 @@
<editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/2" lastBookmarkId="0"/>
<open-files xmlns="http://www.netbeans.org/ns/projectui-open-files/2">
<group>
<file>file:/O:/projects/Workspace_Java/GettextDB/src/tools/Download2.java</file>
<file>file:/O:/projects/Workspace_Java/GettextDB/src/potoxml/FileFinder.java</file>
<file>file:/O:/projects/Workspace_Java/GettextDB/src/potoxml/AssemblyJFrame.java</file>
<file>file:/O:/projects/Workspace_Java/GettextDB/src/potoxml/NewJFrame.java</file>
<file>file:/O:/projects/Workspace_Java/GettextDB/src/tools/Tools.java</file>
<file>file:/O:/projects/Workspace_Java/GettextDB/src/tools/Net.java</file>
<file>file:/O:/projects/Workspace_Java/GettextDB/src/tools/Download2.java</file>
</group>
</open-files>
</project-private>

16
settings.ini
View File

@ -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

5
src/potoxml/AssemblyJFrame.form
View File

@ -76,11 +76,12 @@
<Component class="javax.swing.JTable" name="jTable1">
<Properties>
<Property name="model" type="javax.swing.table.TableModel" editor="org.netbeans.modules.form.editors2.TableModelEditor">
<Table columnCount="4" rowCount="0">
<Table columnCount="5" rowCount="0">
<Column editable="true" title="id" type="java.lang.String"/>
<Column editable="true" title="lng 1" type="java.lang.String"/>
<Column editable="true" title="lng 2" type="java.lang.String"/>
<Column editable="true" title="lng 3" type="java.lang.String"/>
<Column editable="true" title="Type" type="java.lang.String"/>
<Column editable="true" title="Sub" type="java.lang.String"/>
</Table>
</Property>
</Properties>

4
src/potoxml/AssemblyJFrame.java
View File

@ -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) {

2
src/potoxml/FileFinder.java
View File

@ -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
}

3
src/potoxml/NewJFrame.form
View File

@ -144,12 +144,13 @@
<Component class="javax.swing.JTable" name="jTable1">
<Properties>
<Property name="model" type="javax.swing.table.TableModel" editor="org.netbeans.modules.form.editors2.TableModelEditor">
<Table columnCount="5" rowCount="0">
<Table columnCount="6" rowCount="0">
<Column editable="true" title="&#x424;&#x430;&#x439;&#x43b;/&#x41f;&#x443;&#x442;&#x44c;" type="java.lang.String"/>
<Column editable="true" title="&#x420;&#x430;&#x441;&#x448;&#x438;&#x440;&#x435;&#x43d;&#x438;&#x44f; &#x444;&#x430;&#x439;&#x43b;&#x43e;&#x432;" type="java.lang.String"/>
<Column editable="true" title="&#x41d;&#x430;&#x437;&#x432;&#x430;&#x43d;&#x438;&#x435; &#x444;&#x443;&#x43d;&#x43a;&#x446;&#x438;&#x438; (" type="java.lang.String"/>
<Column editable="true" title="&#x428;&#x430;&#x431;&#x43b;&#x43e;&#x43d; &#x43f;&#x440;&#x43e;&#x432;&#x435;&#x440;&#x43a;&#x438;" type="java.lang.String"/>
<Column editable="true" title="ID &#x442;&#x438;&#x43f;&#x430; &#x441;&#x43b;&#x43e;&#x432;" type="java.lang.Integer"/>
<Column editable="true" title="&#x41f;&#x43e;&#x434;&#x441;&#x438;&#x441;&#x442;&#x435;&#x43c;&#x430;" type="java.lang.Integer"/>
</Table>
</Property>
</Properties>

18
src/potoxml/NewJFrame.java
View File

@ -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();
}// </editor-fold>//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");

12
src/tools/Download2.java
View File

@ -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
{