Make NestingCondition a Singleton, simplify code

Author: carlosame

src/main/java/io/sf/carte/doc/style/css/parser/CSSParser.java

@@ -3009,20 +3009,12 @@ protected void handleStarHack(int index, CharSequence word) {
 						.getParentManager();
 				PropertyNameTokenHandler starhackHandler = mgr.new PropertyNameTokenHandler() {
 
+					/**
+					 * Callers must check for non-empty buffer.
+					 */
 					@Override
 					void processBuffer(int index, int triggerCp) {
-						String raw = buffer.toString();
-						if (!isEscapedIdent()) {
-							getManager().propertyName = raw;
-							buffer.setLength(0);
-						} else {
-							getManager().propertyName = unescapeBuffer(index);
-							if (!parseError && !isValidIdentifier(propertyName)) {
-								handleWarning(index - buffer.length(),
-										ParseHelper.WARN_PROPERTY_NAME,
-										"Suspicious property name: " + raw);
-							}
-						}
+						getManager().propertyName = unescapeBuffer(index);
 						setWhitespacePrevCp();
 					}
 
@@ -3340,7 +3332,6 @@ public void endManagement(int index) {
 					SelectorListImpl selist = selectorHandler.getSelectorList();
 					if (!selist.isEmpty()) {
 						handler.endSelector(selist);
-						//selectorHandler.selist = selectorHandler.new ParserSelectorListImpl();
 					}
 					resetFields();
 					yieldManagement(BlockContentsDeclarationManager.this);
@@ -3351,7 +3342,6 @@ public void endOfStream(int len) {
 					SelectorListImpl selist = selectorHandler.getSelectorList();
 					if (!selist.isEmpty()) {
 						handler.endSelector(selist);
-						//selectorHandler.selist = selectorHandler.new ParserSelectorListImpl();
 					}
 					BlockContentsManager.this.endOfStream(len);
 				}

src/main/java/io/sf/carte/doc/style/css/parser/NSACSelectorFactory.java

@@ -591,7 +591,7 @@ Condition createCondition(Condition.ConditionType type) {
 		case POSITIONAL:
 			return createPositionalCondition();
 		case NESTING:
-			return new NestingCondition();
+			return NestingCondition.getInstance();
 		}
 		return null;
 	}

src/main/java/io/sf/carte/doc/style/css/parser/NestingCondition.java

@@ -18,10 +18,16 @@ class NestingCondition extends AbstractCondition {
 
 	private static final long serialVersionUID = 1L;
 
-	NestingCondition() {
+	private static final NestingCondition instance = new NestingCondition();
+
+	private NestingCondition() {
 		super();
 	}
 
+	public static Condition getInstance() {
+		return instance;
+	}
+
 	@Override
 	Condition replace(SelectorList base, MutableBoolean replaced) {
 		replaced.setTrueValue();
@@ -38,6 +44,22 @@ public ConditionType getConditionType() {
 		return ConditionType.NESTING;
 	}
 
+	@Override
+	public int hashCode() {
+		return ConditionType.NESTING.hashCode();
+	}
+
+	@Override
+	public boolean equals(Object obj) {
+		if (this == obj) {
+			return true;
+		}
+		if (obj == null) {
+			return false;
+		}
+		return getClass() == obj.getClass();
+	}
+
 	@Override
 	public String toString() {
 		return "&";

src/test/java/io/sf/carte/doc/style/css/parser/SelectorListImplTest.java

@@ -312,6 +312,22 @@ public void testReplaceNestedList() {
 		assertEquals(":is(p:last-child,div.cls)", replaced.toString());
 	}
 
+	@Test
+	public void testEquals() {
+		SelectorList selist = parseSelectors("p:last-child,div.cls");
+		SelectorList selist2 = parseSelectors("p:last-child,div.cls");
+
+		assertEquals(selist, selist2);
+	}
+
+	@Test
+	public void testEqualsNested() {
+		SelectorList selist = parseSelectors("&:last-child,&.cls");
+		SelectorList selist2 = parseSelectors("&:last-child,&.cls");
+
+		assertEquals(selist, selist2);
+	}
+
 	private SelectorList parseSelectors(String selist) throws CSSException {
 		try {
 			return parser.parseSelectors(new StringReader(selist));