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

Converter:

Browse Source 
Replace hack used to configure Converter by ConverterSettings class
Minor: remove redundant open modifiers, add override annotations
This commit is contained in:
Pavel Talanov
2013-11-05 18:07:47 +04:00
committed by Pavel V. Talanov
parent 3edefcf598
commit cba8d3b6db
11 changed files with 89 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/actions/JavaToKotlinAction.java
+2 -1
View File
@@ -27,6 +27,7 @@ import com.intellij.openapi.ui.Messages;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.psi.PsiFile;
import org.jetbrains.jet.j2k.Converter;
import org.jetbrains.jet.j2k.J2kPackage;
import java.util.List;
@@ -39,7 +40,7 @@ public class JavaToKotlinAction extends AnAction {
assert virtualFiles != null;
final Project project = PlatformDataKeys.PROJECT.getData(e.getDataContext());
assert project != null;
final Converter converter = new Converter(project);
final Converter converter = new Converter(project, J2kPackage.getPluginSettings());
int result = Messages.showYesNoCancelDialog(project,
"Would you like to backup Java files?",
"Backup",
idea/src/org/jetbrains/jet/plugin/conversion/copy/JavaCopyPastePostProcessor.java
+2 -1
View File
@@ -28,6 +28,7 @@ import com.intellij.openapi.util.text.StringUtil;
import com.intellij.psi.*;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.jet.j2k.Converter;
import org.jetbrains.jet.j2k.J2kPackage;
import org.jetbrains.jet.lang.psi.JetFile;
import org.jetbrains.jet.plugin.editor.JetEditorOptions;
@@ -116,7 +117,7 @@ public class JavaCopyPastePostProcessor implements CopyPastePostProcessor<TextBl
Project project = file.getProject();
StringBuilder result = new StringBuilder();
for (PsiElement e : buffer) {
String converted = new Converter(project).elementToKotlin(e);
String converted = new Converter(project, J2kPackage.getPluginSettings()).elementToKotlin(e);
if (!converted.isEmpty()) {
result.append(converted).append(EOL);
}