Update to Idea EAP 134.1342

This commit is contained in:
Nikolay Krasko
2014-02-28 02:46:46 +04:00
parent b0e62315fd
commit 3228630ec5
6 changed files with 11 additions and 11 deletions
+1 -1
View File
@@ -6,7 +6,7 @@
<version>@snapshot@</version>
<vendor url="http://www.jetbrains.com">JetBrains Inc.</vendor>
<idea-version since-build="134.1160" until-build="134.1170"/>
<idea-version since-build="134.1160" until-build="134.1345"/>
<depends optional="true" config-file="junit.xml">JUnit</depends>
<depends optional="true" config-file="gradle.xml">org.jetbrains.plugins.gradle</depends>
@@ -39,23 +39,23 @@ class ModuleTypeCacheManager private (project: Project) {
val connection = project.getMessageBus().connect();
connection.subscribe(VirtualFileManager.VFS_CHANGES, BulkVirtualFileListenerAdapter(
object : VirtualFileAdapter() {
override fun propertyChanged(event: VirtualFilePropertyEvent?) {
override fun propertyChanged(event: VirtualFilePropertyEvent) {
incModificationCount()
}
override fun fileCreated(event: VirtualFileEvent?) {
override fun fileCreated(event: VirtualFileEvent) {
incModificationCount()
}
override fun fileDeleted(event: VirtualFileEvent?) {
override fun fileDeleted(event: VirtualFileEvent) {
incModificationCount()
}
override fun fileMoved(event: VirtualFileMoveEvent?) {
override fun fileMoved(event: VirtualFileMoveEvent) {
incModificationCount()
}
override fun fileCopied(event: VirtualFileCopyEvent?) {
override fun fileCopied(event: VirtualFileCopyEvent) {
incModificationCount()
}
}
@@ -83,7 +83,7 @@ public final class K2JSRunnerUtils {
String filePath = configurationSettings.getPageToOpenFilePath();
String url = VirtualFileManager.constructUrl(LocalFileSystem.PROTOCOL, filePath);
WebBrowser browser = WebBrowserManager.getInstance().findBrowser(configurationSettings.getBrowserFamily());
WebBrowser browser = WebBrowserManager.getInstance().findBrowserById(configurationSettings.getBrowserFamily().getName());
BrowserLauncher.getInstance().browse(url, browser);
}
@@ -1,6 +1,6 @@
import org.jetbrains.annotations.NotNull;
public class Small {
class Small {
void test(@NotNull String hi) {
}
}
@@ -33,7 +33,7 @@ import java.net.URLClassLoader
import java.util.HashSet
public object JavaToKotlinTranslator {
private val DISPOSABLE: Disposable? = Disposer.newDisposable()
private val DISPOSABLE = Disposer.newDisposable()
private fun createFile(text: String): PsiFile? {
val javaCoreEnvironment: JavaCoreProjectEnvironment? = setUpJavaCoreEnvironment()
+2 -2
View File
@@ -1,6 +1,6 @@
<project name="Update Dependencies" default="update">
<property name="jb.buildserver.build.id" value="2376640"/>
<property name="public.buildserver.build.id" value="116034"/>
<property name="jb.buildserver.build.id" value="2394255"/>
<property name="public.buildserver.build.id" value="118313"/>
<condition property="os.tag" value="win.zip">
<os family="windows" />