opensource
/
fine-third
1
0
Fork 1
Code Issues Pull Requests Releases Wiki Activity
Browse Source

Merge pull request #31 in CORE/base-third from ~ZACK/base-third:feature/10.0 to feature/10.0 

* commit 'c102cfcb0bf42bd1b012d52f9b5d56200aa46d5d':
  rt
  REPORT-6935 打包失败
10.0
superman 7 years ago
parent
1dc91a4f47 c102cfcb0b
commit
57c49ead19
7 changed files with 51 additions and 57 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      fine-cssparser/src/com/fr/third/steadystate/css/dom/DOMExceptionImpl.java
  2. 33
      fine-cssparser/src/com/fr/third/steadystate/css/parser/AbstractSACParser.java
  3. 43
      fine-cssparser/src/com/fr/third/steadystate/css/parser/CSSOMParser.java
  4. 7
      fine-cssparser/src/com/fr/third/steadystate/css/parser/SACParserCSS1.java
  5. 3
      fine-cssparser/src/com/fr/third/steadystate/css/parser/SACParserCSS2.java
  6. 3
      fine-cssparser/src/com/fr/third/steadystate/css/parser/SACParserCSS21.java
  7. 13
      fine-cssparser/src/com/fr/third/steadystate/css/parser/SACParserCSS3.java

6
fine-cssparser/src/com/fr/third/steadystate/css/dom/DOMExceptionImpl.java
Unescape View File

