• R/O
  • SSH
  • HTTPS

jsonic: コミット


コミットメタ情報

リビジョン1842 (tree)
日時2014-10-26 00:40:54
作者hizuno

ログメッセージ

(メッセージはありません)

変更サマリ

差分

--- trunk/jsonic-1.3/src/net/arnx/jsonic/JSON.java (revision 1841)
+++ trunk/jsonic-1.3/src/net/arnx/jsonic/JSON.java (revision 1842)
@@ -180,6 +180,7 @@
180180
181181 static final Character ROOT = '$';
182182
183+ private static final String PACKAGE_NAME = JSON.class.getName().substring(0, JSON.class.getName().lastIndexOf('.'));
183184 private static final Map<Class<?>, Formatter> FORMAT_MAP = new HashMap<Class<?>, Formatter>(50);
184185 private static final List<Formatter> FORMAT_LIST = new ArrayList<Formatter>(20);
185186 private static final Map<Class<?>, Converter> CONVERT_MAP = new HashMap<Class<?>, Converter>(50);
@@ -270,28 +271,28 @@
270271 FORMAT_LIST.add(TimeZoneFormatter.INSTANCE);
271272 FORMAT_LIST.add(CharsetFormatter.INSTANCE);
272273
273- formatter = getFormatterInstance("net.arnx.jsonic.SQLArrayFormatter", cl);
274+ formatter = getFormatterInstance(PACKAGE_NAME + ".SQLArrayFormatter", cl);
274275 if (formatter != null) FORMAT_LIST.add(formatter);
275276
276- formatter = getFormatterInstance("net.arnx.jsonic.StructFormmatter", cl);
277+ formatter = getFormatterInstance(PACKAGE_NAME + ".StructFormmatter", cl);
277278 if (formatter != null) FORMAT_LIST.add(formatter);
278279
279- formatter = getFormatterInstance("net.arnx.jsonic.RowIdFormatter", cl);
280+ formatter = getFormatterInstance(PACKAGE_NAME + ".RowIdFormatter", cl);
280281 if (formatter != null) FORMAT_LIST.add(formatter);
281282
282- formatter = getFormatterInstance("net.arnx.jsonic.ElementNodeFormatter", cl);
283+ formatter = getFormatterInstance(PACKAGE_NAME + ".ElementNodeFormatter", cl);
283284 if (formatter != null) FORMAT_LIST.add(formatter);
284285
285- formatter = getFormatterInstance("net.arnx.jsonic.TextNodeFormatter", cl);
286+ formatter = getFormatterInstance(PACKAGE_NAME + ".TextNodeFormatter", cl);
286287 if (formatter != null) FORMAT_LIST.add(formatter);
287288
288- formatter = getFormatterInstance("net.arnx.jsonic.InetAddressFormatter", cl);
289+ formatter = getFormatterInstance(PACKAGE_NAME + ".InetAddressFormatter", cl);
289290 if (formatter != null) FORMAT_LIST.add(formatter);
290291
291- formatter = getFormatterInstance("net.arnx.jsonic.DynaBeanFormatter", cl);
292+ formatter = getFormatterInstance(PACKAGE_NAME + ".DynaBeanFormatter", cl);
292293 if (formatter != null) FORMAT_LIST.add(formatter);
293294
294- formatter = getFormatterInstance("net.arnx.jsonic.TemporalFromatter", cl);
295+ formatter = getFormatterInstance(PACKAGE_NAME + ".TemporalFromatter", cl);
295296 if (formatter != null) FORMAT_LIST.add(formatter);
296297
297298 Converter converter = null;
@@ -361,10 +362,10 @@
361362 CONVERT_MAP.put(LinkedHashMap.class, MapConverter.INSTANCE);
362363 CONVERT_MAP.put(Properties.class, PropertiesConverter.INSTANCE);
363364
364- converter = getConverterInstance("net.arnx.jsonic.DayOfWeekConverter", cl);
365+ converter = getConverterInstance(PACKAGE_NAME + ".DayOfWeekConverter", cl);
365366 if (converter != null) CONVERT_LIST.add(converter);
366367
367- converter = getConverterInstance("net.arnx.jsonic.MonthConverter", cl);
368+ converter = getConverterInstance(PACKAGE_NAME + ".MonthConverter", cl);
368369 if (converter != null) CONVERT_LIST.add(converter);
369370
370371 CONVERT_LIST.add(EnumConverter.INSTANCE);
@@ -378,52 +379,52 @@
378379 CONVERT_LIST.add(CharSequenceConverter.INSTANCE);
379380 CONVERT_LIST.add(AppendableConverter.INSTANCE);
380381
381- converter = getConverterInstance("net.arnx.jsonic.InetAddressConverter", cl);
382+ converter = getConverterInstance(PACKAGE_NAME + ".InetAddressConverter", cl);
382383 if (converter != null) CONVERT_LIST.add(converter);
383384
384- converter = getConverterInstance("net.arnx.jsonic.NullableConverter", cl);
385+ converter = getConverterInstance(PACKAGE_NAME + ".NullableConverter", cl);
385386 if (converter != null) CONVERT_LIST.add(converter);
386387
387- converter = getConverterInstance("net.arnx.jsonic.DurationConverter", cl);
388+ converter = getConverterInstance(PACKAGE_NAME + ".DurationConverter", cl);
388389 if (converter != null) CONVERT_LIST.add(converter);
389390
390- converter = getConverterInstance("net.arnx.jsonic.InstantConverter", cl);
391+ converter = getConverterInstance(PACKAGE_NAME + ".InstantConverter", cl);
391392 if (converter != null) CONVERT_LIST.add(converter);
392393
393- converter = getConverterInstance("net.arnx.jsonic.LocalDateConverter", cl);
394+ converter = getConverterInstance(PACKAGE_NAME + ".LocalDateConverter", cl);
394395 if (converter != null) CONVERT_LIST.add(converter);
395396
396- converter = getConverterInstance("net.arnx.jsonic.LocalDateTimeConverter", cl);
397+ converter = getConverterInstance(PACKAGE_NAME + ".LocalDateTimeConverter", cl);
397398 if (converter != null) CONVERT_LIST.add(converter);
398399
399- converter = getConverterInstance("net.arnx.jsonic.LocalTimeConverter", cl);
400+ converter = getConverterInstance(PACKAGE_NAME + ".LocalTimeConverter", cl);
400401 if (converter != null) CONVERT_LIST.add(converter);
401402
402- converter = getConverterInstance("net.arnx.jsonic.MonthDayConverter", cl);
403+ converter = getConverterInstance(PACKAGE_NAME + ".MonthDayConverter", cl);
403404 if (converter != null) CONVERT_LIST.add(converter);
404405
405- converter = getConverterInstance("net.arnx.jsonic.OffsetDateTimeConverter", cl);
406+ converter = getConverterInstance(PACKAGE_NAME + ".OffsetDateTimeConverter", cl);
406407 if (converter != null) CONVERT_LIST.add(converter);
407408
408- converter = getConverterInstance("net.arnx.jsonic.OffsetTimeConverter", cl);
409+ converter = getConverterInstance(PACKAGE_NAME + ".OffsetTimeConverter", cl);
409410 if (converter != null) CONVERT_LIST.add(converter);
410411
411- converter = getConverterInstance("net.arnx.jsonic.PeriodConverter", cl);
412+ converter = getConverterInstance(PACKAGE_NAME + ".PeriodConverter", cl);
412413 if (converter != null) CONVERT_LIST.add(converter);
413414
414- converter = getConverterInstance("net.arnx.jsonic.YearConverter", cl);
415+ converter = getConverterInstance(PACKAGE_NAME + ".YearConverter", cl);
415416 if (converter != null) CONVERT_LIST.add(converter);
416417
417- converter = getConverterInstance("net.arnx.jsonic.YearMonthConverter", cl);
418+ converter = getConverterInstance(PACKAGE_NAME + ".YearMonthConverter", cl);
418419 if (converter != null) CONVERT_LIST.add(converter);
419420
420- converter = getConverterInstance("net.arnx.jsonic.ZonedDateTimeConverter", cl);
421+ converter = getConverterInstance(PACKAGE_NAME + ".ZonedDateTimeConverter", cl);
421422 if (converter != null) CONVERT_LIST.add(converter);
422423
423- converter = getConverterInstance("net.arnx.jsonic.ZoneIdConverter", cl);
424+ converter = getConverterInstance(PACKAGE_NAME + ".ZoneIdConverter", cl);
424425 if (converter != null) CONVERT_LIST.add(converter);
425426
426- converter = getConverterInstance("net.arnx.jsonic.ZoneOffsetConverter", cl);
427+ converter = getConverterInstance(PACKAGE_NAME + ".ZoneOffsetConverter", cl);
427428 if (converter != null) CONVERT_LIST.add(converter);
428429 }
429430
@@ -1154,7 +1155,7 @@
11541155 }
11551156
11561157 String getMessage(String id, Object... args) {
1157- ResourceBundle bundle = ResourceBundle.getBundle("net.arnx.jsonic.Messages", locale);
1158+ ResourceBundle bundle = ResourceBundle.getBundle(PACKAGE_NAME + ".Messages", locale);
11581159 return MessageFormat.format(bundle.getString(id), args);
11591160 }
11601161
@@ -1349,7 +1350,7 @@
13491350 propertyStyle = JSON.this.propertyStyle;
13501351 enumStyle = JSON.this.enumStyle;
13511352
1352- cache = new LocalCache("net.arnx.jsonic.Messages", locale, timeZone);
1353+ cache = new LocalCache(PACKAGE_NAME + ".Messages", locale, timeZone);
13531354 }
13541355 }
13551356
@@ -1714,8 +1715,7 @@
17141715 }
17151716
17161717 String getMessage(String id, Object... args) {
1717- ResourceBundle bundle = ResourceBundle.getBundle("net.arnx.jsonic.Messages", locale);
1718- return MessageFormat.format(bundle.getString(id), args);
1718+ return cache.getMessage(id, args);
17191719 }
17201720 }
17211721
--- trunk/jsonic-1.3/docs/index.html (revision 1841)
+++ trunk/jsonic-1.3/docs/index.html (revision 1842)
@@ -865,10 +865,11 @@
865865
866866 <h2 id="releasenote">リリースノート</h2>
867867
868-<h3>2014/6/28 version 1.3.6</h3>
868+<h3>2014/10/26 version 1.3.6</h3>
869869 <ul>
870870 <li>[仕様変更] RFC 7159 の発行に伴い、文字列、数値、true/false/null をルート要素として許容するよう変更しました。</li>
871871 <li>[機能追加] Java8 Date/Time API(JSR 310) に対応しました。</li>
872+<li>[改善] JSONICをリパッケージした際、メッセージの取得に失敗する問題を修正しました。</li>
872873 </ul>
873874
874875 <h3>2014/5/25 version 1.3.5</h3>
旧リポジトリブラウザで表示