~ubuntu-branches/ubuntu/raring/protobuf/raring

« back to all changes in this revision

Viewing changes to src/google/protobuf/compiler/java/java_file.h

Committer: Bazaar Package Importer
Author(s): Elliot Murphy
Date: 2010-06-08 17:29:12 UTC
mfrom: (2.2.4 sid)
Revision ID: james.westby@ubuntu.com-20100608172912-nnd1hrkbv1u36pzl

Tags: 2.3.0-2ubuntu1

* Merge from Debian unstable.
* Remaining Ubuntu changes:
- Don't use python2.4 (refreshed this patch)

files added:
.pc

.pc/.version

.pc/applied-patches

.pc/arm_optimization.diff

.pc/arm_optimization.diff/src

.pc/arm_optimization.diff/src/google

.pc/arm_optimization.diff/src/google/protobuf

.pc/arm_optimization.diff/src/google/protobuf/wire_format_lite.h

.pc/default_python_version

.pc/default_python_version/python

.pc/default_python_version/python/mox.py

.pc/default_python_version/python/stubout.py

debian/libprotobuf-lite6.install

debian/libprotobuf-lite6.shlibs

debian/libprotobuf6.install

debian/libprotobuf6.shlibs

debian/libprotoc6.install

debian/libprotoc6.shlibs

debian/patches/arm_optimization.diff

debian/source

debian/source/format

gtest/msvc/gtest-md.sln

gtest/msvc/gtest-md.vcproj

gtest/msvc/gtest_main-md.vcproj

gtest/msvc/gtest_prod_test-md.vcproj

gtest/msvc/gtest_unittest-md.vcproj

gtest/samples/sample10_unittest.cc

gtest/samples/sample9_unittest.cc

gtest/scons/SConstruct

gtest/scons/SConstruct.common

gtest/test/gtest-listener_test.cc

gtest/test/gtest_shuffle_test.py

gtest/test/gtest_shuffle_test_.cc

gtest/xcode/Config/StaticLibraryTarget.xcconfig

src/google/protobuf/compiler/cpp/cpp_plugin_unittest.cc

src/google/protobuf/compiler/java/java_plugin_unittest.cc

src/google/protobuf/compiler/mock_code_generator.cc

src/google/protobuf/compiler/mock_code_generator.h

src/google/protobuf/compiler/plugin.cc

src/google/protobuf/compiler/plugin.h

src/google/protobuf/compiler/plugin.pb.cc

src/google/protobuf/compiler/plugin.pb.h

src/google/protobuf/compiler/plugin.proto

src/google/protobuf/compiler/python/python_plugin_unittest.cc

src/google/protobuf/compiler/subprocess.cc

src/google/protobuf/compiler/subprocess.h

src/google/protobuf/compiler/test_plugin.cc

src/google/protobuf/compiler/zip_output_unittest.sh

src/google/protobuf/compiler/zip_writer.cc

src/google/protobuf/compiler/zip_writer.h

src/google/protobuf/io/coded_stream_inl.h

src/google/protobuf/unittest_no_generic_services.proto

vsprojects/test_plugin.vcproj

files removed:
debian/libprotobuf5.install

debian/libprotobuf5.shlibs

debian/libprotoc5.install

debian/libprotoc5.shlibs

debian/patches/no_death_tests_on_ia64

gtest/msvc/gtest_color_test_.vcproj

gtest/msvc/gtest_env_var_test_.vcproj

gtest/msvc/gtest_environment_test.vcproj

gtest/msvc/gtest_output_test_.vcproj

gtest/msvc/gtest_uninitialized_test_.vcproj

gtest/xcode/Config/InternalPythonTestTarget.xcconfig

gtest/xcode/Config/InternalTestTarget.xcconfig

python/google/protobuf/internal/decoder_test.py

python/google/protobuf/internal/encoder_test.py

python/google/protobuf/internal/input_stream.py

python/google/protobuf/internal/input_stream_test.py

python/google/protobuf/internal/output_stream.py

python/google/protobuf/internal/output_stream_test.py

