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

Compare commits

base: igor:af02be6a6d4a55575531e4c9c04a7ed48b790a18
Branches Tags
igor:master
...
compare: igor:master
Branches Tags
igor:master

10 Commits
af02be6a6d ... master

Author SHA1 Message Date
igor
3bbf691659 Merge branch 'master' of https://git.dirt.kz/igor/GettextDB 
# Conflicts:
#	nbproject/private/private.xml
#	settings.ini
 2025-05-01 20:08:18 +05:00
igor
8a7255deb6 + 2025-05-01 20:06:44 +05:00
igor
5b82aa2b0e Merge branch 'master' of https://git.dirt.kz/igor/GettextDB 
# Conflicts:
#	nbproject/private/private.properties
#	nbproject/private/private.xml
 2025-05-01 20:05:50 +05:00
igor
cac9c6e88d Правки с работы 2025-05-01 20:03:12 +05:00
igor
096e886616 Merge branch 'master' of https://git.dirt.kz/igor/GettextDB 
# Conflicts:
#	nbproject/private/private.properties
#	nbproject/private/private.xml
 2025-04-21 22:01:08 +05:00
igor
87a7efc4d3 + 2025-04-21 21:58:24 +05:00
igor
27a65d38b7 новенькое 2025-04-21 21:57:19 +05:00
Igor I
24305015aa Merge branch 'master' of https://git.dirt.kz/igor/GettextDB 
# Conflicts:
#	nbproject/private/private.xml
 2024-07-16 13:57:16 +05:00
Igor I
baf7c3c851 TODO Нужно добавить подсистемы 2024-07-16 13:55:45 +05:00
Igor
d3e46d79e4 Проверка на скобку 2024-01-20 01:02:26 +06:00
9 changed files with 54 additions and 32 deletions
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\\17\\build.properties
user.properties.file=C:\\Users\\ivanov.i\\AppData\\Roaming\\NetBeans\\25\\build.properties

8
nbproject/private/private.xml
View File

@ -2,6 +2,12 @@
<project-private xmlns="http://www.netbeans.org/ns/project-private/1">
<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/>
<group>
<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>

18
settings.ini
View File

@ -1,12 +1,20 @@
[main]
db_url = jdbc\:postgresql\://10.1.7.74\:5432/pilot
db_user = translate
db_password = translate
db_url = jdbc\:postgresql\://ccalm.org\:5432/CCALM
db_user = app_translation_2
db_password = ZsiVuv7l4iTpVJgtP0tg
[path0]
path = O\:\\projects\\Workspace_PHP\\transit.istt.kz
path = O:\\projects\\Workspace_Java\\kz.istransit.jwt-dev
check = trt(
extensions = (.*\\.php$)||(.*\\.xml$)||(.*\\.js$)
extensions = (.*\\.java$)||(.*\\.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$)
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
}

5
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>
@ -290,7 +291,7 @@
</Container>
<Component class="javax.swing.JButton" name="jButton1">
<Properties>
<Property name="text" type="java.lang.String" value="&#x421;&#x43a;&#x430;&#x43d;&#x438;&#x440;&#x43e;&#x432;&#x430;&#x442;&#x44c;"/>
<Property name="label" type="java.lang.String" value="&#x421;&#x43a;&#x430;&#x43d;&#x438;&#x440;&#x43e;&#x432;&#x430;&#x442;&#x44c;_"/>
<Property name="name" type="java.lang.String" value="" noResource="true"/>
</Properties>
<Events>

30
src/potoxml/NewJFrame.java
View File

@ -60,7 +60,7 @@ public class NewJFrame extends javax.swing.JFrame
}
textArea1.append("JAR file path: " + jarDir + "\n");
File file = new File(jarDir + "settings.ini");
File file = new File(jarDir + "..\\settings.ini");
if(file.exists()){
Ini ini = new Ini(file);
jTFDBURL.setText(ini.get("main", "db_url"));
@ -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) {
@ -266,7 +267,7 @@ public class NewJFrame extends javax.swing.JFrame
.addComponent(jPanel5, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
);
jButton1.setText("Сканировать");
jButton1.setLabel("Сканировать_");
jButton1.setName(""); // NOI18N
jButton1.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent evt) {
@ -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();
@ -351,7 +352,11 @@ public class NewJFrame extends javax.swing.JFrame
if(s>=0)
{
from=s+check.length();
to=line.indexOf(")", from);
String bracket=")";
if(check.charAt(check.length() - 1)=='[') bracket="]"; //Если открывающая скобка квадратная
to=line.indexOf(bracket, from);
//int e=-1;
//if(line.charAt(s+check.length()) == '"') { e=line.indexOf("\")", from); }
//if(line.charAt(s+check.length()) == '\'') { e = line.indexOf("')", from); }
@ -387,9 +392,9 @@ 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");
textArea1.append("Error write to DB\n "+e.getMessage());
}
}
}else{
@ -425,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);
@ -444,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()
);
}
@ -492,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
{