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

Common functionality factored out of OutputItemsCollectorImpl

Browse Source 
To be re-used by external build
This commit is contained in:
Andrey Breslav
2012-11-08 23:34:53 +04:00
parent e2d504c78e
commit c01587a0b1
2 changed files with 79 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ide-compiler-runner/src/org/jetbrains/jet/compiler/runner/AbstractOutputItemCollector.java
+69
View File
@@ -0,0 +1,69 @@
/*
* Copyright 2010-2012 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.jetbrains.jet.compiler.runner;
import com.intellij.util.containers.ContainerUtil;
import org.jetbrains.annotations.NotNull;
import java.util.List;
public abstract class AbstractOutputItemCollector<S, R> implements OutputItemsCollector {
private static final String FOR_SOURCE_PREFIX = "For source: ";
private static final String EMITTING_PREFIX = "Emitting: ";
private S currentSource;
private final List<R> answer = ContainerUtil.newArrayList();
private final List<S> sources = ContainerUtil.newArrayList();
private final String outputPath;
public AbstractOutputItemCollector(@NotNull String outputPath) {
this.outputPath = outputPath;
}
@Override
public final void learn(String message) {
message = message.trim();
if (message.startsWith(FOR_SOURCE_PREFIX)) {
String sourcePath = message.substring(FOR_SOURCE_PREFIX.length());
currentSource = convertSource(sourcePath);
if (currentSource != null) {
sources.add(currentSource);
}
}
else if (message.startsWith(EMITTING_PREFIX)) {
if (currentSource != null) {
String resultPath = message.substring(EMITTING_PREFIX.length());
R item = convertResult(outputPath + "/" + resultPath, currentSource);
if (item != null) {
answer.add(item);
}
}
}
}
protected abstract R convertResult(String resultPath, S correspondingSource);
protected abstract S convertSource(String sourcePath);
public List<R> getOutputs() {
return answer;
}
public List<S> getSources() {
return sources;
}
}
idea/src/org/jetbrains/jet/plugin/compiler/CompilerUtils.java
+10 -33
View File
@@ -24,12 +24,10 @@ import com.intellij.openapi.vfs.LocalFileSystem;
import com.intellij.openapi.vfs.VirtualFile;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.compiler.runner.AbstractOutputItemCollector;
import org.jetbrains.jet.compiler.runner.CompilerEnvironment;
import org.jetbrains.jet.compiler.runner.OutputItemsCollector;
import java.io.File;
import java.util.ArrayList;
import java.util.List;
/**
* @author Pavel Talanov
@@ -51,42 +49,21 @@ public final class CompilerUtils {
return new File(file.getPath());
}
public static class OutputItemsCollectorImpl implements OutputItemsCollector {
private static final String FOR_SOURCE_PREFIX = "For source: ";
private static final String EMITTING_PREFIX = "Emitting: ";
private final String outputPath;
private VirtualFile currentSource;
private List<TranslatingCompiler.OutputItem> answer = new ArrayList<TranslatingCompiler.OutputItem>();
private List<VirtualFile> sources = new ArrayList<VirtualFile>();
public static class OutputItemsCollectorImpl extends AbstractOutputItemCollector<VirtualFile, TranslatingCompiler.OutputItem> {
public OutputItemsCollectorImpl(String outputPath) {
this.outputPath = outputPath;
public OutputItemsCollectorImpl(@NotNull String outputPath) {
super(outputPath);
}
@Override
public void learn(String message) {
message = message.trim();
if (message.startsWith(FOR_SOURCE_PREFIX)) {
currentSource = LocalFileSystem.getInstance().findFileByPath(message.substring(FOR_SOURCE_PREFIX.length()));
if (currentSource != null) {
sources.add(currentSource);
}
}
else if (message.startsWith(EMITTING_PREFIX)) {
if (currentSource != null) {
OutputItemImpl item = new OutputItemImpl(outputPath + "/" + message.substring(EMITTING_PREFIX.length()), currentSource);
LocalFileSystem.getInstance().refreshAndFindFileByIoFile(new File(item.getOutputPath()));
answer.add(item);
}
}
protected TranslatingCompiler.OutputItem convertResult(String resultPath, VirtualFile correspondingSource) {
LocalFileSystem.getInstance().refreshAndFindFileByIoFile(new File(resultPath));
return new OutputItemImpl(resultPath, correspondingSource);
}
public List<TranslatingCompiler.OutputItem> getOutputs() {
return answer;
}
public List<VirtualFile> getSources() {
return sources;
@Override
protected VirtualFile convertSource(String sourcePath) {
return LocalFileSystem.getInstance().findFileByPath(sourcePath);
}
}
}