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

use PsiImportStatementBase.isOnDemand inside importToImport method

Browse Source
This commit is contained in:
Sergey Ignatov
2011-11-16 18:21:10 +04:00
parent 947a5bf5d8
commit 60f7226bd5
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/org/jetbrains/jet/j2k/Converter.java
+6 -4
View File
@@ -173,7 +173,7 @@ public class Converter {
@NotNull @NotNull
private static List<Initializer> initializersToInitializerList(PsiClassInitializer[] initializers) { private static List<Initializer> initializersToInitializerList(PsiClassInitializer[] initializers) {
List<Initializer> result = new LinkedList<Initializer>(); List<Initializer> result = new LinkedList<Initializer>();
for (PsiClassInitializer i : initializers) result.add(initializerToInitializer(i)); for (PsiClassInitializer i : initializers) result.add(initializerToInitializer(i));
return result; return result;
} }
@@ -403,9 +403,11 @@ public class Converter {
} }
@NotNull @NotNull
private static Import importToImport(PsiImportStatementBase i) { private static Import importToImport(@NotNull PsiImportStatementBase i) { // TODO: import reference
final String text = i == null ? "" : quoteKeywords(i.getText().replace("import ", "").replace("static ", "").replace(";", "")); final PsiJavaCodeReferenceElement reference = i.getImportReference();
return new Import(text); // TODO: import reference if (reference != null)
return new Import(quoteKeywords(reference.getQualifiedName()) + (i.isOnDemand() ? ".*" : ""));
return new Import(""); // TODO: remove
} }
@NotNull @NotNull