From 5b52f761d89bc16d03e658f36e039c80cd162da1 Mon Sep 17 00:00:00 2001 From: Olyutorskii Date: Tue, 2 Jul 2019 22:24:46 +0900 Subject: [PATCH] Upgrade ToaGem to 3.122.2 --- pom.xml | 2 +- .../sfjp/mikutoga/vmd/model/xml/Schema110820.java | 35 +++--------------- .../sfjp/mikutoga/vmd/model/xml/Schema130609.java | 35 +++--------------- .../mikutoga/vmd/model/xml/VmdXmlExporter.java | 4 +-- .../jp/sfjp/mikutoga/vmd2xml/XmlInputUtil.java | 41 +++++++++++----------- 5 files changed, 31 insertions(+), 86 deletions(-) diff --git a/pom.xml b/pom.xml index 6052eee..32252cc 100644 --- a/pom.xml +++ b/pom.xml @@ -129,7 +129,7 @@ jp.sourceforge.mikutoga togagem - 3.121.2 + 3.122.2 compile diff --git a/src/main/java/jp/sfjp/mikutoga/vmd/model/xml/Schema110820.java b/src/main/java/jp/sfjp/mikutoga/vmd/model/xml/Schema110820.java index b5f450f..0ce4c06 100644 --- a/src/main/java/jp/sfjp/mikutoga/vmd/model/xml/Schema110820.java +++ b/src/main/java/jp/sfjp/mikutoga/vmd/model/xml/Schema110820.java @@ -9,15 +9,11 @@ package jp.sfjp.mikutoga.vmd.model.xml; import java.net.URI; import java.net.URISyntaxException; -import jp.sfjp.mikutoga.xml.LocalXmlResource; /** * 110820形式XML各種リソースの定義。 */ -public final class Schema110820 implements LocalXmlResource{ - - /** 唯一のシングルトン。 */ - public static final Schema110820 SINGLETON; +public final class Schema110820{ /** XML名前空間識別子。 */ public static final String NS_VMDXML = @@ -32,8 +28,8 @@ public final class Schema110820 implements LocalXmlResource{ public static final String LOCAL_SCHEMA_VMDXML = "resources/vmdxml-110820.xsd"; - private static final URI URI_SCHEMA_VMDXML = URI.create(SCHEMA_VMDXML); - private static final URI RES_SCHEMA_VMDXML; + public static final URI URI_SCHEMA_VMDXML = URI.create(SCHEMA_VMDXML); + public static final URI RES_SCHEMA_VMDXML; private static final Class THISCLASS = Schema110820.class; @@ -44,8 +40,6 @@ public final class Schema110820 implements LocalXmlResource{ }catch(URISyntaxException e){ throw new ExceptionInInitializerError(e); } - - SINGLETON = new Schema110820(); } @@ -53,28 +47,7 @@ public final class Schema110820 implements LocalXmlResource{ * コンストラクタ。 */ private Schema110820(){ - super(); - assert this.getClass() == THISCLASS; - return; - } - - - /** - * {@inheritDoc} - * @return {@inheritDoc} - */ - @Override - public URI getOriginalResource(){ - return URI_SCHEMA_VMDXML; - } - - /** - * {@inheritDoc} - * @return {@inheritDoc} - */ - @Override - public URI getLocalResource(){ - return RES_SCHEMA_VMDXML; + assert false; } } diff --git a/src/main/java/jp/sfjp/mikutoga/vmd/model/xml/Schema130609.java b/src/main/java/jp/sfjp/mikutoga/vmd/model/xml/Schema130609.java index 987437e..3d00d5e 100644 --- a/src/main/java/jp/sfjp/mikutoga/vmd/model/xml/Schema130609.java +++ b/src/main/java/jp/sfjp/mikutoga/vmd/model/xml/Schema130609.java @@ -9,16 +9,12 @@ package jp.sfjp.mikutoga.vmd.model.xml; import java.net.URI; import java.net.URISyntaxException; -import jp.sfjp.mikutoga.xml.LocalXmlResource; /** * 130609形式XML各種リソースの定義。 *

MikuMikuDance Ver7.40 の新VMDファイルフォーマット対応。 */ -public final class Schema130609 implements LocalXmlResource{ - - /** 唯一のシングルトン。 */ - public static final Schema130609 SINGLETON; +public final class Schema130609{ /** XML名前空間識別子。 */ public static final String NS_VMDXML = @@ -33,8 +29,8 @@ public final class Schema130609 implements LocalXmlResource{ public static final String LOCAL_SCHEMA_VMDXML = "resources/vmdxml-130609.xsd"; - private static final URI URI_SCHEMA_VMDXML = URI.create(SCHEMA_VMDXML); - private static final URI RES_SCHEMA_VMDXML; + public static final URI URI_SCHEMA_VMDXML = URI.create(SCHEMA_VMDXML); + public static final URI RES_SCHEMA_VMDXML; private static final Class THISCLASS = Schema130609.class; @@ -45,8 +41,6 @@ public final class Schema130609 implements LocalXmlResource{ }catch(URISyntaxException e){ throw new ExceptionInInitializerError(e); } - - SINGLETON = new Schema130609(); } @@ -54,28 +48,7 @@ public final class Schema130609 implements LocalXmlResource{ * コンストラクタ。 */ private Schema130609(){ - super(); - assert this.getClass() == THISCLASS; - return; - } - - - /** - * {@inheritDoc} - * @return {@inheritDoc} - */ - @Override - public URI getOriginalResource(){ - return URI_SCHEMA_VMDXML; - } - - /** - * {@inheritDoc} - * @return {@inheritDoc} - */ - @Override - public URI getLocalResource(){ - return RES_SCHEMA_VMDXML; + assert false; } } diff --git a/src/main/java/jp/sfjp/mikutoga/vmd/model/xml/VmdXmlExporter.java b/src/main/java/jp/sfjp/mikutoga/vmd/model/xml/VmdXmlExporter.java index 165e209..c2ca40e 100644 --- a/src/main/java/jp/sfjp/mikutoga/vmd/model/xml/VmdXmlExporter.java +++ b/src/main/java/jp/sfjp/mikutoga/vmd/model/xml/VmdXmlExporter.java @@ -24,7 +24,7 @@ import jp.sfjp.mikutoga.vmd.model.MorphMotion; import jp.sfjp.mikutoga.vmd.model.PosCurve; import jp.sfjp.mikutoga.vmd.model.VmdMotion; import jp.sfjp.mikutoga.xml.BasicXmlExporter; -import jp.sfjp.mikutoga.xml.XmlResourceResolver; +import jp.sfjp.mikutoga.xml.SchemaUtil; /** * VMDモーションデータをXMLへエクスポートする。 @@ -217,7 +217,7 @@ public class VmdXmlExporter extends BasicXmlExporter { ind().putOpenSTag(VmdTag.VMD_MOTION.tag()).ln(); pushNest(); ind().putAttr("xmlns", namespace).ln(); - ind().putAttr("xmlns:" + XSINS, XmlResourceResolver.NS_XSD).ln(); + ind().putAttr("xmlns:" + XSINS, SchemaUtil.NS_XSD).ln(); ind().putRawText(XSINS).putRawText(":schemaLocation=") .putRawCh('"'); diff --git a/src/main/java/jp/sfjp/mikutoga/vmd2xml/XmlInputUtil.java b/src/main/java/jp/sfjp/mikutoga/vmd2xml/XmlInputUtil.java index 1d4303e..f965d9c 100644 --- a/src/main/java/jp/sfjp/mikutoga/vmd2xml/XmlInputUtil.java +++ b/src/main/java/jp/sfjp/mikutoga/vmd2xml/XmlInputUtil.java @@ -21,9 +21,8 @@ import javax.xml.validation.Schema; import jp.sfjp.mikutoga.vmd.model.xml.Schema110820; import jp.sfjp.mikutoga.vmd.model.xml.Schema130609; import jp.sfjp.mikutoga.xml.BotherHandler; -import jp.sfjp.mikutoga.xml.LocalXmlResource; +import jp.sfjp.mikutoga.xml.NoopEntityResolver; import jp.sfjp.mikutoga.xml.SchemaUtil; -import jp.sfjp.mikutoga.xml.XmlResourceResolver; import org.xml.sax.InputSource; import org.xml.sax.SAXException; import org.xml.sax.XMLReader; @@ -130,10 +129,7 @@ final class XmlInputUtil { SAXParser parser; try{ parser = factory.newSAXParser(); - }catch(ParserConfigurationException e){ - assert false; - throw new AssertionError(e); - }catch(SAXException e){ + }catch(ParserConfigurationException | SAXException e){ assert false; throw new AssertionError(e); } @@ -149,31 +145,36 @@ final class XmlInputUtil { * @param xmlInType 入力XML種別 * @return スキーマ */ - private static Schema builsSchema(XmlResourceResolver resolver, - MotionFileType xmlInType ){ - LocalXmlResource[] schemaArray; + private static Schema buildSchema(MotionFileType xmlInType ){ + URI[] schemaUris; switch(xmlInType){ case XML_110820: - schemaArray = new LocalXmlResource[]{ - Schema110820.SINGLETON, + schemaUris = new URI[]{ + Schema110820.RES_SCHEMA_VMDXML, }; break; case XML_130609: - schemaArray = new LocalXmlResource[]{ - Schema130609.SINGLETON, + schemaUris = new URI[]{ + Schema130609.RES_SCHEMA_VMDXML, }; break; case XML_AUTO: - schemaArray = new LocalXmlResource[]{ - Schema110820.SINGLETON, - Schema130609.SINGLETON, + schemaUris = new URI[]{ + Schema110820.RES_SCHEMA_VMDXML, + Schema130609.RES_SCHEMA_VMDXML, }; break; default: throw new IllegalStateException(); } - Schema schema = SchemaUtil.newSchema(resolver, schemaArray); + Schema schema; + try{ + schema = SchemaUtil.newSchema(schemaUris); + }catch(IOException | SAXException e){ + assert false; + throw new AssertionError(e); + } return schema; } @@ -185,9 +186,7 @@ final class XmlInputUtil { * @return XMLリーダ */ static XMLReader buildReader(MotionFileType xmlInType){ - XmlResourceResolver resolver = new XmlResourceResolver(); - - Schema schema = builsSchema(resolver, xmlInType); + Schema schema = buildSchema(xmlInType); SAXParser parser = buildParser(schema); @@ -199,7 +198,7 @@ final class XmlInputUtil { throw new AssertionError(e); } - reader.setEntityResolver(resolver); + reader.setEntityResolver(NoopEntityResolver.NOOP_RESOLVER); reader.setErrorHandler(BotherHandler.HANDLER); return reader; -- 2.11.0