From 2add158319626f1f05c1d533bd5e53886f4877c3 Mon Sep 17 00:00:00 2001 From: Igor I Date: Thu, 13 Mar 2025 11:16:16 +0500 Subject: [PATCH] + --- dbtools/DBTools.java | 12 ++--- tctable/TCField.java | 6 +-- tctable/Tools.java | 7 ++- xmltools/XMLIO.java | 2 +- xmltools/XMLTools.java | 119 +++-------------------------------------- 5 files changed, 20 insertions(+), 126 deletions(-) diff --git a/dbtools/DBTools.java b/dbtools/DBTools.java index c9800b3..bc60d7d 100644 --- a/dbtools/DBTools.java +++ b/dbtools/DBTools.java @@ -53,28 +53,28 @@ public class DBTools { //if($t=='object' && (strtoupper($v)!='NULL' && gettype($v)=='string')) $t='string'; //Если id шники uuid if (t.equals("object") || t.equals("uid")) { - if (v.equals("")) + if (v.isEmpty()) v = "NULL"; } else if (t.equals("i4") || t.equals("integer")) { - if (v.equals("")) + if (v.isEmpty()) v = "NULL"; } else if (t.equals("f8")) { - if (v.equals("")) + if (v.isEmpty()) v = "NULL"; v = Tools.replaceAll(v,",", "."); //The decimal part: point. } else if (t.equals("f4")) { - if (v.equals("")) + if (v.isEmpty()) v = "NULL"; v = Tools.replaceAll(v,",", "."); //The decimal part: point. } else if (t.equals("b")) { - if (v.equals("")) + if (v.isEmpty()) v = "NULL"; else if (v.equals("1")) v = "true"; else if (v.equals("0")) v = "false"; } else if (t.equals("string") || t.equals("text") || t.equals("dateTime") || t.equals("date")) { - if (v.equals("")) { + if (v.isEmpty()) { v = "NULL"; } else { v = Tools.replaceAll(v,"'", "''"); diff --git a/tctable/TCField.java b/tctable/TCField.java index 4b37b3d..7b55cb6 100644 --- a/tctable/TCField.java +++ b/tctable/TCField.java @@ -494,7 +494,7 @@ public class TCField }else if(type== TCField.BD_UTF8_1 || type== TCField.BD_UTF8_1_UUID || type== TCField.BD_UTF8_1_TIMESTAMP || this.type== TCField.BD_SUINT8 || this.type== TCField.BD_SINT8 || this.type== TCField.BD_SFLOAT8) { value=null; - if(val!=null && !val.equals("")) + if(val!=null && !val.isEmpty()) { byte[] b=null; try { @@ -517,7 +517,7 @@ public class TCField }else if(type== TCField.BD_UTF8_2) { value=null; - if(val!=null && !val.equals("")) + if(val!=null && !val.isEmpty()) { byte[] b=null; try { @@ -541,7 +541,7 @@ public class TCField }else if(type== TCField.BD_UTF8_4 || type== TCField.BD_UTF8_4_JSONB) { value=null; - if(val!=null && !val.equals("")) + if(val!=null && !val.isEmpty()) { byte[] b=null; try { diff --git a/tctable/Tools.java b/tctable/Tools.java index db48d39..4aa6426 100644 --- a/tctable/Tools.java +++ b/tctable/Tools.java @@ -100,8 +100,7 @@ public class Tools { try { InetAddress ipAddr = InetAddress.getByName("google.com"); //InetAddress ipAddr = InetAddress.getByName("geovizor.com"); - //You can replace it with your name - return !ipAddr.equals(""); + return ipAddr.isReachable(5000); } catch (Exception ex) { return false; } @@ -1019,10 +1018,10 @@ public class Tools { if((str.charAt(i)=='-' && (val.length()==0 || val.charAt(0)!='-')) || str.charAt(i)=='0' || str.charAt(i)=='1' || str.charAt(i)=='2' || str.charAt(i)=='3' || str.charAt(i)=='4' || str.charAt(i)=='5' || str.charAt(i)=='6' || str.charAt(i)=='7' || str.charAt(i)=='8' || str.charAt(i)=='9') val.append(str.charAt(i)); } - if(val.toString().equals("")) return 0; + if(val.toString().isEmpty()) return 0; return Integer.parseInt(val.toString()); } - if(str.equals("")) return 0; + if(str.isEmpty()) return 0; return Integer.parseInt(str); } //--------------------------------------------------------------------------- diff --git a/xmltools/XMLIO.java b/xmltools/XMLIO.java index 9599869..901b0b2 100644 --- a/xmltools/XMLIO.java +++ b/xmltools/XMLIO.java @@ -1,4 +1,4 @@ -package tools.xml; +package tools.xmltools; import org.w3c.dom.Document; import org.xml.sax.SAXException; diff --git a/xmltools/XMLTools.java b/xmltools/XMLTools.java index 566c2b9..fdd1daf 100644 --- a/xmltools/XMLTools.java +++ b/xmltools/XMLTools.java @@ -1,4 +1,4 @@ -package tools.xml; +package tools.xmltools; import javax.xml.parsers.ParserConfigurationException; import javax.xml.xpath.XPath; @@ -87,8 +87,6 @@ public class XMLTools return node instanceof Element && node.getNodeName().equals(tagname); } -<<<<<<<< HEAD:xmltools/XMLTools.java -======== //вернуть первый попавшийся узел среди дочерних public static Node getFirstNodeOnName(Node node,String nodename) { @@ -154,76 +152,6 @@ public class XMLTools return lsSerializer.writeToString(node); } ->>>>>>>> bd22e57cbce7dba632e6c46bb0e627e3b0f388f7:xml/XMLTools.java - /** Найти узел по атрибуту - */ - public static Node findNodeOnAttribute(Node node, String nodename, String attribute, String val) - { - if(node==null) return null; - NodeList items = node.getChildNodes(); - for (int i=0;i0){ pos--; }else{ break; } - }else - { - break; - } - } - } - } - return null; - } - - /** - * Return first from childs in first deep level on name - * @param node Find in - * @param nodename Name node - * @return node - */ - public static Node getNodeOnName(Node node,String nodename) - { - if(node==null) return null; - Node nextNode = node.getFirstChild(); - while(nextNode != null) - { - if(nextNode.getNodeName().equals(nodename)) return nextNode; - nextNode=nextNode.getNextSibling(); -======== public static Node findFirstNodeOnAttribute(Node node, String nodename,String attribute,String val) { Node result=null; @@ -236,23 +164,13 @@ public class XMLTools expr = xpath.compile("//*/"+nodename+"[@"+attribute+"='" + val + "']"); exprResult = expr.evaluate(node, XPathConstants.NODESET); } catch (XPathExpressionException ex) { - ->>>>>>>> bd22e57cbce7dba632e6c46bb0e627e3b0f388f7:xml/XMLTools.java - } - return null; - } - //Сериализовать узел в строку - public static String getOuterXML(Node node) - { - DOMImplementationLS domImplementation = (DOMImplementationLS) node.getOwnerDocument().getImplementation(); - LSSerializer lsSerializer = domImplementation.createLSSerializer(); - if (!(node instanceof Document)) - { - lsSerializer.getDomConfig().setParameter("xml-declaration", false); - } - return lsSerializer.writeToString(node); - } + } + NodeList nodeList = (NodeList) exprResult; + if (nodeList.getLength() > 0) + result = nodeList.item(0); + return result; + } /** * Поиск среди текущего и дочерних узлов @@ -300,10 +218,7 @@ public class XMLTools } return null; } -<<<<<<<< HEAD:xmltools/XMLTools.java -======== ->>>>>>>> bd22e57cbce7dba632e6c46bb0e627e3b0f388f7:xml/XMLTools.java /** Найти узел по атрибуту */ public static Node findNodeOnAttribute(Node node, String nodename, String attribute, String val) @@ -322,26 +237,6 @@ public class XMLTools return null; } - public static Node findFirstNodeOnAttribute(Node node, String nodename,String attribute,String val) - { - Node result=null; - if(node==null) return result; - javax.xml.xpath.XPathFactory xPathfactory = javax.xml.xpath.XPathFactory.newInstance(); - XPath xpath = xPathfactory.newXPath(); - XPathExpression expr=null; - Object exprResult=null; - try { - expr = xpath.compile("//*/"+nodename+"[@"+attribute+"='" + val + "']"); - exprResult = expr.evaluate(node, XPathConstants.NODESET); - } catch (XPathExpressionException ex) { - - } - NodeList nodeList = (NodeList) exprResult; - if (nodeList.getLength() > 0) - result = nodeList.item(0); - return result; - } - /** * Присвоить дочерние узлы первого дерева второму если их нет, иначе дополнить либо заменить. (Работает через рекурсию нужно для передачи параметров между окнами) * @param {XML} first Узел где ханятся настройки