files modified:
CHANGES.txt

CONTRIBUTORS.txt

Makefile.am

Makefile.in

autogen.sh

config.h.in

configure

configure.ac

debian/changelog

debian/control

debian/java-build.xml

debian/libprotobuf-dev.install

debian/libprotobuf-java.links

debian/libprotoc-dev.install

debian/patches/default_python_version

debian/patches/series

debian/rules

editors/protobuf-mode.el

generate_descriptor_proto.sh

gtest/CHANGES

gtest/CONTRIBUTORS

gtest/Makefile.am

gtest/Makefile.in

gtest/README

gtest/configure

gtest/configure.ac

gtest/include/gtest/gtest-death-test.h

gtest/include/gtest/gtest-spi.h

gtest/include/gtest/gtest-test-part.h

gtest/include/gtest/gtest.h

gtest/include/gtest/internal/gtest-death-test-internal.h

gtest/include/gtest/internal/gtest-internal.h

gtest/include/gtest/internal/gtest-param-util-generated.h

gtest/include/gtest/internal/gtest-param-util-generated.h.pump

gtest/include/gtest/internal/gtest-param-util.h

gtest/include/gtest/internal/gtest-port.h

gtest/include/gtest/internal/gtest-string.h

gtest/msvc/gtest.sln

gtest/msvc/gtest.vcproj

gtest/msvc/gtest_main.vcproj

gtest/msvc/gtest_prod_test.vcproj

gtest/msvc/gtest_unittest.vcproj

gtest/scons/SConscript

gtest/scripts/gen_gtest_pred_impl.py

gtest/src/gtest-death-test.cc

gtest/src/gtest-filepath.cc

gtest/src/gtest-internal-inl.h

gtest/src/gtest-port.cc

gtest/src/gtest-test-part.cc

gtest/src/gtest.cc

gtest/test/gtest-death-test_test.cc

gtest/test/gtest-filepath_test.cc

gtest/test/gtest-options_test.cc

gtest/test/gtest-port_test.cc

gtest/test/gtest-test-part_test.cc

gtest/test/gtest-typed-test_test.cc

gtest/test/gtest-unittest-api_test.cc

gtest/test/gtest_env_var_test.py

gtest/test/gtest_filter_unittest_.cc

gtest/test/gtest_repeat_test.cc

gtest/test/gtest_stress_test.cc

gtest/test/gtest_unittest.cc

gtest/test/gtest_xml_output_unittest.py

gtest/test/gtest_xml_output_unittest_.cc

gtest/test/gtest_xml_test_utils.py

gtest/xcode/Config/FrameworkTarget.xcconfig

gtest/xcode/Samples/FrameworkSample/WidgetFramework.xcodeproj/project.pbxproj

gtest/xcode/Scripts/runtests.sh

gtest/xcode/gtest.xcodeproj/project.pbxproj

java/pom.xml

java/src/main/java/com/google/protobuf/AbstractMessage.java

java/src/main/java/com/google/protobuf/AbstractMessageLite.java

java/src/main/java/com/google/protobuf/ByteString.java

java/src/main/java/com/google/protobuf/CodedInputStream.java

java/src/main/java/com/google/protobuf/CodedOutputStream.java

java/src/main/java/com/google/protobuf/Descriptors.java

java/src/main/java/com/google/protobuf/ExtensionRegistry.java

java/src/main/java/com/google/protobuf/GeneratedMessage.java

java/src/main/java/com/google/protobuf/GeneratedMessageLite.java

java/src/main/java/com/google/protobuf/Message.java

java/src/main/java/com/google/protobuf/MessageLite.java

java/src/main/java/com/google/protobuf/RpcCallback.java

java/src/main/java/com/google/protobuf/RpcChannel.java

java/src/main/java/com/google/protobuf/RpcController.java

java/src/main/java/com/google/protobuf/Service.java

java/src/main/java/com/google/protobuf/TextFormat.java

java/src/main/java/com/google/protobuf/UnknownFieldSet.java

