[skip] code style updates

This commit is contained in:
Connor Tumbleson 2014-12-25 12:21:30 -06:00
parent 5dfa79934c
commit c91ef3822e
2 changed files with 4 additions and 6 deletions

View File

@ -1,4 +1,4 @@
package brut.androlib; /** /**
* Copyright 2014 Ryszard Wiśniewski <brut.alll@gmail.com> * Copyright 2014 Ryszard Wiśniewski <brut.alll@gmail.com>
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
@ -13,6 +13,7 @@ package brut.androlib; /**
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package brut.androlib;
public class ApkOptions { public class ApkOptions {
public boolean forceBuildAll = false; public boolean forceBuildAll = false;

View File

@ -45,15 +45,12 @@ public class ResReferenceValue extends ResIntValue {
} }
ResResSpec spec = getReferent(); ResResSpec spec = getReferent();
boolean newId = spec.hasDefaultResource() boolean newId = spec.hasDefaultResource() && spec.getDefaultResource().getValue() instanceof ResIdValue;
&& spec.getDefaultResource().getValue() instanceof ResIdValue;
// generate the beginning to fix @android // generate the beginning to fix @android
String mStart = (mTheme ? '?' : '@') + (newId ? "+" : ""); String mStart = (mTheme ? '?' : '@') + (newId ? "+" : "");
return mStart return mStart + spec.getFullName(mPackage, mTheme && spec.getType().getName().equals("attr"));
+ spec.getFullName(mPackage, mTheme
&& spec.getType().getName().equals("attr"));
} }
public ResResSpec getReferent() throws AndrolibException { public ResResSpec getReferent() throws AndrolibException {