MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

refactoring: rename getAndroidDependencies to getAndroidLibraryDependencies, remove useless parameter

Browse Source
This commit is contained in:
Eugene Kudelevsky
2012-03-12 19:17:36 +04:00
parent 7696779cf5
commit eb469cb33d
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/android/src/org/jetbrains/android/compiler/AndroidPackagingCompiler.java
+1 -1
View File
@@ -173,7 +173,7 @@ public class AndroidPackagingCompiler implements PackagingCompiler {
if (libsDir != null) {
result.add(libsDir);
}
for (AndroidFacet depFacet : AndroidUtils.getAndroidDependencies(facet.getModule(), true)) {
for (AndroidFacet depFacet : AndroidUtils.getAndroidLibraryDependencies(facet.getModule())) {
VirtualFile depLibsDir = AndroidRootUtil.getLibsDir(depFacet);
if (depLibsDir != null) {
result.add(depLibsDir);
plugins/android/src/org/jetbrains/android/facet/AndroidFacet.java
+1 -1
View File
@@ -576,7 +576,7 @@ public class AndroidFacet extends Facet<AndroidFacetConfiguration> {
private VirtualFile[] collectDependencies() {
final List<VirtualFile> dependenciesList = new ArrayList<VirtualFile>();
for (AndroidFacet depFacet : AndroidUtils.getAndroidDependencies(getModule(), true)) {
for (AndroidFacet depFacet : AndroidUtils.getAndroidLibraryDependencies(getModule())) {
final Module depModule = depFacet.getModule();
final VirtualFile libDir = getBaseAndroidContentRoot(depModule);
if (libDir != null) {
plugins/android/src/org/jetbrains/android/util/AndroidUtils.java
+2 -2
View File
@@ -638,7 +638,7 @@ public class AndroidUtils {
}
@NotNull
public static List<AndroidFacet> getAndroidDependencies(@NotNull Module module, boolean androidLibrariesOnly) {
public static List<AndroidFacet> getAndroidLibraryDependencies(@NotNull Module module) {
final List<AndroidFacet> depFacets = new ArrayList<AndroidFacet>();
for (OrderEntry orderEntry : ModuleRootManager.getInstance(module).getOrderEntries()) {
@@ -651,7 +651,7 @@ public class AndroidUtils {
if (depModule != null) {
final AndroidFacet depFacet = AndroidFacet.getInstance(depModule);
if (depFacet != null && (!androidLibrariesOnly || depFacet.getConfiguration().LIBRARY_PROJECT)) {
if (depFacet != null && depFacet.getConfiguration().LIBRARY_PROJECT) {
depFacets.add(depFacet);
}
}