@ -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) {

33
fine-cssparser/src/com/fr/third/steadystate/css/parser/AbstractSACParser.java
Unescape View File

@ -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) {

43
fine-cssparser/src/com/fr/third/steadystate/css/parser/CSSOMParser.java
Unescape View File

@ -15,14 +15,22 @@
package com.fr.third.steadystate.css.parser;
import java.io.IOException;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.util.Stack;
import java.util.logging.Logger;
import com.fr.third.steadystate.css.dom.CSSCharsetRuleImpl;
import com.fr.third.steadystate.css.dom.CSSFontFaceRuleImpl;
import com.fr.third.steadystate.css.dom.CSSImportRuleImpl;
import com.fr.third.steadystate.css.dom.CSSMediaRuleImpl;
import com.fr.third.steadystate.css.dom.CSSOMObject;
import com.fr.third.steadystate.css.dom.CSSPageRuleImpl;
import com.fr.third.steadystate.css.dom.CSSRuleListImpl;
import com.fr.third.steadystate.css.dom.CSSStyleDeclarationImpl;
import com.fr.third.steadystate.css.dom.CSSStyleRuleImpl;
import com.fr.third.steadystate.css.dom.CSSStyleSheetImpl;
import com.fr.third.steadystate.css.dom.CSSUnknownRuleImpl;
import com.fr.third.steadystate.css.dom.CSSValueImpl;
import com.fr.third.steadystate.css.dom.MediaListImpl;
import com.fr.third.steadystate.css.dom.Property;
import com.fr.third.steadystate.css.sac.DocumentHandlerExt;
import com.fr.third.steadystate.css.userdata.UserDataConstants;
import org.w3c.css.sac.CSSException;
import org.w3c.css.sac.ErrorHandler;
import org.w3c.css.sac.InputSource;
@ -39,20 +47,11 @@ import org.w3c.dom.css.CSSStyleDeclaration;
import org.w3c.dom.css.CSSStyleSheet;
import org.w3c.dom.css.CSSValue;
import com.fr.third.steadystate.css.dom.CSSCharsetRuleImpl;
import com.fr.third.steadystate.css.dom.CSSFontFaceRuleImpl;
import com.fr.third.steadystate.css.dom.CSSMediaRuleImpl;
import com.fr.third.steadystate.css.dom.CSSOMObject;
import com.fr.third.steadystate.css.dom.CSSPageRuleImpl;
import com.fr.third.steadystate.css.dom.CSSRuleListImpl;
import com.fr.third.steadystate.css.dom.CSSStyleDeclarationImpl;
import com.fr.third.steadystate.css.dom.CSSStyleRuleImpl;
import com.fr.third.steadystate.css.dom.CSSStyleSheetImpl;
import com.fr.third.steadystate.css.dom.CSSUnknownRuleImpl;
import com.fr.third.steadystate.css.dom.CSSValueImpl;
import com.fr.third.steadystate.css.dom.MediaListImpl;
import com.fr.third.steadystate.css.dom.Property;
import com.fr.third.steadystate.css.userdata.UserDataConstants;
import java.io.IOException;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.util.Stack;
import java.util.logging.Logger;
/**
* @author <a href="mailto:davidsch@users.sourceforge.net">David Schweinsberg</a>
@ -60,7 +59,7 @@ import com.fr.third.steadystate.css.userdata.UserDataConstants;
public class CSSOMParser {
private static final Object LOCK = new Object();
private static final String DEFAULT_PARSER = "com.steadystate.css.parser.SACParserCSS21";
private static final String DEFAULT_PARSER = "com.fr.third.steadystate.css.parser.SACParserCSS21";
private static String LastFailed_;
@ -102,7 +101,7 @@ public class CSSOMParser {
}
}
catch (final Exception e) {
final Logger log = Logger.getLogger("com.steadystate.css");
final Logger log = Logger.getLogger("com.fr.third.steadystate.css");
log.warning(e.toString());
log.warning("using the default 'SACParserCSS21' instead");
log.throwing("CSSOMParser", "consturctor", e);

7
fine-cssparser/src/com/fr/third/steadystate/css/parser/SACParserCSS1.java
Unescape View File

@ -6,7 +6,6 @@ import org.w3c.css.sac.CSSParseException;
import org.w3c.css.sac.Condition;
import org.w3c.css.sac.LexicalUnit;
import org.w3c.css.sac.Locator;
import org.w3c.css.sac.Parser;
import org.w3c.css.sac.Selector;
import org.w3c.css.sac.SelectorList;
import org.w3c.css.sac.SimpleSelector;
@ -619,7 +618,7 @@ throw toCSSParseException("invalidSelector", e);
break;
}
case HASH:{
simpleSel = ((com.steadystate.css.parser.selectors.SelectorFactoryImpl) getSelectorFactory()).createSyntheticElementSelector();
simpleSel = ((com.fr.third.steadystate.css.parser.selectors.SelectorFactoryImpl) getSelectorFactory()).createSyntheticElementSelector();
c = hash(c);
switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
case DOT:{
@ -644,7 +643,7 @@ simpleSel = ((com.steadystate.css.parser.selectors.SelectorFactoryImpl) getSelec
break;
}
case DOT:{
simpleSel = ((com.steadystate.css.parser.selectors.SelectorFactoryImpl) getSelectorFactory()).createSyntheticElementSelector();
simpleSel = ((com.fr.third.steadystate.css.parser.selectors.SelectorFactoryImpl) getSelectorFactory()).createSyntheticElementSelector();
c = _class(c);
switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
case LINK_PSCLASS:
@ -662,7 +661,7 @@ simpleSel = ((com.steadystate.css.parser.selectors.SelectorFactoryImpl) getSelec
case LINK_PSCLASS:
case VISITED_PSCLASS:
case ACTIVE_PSCLASS:{
simpleSel = ((com.steadystate.css.parser.selectors.SelectorFactoryImpl) getSelectorFactory()).createSyntheticElementSelector();
simpleSel = ((com.fr.third.steadystate.css.parser.selectors.SelectorFactoryImpl) getSelectorFactory()).createSyntheticElementSelector();
c = pseudoClass(c);
break;
}

3
fine-cssparser/src/com/fr/third/steadystate/css/parser/SACParserCSS2.java
Unescape View File

@ -6,7 +6,6 @@ import org.w3c.css.sac.CSSParseException;
import org.w3c.css.sac.Condition;
import org.w3c.css.sac.LexicalUnit;
import org.w3c.css.sac.Locator;
import org.w3c.css.sac.Parser;
import org.w3c.css.sac.Selector;
import org.w3c.css.sac.SelectorList;
import org.w3c.css.sac.SimpleSelector;
@ -1265,7 +1264,7 @@ if (o instanceof Condition)
case COLON:
case LSQUARE:
case HASH:{
simpleSel = ((com.steadystate.css.parser.selectors.SelectorFactoryImpl) getSelectorFactory()).createSyntheticElementSelector();
simpleSel = ((com.fr.third.steadystate.css.parser.selectors.SelectorFactoryImpl) getSelectorFactory()).createSyntheticElementSelector();
label_41:
while (true) {
switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {

3
fine-cssparser/src/com/fr/third/steadystate/css/parser/SACParserCSS21.java
Unescape View File

@ -6,7 +6,6 @@ import org.w3c.css.sac.CSSParseException;
import org.w3c.css.sac.Condition;
import org.w3c.css.sac.LexicalUnit;
import org.w3c.css.sac.Locator;
import org.w3c.css.sac.Parser;
import org.w3c.css.sac.Selector;
import org.w3c.css.sac.SelectorList;
import org.w3c.css.sac.SimpleSelector;
@ -1133,7 +1132,7 @@ if (o instanceof Condition)
case COLON:
case LSQUARE:
case HASH:{
simpleSel = ((com.steadystate.css.parser.selectors.SelectorFactoryImpl) getSelectorFactory()).createSyntheticElementSelector();
simpleSel = ((com.fr.third.steadystate.css.parser.selectors.SelectorFactoryImpl) getSelectorFactory()).createSyntheticElementSelector();
label_32:
while (true) {
switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {

13
fine-cssparser/src/com/fr/third/steadystate/css/parser/SACParserCSS3.java
Unescape View File

@ -2,9 +2,6 @@
/* Generated By:JavaCC: Do not edit this line. SACParserCSS3.java */
package com.fr.third.steadystate.css.parser;
import java.util.LinkedList;
import java.util.Locale;
import com.fr.third.steadystate.css.dom.CSSValueImpl;
import com.fr.third.steadystate.css.dom.Property;
import com.fr.third.steadystate.css.format.CSSFormatable;
@ -14,11 +11,13 @@ import org.w3c.css.sac.CSSParseException;
import org.w3c.css.sac.Condition;
import org.w3c.css.sac.LexicalUnit;
import org.w3c.css.sac.Locator;
import org.w3c.css.sac.Parser;
import org.w3c.css.sac.Selector;
import org.w3c.css.sac.SelectorList;
import org.w3c.css.sac.SimpleSelector;
import java.util.LinkedList;
import java.util.Locale;
/**
* @author <a href="mailto:davidsch@users.sourceforge.net">David Schweinsberg</a>
* @author waldbaer
@ -1797,15 +1796,15 @@ Condition c = null;
c = getConditionFactory().createBeginHyphenAttributeCondition(name, null, null != value, value);
break;
case 4:
c = ((com.steadystate.css.parser.selectors.ConditionFactoryImpl) getConditionFactory())
c = ((com.fr.third.steadystate.css.parser.selectors.ConditionFactoryImpl) getConditionFactory())
.createPrefixAttributeCondition(name, null, null != value, value);
break;
case 5:
c = ((com.steadystate.css.parser.selectors.ConditionFactoryImpl) getConditionFactory())
c = ((com.fr.third.steadystate.css.parser.selectors.ConditionFactoryImpl) getConditionFactory())
.createSuffixAttributeCondition(name, null, null != value, value);
break;
case 6:
c = ((com.steadystate.css.parser.selectors.ConditionFactoryImpl) getConditionFactory())
c = ((com.fr.third.steadystate.css.parser.selectors.ConditionFactoryImpl) getConditionFactory())
.createSubstringAttributeCondition(name, null, null != value, value);
break;
}

Write Preview
Loading…
Cancel
Save