Clean up BlazeProjectSystem

Since there are different implementations per platform: 1. remove methods that do not override base methods anymore 2. add `getProject()` method needed in upcoming changes and which has been added to the interface in recent platforms. PiperOrigin-RevId: 578558211
bazelbuild · Nov 1, 2023 · efdf056 · efdf056
1 parent 0340955
commit efdf056
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 63 deletions.
diff --git a/aswb/sdkcompat/as222/com/google/idea/blaze/android/projectsystem/BlazeProjectSystem.java b/aswb/sdkcompat/as222/com/google/idea/blaze/android/projectsystem/BlazeProjectSystem.java
@@ -95,12 +95,12 @@ public Path getPathToAapt() {
         new LogWrapper(BlazeProjectSystem.class));
   }
 
-  // @Override #api42
+  @Override
   public void buildProject() {
     BlazeBuildService.getInstance(project).buildProject();
   }
 
-  // @Override #api42
+  @Override
   public ProjectSystemBuildManager getBuildManager() {
     return buildManager;
   }
@@ -171,7 +171,7 @@ private SourceProviders createForModel(BlazeAndroidModel model) {
     };
   }
 
-  // @Override #api212
+  @Override
   public ClassJarProvider getClassJarProvider() {
     return new BlazeClassJarProvider(project);
   }

diff --git a/aswb/sdkcompat/as223/com/google/idea/blaze/android/projectsystem/BlazeProjectSystem.java b/aswb/sdkcompat/as223/com/google/idea/blaze/android/projectsystem/BlazeProjectSystem.java
@@ -39,7 +39,6 @@
 import com.google.idea.blaze.android.resources.BlazeLightResourceClassService;
 import com.google.idea.blaze.android.sync.model.idea.BlazeAndroidModel;
 import com.google.idea.blaze.android.sync.model.idea.BlazeClassJarProvider;
-import com.google.idea.blaze.base.build.BlazeBuildService;
 import com.google.idea.blaze.base.settings.Blaze;
 import com.google.idea.blaze.base.settings.BlazeImportSettings.ProjectType;
 import com.intellij.facet.ProjectFacetManager;
@@ -48,7 +47,6 @@
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.psi.PsiElementFinder;
 import com.intellij.psi.search.GlobalSearchScope;
-import java.io.File;
 import java.nio.file.Path;
 import java.util.Arrays;
 import java.util.Collection;
@@ -79,6 +77,10 @@ public BlazeProjectSystem(Project project) {
             new AndroidResourceClassPsiElementFinder(getLightResourceClassService()));
   }
 
+  public Project getProject() {
+    return project;
+  }
+
   @Override
   public boolean allowsFileCreation() {
     return true;
@@ -97,12 +99,7 @@ public Path getPathToAapt() {
         new LogWrapper(BlazeProjectSystem.class));
   }
 
-  // @Override #api42
-  public void buildProject() {
-    BlazeBuildService.getInstance(project).buildProject();
-  }
-
-  // @Override #api42
+  @Override
   public ProjectSystemBuildManager getBuildManager() {
     return buildManager;
   }
@@ -173,7 +170,7 @@ private SourceProviders createForModel(BlazeAndroidModel model) {
     };
   }
 
-  // @Override #api212
+  @Override
   public ClassJarProvider getClassJarProvider() {
     return new BlazeClassJarProvider(project);
   }
@@ -220,10 +217,4 @@ private static boolean hasPackageName(AndroidFacet facet, String packageName) {
     }
     return nameFromFacet.equals(packageName);
   }
-
-  @NotNull
-  // @Override #api223
-  public List<File> desugarLibraryConfigFiles(@NotNull Project project) {
-    return ImmutableList.of();
-  }
 }
diff --git a/aswb/sdkcompat/as231/com/google/idea/blaze/android/projectsystem/BlazeProjectSystem.java b/aswb/sdkcompat/as231/com/google/idea/blaze/android/projectsystem/BlazeProjectSystem.java
@@ -38,7 +38,6 @@
 import com.google.idea.blaze.android.resources.BlazeLightResourceClassService;
 import com.google.idea.blaze.android.sync.model.idea.BlazeAndroidModel;
 import com.google.idea.blaze.android.sync.model.idea.BlazeClassJarProvider;
-import com.google.idea.blaze.base.build.BlazeBuildService;
 import com.google.idea.blaze.base.settings.Blaze;
 import com.google.idea.blaze.base.settings.BlazeImportSettings.ProjectType;
 import com.intellij.facet.ProjectFacetManager;
@@ -47,7 +46,6 @@
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.psi.PsiElementFinder;
 import com.intellij.psi.search.GlobalSearchScope;
-import java.io.File;
 import java.nio.file.Path;
 import java.util.Arrays;
 import java.util.Collection;
@@ -78,6 +76,10 @@ public BlazeProjectSystem(Project project) {
             new AndroidResourceClassPsiElementFinder(getLightResourceClassService()));
   }
 
+  public Project getProject() {
+    return project;
+  }
+
   @Override
   public boolean allowsFileCreation() {
     return true;
@@ -96,12 +98,7 @@ public Path getPathToAapt() {
         new LogWrapper(BlazeProjectSystem.class));
   }
 
