diff --git a/nbproject/private/private.properties b/nbproject/private/private.properties index 91f4b66..eebfb44 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\\17\\build.properties +user.properties.file=C:\\Users\\ivanov.i\\AppData\\Roaming\\NetBeans\\20\\build.properties diff --git a/nbproject/private/private.xml b/nbproject/private/private.xml index 6807a2b..def9962 100644 --- a/nbproject/private/private.xml +++ b/nbproject/private/private.xml @@ -2,6 +2,9 @@ - + + file:/O:/projects/Workspace_Java/GettextDB/src/tools/Download2.java + file:/O:/projects/Workspace_Java/GettextDB/src/potoxml/NewJFrame.java + diff --git a/settings.ini b/settings.ini index 5b74044..d7b2951 100644 --- a/settings.ini +++ b/settings.ini @@ -1,5 +1,5 @@ [main] -db_url = jdbc\:postgresql\://10.1.7.74\:5432/pilot +db_url = jdbc\:postgresql\://10.101.1.6\:5432/transit db_user = translate db_password = translate @@ -10,3 +10,10 @@ 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$) +pattern = [0-9|a-z|A-Z|_]+ +type = 7 + diff --git a/src/potoxml/NewJFrame.java b/src/potoxml/NewJFrame.java index fca93d0..602265e 100644 --- a/src/potoxml/NewJFrame.java +++ b/src/potoxml/NewJFrame.java @@ -351,7 +351,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); } @@ -389,7 +393,7 @@ public class NewJFrame extends javax.swing.JFrame try (Statement stmt = conn.createStatement()) { ResultSet rs = stmt.executeQuery("select main._update_translation_identifier('"+text+"',"+type+");"); } catch (SQLException e) { - textArea1.append("Error write to DB\n"); + textArea1.append("Error write to DB\n "+e.getMessage()); } } }else{