Author: elvisisking Date: 2012-04-19 09:53:42 -0400 (Thu, 19 Apr 2012) New Revision: 40341 Modified: trunk/modeshape/tests/org.jboss.tools.modeshape.jcr.test/src/org/jboss/tools/modeshape/jcr/cnd/Constants.java trunk/modeshape/tests/org.jboss.tools.modeshape.jcr.test/src/org/jboss/tools/modeshape/jcr/cnd/NamespaceMappingTest.java Log: JBIDE-11575 The ModeShape Tools JCR CND Preference Page Should Show Notation Type Preview. Add more to the CND that is previewed. Corrected some minor formatting problems. Added a CndImporter that imports the JackRabbit CND Reader *.cnd file. Modified: trunk/modeshape/tests/org.jboss.tools.modeshape.jcr.test/src/org/jboss/tools/modeshape/jcr/cnd/Constants.java =================================================================== --- trunk/modeshape/tests/org.jboss.tools.modeshape.jcr.test/src/org/jboss/tools/modeshape/jcr/cnd/Constants.java 2012-04-19 13:47:13 UTC (rev 40340) +++ trunk/modeshape/tests/org.jboss.tools.modeshape.jcr.test/src/org/jboss/tools/modeshape/jcr/cnd/Constants.java 2012-04-19 13:53:42 UTC (rev 40341) @@ -226,13 +226,13 @@ + Utils.SINGLE_QUOTE + ITEM_THREE + Utils.SINGLE_QUOTE; String REQUIRED_TYPES_SHORT_VARIANT = RequiredTypes.NOTATION_PREFIX + VARIANT + RequiredTypes.NOTATION_SUFFIX; - String REQUIRED_TYPES_VARIANT = RequiredTypes.NOTATION_PREFIX + Utils.SPACE_STRING + VARIANT + RequiredTypes.NOTATION_SUFFIX; - String REQUIRED_TYPES_ONE_ITEM_FORM = RequiredTypes.NOTATION_PREFIX + Utils.SPACE_STRING + QUALIFIED_NAME1 + RequiredTypes.NOTATION_SUFFIX; + String REQUIRED_TYPES_VARIANT = RequiredTypes.NOTATION_PREFIX + VARIANT + RequiredTypes.NOTATION_SUFFIX; + String REQUIRED_TYPES_ONE_ITEM_FORM = RequiredTypes.NOTATION_PREFIX + QUALIFIED_NAME1 + RequiredTypes.NOTATION_SUFFIX; String REQUIRED_TYPES_ONE_ITEM_SHORT_FORM = RequiredTypes.NOTATION_PREFIX + QUALIFIED_NAME1 + RequiredTypes.NOTATION_SUFFIX; String REQUIRED_TYPES_THREE_ITEM_SHORT_FORM = RequiredTypes.NOTATION_PREFIX + QUALIFIED_NAME1 + ListAttributeState.ITEM_DELIM_NOTATION[NotationType.COMPACT_INDEX] + QUALIFIED_NAME2 + ListAttributeState.ITEM_DELIM_NOTATION[NotationType.COMPACT_INDEX] + QUALIFIED_NAME3 + RequiredTypes.NOTATION_SUFFIX; - String REQUIRED_TYPES_THREE_ITEM_FORM = RequiredTypes.NOTATION_PREFIX + Utils.SPACE_STRING + QUALIFIED_NAME1 + String REQUIRED_TYPES_THREE_ITEM_FORM = RequiredTypes.NOTATION_PREFIX + QUALIFIED_NAME1 + ListAttributeState.ITEM_DELIM_NOTATION[NotationType.LONG_INDEX] + QUALIFIED_NAME2 + ListAttributeState.ITEM_DELIM_NOTATION[NotationType.LONG_INDEX] + QUALIFIED_NAME3 + RequiredTypes.NOTATION_SUFFIX; Modified: trunk/modeshape/tests/org.jboss.tools.modeshape.jcr.test/src/org/jboss/tools/modeshape/jcr/cnd/NamespaceMappingTest.java =================================================================== --- trunk/modeshape/tests/org.jboss.tools.modeshape.jcr.test/src/org/jboss/tools/modeshape/jcr/cnd/NamespaceMappingTest.java 2012-04-19 13:47:13 UTC (rev 40340) +++ trunk/modeshape/tests/org.jboss.tools.modeshape.jcr.test/src/org/jboss/tools/modeshape/jcr/cnd/NamespaceMappingTest.java 2012-04-19 13:53:42 UTC (rev 40341) @@ -70,8 +70,9 @@ final String PREFIX = "prefix"; //$NON-NLS-1$ final String URI = "uri"; //$NON-NLS-1$ this.namespaceMapping = new NamespaceMapping(PREFIX, URI); - assertEquals(NamespaceMapping.NOTATION_PREFIX + PREFIX + NamespaceMapping.NOTATION_DELIMITER + '\'' + URI + '\'' - + NamespaceMapping.NOTATION_SUFFIX, this.namespaceMapping.toCndNotation(NotationType.LONG)); + assertEquals(NamespaceMapping.NOTATION_PREFIX + PREFIX + Utils.SPACE_STRING + NamespaceMapping.NOTATION_DELIMITER + + Utils.SPACE_STRING + '\'' + URI + '\'' + NamespaceMapping.NOTATION_SUFFIX, + this.namespaceMapping.toCndNotation(NotationType.LONG)); } @Test