From ec3f70d2a72050bc095f951c36594a5809bbb2e5 Mon Sep 17 00:00:00 2001 From: Jarno Elovirta Date: Mon, 11 Apr 2016 21:19:58 +0300 Subject: [PATCH] Change reserved DOTJ068E to DOTJ069E #2227 --- src/main/java/org/dita/dost/reader/KeyrefReader.java | 2 +- src/main/resources/messages_template.xml | 2 +- src/test/java/org/dita/dost/reader/TestKeyrefReader.java | 8 ++++---- src/test/resources/messages.xml | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/main/java/org/dita/dost/reader/KeyrefReader.java b/src/main/java/org/dita/dost/reader/KeyrefReader.java index 81d9e29f5b..81d8593ca6 100644 --- a/src/main/java/org/dita/dost/reader/KeyrefReader.java +++ b/src/main/java/org/dita/dost/reader/KeyrefReader.java @@ -287,7 +287,7 @@ private void handleCircularDefinitionException(final List 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()); } diff --git a/src/main/resources/messages_template.xml b/src/main/resources/messages_template.xml index 2e922d1bb8..21c45824fe 100644 --- a/src/main/resources/messages_template.xml +++ b/src/main/resources/messages_template.xml @@ -319,7 +319,7 @@ - + Circular key definition %1. diff --git a/src/test/java/org/dita/dost/reader/TestKeyrefReader.java b/src/test/java/org/dita/dost/reader/TestKeyrefReader.java index 0bc264b737..d0e695edfa 100644 --- a/src/test/java/org/dita/dost/reader/TestKeyrefReader.java +++ b/src/test/java/org/dita/dost/reader/TestKeyrefReader.java @@ -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 @@ -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); } diff --git a/src/test/resources/messages.xml b/src/test/resources/messages.xml index ef4e0613c5..ba7471291c 100644 --- a/src/test/resources/messages.xml +++ b/src/test/resources/messages.xml @@ -419,7 +419,7 @@ - + Circular key definition %1.