-  // @Override #api42
-  public void buildProject() {
-    BlazeBuildService.getInstance(project).buildProject();
-  }
-
-  // @Override #api42
+  @Override
   public ProjectSystemBuildManager getBuildManager() {
     return buildManager;
   }
@@ -172,7 +169,7 @@ private SourceProviders createForModel(BlazeAndroidModel model) {
     };
   }
 
-  // @Override #api212
+  @Override
   public ClassJarProvider getClassJarProvider() {
     return new BlazeClassJarProvider(project);
   }
@@ -246,10 +243,4 @@ private static boolean hasPackageName(AndroidFacet facet, String packageName) {
     }
     return nameFromFacet.equals(packageName);
   }
-
-  @NotNull
-  // @Override #api223
-  public List<File> desugarLibraryConfigFiles(@NotNull Project project) {
-    return ImmutableList.of();
-  }
 }
diff --git a/aswb/sdkcompat/as232/com/google/idea/blaze/android/projectsystem/BlazeProjectSystem.java b/aswb/sdkcompat/as232/com/google/idea/blaze/android/projectsystem/BlazeProjectSystem.java
@@ -40,7 +40,6 @@
 import com.google.idea.blaze.android.resources.BlazeLightResourceClassService;
 import com.google.idea.blaze.android.sync.model.idea.BlazeAndroidModel;
 import com.google.idea.blaze.android.sync.model.idea.BlazeClassJarProvider;
-import com.google.idea.blaze.base.build.BlazeBuildService;
 import com.google.idea.blaze.base.settings.Blaze;
 import com.google.idea.blaze.base.settings.BlazeImportSettings.ProjectType;
 import com.intellij.facet.ProjectFacetManager;
@@ -50,7 +49,6 @@
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.psi.PsiElementFinder;
 import com.intellij.psi.search.GlobalSearchScope;
-import java.io.File;
 import java.nio.file.Path;
 import java.util.Arrays;
 import java.util.Collection;
@@ -108,12 +106,7 @@ public Path getPathToAapt() {
         new LogWrapper(BlazeProjectSystem.class));
   }
 
-  // @Override #api42
-  public void buildProject() {
-    BlazeBuildService.getInstance(project).buildProject();
-  }
-
-  // @Override #api42
+  @Override
   public ProjectSystemBuildManager getBuildManager() {
     return buildManager;
   }
@@ -184,7 +177,7 @@ private SourceProviders createForModel(BlazeAndroidModel model) {
     };
   }
 
-  // @Override #api212
+  @Override
   public ClassJarProvider getClassJarProvider() {
     return new BlazeClassJarProvider(project);
   }
@@ -295,10 +288,4 @@ private static boolean hasPackageName(AndroidFacet facet, String packageName) {
     }
     return nameFromFacet.equals(packageName);
   }
-
-  @NotNull
-  // @Override #api223
-  public List<File> desugarLibraryConfigFiles(@NotNull Project project) {
-    return ImmutableList.of();
-  }
 }
diff --git a/aswb/sdkcompat/asdev/com/google/idea/blaze/android/projectsystem/BlazeProjectSystem.java b/aswb/sdkcompat/asdev/com/google/idea/blaze/android/projectsystem/BlazeProjectSystem.java
@@ -40,7 +40,6 @@
 import com.google.idea.blaze.android.resources.BlazeLightResourceClassService;
 import com.google.idea.blaze.android.sync.model.idea.BlazeAndroidModel;
 import com.google.idea.blaze.android.sync.model.idea.BlazeClassJarProvider;
-import com.google.idea.blaze.base.build.BlazeBuildService;
 import com.google.idea.blaze.base.qsync.QuerySync;
 import com.intellij.facet.ProjectFacetManager;
 import com.intellij.openapi.module.Module;
@@ -49,7 +48,6 @@
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.psi.PsiElementFinder;
 import com.intellij.psi.search.GlobalSearchScope;
-import java.io.File;
 import java.nio.file.Path;
 import java.util.Arrays;
 import java.util.Collection;
@@ -83,6 +81,10 @@ public BlazeProjectSystem(Project project) {
             new AndroidResourceClassPsiElementFinder(getLightResourceClassService()));
   }
 
+  public Project getProject() {
+    return project;
+  }
+
   @Override
   public boolean allowsFileCreation() {
     return true;
@@ -101,12 +103,7 @@ public Path getPathToAapt() {
         new LogWrapper(BlazeProjectSystem.class));
   }
 
-  // @Override #api42
-  public void buildProject() {
-    BlazeBuildService.getInstance(project).buildProject();
-  }
-
-  // @Override #api42
+  @Override
   public ProjectSystemBuildManager getBuildManager() {
     return buildManager;
   }
@@ -177,7 +174,7 @@ private SourceProviders createForModel(BlazeAndroidModel model) {
     };
   }
 
-  // @Override #api212
+  @Override
   public ClassJarProvider getClassJarProvider() {
     return new BlazeClassJarProvider(project);
   }
@@ -289,10 +286,4 @@ private static boolean hasPackageName(AndroidFacet facet, String packageName) {
     }
     return nameFromFacet.equals(packageName);
   }
-
-  @NotNull
-  // @Override #api223
-  public List<File> desugarLibraryConfigFiles(@NotNull Project project) {
-    return ImmutableList.of();
-  }
 }