java/src/main/java/com/google/protobuf/WireFormat.java

java/src/test/java/com/google/protobuf/AbstractMessageTest.java

java/src/test/java/com/google/protobuf/CodedInputStreamTest.java

java/src/test/java/com/google/protobuf/DescriptorsTest.java

java/src/test/java/com/google/protobuf/GeneratedMessageTest.java

java/src/test/java/com/google/protobuf/LiteTest.java

java/src/test/java/com/google/protobuf/ServiceTest.java

java/src/test/java/com/google/protobuf/TestUtil.java

java/src/test/java/com/google/protobuf/TextFormatTest.java

java/src/test/java/com/google/protobuf/WireFormatTest.java

m4/acx_check_suncc.m4

m4/stl_hash.m4

python/google/protobuf/descriptor.py

python/google/protobuf/internal/containers.py

python/google/protobuf/internal/decoder.py

python/google/protobuf/internal/descriptor_test.py

python/google/protobuf/internal/encoder.py

python/google/protobuf/internal/generator_test.py

python/google/protobuf/internal/message_listener.py

python/google/protobuf/internal/message_test.py

python/google/protobuf/internal/reflection_test.py

python/google/protobuf/internal/test_util.py

python/google/protobuf/internal/text_format_test.py

python/google/protobuf/internal/type_checkers.py

python/google/protobuf/internal/wire_format.py

python/google/protobuf/message.py

python/google/protobuf/reflection.py

python/google/protobuf/service.py

python/google/protobuf/text_format.py

python/mox.py

python/setup.py

python/stubout.py

src/Makefile.am

src/Makefile.in

src/google/protobuf/compiler/code_generator.cc

src/google/protobuf/compiler/code_generator.h

src/google/protobuf/compiler/command_line_interface.cc

src/google/protobuf/compiler/command_line_interface.h

src/google/protobuf/compiler/command_line_interface_unittest.cc

src/google/protobuf/compiler/cpp/cpp_bootstrap_unittest.cc

src/google/protobuf/compiler/cpp/cpp_enum.cc

src/google/protobuf/compiler/cpp/cpp_enum_field.cc

src/google/protobuf/compiler/cpp/cpp_enum_field.h

src/google/protobuf/compiler/cpp/cpp_extension.cc

src/google/protobuf/compiler/cpp/cpp_field.cc

src/google/protobuf/compiler/cpp/cpp_field.h

src/google/protobuf/compiler/cpp/cpp_file.cc

src/google/protobuf/compiler/cpp/cpp_helpers.cc

src/google/protobuf/compiler/cpp/cpp_helpers.h

src/google/protobuf/compiler/cpp/cpp_message.cc

src/google/protobuf/compiler/cpp/cpp_message.h

src/google/protobuf/compiler/cpp/cpp_message_field.cc

src/google/protobuf/compiler/cpp/cpp_primitive_field.cc

src/google/protobuf/compiler/cpp/cpp_primitive_field.h

src/google/protobuf/compiler/cpp/cpp_string_field.cc

src/google/protobuf/compiler/cpp/cpp_unittest.cc

src/google/protobuf/compiler/importer.cc

src/google/protobuf/compiler/java/java_enum.cc

src/google/protobuf/compiler/java/java_enum_field.cc

src/google/protobuf/compiler/java/java_enum_field.h

src/google/protobuf/compiler/java/java_extension.cc

src/google/protobuf/compiler/java/java_field.cc

src/google/protobuf/compiler/java/java_field.h

src/google/protobuf/compiler/java/java_file.cc

src/google/protobuf/compiler/java/java_file.h

src/google/protobuf/compiler/java/java_generator.cc

src/google/protobuf/compiler/java/java_helpers.cc

src/google/protobuf/compiler/java/java_helpers.h

src/google/protobuf/compiler/java/java_message.cc

src/google/protobuf/compiler/java/java_message_field.cc

src/google/protobuf/compiler/java/java_message_field.h

src/google/protobuf/compiler/java/java_primitive_field.cc

src/google/protobuf/compiler/java/java_primitive_field.h

