Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #413 from TeBoring/master | Paul Yang | 2015-05-21 | 32 | -202/+7126 |
|\ | | | | | down-integrate internal changes | ||||
| * | down-integrate internal changes | Bo Yang | 2015-05-21 | 32 | -202/+7126 |
| | | |||||
* | | Include well-known types in Java runtime. | Feng Xiao | 2015-05-21 | 1 | -0/+65 |
|/ | | | | Change-Id: I816fe2fac7fccbcd96dd8510c7c9b5e7996aeadc | ||||
* | Clean up imports | Tamir Duberstein | 2015-04-02 | 8 | -27/+16 |
| | |||||
* | Move `UTF_8` to `Internal` | Tamir Duberstein | 2015-04-02 | 14 | -34/+33 |
| | |||||
* | Skip 3-byte test in CI | Tamir Duberstein | 2015-04-02 | 1 | -2/+5 |
| | |||||
* | DRY: Use `Charset` statics to eliminate exceptions | Tamir Duberstein | 2015-04-02 | 16 | -76/+51 |
| | |||||
* | perf: String#getBytes(Charset) vs getBytes(String) | Viktor Szathmáry | 2015-04-02 | 7 | -28/+117 |
| | |||||
* | Whitespace | Tamir Duberstein | 2015-04-02 | 12 | -86/+86 |
| | |||||
* | Down integrate from Google internal branch for C++ and Java. | Jisi Liu | 2015-02-28 | 27 | -210/+1011 |
| | | | | | | | | - Maps for C++ lite - C++ Arena optimizations. - Java Lite runtime code size optimization. Change-Id: I7537a4357c1cb385d23f9e8aa7ffdfeefe079f13 | ||||
* | Merge pull request #216 from cnauroth/Parser-JavaDoc | Jisi Liu | 2015-02-26 | 1 | -2/+2 |
|\ | | | | | Correct JavaDoc return value documentation for Parser#parseDelimitedFrom... | ||||
| * | Correct JavaDoc return value documentation for Parser#parseDelimitedFrom. | cnauroth | 2015-02-23 | 1 | -2/+2 |
| | | |||||
* | | Propogate onChange() event when getFooBuilder() is on an oneof message | Jisi Liu | 2015-02-23 | 1 | -1/+13 |
| | | | | | | | | | | | | field. Change-Id: Idb5b53da5accd24038a895aba49b684eeee95814 | ||||
* | | Fix Java maps reflection to call onChange to populate changes to parent | Jisi Liu | 2015-02-23 | 2 | -89/+132 |
|/ | | | | | | builders. Change-Id: Ibf6ae3c0fe6bc31f74b8018c81a5af461b1c24ea | ||||
* | Down-integrate from internal code base. | Feng Xiao | 2014-12-09 | 2 | -1/+8 |
| | |||||
* | Remove usage of features not supported in Java 1.6. | Feng Xiao | 2014-12-03 | 1 | -3/+2 |
| | |||||
* | Merge pull request #102 from fizbin/bytestring_serializable | Feng Xiao | 2014-11-27 | 7 | -1/+90 |
|\ | | | | | Make ByteStrings serializable with java serialization. | ||||
| * | Add tests for other ByteString subclasses | Daniel Martin | 2014-11-27 | 2 | -0/+37 |
| | | |||||
| * | Make ByteStrings serializable with java serialization. | Daniel Martin | 2014-11-25 | 5 | -1/+53 |
| | | |||||
* | | Make Java TextFormat.printToUnicodeString() escape newlines. | Feng Xiao | 2014-11-25 | 2 | -6/+15 |
| | | | | | | | | Fix issue #77 | ||||
* | | Fix javadoc warnings. | Feng Xiao | 2014-11-25 | 2 | -14/+14 |
|/ | |||||
* | Down-integrate from internal code base. | Feng Xiao | 2014-11-20 | 3 | -22/+26 |
| | |||||
* | Down-integrate from internal code base (C++ maps support). | Feng Xiao | 2014-11-14 | 6 | -17/+49 |
| | |||||
* | Merge branch 'typofixes-vlajos-20141108' of ↵ | Feng Xiao | 2014-11-11 | 4 | -7/+7 |
|\ | | | | | | | | | | | | | https://github.com/vlajos/protobuf into typo Conflicts: src/google/protobuf/compiler/java/java_file.cc | ||||
| * | typo fixes - https://github.com/vlajos/misspell_fixer | Veres Lajos | 2014-11-08 | 4 | -7/+7 |
| | | |||||
* | | Down-integrate from internal code base. | Feng Xiao | 2014-11-10 | 55 | -280/+5347 |
|/ | |||||
* | Merge pull request #38 from xfxyjwf/fix17 | Feng Xiao | 2014-10-03 | 2 | -3/+38 |
|\ | | | | | Fix a bug that causes DynamicMessage.setField() to not work for repeated enum fields. | ||||
| * | Update verification methods' names. | Feng Xiao | 2014-10-02 | 1 | -6/+8 |
| | | |||||
| * | Fix a bug that causes DynamicMessage.setField() to not work for repeated | Feng Xiao | 2014-10-01 | 2 | -2/+35 |
| | | | | | | | | enum fields. | ||||
* | | Fix descriptor validation logic for packed enum fields. | Feng Xiao | 2014-10-01 | 2 | -7/+34 |
|/ | |||||
* | Replace links to code.google.com/protobuf with ↵ | Feng Xiao | 2014-10-01 | 100 | -100/+100 |
| | | | | developers.google.com/protocol-buffers | ||||
* | 1, Remove unkown field support in jave TextFormat | jieluo@google.com | 2014-07-25 | 3 | -118/+19 |
| | | | | 2, Verifies the EnumValueDscriptor for DynamicMessage.Builder#setField | ||||
* | add LazyFieldLite.java | jieluo@google.com | 2014-07-19 | 1 | -0/+176 |
| | |||||
* | add printUnicode methods in TextFormat | jieluo@google.com | 2014-07-18 | 1 | -0/+20 |
| | |||||
* | down integrate to svn | jieluo@google.com | 2014-07-18 | 63 | -1332/+7578 |
| | |||||
* | Fix Java compile issues under JDK 1.5 | xiaofeng@google.com | 2012-11-30 | 5 | -17/+15 |
| | |||||
* | Down-integrate from internal branch | xiaofeng@google.com | 2012-09-22 | 54 | -697/+7846 |
| | |||||
* | Close resources properly for java tests and examples. | liujisi@google.com | 2011-06-07 | 2 | -6/+15 |
| | |||||
* | Allow String to be used as message names. | liujisi@google.com | 2011-05-04 | 1 | -0/+20 |
| | |||||
* | Fix incomplete comments. | liujisi@google.com | 2011-04-28 | 1 | -1/+1 |
| | |||||
* | Make protobuf java JDK 1.5 compatible. | liujisi@google.com | 2011-04-28 | 8 | -35/+77 |
| | |||||
* | Use fully qualified java.lang.Object in protoc java code. | liujisi@google.com | 2011-04-08 | 1 | -1/+5 |
| | |||||
* | Fix issue 256: compute the correct size for negative enum values, which need ↵ | jasonh@google.com | 2011-02-18 | 2 | -1/+16 |
| | | | | to be sign extended. | ||||
* | Escape C++ Trigraphs. | liujisi@google.com | 2010-12-21 | 1 | -0/+1 |
| | |||||
* | Fix issues: 200 202 211 215 237 246. | liujisi@google.com | 2010-12-06 | 3 | -1/+3 |
| | |||||
* | Fix issues: 166 167 172 175 181 188 192 194 195. | liujisi@google.com | 2010-12-03 | 1 | -1/+3 |
| | |||||
* | Submit recent changes from internal branch. See CHANGES.txt for more details. | liujisi@google.com | 2010-11-02 | 47 | -727/+6140 |
| | |||||
* | Roll back revision 313. A similar but far more exensive change was made in ↵ | kenton@google.com | 2010-09-17 | 2 | -41/+0 |
| | | | | our internal branch, which will be integrated soon. | ||||
* | Optimize Java string serialization. Patch from Evan Jones. | kenton@google.com | 2010-02-01 | 2 | -0/+41 |
| | |||||
* | More Java warning tweaks from Evan Jones. | kenton@google.com | 2010-01-28 | 3 | -4/+6 |
| |