MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

init IDEA-93952 LiveEdit: JSP support

Browse Source
This commit is contained in:
Vladimir Krivosheev
2013-04-08 16:09:25 +02:00
parent 99142bf982
commit 2d4a9e1eae
1 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/compiler/impl/src/com/intellij/packaging/impl/ui/actions/PackageFileWorker.java
+19 -5
View File
@@ -28,11 +28,12 @@ import com.intellij.openapi.progress.ProgressIndicator;
import com.intellij.openapi.progress.ProgressManager;
import com.intellij.openapi.progress.Task;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.ActionCallback;
import com.intellij.openapi.util.Trinity;
import com.intellij.openapi.util.io.FileUtil;
import com.intellij.openapi.util.io.FileUtilRt;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.openapi.vfs.VfsUtil;
import com.intellij.openapi.vfs.VfsUtilCore;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.packaging.artifacts.Artifact;
import com.intellij.packaging.elements.ArtifactRootElement;
@@ -65,8 +66,17 @@ public class PackageFileWorker {
myRelativeOutputPath = relativeOutputPath;
}
public static void startPackagingFiles(final Project project, final List<VirtualFile> files,
final Artifact[] artifacts, final Runnable onFinished) {
public static void startPackagingFiles(Project project, List<VirtualFile> files, Artifact[] artifacts, final @NotNull Runnable onFinishedInAwt) {
startPackagingFiles(project, files, artifacts).doWhenProcessed(new Runnable() {
@Override
public void run() {
ApplicationManager.getApplication().invokeLater(onFinishedInAwt);
}
});
}
public static ActionCallback startPackagingFiles(final Project project, final List<VirtualFile> files, final Artifact[] artifacts) {
final ActionCallback callback = new ActionCallback();
ProgressManager.getInstance().run(new Task.Backgroundable(project, "Packaging Files") {
@Override
public void run(@NotNull ProgressIndicator indicator) {
@@ -84,19 +94,23 @@ public class PackageFileWorker {
}
}
}.execute();
callback.setDone();
}
}
finally {
ApplicationManager.getApplication().invokeLater(onFinished);
if (!callback.isDone()) {
callback.setRejected();
}
}
}
});
return callback;
}
public static void packageFile(@NotNull VirtualFile file, @NotNull Project project, final Artifact[] artifacts) throws IOException {
LOG.debug("Start packaging file: " + file.getPath());
final Collection<Trinity<Artifact, PackagingElementPath, String>> items = ArtifactUtil.findContainingArtifactsWithOutputPaths(file, project, artifacts);
File ioFile = VfsUtil.virtualToIoFile(file);
File ioFile = VfsUtilCore.virtualToIoFile(file);
for (Trinity<Artifact, PackagingElementPath, String> item : items) {
final Artifact artifact = item.getFirst();
final String outputPath = artifact.getOutputPath();