azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

JpsJsModuleUtils: convert to kotlin

Browse Source
This commit is contained in:
Michael Nedzelsky
2015-03-25 16:40:37 +03:00
parent 5a73bd19c5
commit e779c8a2ae
1 changed files with 37 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jps-plugin/src/org/jetbrains/kotlin/jps/build/JpsJsModuleUtils.java
+37 -44
View File
@@ -14,56 +14,49 @@
* limitations under the License. * limitations under the License.
*/ */
package org.jetbrains.kotlin.jps.build; package org.jetbrains.kotlin.jps.build
import com.intellij.util.Consumer; import com.intellij.util.Consumer
import org.jetbrains.annotations.NotNull; import org.jetbrains.jps.incremental.ModuleBuildTarget
import org.jetbrains.jps.incremental.ModuleBuildTarget; import org.jetbrains.jps.model.java.JavaSourceRootProperties
import org.jetbrains.jps.model.java.JavaSourceRootType; import org.jetbrains.jps.model.java.JavaSourceRootType
import org.jetbrains.jps.model.java.JpsJavaModuleType; import org.jetbrains.jps.model.java.JpsJavaModuleType
import org.jetbrains.jps.model.library.JpsLibrary; import org.jetbrains.jps.model.library.JpsOrderRootType
import org.jetbrains.jps.model.library.JpsLibraryRoot; import org.jetbrains.jps.model.module.JpsModule
import org.jetbrains.jps.model.library.JpsOrderRootType; import org.jetbrains.jps.util.JpsPathUtil
import org.jetbrains.jps.model.module.JpsModule; import java.util.ArrayList
import org.jetbrains.jps.model.module.JpsModuleSourceRoot;
import org.jetbrains.jps.util.JpsPathUtil;
import java.util.ArrayList; class JpsJsModuleUtils private() {
import java.util.List; companion object {
import java.util.Set;
class JpsJsModuleUtils { fun getLibraryFilesAndDependencies(target: ModuleBuildTarget): List<String> {
private JpsJsModuleUtils() {} val result = ArrayList<String>()
getLibraryFiles(target, result)
@NotNull getDependencyModulesAndSources(target, result)
static List<String> getLibraryFilesAndDependencies(@NotNull ModuleBuildTarget target) { return result
List<String> result = new ArrayList<String>();
getLibraryFiles(target, result);
getDependencyModulesAndSources(target, result);
return result;
}
static void getLibraryFiles(@NotNull ModuleBuildTarget target, @NotNull List<String> result) {
Set<JpsLibrary> libraries = JpsUtils.getAllDependencies(target).getLibraries();
for (JpsLibrary library : libraries) {
for (JpsLibraryRoot root : library.getRoots(JpsOrderRootType.COMPILED)) {
result.add(JpsPathUtil.urlToPath(root.getUrl()));
}
} }
}
static void getDependencyModulesAndSources(@NotNull final ModuleBuildTarget target, @NotNull final List<String> result) { fun getLibraryFiles(target: ModuleBuildTarget, result: MutableList<String>) {
JpsUtils.getAllDependencies(target).processModules(new Consumer<JpsModule>() { val libraries = JpsUtils.getAllDependencies(target).getLibraries()
@Override for (library in libraries) {
public void consume(JpsModule module) { for (root in library.getRoots(JpsOrderRootType.COMPILED)) {
if (module == target.getModule() || module.getModuleType() != JpsJavaModuleType.INSTANCE) return; result.add(JpsPathUtil.urlToPath(root.getUrl()))
result.add("@" + module.getName());
for (JpsModuleSourceRoot root : module.getSourceRoots(JavaSourceRootType.SOURCE)) {
result.add(JpsPathUtil.urlToPath(root.getUrl()));
} }
} }
}); }
fun getDependencyModulesAndSources(target: ModuleBuildTarget, result: MutableList<String>) {
JpsUtils.getAllDependencies(target).processModules(object : Consumer<JpsModule> {
override fun consume(module: JpsModule) {
if (module == target.getModule() || module.getModuleType() != JpsJavaModuleType.INSTANCE) return
result.add("@" + module.getName())
for (root in module.getSourceRoots<JavaSourceRootProperties>(JavaSourceRootType.SOURCE)) {
result.add(JpsPathUtil.urlToPath(root.getUrl()))
}
}
})
}
} }
} }