Skip to content

Commit

Permalink
Change reserved DOTJ068E to DOTJ069E #2227
Browse files Browse the repository at this point in the history
  • Loading branch information
jelovirt committed Apr 11, 2016
1 parent 634761c commit ec3f70d
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion src/main/java/org/dita/dost/reader/KeyrefReader.java
Expand Up @@ -287,7 +287,7 @@ private void handleCircularDefinitionException(final List<KeyDef> circularityTra
}
sb.append(circularityTracker.get(0).keys);
final MessageBean ex = MessageUtils.getInstance()
.getMessage("DOTJ068E", sb.toString())
.getMessage("DOTJ069E", sb.toString())
.setLocation(circularityTracker.get(0).element);
logger.error(ex.toString(), ex.toException());
}
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/messages_template.xml
Expand Up @@ -319,7 +319,7 @@
<response></response>
</message>

<message id="DOTJ068E" type="ERROR">
<message id="DOTJ069E" type="ERROR">
<reason>Circular key definition %1.</reason>
<response></response>
</message>
Expand Down
8 changes: 4 additions & 4 deletions src/test/java/org/dita/dost/reader/TestKeyrefReader.java
Expand Up @@ -448,7 +448,7 @@ public void testSingleCircular() throws DITAOTException {
keyrefreader.read(filename.toURI(), readMap(filename));

assertEquals(1, logger.getMessages().size());
assertEquals("[DOTJ068E][ERROR] Circular key definition same -> same.", logger.getMessages().get(0).message);
assertEquals("[DOTJ069E][ERROR] Circular key definition same -> same.", logger.getMessages().get(0).message);
}

@Test
Expand All @@ -467,9 +467,9 @@ public void testCircular() throws DITAOTException {
act.add(msg.message);
}
assertEquals(new HashSet<>(Arrays.asList(
"[DOTJ068E][ERROR] Circular key definition first -> second -> third -> first.",
"[DOTJ068E][ERROR] Circular key definition second -> third -> first -> second.",
"[DOTJ068E][ERROR] Circular key definition third -> first -> second -> third.")),
"[DOTJ069E][ERROR] Circular key definition first -> second -> third -> first.",
"[DOTJ069E][ERROR] Circular key definition second -> third -> first -> second.",
"[DOTJ069E][ERROR] Circular key definition third -> first -> second -> third.")),
act);
}

Expand Down
2 changes: 1 addition & 1 deletion src/test/resources/messages.xml
Expand Up @@ -419,7 +419,7 @@
<response></response>
</message>

<message id="DOTJ068E" type="ERROR">
<message id="DOTJ069E" type="ERROR">
<reason>Circular key definition %1.</reason>
<response></response>
</message>
Expand Down

0 comments on commit ec3f70d

Please sign in to comment.