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

cleanup

Browse Source
This commit is contained in:
Sergey Ignatov
2011-12-05 15:43:12 +04:00
parent 82ff073a43
commit d8eaf2977c
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/org/jetbrains/jet/j2k/Converter.java
+9 -6
View File
@@ -432,18 +432,21 @@ public class Converter {
@NotNull
private static List<Import> importsToImportList(@NotNull PsiImportStatementBase[] imports) {
List<Import> result = new LinkedList<Import>();
for (PsiImportStatementBase i : imports)
if (!NOT_NULL_ANNOTATIONS.contains(importToImport(i).getName()))
result.add(importToImport(i));
for (PsiImportStatementBase i : imports) {
Import anImport = importToImport(i);
String name = anImport.getName();
if (!name.isEmpty() && !NOT_NULL_ANNOTATIONS.contains(name))
result.add(anImport);
}
return result;
}
@NotNull
private static Import importToImport(@NotNull PsiImportStatementBase i) { // TODO: import reference
private static Import importToImport(@NotNull PsiImportStatementBase i) {
final PsiJavaCodeReferenceElement reference = i.getImportReference();
if (reference != null)
return new Import(quoteKeywords(reference.getQualifiedName()) + (i.isOnDemand() ? ".*" : ""));
return new Import(""); // TODO: remove
return new Import("");
}
@NotNull
@@ -456,7 +459,7 @@ public class Converter {
@NotNull
public static Parameter parameterToParameter(@NotNull PsiParameter parameter) {
return new Parameter(
new IdentifierImpl(parameter.getName()), // TODO: remove
new IdentifierImpl(parameter.getName()),
typeToType(parameter.getType(), isNotNull(parameter.getModifierList())),
isReadOnly(parameter)
);