Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

AAPT2: Rename to match new style

Browse Source 
Use Google3 naming style to match new
projects' and open source google projects' style.

Preferred to do this in a massive CL so as to avoid
style inconsistencies that plague legacy code bases.
This is a relatively NEW code base, may as well keep
it up to date.

Test: name/style refactor - existing tests pass
Change-Id: Ie80ecb78d46ec53efdfca2336bb57d96cbb7fb87
This commit is contained in:
Adam Lesinski
2016-10-21 17:56:45 -07:00
parent 0f7cc4dc2c
commit ce5e56e243
181 changed files with 13853 additions and 13329 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
tools/aapt2/java/ClassDefinition.cpp
View File

@@ -15,61 +15,59 @@
*/
#include "java/ClassDefinition.h"
#include "util/StringPiece.h"
#include <ostream>
#include "util/StringPiece.h"
namespace aapt {
bool ClassDefinition::empty() const {
for (const std::unique_ptr<ClassMember>& member : mMembers) {
if (!member->empty()) {
return false;
}
for (const std::unique_ptr<ClassMember>& member : members_) {
if (!member->empty()) {
return false;
}
return true;
}
return true;
}
void ClassDefinition::writeToStream(const StringPiece& prefix, bool final,
void ClassDefinition::WriteToStream(const StringPiece& prefix, bool final,
std::ostream* out) const {
if (mMembers.empty() && !mCreateIfEmpty) {
return;
}
if (members_.empty() && !create_if_empty_) {
return;
}
ClassMember::writeToStream(prefix, final, out);
ClassMember::WriteToStream(prefix, final, out);
*out << prefix << "public ";
if (mQualifier == ClassQualifier::Static) {
*out << "static ";
}
*out << "final class " << mName << " {\n";
*out << prefix << "public ";
if (qualifier_ == ClassQualifier::Static) {
*out << "static ";
}
*out << "final class " << name_ << " {\n";
std::string newPrefix = prefix.toString();
newPrefix.append(kIndent);
std::string new_prefix = prefix.ToString();
new_prefix.append(kIndent);
for (const std::unique_ptr<ClassMember>& member : mMembers) {
member->writeToStream(newPrefix, final, out);
*out << "\n";
}
for (const std::unique_ptr<ClassMember>& member : members_) {
member->WriteToStream(new_prefix, final, out);
*out << "\n";
}
*out << prefix << "}";
*out << prefix << "}";
}
constexpr static const char* sWarningHeader =
"/* AUTO-GENERATED FILE. DO NOT MODIFY.\n"
" *\n"
" * This class was automatically generated by the\n"
" * aapt tool from the resource data it found. It\n"
" * should not be modified by hand.\n"
" */\n\n";
"/* AUTO-GENERATED FILE. DO NOT MODIFY.\n"
" *\n"
" * This class was automatically generated by the\n"
" * aapt tool from the resource data it found. It\n"
" * should not be modified by hand.\n"
" */\n\n";
bool ClassDefinition::writeJavaFile(const ClassDefinition* def,
const StringPiece& package,
bool final,
bool ClassDefinition::WriteJavaFile(const ClassDefinition* def,
const StringPiece& package, bool final,
std::ostream* out) {
*out << sWarningHeader << "package " << package << ";\n\n";
def->writeToStream("", final, out);
return bool(*out);
*out << sWarningHeader << "package " << package << ";\n\n";
def->WriteToStream("", final, out);
return bool(*out);
}
} // namespace aapt
} // namespace aapt