Skip to content

Commit 42ff341

Browse files
aleks-faleks-f
committed
GH pocoproject#119: JSON::Object holds values in ordered map
- fixed GH pocoproject#119: JSON::Object holds values in ordered map - added PrintHandler - renamed DefaultHandler to ParseHandler - redefined DefaultHandler as typedef to ParseHandler
1 parent fe67158 commit 42ff341

34 files changed

Lines changed: 1246 additions & 325 deletions

‎CHANGELOG‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,10 @@ Release 1.5.2 (2013-03-??)
2323
- added ListMap (map-like container with preserving insertion order)
2424
- MailMessage: attachments saving support and consistent read/write
2525
- fixed GH #124: Possibile buffer overrun in Foundation/EventLogChannel
26+
- fixed GH #119: JSON::Object holds values in ordered map
27+
- added PrintHandler
28+
- renamed DefaultHandler to ParseHandler
29+
- redefined DefaultHandler as typedef to ParseHandler
2630

2731
Release 1.5.1 (2013-01-11)
2832
==========================

‎Foundation/include/Poco/Platform.h‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -247,4 +247,11 @@
247247
#endif
248248

249249

250+
#if defined(POCO_OS_FAMILY_WINDOWS)
251+
#define POCO_DEFAULT_NEWLINE_CHARS "\r\n"
252+
#else
253+
#define POCO_DEFAULT_NEWLINE_CHARS "\n"
254+
#endif
255+
256+
250257
#endif // Foundation_Platform_INCLUDED

