Commits

petermr committed ad70b17

merged with old JC

Comments (0)

Files changed (3)

jc-top-core/.classpath

 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" output="target/classes" path="src/main/java"/>
+	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>
 	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
 	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>

jc-top-core/src/main/java/org/xmlcml/cml/converters/cml/CMLLiteHelper.java

 
 public class CMLLiteHelper {
 
+	private static final String REPLACEABLE_CHARS = "[&^%$�\"!(),;'/#~=+*{}\\[\\]]";
 	private static final Logger LOG = Logger.getLogger(CMLLiteHelper.class);
 	private static Set<Class<? extends CMLElement>> cmlLiteClassSet = new HashSet<Class<? extends CMLElement>>(); 
 	static {
 
 	private void normalizeId(Attribute idAtt) {
 		String value = idAtt.getValue();
-		value = value.replaceAll("[&^%$�\"!(),;'/#~=+*{}\\[\\]]", "_");
+		value = value.replaceAll(REPLACEABLE_CHARS, CMLConstants.S_UNDER);
 		idAtt.setValue(value);
 	}
 	

jc-top-core/src/main/resources/META-INF/jumbo-converters

-org.xmlcml.cml.converters.CoreConverterModule
 org.xmlcml.cml.converters.cml.CMLModule