Changeset 9:8ad424212eed in rrlib_logging-java

Timestamp:

14.07.2019 14:13:34 (2 months ago)

Author:

Max Reichardt <mreichardt@…>

Branch:

17.03

Phase:

public

Message:

Aligns log domain configuration from log config files with C++ version of rrlib_logging (-> log config files used for C++ applications can now also be used in Java)

Files:

• LogDomain.java (modified) (2 diffs)
• LogDomainConfiguration.java (modified) (2 diffs)
• LogDomainRegistry.java (modified) (4 diffs)

LogDomain.java

@@ -118 +118 @@
      */
     void configureSubTree() {
-        if (parent != null && parent.configuration.configureSubTree) {
+        if (parent != null) {
             configuration = new LogDomainConfiguration(configuration.name, parent.configuration);
             for (LogDomain ld : children) {
@@ -177 +177 @@
                 } else if (ls == LogStreamOutput.COMBINED_FILE) {
                     LogDomain domain = this;
-                    for (; domain.parent != null && domain.parent.configuration.configureSubTree; domain = domain.parent) {}
+                    for (; domain.parent != null; domain = domain.parent) {}
                     tmp.add(domain.openFileOutputStream() ? fileStream : System.err);
                 }

LogDomainConfiguration.java

@@ -50 +50 @@
 
     String name;
-    boolean configureSubTree;
 
     boolean enabled = true;
@@ -69 +68 @@
     LogDomainConfiguration(String name, LogDomainConfiguration other) {
         this.name = name;
-        configureSubTree = other.configureSubTree;
         enabled = other.enabled;
         printTime = other.printTime;

LogDomainRegistry.java

@@ -154 +154 @@
         assert(node.getNodeName().equals("domain"));
 
-        String prefix = (parentName == "." ? "" : parentName) + ".";
+        String prefix = (parentName.equals(".") ? "" : parentName) + ".";
         String nodeName = node.getAttributes().getNamedItem("name").getNodeValue().trim();
-        String name = prefix + (parentName.length() == 0 && nodeName == "global" ? "" : nodeName);
-
-        Node item = node.getAttributes().getNamedItem("configures_sub_tree");
-        if (item != null) {
-            setDomainConfiguresSubTree(name, item.getNodeValue().trim().toLowerCase().equals("true"));
-        }
-
-        item = node.getAttributes().getNamedItem("enabled");
+        if (nodeName.equals(".")) {
+            nodeName = "";
+        }
+        String name = prefix + (parentName.length() == 0 && nodeName.equals("global") ? "" : nodeName);
+
+        Node item = node.getAttributes().getNamedItem("enabled");
         if (item != null) {
             setDomainIsEnabled(name, item.getNodeValue().trim().toLowerCase().equals("true"));
         }
 
-        item = node.getAttributes().getNamedItem("print_time");
+        item = node.getAttributes().getNamedItem("prints_time");
         if (item != null) {
             setDomainPrintsTime(name, item.getNodeValue().trim().toLowerCase().equals("true"));
         }
 
-        item = node.getAttributes().getNamedItem("print_name");
+        item = node.getAttributes().getNamedItem("prints_name");
         if (item != null) {
             setDomainPrintsName(name, item.getNodeValue().trim().toLowerCase().equals("true"));
         }
 
-        item = node.getAttributes().getNamedItem("print_level");
+        item = node.getAttributes().getNamedItem("prints_level");
         if (item != null) {
             setDomainPrintsLevel(name, item.getNodeValue().trim().toLowerCase().equals("true"));
         }
 
-        item = node.getAttributes().getNamedItem("print_location");
+        item = node.getAttributes().getNamedItem("prints_location");
         if (item != null) {
             setDomainPrintsLocation(name, item.getNodeValue().trim().toLowerCase().equals("true"));
@@ -302 +300 @@
     }
 
-// TODO: maybe..
-// /** Get the length of the longest full qualified domain name
-//  *
-//  * This method can be used for formatting user dialogs
-//  *
-//  * @return The length of the longest domain name
-//  */
-// public int GetMaxDomainNameLength() {
-//
-// }
-
-    /** Enable a given domain and switch recursion on or off
-    *
-    * This is a shortcut for setting the configuration of the domain's
-    * sub tree and enabling it.
-    *
-    * @param name            The full qualified name of the domain
-    */
-    public void enableDomain(String name) {
-        enableDomain(name, false);
-    }
-
-    /** Enable a given domain and switch recursion on or off
-     *
-     * This is a shortcut for setting the configuration of the domain's
-     * sub tree and enabling it.
-     *
-     * @param name            The full qualified name of the domain
-     * @param withSubTree   Switch recursion on or off
-     */
-    public void enableDomain(String name, boolean withSubTree) {
-        setDomainConfiguresSubTree(name, withSubTree);
-        setDomainIsEnabled(name, true);
-    }
-
-    /** Disable a given domain and switch recursion on or off
-    *
-    * This is a shortcut for setting the configuration of the domain's
-    * sub tree and disabling it.
-    *
-    * @param name            The full qualified name of the domain
-    */
-    public void disableDomain(String name) {
-        disableDomain(name, false);
-    }
-
-    /** Disable a given domain and switch recursion on or off
-     *
-     * This is a shortcut for setting the configuration of the domain's
-     * sub tree and disabling it.
-     *
-     * @param name            The full qualified name of the domain
-     * @param withSubTree   Switch recursion on or off
-     */
-    public void disableDomain(String name, boolean withSubTree) {
-        setDomainConfiguresSubTree(name, withSubTree);
-        setDomainIsEnabled(name, false);
-    }
-
-    /** Set if the domain configures its subtree or not
-     *
-     * If set to true every configuration update to the given domain
-     * will be propagated to its subtree.
-     *
-     * @param name    The full qualified name of the domain
-     * @param value   The new value of the setting
-     */
-    public void setDomainConfiguresSubTree(String name, boolean value) {
-        LogDomainConfiguration configuration = getConfigurationByName(name);
-        configuration.configureSubTree = value;
-        propagateDomainConfigurationToChildren(name);
-    }
-
     /** Set if the domain is enabled or not
      *
@@ -493 +418 @@
             Document doc = dbuilder.parse(fileName);
 
-            return configureFromXMLNode(doc.getFirstChild());
+            return configureFromXMLNode(doc.getDocumentElement());
         } catch (Exception e) {
             System.err.println("RRLib Logging: tLoggingDomainRegistry::ConfigureFromFile >> " + e.getMessage());
@@ -512 +437 @@
      */
     public boolean configureFromXMLNode(Node node) {
-        if (node.getNodeName() != "rrlib_logging") {
+        if (!node.getNodeName().equals("rrlib_logging")) {
             System.err.println("RRLib Logging: tLoggingDomainRegistry::ConfigureFromXMLNode >> Unexpected content (Not an rrlib_logging tree)");
             return false;