src/google/protobuf/compiler/main.cc

src/google/protobuf/compiler/parser.cc

src/google/protobuf/compiler/parser_unittest.cc

src/google/protobuf/compiler/python/python_generator.cc

src/google/protobuf/compiler/python/python_generator.h

src/google/protobuf/descriptor.cc

src/google/protobuf/descriptor.h

src/google/protobuf/descriptor.pb.cc

src/google/protobuf/descriptor.pb.h

src/google/protobuf/descriptor.proto

src/google/protobuf/descriptor_database.cc

src/google/protobuf/descriptor_database.h

src/google/protobuf/descriptor_database_unittest.cc

src/google/protobuf/descriptor_unittest.cc

src/google/protobuf/dynamic_message.cc

src/google/protobuf/dynamic_message.h

src/google/protobuf/extension_set.cc

src/google/protobuf/extension_set.h

src/google/protobuf/extension_set_heavy.cc

src/google/protobuf/extension_set_unittest.cc

src/google/protobuf/generated_message_reflection.cc

src/google/protobuf/generated_message_reflection.h

src/google/protobuf/generated_message_util.cc

src/google/protobuf/generated_message_util.h

src/google/protobuf/io/coded_stream.cc

src/google/protobuf/io/coded_stream.h

src/google/protobuf/io/coded_stream_unittest.cc

src/google/protobuf/io/printer.cc

src/google/protobuf/io/printer.h

src/google/protobuf/io/printer_unittest.cc

src/google/protobuf/io/tokenizer.cc

src/google/protobuf/io/tokenizer.h

src/google/protobuf/io/tokenizer_unittest.cc

src/google/protobuf/io/zero_copy_stream_impl.h

src/google/protobuf/io/zero_copy_stream_unittest.cc

src/google/protobuf/message.cc

src/google/protobuf/message.h

src/google/protobuf/message_lite.cc

src/google/protobuf/message_unittest.cc

src/google/protobuf/repeated_field.cc

src/google/protobuf/repeated_field.h

src/google/protobuf/repeated_field_unittest.cc

src/google/protobuf/service.h

src/google/protobuf/stubs/common.h

src/google/protobuf/stubs/hash.h

src/google/protobuf/stubs/once.cc

src/google/protobuf/stubs/once.h

src/google/protobuf/stubs/once_unittest.cc

src/google/protobuf/stubs/structurally_valid.cc

src/google/protobuf/stubs/structurally_valid_unittest.cc

src/google/protobuf/stubs/strutil.cc

src/google/protobuf/stubs/strutil.h

src/google/protobuf/test_util.cc

src/google/protobuf/test_util.h

src/google/protobuf/testing/file.cc

src/google/protobuf/testing/googletest.cc

src/google/protobuf/text_format.cc

src/google/protobuf/text_format.h

src/google/protobuf/text_format_unittest.cc

src/google/protobuf/unittest.proto

src/google/protobuf/unittest_enormous_descriptor.proto

src/google/protobuf/unknown_field_set.cc

src/google/protobuf/unknown_field_set.h

src/google/protobuf/wire_format.cc

src/google/protobuf/wire_format_lite.cc

src/google/protobuf/wire_format_lite.h

src/google/protobuf/wire_format_lite_inl.h

src/google/protobuf/wire_format_unittest.cc

vsprojects/config.h

vsprojects/libprotobuf-lite.vcproj

vsprojects/libprotobuf.vcproj

vsprojects/libprotoc.vcproj

vsprojects/lite-test.vcproj

vsprojects/protobuf.sln

vsprojects/tests.vcproj

Show diffs side-by-side

added added

removed removed

src/google/protobuf/compiler/java/java_file.h

const string& classname() { return classname_; }

private:

// Returns whether the dependency should be included in the output file.

// Always returns true for opensource, but used internally at Google to help

// improve compatibility with version 1 of protocol buffers.

bool ShouldIncludeDependency(const FileDescriptor* descriptor);

const FileDescriptor* file_;

string java_package_;

string classname_;

Older »