commit 086e5f2717144c51c6f625805fa5374373d706d8
author Han-Wen Nienhuys <hanwen@google.com> Tue Apr 21 11:39:59 2015 +0000
committer Laurent Le Brun <laurentlb@google.com> Wed Apr 22 12:29:24 2015 +0000
tree f56a4d5f00c2566206c7b5900f28f755820c1dc4
parent 3b619a8aef4bf27df9811afc3b5b4e53b4a8a742

Remove Package.AbstractBuilder.

This simplifies the code a little, and prepares for properly
serializing ExternalPackage.

--
MOS_MIGRATED_REVID=91673213

src/main/java/com/google/devtools/build/lib/packages/RuleClass.java

diff --git a/src/main/java/com/google/devtools/build/lib/packages/RuleClass.java b/src/main/java/com/google/devtools/build/lib/packages/RuleClass.java
index c06b06b..b4273c5 100644
--- a/src/main/java/com/google/devtools/build/lib/packages/RuleClass.java
+++ b/src/main/java/com/google/devtools/build/lib/packages/RuleClass.java
@@ -1103,7 +1103,7 @@
   /**
    * Helper function for {@link RuleFactory#createAndAddRule}.
    */
-  Rule createRuleWithLabel(Package.AbstractBuilder<?, ?> pkgBuilder, Label ruleLabel,
+  Rule createRuleWithLabel(Package.Builder pkgBuilder, Label ruleLabel,
       Map<String, Object> attributeValues, EventHandler eventHandler, FuncallExpression ast,
       Location location) throws SyntaxException {
     Rule rule = pkgBuilder.newRuleWithLabel(ruleLabel, this, null, location);
@@ -1111,7 +1111,7 @@
     return rule;
   }
 
-  private void createRuleCommon(Rule rule, Package.AbstractBuilder<?, ?> pkgBuilder,
+  private void createRuleCommon(Rule rule, Package.Builder pkgBuilder,
       Map<String, Object> attributeValues, EventHandler eventHandler, FuncallExpression ast)
           throws SyntaxException {
     populateRuleAttributeValues(
@@ -1153,7 +1153,7 @@
    */
   @SuppressWarnings("unchecked")
   Rule createRuleWithParsedAttributeValues(Label label,
-      Package.AbstractBuilder<?, ?> pkgBuilder, Location ruleLocation,
+      Package.Builder pkgBuilder, Location ruleLocation,
       Map<String, ParsedAttributeValue> attributeValues, EventHandler eventHandler)
           throws SyntaxException{
     Rule rule = pkgBuilder.newRuleWithLabel(label, this, null, ruleLocation);
@@ -1191,7 +1191,7 @@
    * location information with each rule attribute.
    */
   private void populateRuleAttributeValues(Rule rule,
-                                           Package.AbstractBuilder<?, ?> pkgBuilder,
+                                           Package.Builder pkgBuilder,
                                            Map<String, Object> attributeValues,
                                            EventHandler eventHandler,
                                            FuncallExpression ast) {
@@ -1319,7 +1319,7 @@
    * but does not have a declared license.
    */
   private static void checkThirdPartyRuleHasLicense(Rule rule,
-      Package.AbstractBuilder<?, ?> pkgBuilder, EventHandler eventHandler) {
+      Package.Builder pkgBuilder, EventHandler eventHandler) {
     if (rule.getLabel().getPackageName().startsWith("third_party/")) {
       License license = rule.getLicense();
       if (license == null) {
@@ -1391,7 +1391,7 @@
    * evaluated in second pass.)
    */
   private static Object getAttributeNoncomputedDefaultValue(Attribute attr,
-      Package.AbstractBuilder<?, ?> pkgBuilder) {
+      Package.Builder pkgBuilder) {
     if (attr.getName().equals("licenses")) {
       return pkgBuilder.getDefaultLicense();
     }