summaryrefslogtreecommitdiff
path: root/src/proguard/obfuscate/ClassObfuscator.java
diff options
context:
space:
mode:
authorBrian Carlstrom <bdc@google.com>2015-01-08 08:24:06 -0800
committerBrian Carlstrom <bdc@google.com>2015-01-08 10:29:11 -0800
commitcd9e071098d0539dda3a4a5d3f45cfd8814de4ed (patch)
tree9ac962825d41c4fb8ad1ec0fc2e8b441b42d3869 /src/proguard/obfuscate/ClassObfuscator.java
parent9961286c06c25cd03464d3e2b00bd9b9dedf96ba (diff)
downloadproguard-cd9e071098d0539dda3a4a5d3f45cfd8814de4ed.tar.gz
Upgrade Proguard to 5.1.
Downloaded from: http://sourceforge.net/projects/proguard/files/proguard/5.1/ Bug: 17550647 (cherry picked from commit 2270795fbe0b277bfd49f40950ecaa78583175cc) Change-Id: I4d4c6b4f11aca8d5595b7f285c675bc5873d5e24
Diffstat (limited to 'src/proguard/obfuscate/ClassObfuscator.java')
-rw-r--r--src/proguard/obfuscate/ClassObfuscator.java10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/proguard/obfuscate/ClassObfuscator.java b/src/proguard/obfuscate/ClassObfuscator.java
index 9e1a91c..516c889 100644
--- a/src/proguard/obfuscate/ClassObfuscator.java
+++ b/src/proguard/obfuscate/ClassObfuscator.java
@@ -2,7 +2,7 @@
* ProGuard -- shrinking, optimization, obfuscation, and preverification
* of Java bytecode.
*
- * Copyright (c) 2002-2013 Eric Lafortune (eric@graphics.cornell.edu)
+ * Copyright (c) 2002-2014 Eric Lafortune (eric@graphics.cornell.edu)
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the Free
@@ -109,14 +109,14 @@ implements ClassVisitor,
if (flattenPackageHierarchy != null &&
flattenPackageHierarchy.length() > 0)
{
- flattenPackageHierarchy += ClassConstants.INTERNAL_PACKAGE_SEPARATOR;
+ flattenPackageHierarchy += ClassConstants.PACKAGE_SEPARATOR;
}
// First append the package separator if necessary.
if (repackageClasses != null &&
repackageClasses.length() > 0)
{
- repackageClasses += ClassConstants.INTERNAL_PACKAGE_SEPARATOR;
+ repackageClasses += ClassConstants.PACKAGE_SEPARATOR;
}
this.useMixedCaseClassNames = useMixedCaseClassNames;
@@ -151,7 +151,7 @@ implements ClassVisitor,
// the an outer class prefix, if any, or it may be the fixed base
// package, if classes are to be repackaged.
String newPackagePrefix = newClassName != null ?
- newClassName + ClassConstants.INTERNAL_INNER_CLASS_SEPARATOR :
+ newClassName + ClassConstants.INNER_CLASS_SEPARATOR :
newPackagePrefix(ClassUtil.internalPackagePrefix(programClass.getName()));
// Come up with a new class name, numeric or ordinary.
@@ -410,7 +410,7 @@ implements ClassVisitor,
// Let the factory produce a package name.
newPackagePrefix = newSuperPackagePrefix +
packageNameFactory.nextName() +
- ClassConstants.INTERNAL_PACKAGE_SEPARATOR;
+ ClassConstants.PACKAGE_SEPARATOR;
}
while (packagePrefixMap.containsValue(newPackagePrefix));