simplify code

HtmlUnit · Nov 21, 2024 · 5a61e62 · 5a61e62
1 parent 65702ac
commit 5a61e62
Show file tree

Hide file tree

Showing 18 changed files with 17 additions and 4 deletions.
diff --git a/src/main/java/org/htmlunit/cyberneko/xerces/dom/AttrImpl.java b/src/main/java/org/htmlunit/cyberneko/xerces/dom/AttrImpl.java
@@ -14,6 +14,7 @@
  */
 package org.htmlunit.cyberneko.xerces.dom;
 
+import org.htmlunit.cyberneko.xerces.util.DOMMessageFormatter;
 import org.w3c.dom.Attr;
 import org.w3c.dom.DOMException;
 import org.w3c.dom.Element;

diff --git a/src/main/java/org/htmlunit/cyberneko/xerces/dom/AttrNSImpl.java b/src/main/java/org/htmlunit/cyberneko/xerces/dom/AttrNSImpl.java
@@ -14,6 +14,7 @@
  */
 package org.htmlunit.cyberneko.xerces.dom;
 
+import org.htmlunit.cyberneko.xerces.util.DOMMessageFormatter;
 import org.htmlunit.cyberneko.xerces.xni.NamespaceContext;
 import org.w3c.dom.DOMException;
 

diff --git a/src/main/java/org/htmlunit/cyberneko/xerces/dom/AttributeMap.java b/src/main/java/org/htmlunit/cyberneko/xerces/dom/AttributeMap.java
@@ -17,6 +17,7 @@
 import java.util.List;
 
 import org.htmlunit.cyberneko.util.SimpleArrayList;
+import org.htmlunit.cyberneko.xerces.util.DOMMessageFormatter;
 import org.w3c.dom.DOMException;
 import org.w3c.dom.Node;
 

diff --git a/src/main/java/org/htmlunit/cyberneko/xerces/dom/CharacterDataImpl.java b/src/main/java/org/htmlunit/cyberneko/xerces/dom/CharacterDataImpl.java
@@ -14,6 +14,7 @@
  */
 package org.htmlunit.cyberneko.xerces.dom;
 
+import org.htmlunit.cyberneko.xerces.util.DOMMessageFormatter;
 import org.w3c.dom.DOMException;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;

diff --git a/src/main/java/org/htmlunit/cyberneko/xerces/dom/CoreDOMImplementationImpl.java b/src/main/java/org/htmlunit/cyberneko/xerces/dom/CoreDOMImplementationImpl.java
@@ -14,6 +14,7 @@
  */
 package org.htmlunit.cyberneko.xerces.dom;
 
+import org.htmlunit.cyberneko.xerces.util.DOMMessageFormatter;
 import org.htmlunit.cyberneko.xerces.util.XMLChar;
 import org.w3c.dom.DOMException;
 import org.w3c.dom.DOMImplementation;

diff --git a/src/main/java/org/htmlunit/cyberneko/xerces/dom/CoreDocumentImpl.java b/src/main/java/org/htmlunit/cyberneko/xerces/dom/CoreDocumentImpl.java
@@ -18,6 +18,7 @@
 import java.util.Map;
 import java.util.WeakHashMap;
 
+import org.htmlunit.cyberneko.xerces.util.DOMMessageFormatter;
 import org.htmlunit.cyberneko.xerces.util.URI;
 import org.htmlunit.cyberneko.xerces.util.XML11Char;
 import org.htmlunit.cyberneko.xerces.util.XMLChar;

diff --git a/src/main/java/org/htmlunit/cyberneko/xerces/dom/DocumentImpl.java b/src/main/java/org/htmlunit/cyberneko/xerces/dom/DocumentImpl.java
@@ -14,6 +14,7 @@
  */
 package org.htmlunit.cyberneko.xerces.dom;
 
+import org.htmlunit.cyberneko.xerces.util.DOMMessageFormatter;
 import org.w3c.dom.Attr;
 import org.w3c.dom.DOMException;
 import org.w3c.dom.DOMImplementation;

diff --git a/src/main/java/org/htmlunit/cyberneko/xerces/dom/ElementImpl.java b/src/main/java/org/htmlunit/cyberneko/xerces/dom/ElementImpl.java
@@ -14,6 +14,7 @@
  */
 package org.htmlunit.cyberneko.xerces.dom;
 
+import org.htmlunit.cyberneko.xerces.util.DOMMessageFormatter;
 import org.htmlunit.cyberneko.xerces.util.URI;
 import org.w3c.dom.Attr;
 import org.w3c.dom.DOMException;

diff --git a/src/main/java/org/htmlunit/cyberneko/xerces/dom/ElementNSImpl.java b/src/main/java/org/htmlunit/cyberneko/xerces/dom/ElementNSImpl.java
@@ -14,6 +14,7 @@
  */
 package org.htmlunit.cyberneko.xerces.dom;
 
+import org.htmlunit.cyberneko.xerces.util.DOMMessageFormatter;
 import org.htmlunit.cyberneko.xerces.xni.NamespaceContext;
 import org.w3c.dom.Attr;
 import org.w3c.dom.DOMException;

