From c102cfcb0bf42bd1b012d52f9b5d56200aa46d5d Mon Sep 17 00:00:00 2001 From: zack Date: Thu, 15 Mar 2018 18:18:27 +0800 Subject: [PATCH] rt --- .../steadystate/css/dom/DOMExceptionImpl.java | 6 ++-- .../css/parser/AbstractSACParser.java | 33 +++++++++---------- 2 files changed, 19 insertions(+), 20 deletions(-) diff --git a/fine-cssparser/src/com/fr/third/steadystate/css/dom/DOMExceptionImpl.java b/fine-cssparser/src/com/fr/third/steadystate/css/dom/DOMExceptionImpl.java index 5e8318c1f..ad1143866 100644 --- a/fine-cssparser/src/com/fr/third/steadystate/css/dom/DOMExceptionImpl.java +++ b/fine-cssparser/src/com/fr/third/steadystate/css/dom/DOMExceptionImpl.java @@ -15,11 +15,11 @@ package com.fr.third.steadystate.css.dom; +import org.w3c.dom.DOMException; + import java.util.Locale; import java.util.ResourceBundle; -import org.w3c.dom.DOMException; - /** * Custom {@link DOMException} extension. * @@ -54,7 +54,7 @@ public class DOMExceptionImpl extends DOMException { private static ResourceBundle ExceptionResource_ = ResourceBundle.getBundle( - "com.steadystate.css.parser.ExceptionResource", + "com.fr.third.steadystate.css.parser.ExceptionResource", Locale.getDefault()); public DOMExceptionImpl(final short code, final int messageKey) { diff --git a/fine-cssparser/src/com/fr/third/steadystate/css/parser/AbstractSACParser.java b/fine-cssparser/src/com/fr/third/steadystate/css/parser/AbstractSACParser.java index 1d18bed73..ef73e0daf 100644 --- a/fine-cssparser/src/com/fr/third/steadystate/css/parser/AbstractSACParser.java +++ b/fine-cssparser/src/com/fr/third/steadystate/css/parser/AbstractSACParser.java @@ -15,16 +15,14 @@ package com.fr.third.steadystate.css.parser; -import java.io.IOException; -import java.io.InputStreamReader; -import java.net.URL; -import java.nio.charset.Charset; -import java.text.MessageFormat; -import java.util.Locale; -import java.util.MissingResourceException; -import java.util.ResourceBundle; - +import com.fr.third.steadystate.css.parser.selectors.ConditionFactoryImpl; +import com.fr.third.steadystate.css.parser.selectors.SelectorFactoryImpl; +import com.fr.third.steadystate.css.sac.ConditionFactoryAdapter; +import com.fr.third.steadystate.css.sac.ConditionFactoryExt; +import com.fr.third.steadystate.css.sac.DocumentHandlerAdapter; +import com.fr.third.steadystate.css.sac.DocumentHandlerExt; import com.fr.third.steadystate.css.sac.SelectorFactoryAdapter; +import com.fr.third.steadystate.css.sac.SelectorFactoryExt; import org.w3c.css.sac.CSSParseException; import org.w3c.css.sac.ConditionFactory; import org.w3c.css.sac.DocumentHandler; @@ -39,13 +37,14 @@ import org.w3c.css.sac.SelectorFactory; import org.w3c.css.sac.SelectorList; import org.w3c.dom.DOMException; -import com.fr.third.steadystate.css.parser.selectors.ConditionFactoryImpl; -import com.fr.third.steadystate.css.parser.selectors.SelectorFactoryImpl; -import com.fr.third.steadystate.css.sac.ConditionFactoryAdapter; -import com.fr.third.steadystate.css.sac.ConditionFactoryExt; -import com.fr.third.steadystate.css.sac.DocumentHandlerAdapter; -import com.fr.third.steadystate.css.sac.DocumentHandlerExt; -import com.fr.third.steadystate.css.sac.SelectorFactoryExt; +import java.io.IOException; +import java.io.InputStreamReader; +import java.net.URL; +import java.nio.charset.Charset; +import java.text.MessageFormat; +import java.util.Locale; +import java.util.MissingResourceException; +import java.util.ResourceBundle; /** * Base implementation of {@link Parser}. @@ -155,7 +154,7 @@ abstract class AbstractSACParser implements SACParser { if (sacParserMessages_ == null) { try { sacParserMessages_ = ResourceBundle.getBundle( - "com.steadystate.css.parser.SACParserMessages", + "com.fr.third.steadystate.css.parser.SACParserMessages", getLocale()); } catch (final MissingResourceException e) {