Reconstruct the codes && fix wrong file separator when switch to anther os from Windows.

This commit is contained in:
huanghongxun
2015-07-10 22:53:18 +08:00
parent 244b646225
commit 0be056ac04
7 changed files with 154 additions and 70 deletions

View File

@@ -0,0 +1,75 @@
/*
* Copyright 2013 huangyuhui <huanghongxun2008@126.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program.
*/
package org.jackhuang.hellominecraft.utils.system;
import java.util.Arrays;
import java.util.HashSet;
import org.jackhuang.hellominecraft.C;
import org.jackhuang.hellominecraft.utils.CollectionUtils;
import org.jackhuang.hellominecraft.utils.Event;
import org.jackhuang.hellominecraft.utils.EventHandler;
import org.jackhuang.hellominecraft.utils.StrUtils;
/**
*
* @author huangyuhui
*/
public class JavaProcessMonitor {
private final HashSet<Thread> al = new HashSet<>();
public final EventHandler<JavaProcess> stoppedEvent = new EventHandler<>(this);
private final JavaProcess p;
public JavaProcessMonitor(JavaProcess p) {
this.p = p;
}
void start() {
Event<JavaProcess> event = (sender2, t) -> {
processThreadStopped((ProcessThread) sender2, false);
return true;
};
ProcessThread a = new ProcessThread(p, true, true);
a.stopEvent.register((sender3, p1) -> {
if (p1.getExitCode() != 0 && p1.getStdErrLines().size() > 0 && StrUtils.containsOne(p1.getStdErrLines(), Arrays.asList("Could not create the Java Virtual Machine.",
"Error occurred during initialization of VM",
"A fatal exception has occurred. Program will exit."))) MessageBox.Show(C.i18n("launch.cannot_create_jvm"));
processThreadStopped((ProcessThread) sender3, false);
return true;
});
a.start();
al.add(a);
a = new ProcessThread(p, false, true);
a.stopEvent.register(event);
a.start();
al.add(a);
a = new ProcessThread(p, false, false);
a.stopEvent.register(event);
a.start();
al.add(a);
}
void processThreadStopped(ProcessThread t, boolean forceTermintate) {
al.remove(t);
al.removeAll(CollectionUtils.sortOut(al, t1 -> !t1.isAlive()));
if (al.isEmpty() || forceTermintate) {
for (Thread a : al) a.interrupt();
al.clear();
stoppedEvent.execute(p);
}
}
}

View File

@@ -25,10 +25,16 @@ import org.jackhuang.hellominecraft.HMCLog;
*/
public enum OS {
LINUX,
WINDOWS,
OSX,
UNKOWN;
LINUX('/'),
WINDOWS('\\'),
OSX('/'),
UNKOWN('/');
public final char fileSeparator;
private OS(char fileSeparator) {
this.fileSeparator = fileSeparator;
}
public static OS os() {
String str;