svnno****@sourc*****
svnno****@sourc*****
2009年 2月 6日 (金) 03:10:22 JST
Revision: 2624 http://svn.sourceforge.jp/view?root=jiemamy&view=rev&rev=2624 Author: daisuke_m Date: 2009-02-06 03:10:22 +0900 (Fri, 06 Feb 2009) Log Message: ----------- viewのxsi:schemaLocationを、view側のコンポーネントで指定するように変更。 Modified Paths: -------------- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/serializer/DomBuilder.java artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/ViewDomSerializerEnhancer.java -------------- next part -------------- Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/serializer/DomBuilder.java =================================================================== --- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/serializer/DomBuilder.java 2009-02-05 17:57:30 UTC (rev 2623) +++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/serializer/DomBuilder.java 2009-02-05 18:10:22 UTC (rev 2624) @@ -226,8 +226,7 @@ rootElement.setAttribute("xmlns:xsi", "http://www.w3.org/2001/XMLSchema-instance"); // FIXME locationを正式なURLに rootElement.setAttribute("xsi:schemaLocation", "" - + "http://jiemamy.org/xml/ns/core ../../main/resources/jiemamy-core.xsd " - + "http://jiemamy.org/xml/ns/view ../../main/resources/jiemamy-view.xsd"); + + "http://jiemamy.org/xml/ns/core ../../main/resources/jiemamy-core.xsd"); document.appendChild(rootElement); buildMiscSection(rootElement); Modified: artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/ViewDomSerializerEnhancer.java =================================================================== --- artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/ViewDomSerializerEnhancer.java 2009-02-05 17:57:30 UTC (rev 2623) +++ artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/ViewDomSerializerEnhancer.java 2009-02-05 18:10:22 UTC (rev 2624) @@ -96,6 +96,12 @@ if (diagramPresentations == null || diagramPresentations.size() == 0) { return document; } + + Element rootElement = document.getDocumentElement(); + // FIXME locationを正式なURLに + rootElement.setAttribute("xsi:schemaLocation", rootElement.getAttribute("xsi:schemaLocation") + + " http://jiemamy.org/xml/ns/view ../../main/resources/jiemamy-view.xsd"); + Element diagramPresentationsElement = DomUtil.newChild(document.getDocumentElement(), ViewQName.DIAGRAM_PRESENTATIONS);