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

Rewrote DiagnosticRendererUtil to kotlin

Browse Source
This commit is contained in:
Svetlana Isakova
2014-08-23 16:20:35 +04:00
parent 3a15192bf8
commit d150a26f8a
4 changed files with 7 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/DiagnosticRendererUtil.java → compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/DiagnosticRendererUtil.kt
+4 -14
View File
@@ -1,5 +1,5 @@
/* /*
* Copyright 2010-2013 JetBrains s.r.o. * Copyright 2010-2014 JetBrains s.r.o.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -14,18 +14,8 @@
* limitations under the License. * limitations under the License.
*/ */
package org.jetbrains.jet.lang.diagnostics.rendering; package org.jetbrains.jet.lang.diagnostics.rendering
import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.renderer.Renderer
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.renderer.Renderer;
public class DiagnosticRendererUtil { public fun <P> renderParameter(parameter: P, renderer: Renderer<P>?): Any = renderer?.render(parameter) ?: parameter
private DiagnosticRendererUtil() {
}
@NotNull
public static <P> Object renderParameter(@NotNull P parameter, @Nullable Renderer<P> renderer) {
return renderer == null ? parameter : renderer.render(parameter);
}
}
compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/DiagnosticWithParameters1Renderer.java
+1 -1
View File
@@ -23,7 +23,7 @@ import org.jetbrains.jet.renderer.Renderer;
import java.text.MessageFormat; import java.text.MessageFormat;
import static org.jetbrains.jet.lang.diagnostics.rendering.DiagnosticRendererUtil.renderParameter; import static org.jetbrains.jet.lang.diagnostics.rendering.RenderingPackage.renderParameter;
public class DiagnosticWithParameters1Renderer<A> implements DiagnosticRenderer<DiagnosticWithParameters1<?, A>> { public class DiagnosticWithParameters1Renderer<A> implements DiagnosticRenderer<DiagnosticWithParameters1<?, A>> {
private final MessageFormat messageFormat; private final MessageFormat messageFormat;
compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/DiagnosticWithParameters2Renderer.java
+1 -1
View File
@@ -23,7 +23,7 @@ import org.jetbrains.jet.renderer.Renderer;
import java.text.MessageFormat; import java.text.MessageFormat;
import static org.jetbrains.jet.lang.diagnostics.rendering.DiagnosticRendererUtil.renderParameter; import static org.jetbrains.jet.lang.diagnostics.rendering.RenderingPackage.renderParameter;
public class DiagnosticWithParameters2Renderer<A, B> implements DiagnosticRenderer<DiagnosticWithParameters2<?, A, B>> { public class DiagnosticWithParameters2Renderer<A, B> implements DiagnosticRenderer<DiagnosticWithParameters2<?, A, B>> {
private final MessageFormat messageFormat; private final MessageFormat messageFormat;
compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/DiagnosticWithParameters3Renderer.java
+1 -1
View File
@@ -23,7 +23,7 @@ import org.jetbrains.jet.renderer.Renderer;
import java.text.MessageFormat; import java.text.MessageFormat;
import static org.jetbrains.jet.lang.diagnostics.rendering.DiagnosticRendererUtil.renderParameter; import static org.jetbrains.jet.lang.diagnostics.rendering.RenderingPackage.renderParameter;
public class DiagnosticWithParameters3Renderer<A, B, C> implements DiagnosticRenderer<DiagnosticWithParameters3<?, A, B, C>> { public class DiagnosticWithParameters3Renderer<A, B, C> implements DiagnosticRenderer<DiagnosticWithParameters3<?, A, B, C>> {
private final MessageFormat messageFormat; private final MessageFormat messageFormat;