Native libraries verplaatst naar root, dat is meer consistent.

This commit is contained in:
2011-06-16 07:53:40 +00:00
parent 5cbe047b32
commit e4515cca10
19 changed files with 18 additions and 11 deletions

View File

@@ -1,12 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<classpath> <classpath>
<classpathentry kind="src" path="src"/> <classpathentry kind="src" path="src">
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6">
<attributes> <attributes>
<attribute name="org.eclipse.jdt.launching.CLASSPATH_ATTR_LIBRARY_PATH_ENTRY" value="Mimis/native"/> <attribute name="org.eclipse.jdt.launching.CLASSPATH_ATTR_LIBRARY_PATH_ENTRY" value="Mimis/native"/>
</attributes> </attributes>
</classpathentry> </classpathentry>
<classpathentry kind="lib" path="native"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6">
<attributes>
<attribute name="org.eclipse.jdt.launching.CLASSPATH_ATTR_LIBRARY_PATH_ENTRY" value="Mimis"/>
</attributes>
</classpathentry>
<classpathentry kind="lib" path="resource"/> <classpathentry kind="lib" path="resource"/>
<classpathentry kind="lib" path="lib/commons-logging-1.1.1.jar"/> <classpathentry kind="lib" path="lib/commons-logging-1.1.1.jar"/>
<classpathentry kind="lib" path="lib/log4j-1.2.16.jar"/> <classpathentry kind="lib" path="lib/log4j-1.2.16.jar"/>

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@@ -38,6 +38,13 @@ public abstract class WindowsApplication extends CMDApplication {
} }
} }
public boolean active() {
if (!active) {
handle = Windows.findWindow(name, null);
}
return super.active();
}
public void deactivate() throws DeactivateException { public void deactivate() throws DeactivateException {
try { try {
VBScript.terminate(program); VBScript.terminate(program);

View File

@@ -22,7 +22,7 @@ public class Multiplexer extends Worker {
this.signalListener = signalListener; this.signalListener = signalListener;
} }
public void add(Object object) { public synchronized void add(Object object) {
if (this.object == null) { if (this.object == null) {
signalListener.add(Signal.BEGIN, object); signalListener.add(Signal.BEGIN, object);
this.object = object; this.object = object;
@@ -34,20 +34,17 @@ public class Multiplexer extends Worker {
} }
} else if (this.object.equals(object)) { } else if (this.object.equals(object)) {
end = false; end = false;
synchronized (this) { notifyAll();
notifyAll();
}
} else { } else {
end = true; end = true;
synchronized (this) { synchronized (this) {
notifyAll(); notifyAll();
} }
add(object); add(object);
} }
} }
protected void work() { protected void work() {
log.debug("Multiplexer work");
try { try {
synchronized (this) { synchronized (this) {
wait(TIMEOUT); wait(TIMEOUT);

View File

@@ -8,7 +8,7 @@ import java.util.Scanner;
public class Native { public class Native {
public static int getHandle(String title) throws IOException { public static int getHandle(String title) throws IOException {
String command = String.format("native/list.exe w"); String command = String.format("list.exe w");
Process process = Runtime.getRuntime().exec(command); Process process = Runtime.getRuntime().exec(command);
Scanner scanner = new Scanner(process.getInputStream()); Scanner scanner = new Scanner(process.getInputStream());
scanner.nextLine(); scanner.nextLine();
@@ -27,7 +27,7 @@ public class Native {
} }
public static String getProgram(int processId) throws IOException { public static String getProgram(int processId) throws IOException {
String command = String.format("native/list.exe p"); String command = String.format("list.exe p");
Process process = Runtime.getRuntime().exec(command); Process process = Runtime.getRuntime().exec(command);
Scanner scanner = new Scanner(process.getInputStream()); Scanner scanner = new Scanner(process.getInputStream());
scanner.nextLine(); scanner.nextLine();