halfdan/eva2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

providing GOParameters and predicate isOptFinished from client (merging 219,220 from MK branch).

Browse Source
This commit is contained in:
Marcel Kronfeld 2008-11-17 14:29:45 +00:00
parent 55014fd1d8
commit eca74db612
2 changed files with 35 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/eva2/client/EvAClient.java
View File

@ -57,6 +57,8 @@ import eva2.gui.JExtMenu;
import eva2.gui.JTabbedModuleFrame; import eva2.gui.JTabbedModuleFrame;
import eva2.gui.LogPanel; import eva2.gui.LogPanel;
import eva2.server.EvAServer; import eva2.server.EvAServer;
import eva2.server.go.InterfaceGOParameters;
import eva2.server.modules.AbstractModuleAdapter;
import eva2.server.modules.ModuleAdapter; import eva2.server.modules.ModuleAdapter;
import eva2.tools.EVAERROR; import eva2.tools.EVAERROR;
import eva2.tools.EVAHELP; import eva2.tools.EVAHELP;
@ -96,7 +98,7 @@ public class EvAClient implements RemoteStateListener, Serializable {
private ExtAction m_actAvailableHost; private ExtAction m_actAvailableHost;
private ExtAction m_actKillHost; private ExtAction m_actKillHost;
private ExtAction m_actKillAllHosts; private ExtAction m_actKillAllHosts;
// private ArrayList m_ModuleAdapterList = new ArrayList(); private ModuleAdapter currentModuleAdapter = null;
// About: // About:
private ExtAction m_actAbout; private ExtAction m_actAbout;
private ExtAction m_actLicense; private ExtAction m_actLicense;
@ -548,6 +550,31 @@ public class EvAClient implements RemoteStateListener, Serializable {
} }
} }
/**
* Retrieve the GOParamters of a loaded module. Return null if no module is loaded.
*
* @return
*/
public InterfaceGOParameters getGOParameters() {
if (currentModuleAdapter != null) {
if (currentModuleAdapter instanceof AbstractModuleAdapter) {
return ((AbstractModuleAdapter)currentModuleAdapter).getGOParameters();
}
}
return null;
}
/**
* Check if there is an optimization currently running.
*
* @return
*/
public boolean isOptRunning() {
if (currentModuleAdapter != null && (currentModuleAdapter instanceof AbstractModuleAdapter)) {
return ((AbstractModuleAdapter)currentModuleAdapter).isOptRunning();
} else return false;
}
private void loadSpecificModule(String selectedModule) { private void loadSpecificModule(String selectedModule) {
ModuleAdapter newModuleAdapter = null; ModuleAdapter newModuleAdapter = null;
// //
@ -624,6 +651,7 @@ public class EvAClient implements RemoteStateListener, Serializable {
// ModuladapterListe adden // ModuladapterListe adden
// m_ModuleAdapterList.add(newModuleAdapter); // m_ModuleAdapterList.add(newModuleAdapter);
currentModuleAdapter = newModuleAdapter;
} }
} }

6
src/eva2/server/modules/AbstractModuleAdapter.java
View File

@ -126,6 +126,12 @@ abstract public class AbstractModuleAdapter implements ModuleAdapter, Serializab
} else return null; } else return null;
} }
public boolean isOptRunning() {
if ((m_Processor != null) && (m_Processor instanceof Processor)) {
return ((Processor)m_Processor).isOptRunning();
} else return false;
}
/** /**
* *
*/ */