commit 248f0448af4675ad72cfe4e05348cff8c6915717
author Mark Schaller <mschaller@google.com> Tue May 19 17:59:36 2015 +0000
committer Han-Wen Nienhuys <hanwen@google.com> Thu May 21 09:46:04 2015 +0000
tree b7b7de6d44a2875ddd286a3bf78961d7161367f6
parent a5e42eed61e651105d5edb759a5265d9b6c531cf

Rename skyframe's TargetPattern to TargetPatternKey

There were two TargetPattern types, one in cmdline and one in skyframe.
This made things more confusing than they needed to be.

--
MOS_MIGRATED_REVID=94005358

src/main/java/com/google/devtools/build/lib/skyframe/TargetPatternValue.java

diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/TargetPatternValue.java b/src/main/java/com/google/devtools/build/lib/skyframe/TargetPatternValue.java
index 50cdc9b..1463140 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/TargetPatternValue.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/TargetPatternValue.java
@@ -107,8 +107,8 @@
     return new SkyKey(SkyFunctions.TARGET_PATTERN,
         pattern.startsWith("-")
         // Don't apply filters to negative patterns.
-        ? new TargetPattern(pattern.substring(1), FilteringPolicies.NO_FILTER, true, offset)
-        : new TargetPattern(pattern, policy, false, offset));
+        ? new TargetPatternKey(pattern.substring(1), FilteringPolicies.NO_FILTER, true, offset)
+        : new TargetPatternKey(pattern, policy, false, offset));
   }
 
   /**
@@ -135,19 +135,19 @@
   }
 
   /**
-   * A TargetPattern is a tuple of pattern (eg, "foo/..."), filtering policy, a relative pattern
+   * A TargetPatternKey is a tuple of pattern (eg, "foo/..."), filtering policy, a relative pattern
    * offset, and whether it is a positive or negative match.
    */
   @ThreadSafe
-  public static class TargetPattern implements Serializable {
+  public static class TargetPatternKey implements Serializable {
     private final String pattern;
     private final FilteringPolicy policy;
     private final boolean isNegative;
 
     private final String offset;
 
-    public TargetPattern(String pattern, FilteringPolicy policy,
-                         boolean isNegative, String offset) {
+    public TargetPatternKey(String pattern, FilteringPolicy policy,
+        boolean isNegative, String offset) {
       this.pattern = Preconditions.checkNotNull(pattern);
       this.policy = Preconditions.checkNotNull(policy);
       this.isNegative = isNegative;
@@ -182,10 +182,10 @@
 
     @Override
     public boolean equals(Object obj) {
-      if (!(obj instanceof TargetPattern)) {
+      if (!(obj instanceof TargetPatternKey)) {
         return false;
       }
-      TargetPattern other = (TargetPattern) obj;
+      TargetPatternKey other = (TargetPatternKey) obj;
 
       return other.isNegative == this.isNegative && other.pattern.equals(this.pattern) &&
           other.offset.equals(this.offset) && other.policy.equals(this.policy);