diff --git a/src/main/java/org/htmlunit/cyberneko/xerces/dom/NamedNodeMapImpl.java b/src/main/java/org/htmlunit/cyberneko/xerces/dom/NamedNodeMapImpl.java
@@ -17,6 +17,7 @@
 import java.util.List;
 
 import org.htmlunit.cyberneko.util.SimpleArrayList;
+import org.htmlunit.cyberneko.xerces.util.DOMMessageFormatter;
 import org.w3c.dom.DOMException;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;

diff --git a/src/main/java/org/htmlunit/cyberneko/xerces/dom/NodeImpl.java b/src/main/java/org/htmlunit/cyberneko/xerces/dom/NodeImpl.java
@@ -14,6 +14,7 @@
  */
 package org.htmlunit.cyberneko.xerces.dom;
 
+import org.htmlunit.cyberneko.xerces.util.DOMMessageFormatter;
 import org.w3c.dom.DOMException;
 import org.w3c.dom.Document;
 import org.w3c.dom.DocumentType;

diff --git a/src/main/java/org/htmlunit/cyberneko/xerces/dom/ParentNode.java b/src/main/java/org/htmlunit/cyberneko/xerces/dom/ParentNode.java
@@ -14,6 +14,7 @@
  */
 package org.htmlunit.cyberneko.xerces.dom;
 
+import org.htmlunit.cyberneko.xerces.util.DOMMessageFormatter;
 import org.w3c.dom.DOMException;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;

diff --git a/src/main/java/org/htmlunit/cyberneko/xerces/dom/TextImpl.java b/src/main/java/org/htmlunit/cyberneko/xerces/dom/TextImpl.java
@@ -14,6 +14,7 @@
  */
 package org.htmlunit.cyberneko.xerces.dom;
 
+import org.htmlunit.cyberneko.xerces.util.DOMMessageFormatter;
 import org.w3c.dom.DOMException;
 import org.w3c.dom.Node;
 import org.w3c.dom.Text;

diff --git a/src/main/java/org/htmlunit/cyberneko/xerces/parsers/AbstractDOMParser.java b/src/main/java/org/htmlunit/cyberneko/xerces/parsers/AbstractDOMParser.java
@@ -20,9 +20,9 @@
 
 import org.htmlunit.cyberneko.xerces.dom.AttrImpl;
 import org.htmlunit.cyberneko.xerces.dom.CoreDocumentImpl;
-import org.htmlunit.cyberneko.xerces.dom.DOMMessageFormatter;
 import org.htmlunit.cyberneko.xerces.dom.DocumentImpl;
 import org.htmlunit.cyberneko.xerces.dom.TextImpl;
+import org.htmlunit.cyberneko.xerces.util.DOMMessageFormatter;
 import org.htmlunit.cyberneko.xerces.util.ErrorHandlerWrapper;
 import org.htmlunit.cyberneko.xerces.util.SAXMessageFormatter;
 import org.htmlunit.cyberneko.xerces.xni.Augmentations;

diff --git a/...rneko/xerces/dom/DOMMessageFormatter.java → ...neko/xerces/util/DOMMessageFormatter.java b/...rneko/xerces/dom/DOMMessageFormatter.java → ...neko/xerces/util/DOMMessageFormatter.java
@@ -12,7 +12,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.htmlunit.cyberneko.xerces.dom;
+package org.htmlunit.cyberneko.xerces.util;
 
 import java.util.MissingResourceException;
 import java.util.ResourceBundle;
@@ -25,7 +25,7 @@
  */
 public final class DOMMessageFormatter {
 
-    private static ResourceBundle DomResourceBundle_ = ResourceBundle.getBundle("org.htmlunit.cyberneko.xerces.impl.msg.DOMMessages");
+    private static ResourceBundle DomResourceBundle_ = ResourceBundle.getBundle("org.htmlunit.cyberneko.res.DOMMessages");
 
     private DOMMessageFormatter() {
     }

diff --git a/src/main/java/org/htmlunit/cyberneko/xerces/util/SAXMessageFormatter.java b/src/main/java/org/htmlunit/cyberneko/xerces/util/SAXMessageFormatter.java
@@ -24,7 +24,7 @@
  */
 public final class SAXMessageFormatter {
 
-    private static final ResourceBundle SAXResourceBundle_ = ResourceBundle.getBundle("org.htmlunit.cyberneko.xerces.impl.msg.SAXMessages");
+    private static final ResourceBundle SAXResourceBundle_ = ResourceBundle.getBundle("org.htmlunit.cyberneko.res.SAXMessages");
 
     private SAXMessageFormatter() {
     }

diff --git a/...ko/xerces/impl/msg/DOMMessages.properties → ...unit/cyberneko/res/DOMMessages.properties b/...ko/xerces/impl/msg/DOMMessages.properties → ...unit/cyberneko/res/DOMMessages.properties
diff --git a/...ko/xerces/impl/msg/SAXMessages.properties → ...unit/cyberneko/res/SAXMessages.properties b/...ko/xerces/impl/msg/SAXMessages.properties → ...unit/cyberneko/res/SAXMessages.properties