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

Minor: Unit.VALUE -> Unit in Java code.

Browse Source
This commit is contained in:
Zalim Bashorov
2014-07-25 21:03:10 +04:00
parent 16dfdd2f03
commit a811de9bbd
11 changed files with 17 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/CompileEnvironmentUtil.java
+1 -2
View File
@@ -62,7 +62,6 @@ import java.net.MalformedURLException;
import java.net.URL; import java.net.URL;
import java.net.URLClassLoader; import java.net.URLClassLoader;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.jar.*; import java.util.jar.*;
@@ -304,7 +303,7 @@ public class CompileEnvironmentUtil {
} }
} }
} }
return Unit.VALUE; return Unit.instance$;
} }
}); });
} }
compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/JetCoreEnvironment.java
+1 -1
View File
@@ -209,7 +209,7 @@ public class JetCoreEnvironment {
@Override @Override
public Unit invoke(String s) { public Unit invoke(String s) {
report(ERROR, s); report(ERROR, s);
return Unit.VALUE; return Unit.instance$;
} }
})); }));
JetScriptDefinitionProvider.getInstance(project).addScriptDefinitions( JetScriptDefinitionProvider.getInstance(project).addScriptDefinitions(
compiler/frontend/src/org/jetbrains/jet/lang/cfg/JetFlowInformationProvider.java
+2 -2
View File
@@ -957,7 +957,7 @@ public class JetFlowInformationProvider {
@Override @Override
public Unit invoke(Instruction instruction, D enterData, D exitData) { public Unit invoke(Instruction instruction, D enterData, D exitData) {
execute(instruction, enterData, exitData); execute(instruction, enterData, exitData);
return Unit.VALUE; return Unit.instance$;
} }
public abstract void execute(Instruction instruction, D enterData, D exitData); public abstract void execute(Instruction instruction, D enterData, D exitData);
@@ -967,7 +967,7 @@ public class JetFlowInformationProvider {
@Override @Override
public Unit invoke(P p) { public Unit invoke(P p) {
execute(p); execute(p);
return Unit.VALUE; return Unit.instance$;
} }
public abstract void execute(P p); public abstract void execute(P p);
compiler/frontend/src/org/jetbrains/jet/lang/cfg/PseudocodeVariablesData.java
+1 -1
View File
@@ -85,7 +85,7 @@ public class PseudocodeVariablesData {
if (variableDescriptor != null) { if (variableDescriptor != null) {
result.add(variableDescriptor); result.add(variableDescriptor);
} }
return Unit.VALUE; return Unit.instance$;
} }
}); });
usedVariables = Collections.unmodifiableSet(result); usedVariables = Collections.unmodifiableSet(result);
compiler/frontend/src/org/jetbrains/jet/lang/resolve/OverrideResolver.java
+1 -1
View File
@@ -192,7 +192,7 @@ public class OverrideResolver {
if (element instanceof JetDeclaration) { if (element instanceof JetDeclaration) {
trace.report(CANNOT_INFER_VISIBILITY.on((JetDeclaration) element, descriptor)); trace.report(CANNOT_INFER_VISIBILITY.on((JetDeclaration) element, descriptor));
} }
return Unit.VALUE; return Unit.instance$;
} }
}; };
} }
compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/LazyClassDescriptor.java
+1 -1
View File
@@ -515,7 +515,7 @@ public class LazyClassDescriptor extends ClassDescriptorBase implements ClassDes
@Override @Override
public Unit invoke(@NotNull Supertypes supertypes) { public Unit invoke(@NotNull Supertypes supertypes) {
findAndDisconnectLoopsInTypeHierarchy(supertypes); findAndDisconnectLoopsInTypeHierarchy(supertypes);
return Unit.VALUE; return Unit.instance$;
} }
} }
); );
compiler/tests/org/jetbrains/jet/storage/StorageManagerTest.java
+6 -6
View File
@@ -281,7 +281,7 @@ public class StorageManagerTest extends TestCase {
new Function1<String, Unit>() { new Function1<String, Unit>() {
@Override @Override
public Unit invoke(String s) { public Unit invoke(String s) {
return Unit.VALUE; return Unit.instance$;
} }
} }
); );
@@ -317,7 +317,7 @@ public class StorageManagerTest extends TestCase {
public Unit invoke(String s) { public Unit invoke(String s) {
counter.inc(); counter.inc();
assertEquals("tolerant", s); assertEquals("tolerant", s);
return Unit.VALUE; return Unit.instance$;
} }
} }
); );
@@ -346,7 +346,7 @@ public class StorageManagerTest extends TestCase {
public Unit invoke(Collection<String> strings) { public Unit invoke(Collection<String> strings) {
counter.inc(); counter.inc();
strings.add("postComputed"); strings.add("postComputed");
return Unit.VALUE; return Unit.instance$;
} }
} }
); );
@@ -372,7 +372,7 @@ public class StorageManagerTest extends TestCase {
public Unit invoke(Collection<String> strings) { public Unit invoke(Collection<String> strings) {
counter.inc(); counter.inc();
strings.add("postComputed"); strings.add("postComputed");
return Unit.VALUE; return Unit.instance$;
} }
} }
); );
@@ -405,7 +405,7 @@ public class StorageManagerTest extends TestCase {
@Override @Override
public Unit invoke(String s) { public Unit invoke(String s) {
fail("Recursion-tolerating value should not be post computed"); fail("Recursion-tolerating value should not be post computed");
return Unit.VALUE; return Unit.instance$;
} }
} }
); );
@@ -581,4 +581,4 @@ public class StorageManagerTest extends TestCase {
throw new UnsupportedOperationException(); throw new UnsupportedOperationException();
} }
} }
} }
core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/DescriptorResolverUtils.java
+1 -1
View File
@@ -62,7 +62,7 @@ public final class DescriptorResolverUtils {
@Override @Override
public Unit invoke(@NotNull CallableMemberDescriptor descriptor) { public Unit invoke(@NotNull CallableMemberDescriptor descriptor) {
errorReporter.reportCannotInferVisibility(descriptor); errorReporter.reportCannotInferVisibility(descriptor);
return Unit.VALUE; return Unit.instance$;
} }
}); });
result.add((D) fakeOverride); result.add((D) fakeOverride);
idea/tests/org/jetbrains/jet/completion/AbstractMultiFileJvmBasicCompletionTest.java
+1 -1
View File
@@ -43,7 +43,7 @@ public abstract class AbstractMultiFileJvmBasicCompletionTest extends KotlinComp
return myItems; return myItems;
} }
}); });
return Unit.VALUE; return Unit.instance$;
} }
} }
); );
idea/tests/org/jetbrains/jet/plugin/stubs/AbstractLazyResolveByStubTest.java
+1 -1
View File
@@ -63,7 +63,7 @@ public abstract class AbstractLazyResolveByStubTest extends KotlinCodeInsightTes
@Override @Override
public Unit invoke() { public Unit invoke() {
performTest(path, checkPrimaryConstructors, checkPropertyAccessors); performTest(path, checkPrimaryConstructors, checkPropertyAccessors);
return Unit.VALUE; return Unit.instance$;
} }
} }
); );
idea/tests/org/jetbrains/jet/plugin/stubs/AbstractMultiFileHighlightingTest.java
+1 -1
View File
@@ -47,7 +47,7 @@ public abstract class AbstractMultiFileHighlightingTest extends KotlinCompletion
@Override @Override
public Unit invoke() { public Unit invoke() {
checkHighlighting(myEditor, true, false); checkHighlighting(myEditor, true, false);
return Unit.VALUE; return Unit.instance$;
} }
} }
); );