‎Foundation/src/LineEndingConverter.cpp‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -40,13 +40,6 @@
4040
namespace Poco {
4141

4242

43-
#if defined(_WIN32)
44-
#define POCO_DEFAULT_NEWLINE_CHARS "\r\n"
45-
#else
46-
#define POCO_DEFAULT_NEWLINE_CHARS "\n"
47-
#endif
48-
49-
5043
const std::string LineEnding::NEWLINE_DEFAULT(POCO_DEFAULT_NEWLINE_CHARS);
5144
const std::string LineEnding::NEWLINE_CR("\r");
5245
const std::string LineEnding::NEWLINE_CRLF("\r\n");

‎JSON/JSON_CE_vs90.vcproj‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -433,7 +433,7 @@
433433
<File
434434
RelativePath=".\src\Array.cpp"/>
435435
<File
436-
RelativePath=".\src\DefaultHandler.cpp"/>
436+
RelativePath=".\src\ParseHandler.cpp"/>
437437
<File
438438
RelativePath=".\src\Handler.cpp"/>
439439
<File
@@ -442,6 +442,8 @@
442442
RelativePath=".\src\Object.cpp"/>
443443
<File
444444
RelativePath=".\src\Parser.cpp"/>
445+
<File
446+
RelativePath=".\src\PrintHandler.cpp"/>
445447
<File
446448
RelativePath=".\src\Query.cpp"/>
447449
<File
@@ -467,6 +469,10 @@
467469
RelativePath=".\include\Poco\JSON\Object.h"/>
468470
<File
469471
RelativePath=".\include\Poco\JSON\Parser.h"/>
472+
<File
473+
RelativePath=".\include\Poco\JSON\ParseHandler.h"/>
474+
<File
475+
RelativePath=".\include\Poco\JSON\PrintHandler.h"/>
470476
<File
471477
RelativePath=".\include\Poco\JSON\Query.h"/>
472478
<File

‎JSON/JSON_vs100.vcxproj‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -273,19 +273,22 @@
273273
<ClInclude Include="include\Poco\JSON\JSON.h" />
274274
<ClInclude Include="include\Poco\JSON\JSONException.h" />
275275
<ClInclude Include="include\Poco\JSON\Object.h" />
276+
<ClInclude Include="include\Poco\JSON\ParseHandler.h" />
276277
<ClInclude Include="include\Poco\JSON\Parser.h" />
278+
<ClInclude Include="include\Poco\JSON\PrintHandler.h" />
277279
<ClInclude Include="include\Poco\JSON\Query.h" />
278280
<ClInclude Include="include\Poco\JSON\Stringifier.h" />
279281
<ClInclude Include="include\Poco\JSON\Template.h" />
280282
<ClInclude Include="include\Poco\JSON\TemplateCache.h" />
281283
</ItemGroup>
282284
<ItemGroup>
283285
<ClCompile Include="src\Array.cpp" />
284-
<ClCompile Include="src\DefaultHandler.cpp" />
286+
<ClCompile Include="src\ParseHandler.cpp" />
285287
<ClCompile Include="src\Handler.cpp" />
286288
<ClCompile Include="src\JSONException.cpp" />
287289
<ClCompile Include="src\Object.cpp" />
288290
<ClCompile Include="src\Parser.cpp" />
291+
<ClCompile Include="src\PrintHandler.cpp" />
289292
<ClCompile Include="src\Query.cpp" />
290293
<ClCompile Include="src\Stringifier.cpp" />
291294
<ClCompile Include="src\Template.cpp" />

‎JSON/JSON_vs100.vcxproj.filters‎

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,14 +42,17 @@
4242
<ClInclude Include="include\Poco\JSON\TemplateCache.h">
4343
<Filter>Header Files</Filter>
4444
</ClInclude>
45+
<ClInclude Include="include\Poco\JSON\PrintHandler.h">
46+
<Filter>Header Files</Filter>
47+
</ClInclude>
48+
<ClInclude Include="include\Poco\JSON\ParseHandler.h">
49+
<Filter>Header Files</Filter>
50+
</ClInclude>
4551
</ItemGroup>
4652
<ItemGroup>
4753
<ClCompile Include="src\Array.cpp">
4854
<Filter>Source Files</Filter>
4955
</ClCompile>
50-
<ClCompile Include="src\DefaultHandler.cpp">
51-
<Filter>Source Files</Filter>
52-
</ClCompile>
5356
<ClCompile Include="src\Handler.cpp">
5457
<Filter>Source Files</Filter>
5558
</ClCompile>
@@ -74,5 +77,11 @@
7477
<ClCompile Include="src\TemplateCache.cpp">
7578
<Filter>Source Files</Filter>
7679
</ClCompile>
80+
<ClCompile Include="src\PrintHandler.cpp">
81+
<Filter>Source Files</Filter>
82+
</ClCompile>
83+
<ClCompile Include="src\ParseHandler.cpp">
84+
<Filter>Source Files</Filter>
85+
</ClCompile>
7786
</ItemGroup>
7887
</Project>

‎JSON/JSON_vs110.vcxproj‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -274,11 +274,12 @@
274274
</ItemDefinitionGroup>
275275
<ItemGroup>
276276
<ClCompile Include="src\Array.cpp"/>
277-
<ClCompile Include="src\DefaultHandler.cpp"/>
277+
<ClCompile Include="src\ParseHandler.cpp"/>
278278
<ClCompile Include="src\Handler.cpp"/>
279279
<ClCompile Include="src\JSONException.cpp"/>
280280
<ClCompile Include="src\Object.cpp"/>
281281
<ClCompile Include="src\Parser.cpp"/>
282+
<ClCompile Include="src\PrintHandler.cpp"/>
282283
<ClCompile Include="src\Query.cpp"/>
283284
<ClCompile Include="src\Stringifier.cpp"/>
284285
<ClCompile Include="src\Template.cpp"/>
@@ -292,6 +293,8 @@
292293
<ClInclude Include="include\Poco\JSON\JSONException.h"/>
293294
<ClInclude Include="include\Poco\JSON\Object.h"/>
294295
<ClInclude Include="include\Poco\JSON\Parser.h"/>
296+
<ClInclude Include="include\Poco\JSON\ParseHandler.h"/>
297+
<ClInclude Include="include\Poco\JSON\PrintHandler.h"/>
295298
<ClInclude Include="include\Poco\JSON\Query.h"/>
296299
<ClInclude Include="include\Poco\JSON\Stringifier.h"/>
297300
<ClInclude Include="include\Poco\JSON\Template.h"/>

‎JSON/JSON_vs110.vcxproj.filters‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<ClCompile Include="src\Array.cpp">
1313
<Filter>Source Files</Filter>
1414
</ClCompile>
15-
<ClCompile Include="src\DefaultHandler.cpp">
15+
<ClCompile Include="src\ParseHandler.cpp">
1616
<Filter>Source Files</Filter>
1717
</ClCompile>
1818
<ClCompile Include="src\Handler.cpp">
@@ -27,6 +27,9 @@
2727
<ClCompile Include="src\Parser.cpp">
2828
<Filter>Source Files</Filter>
2929
</ClCompile>
30+
<ClCompile Include="src\PrintHandler.cpp">
31+
<Filter>Source Files</Filter>
32+
</ClCompile>
3033
<ClCompile Include="src\Query.cpp">
3134
<Filter>Source Files</Filter>
3235
</ClCompile>
@@ -62,6 +65,12 @@
6265
<ClInclude Include="include\Poco\JSON\Parser.h">
6366
<Filter>Header Files</Filter>
6467
</ClInclude>
68+
<ClInclude Include="include\Poco\JSON\ParseHandler.h">
69+
<Filter>Header Files</Filter>
70+
</ClInclude>
71+
<ClInclude Include="include\Poco\JSON\PrintHandler.h">
72+
<Filter>Header Files</Filter>
73+
</ClInclude>
6574
<ClInclude Include="include\Poco\JSON\Query.h">
6675
<Filter>Header Files</Filter>
6776
</ClInclude>

‎JSON/JSON_vs71.vcproj‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -365,7 +365,7 @@
365365
<File
366366
RelativePath=".\src\Array.cpp"/>
367367
<File
368-
RelativePath=".\src\DefaultHandler.cpp"/>
368+
RelativePath=".\src\ParseHandler.cpp"/>
369369
<File
370370
RelativePath=".\src\Handler.cpp"/>
371371
<File
@@ -374,6 +374,8 @@
374374
RelativePath=".\src\Object.cpp"/>
375375
<File
376376
RelativePath=".\src\Parser.cpp"/>
377+
<File
378+
RelativePath=".\src\PrintHandler.cpp"/>
377379
<File
378380
RelativePath=".\src\Query.cpp"/>
379381
<File
@@ -399,6 +401,10 @@
399401
RelativePath=".\include\Poco\JSON\Object.h"/>
400402
<File
401403
RelativePath=".\include\Poco\JSON\Parser.h"/>
404+
<File
405+
RelativePath=".\include\Poco\JSON\ParseHandler.h"/>
406+
<File
407+
RelativePath=".\include\Poco\JSON\PrintHandler.h"/>
402408
<File
403409
RelativePath=".\include\Poco\JSON\Query.h"/>
404410
<File

‎JSON/JSON_vs80.vcproj‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -386,7 +386,7 @@
386386
<File
387387
RelativePath=".\src\Array.cpp"/>
388388
<File
389-
RelativePath=".\src\DefaultHandler.cpp"/>
389+
RelativePath=".\src\ParseHandler.cpp"/>
390390
<File
391391
RelativePath=".\src\Handler.cpp"/>
392392
<File
@@ -395,6 +395,8 @@
395395
RelativePath=".\src\Object.cpp"/>
396396
<File
397397
RelativePath=".\src\Parser.cpp"/>
398+
<File
399+
RelativePath=".\src\PrintHandler.cpp"/>
398400
<File
399401
RelativePath=".\src\Query.cpp"/>
400402
<File
@@ -420,6 +422,10 @@
420422
RelativePath=".\include\Poco\JSON\Object.h"/>
421423
<File
422424
RelativePath=".\include\Poco\JSON\Parser.h"/>
425+
<File
426+
RelativePath=".\include\Poco\JSON\ParseHandler.h"/>
427+
<File
428+
RelativePath=".\include\Poco\JSON\PrintHandler.h"/>
423429
<File
424430
RelativePath=".\include\Poco\JSON\Query.h"/>
425431
<File

0 commit comments

Comments
 (0)