From 02830406e9c58d80fd51901ae799f71df264d076 Mon Sep 17 00:00:00 2001 From: Michajlo Matijkiw Date: Thu, 25 Jun 2015 22:00:25 +0000 Subject: Remove unused SkyFunctionName isComputed. Removing since we don't appear to need it. Replaced SkyFunctionName.computed with create to simplify changing everything. Moved all constructors using new to use create for consistency. Chose create over new since it was less changes. -- MOS_MIGRATED_REVID=96914199 --- .../devtools/build/lib/skyframe/SkyFunctions.java | 70 +++++++++++----------- 1 file changed, 35 insertions(+), 35 deletions(-) (limited to 'src/main/java/com/google/devtools/build/lib/skyframe/SkyFunctions.java') diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/SkyFunctions.java b/src/main/java/com/google/devtools/build/lib/skyframe/SkyFunctions.java index 633e95a591..047db51478 100644 --- a/src/main/java/com/google/devtools/build/lib/skyframe/SkyFunctions.java +++ b/src/main/java/com/google/devtools/build/lib/skyframe/SkyFunctions.java @@ -21,58 +21,58 @@ import com.google.devtools.build.skyframe.SkyKey; * Value types in Skyframe. */ public final class SkyFunctions { - public static final SkyFunctionName PRECOMPUTED = new SkyFunctionName("PRECOMPUTED", false); - public static final SkyFunctionName FILE_STATE = new SkyFunctionName("FILE_STATE", false); + public static final SkyFunctionName PRECOMPUTED = SkyFunctionName.create("PRECOMPUTED"); + public static final SkyFunctionName FILE_STATE = SkyFunctionName.create("FILE_STATE"); public static final SkyFunctionName DIRECTORY_LISTING_STATE = - new SkyFunctionName("DIRECTORY_LISTING_STATE", false); + SkyFunctionName.create("DIRECTORY_LISTING_STATE"); public static final SkyFunctionName FILE_SYMLINK_CYCLE_UNIQUENESS = - SkyFunctionName.computed("FILE_SYMLINK_CYCLE_UNIQUENESS_NODE"); - public static final SkyFunctionName FILE = SkyFunctionName.computed("FILE"); + SkyFunctionName.create("FILE_SYMLINK_CYCLE_UNIQUENESS_NODE"); + public static final SkyFunctionName FILE = SkyFunctionName.create("FILE"); public static final SkyFunctionName DIRECTORY_LISTING = - SkyFunctionName.computed("DIRECTORY_LISTING"); - public static final SkyFunctionName PACKAGE_LOOKUP = SkyFunctionName.computed("PACKAGE_LOOKUP"); + SkyFunctionName.create("DIRECTORY_LISTING"); + public static final SkyFunctionName PACKAGE_LOOKUP = SkyFunctionName.create("PACKAGE_LOOKUP"); public static final SkyFunctionName CONTAINING_PACKAGE_LOOKUP = - SkyFunctionName.computed("CONTAINING_PACKAGE_LOOKUP"); - public static final SkyFunctionName AST_FILE_LOOKUP = SkyFunctionName.computed("AST_FILE_LOOKUP"); + SkyFunctionName.create("CONTAINING_PACKAGE_LOOKUP"); + public static final SkyFunctionName AST_FILE_LOOKUP = SkyFunctionName.create("AST_FILE_LOOKUP"); public static final SkyFunctionName SKYLARK_IMPORTS_LOOKUP = - SkyFunctionName.computed("SKYLARK_IMPORTS_LOOKUP"); - public static final SkyFunctionName GLOB = SkyFunctionName.computed("GLOB"); - public static final SkyFunctionName PACKAGE = SkyFunctionName.computed("PACKAGE"); - public static final SkyFunctionName TARGET_MARKER = SkyFunctionName.computed("TARGET_MARKER"); - public static final SkyFunctionName TARGET_PATTERN = SkyFunctionName.computed("TARGET_PATTERN"); + SkyFunctionName.create("SKYLARK_IMPORTS_LOOKUP"); + public static final SkyFunctionName GLOB = SkyFunctionName.create("GLOB"); + public static final SkyFunctionName PACKAGE = SkyFunctionName.create("PACKAGE"); + public static final SkyFunctionName TARGET_MARKER = SkyFunctionName.create("TARGET_MARKER"); + public static final SkyFunctionName TARGET_PATTERN = SkyFunctionName.create("TARGET_PATTERN"); public static final SkyFunctionName PREPARE_DEPS_OF_PATTERNS = - SkyFunctionName.computed("PREPARE_DEPS_OF_PATTERNS"); - public static final SkyFunctionName RECURSIVE_PKG = SkyFunctionName.computed("RECURSIVE_PKG"); + SkyFunctionName.create("PREPARE_DEPS_OF_PATTERNS"); + public static final SkyFunctionName RECURSIVE_PKG = SkyFunctionName.create("RECURSIVE_PKG"); public static final SkyFunctionName TRANSITIVE_TARGET = - SkyFunctionName.computed("TRANSITIVE_TARGET"); + SkyFunctionName.create("TRANSITIVE_TARGET"); public static final SkyFunctionName CONFIGURED_TARGET = - SkyFunctionName.computed("CONFIGURED_TARGET"); - public static final SkyFunctionName ASPECT = SkyFunctionName.computed("ASPECT"); + SkyFunctionName.create("CONFIGURED_TARGET"); + public static final SkyFunctionName ASPECT = SkyFunctionName.create("ASPECT"); public static final SkyFunctionName POST_CONFIGURED_TARGET = - SkyFunctionName.computed("POST_CONFIGURED_TARGET"); + SkyFunctionName.create("POST_CONFIGURED_TARGET"); public static final SkyFunctionName TARGET_COMPLETION = - SkyFunctionName.computed("TARGET_COMPLETION"); + SkyFunctionName.create("TARGET_COMPLETION"); public static final SkyFunctionName TEST_COMPLETION = - SkyFunctionName.computed("TEST_COMPLETION"); + SkyFunctionName.create("TEST_COMPLETION"); public static final SkyFunctionName BUILD_CONFIGURATION = - SkyFunctionName.computed("BUILD_CONFIGURATION"); + SkyFunctionName.create("BUILD_CONFIGURATION"); public static final SkyFunctionName CONFIGURATION_FRAGMENT = - SkyFunctionName.computed("CONFIGURATION_FRAGMENT"); + SkyFunctionName.create("CONFIGURATION_FRAGMENT"); public static final SkyFunctionName CONFIGURATION_COLLECTION = - SkyFunctionName.computed("CONFIGURATION_COLLECTION"); - public static final SkyFunctionName ARTIFACT = SkyFunctionName.computed("ARTIFACT"); + SkyFunctionName.create("CONFIGURATION_COLLECTION"); + public static final SkyFunctionName ARTIFACT = SkyFunctionName.create("ARTIFACT"); public static final SkyFunctionName ACTION_EXECUTION = - SkyFunctionName.computed("ACTION_EXECUTION"); - public static final SkyFunctionName ACTION_LOOKUP = SkyFunctionName.computed("ACTION_LOOKUP"); + SkyFunctionName.create("ACTION_EXECUTION"); + public static final SkyFunctionName ACTION_LOOKUP = SkyFunctionName.create("ACTION_LOOKUP"); public static final SkyFunctionName RECURSIVE_FILESYSTEM_TRAVERSAL = - SkyFunctionName.computed("RECURSIVE_DIRECTORY_TRAVERSAL"); - public static final SkyFunctionName FILESET_ENTRY = SkyFunctionName.computed("FILESET_ENTRY"); + SkyFunctionName.create("RECURSIVE_DIRECTORY_TRAVERSAL"); + public static final SkyFunctionName FILESET_ENTRY = SkyFunctionName.create("FILESET_ENTRY"); public static final SkyFunctionName BUILD_INFO_COLLECTION = - SkyFunctionName.computed("BUILD_INFO_COLLECTION"); - public static final SkyFunctionName BUILD_INFO = SkyFunctionName.computed("BUILD_INFO"); - public static final SkyFunctionName WORKSPACE_FILE = SkyFunctionName.computed("WORKSPACE_FILE"); - public static final SkyFunctionName COVERAGE_REPORT = SkyFunctionName.computed("COVERAGE_REPORT"); - public static final SkyFunctionName REPOSITORY = SkyFunctionName.computed("REPOSITORY"); + SkyFunctionName.create("BUILD_INFO_COLLECTION"); + public static final SkyFunctionName BUILD_INFO = SkyFunctionName.create("BUILD_INFO"); + public static final SkyFunctionName WORKSPACE_FILE = SkyFunctionName.create("WORKSPACE_FILE"); + public static final SkyFunctionName COVERAGE_REPORT = SkyFunctionName.create("COVERAGE_REPORT"); + public static final SkyFunctionName REPOSITORY = SkyFunctionName.create("REPOSITORY"); public static Predicate isSkyFunction(final SkyFunctionName functionName) { return new Predicate() { -- cgit v1.2.3