maece/HSG-MCS-HS21_tapas
1
0
Fork 0
Code Issues 14 Pull Requests Packages Projects Releases 6 Wiki Activity

Merging dev to main #107

Merged
Maece97 merged 52 commits from dev into main 2021-12-23 16:12:19 +00:00
Conversation 4 Commits 52 Files Changed 248 +2 -2
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 7e34a5a7b1 - Show all commits

2
executor-base/src/main/java/ch/unisg/executorBase/executor/domain/ExecutorType.java
View File

@ -1,7 +1,7 @@
package ch.unisg.executorbase.executor.domain; package ch.unisg.executorbase.executor.domain;
public enum ExecutorType { public enum ExecutorType {
ADDITION, ROBOT; COMPUTATION, ROBOT;
/** /**
* Checks if the give executor type exists. * Checks if the give executor type exists.

2
executor-computation/src/main/java/ch/unisg/executorcomputation/executor/domain/Executor.java
View File

@ -7,7 +7,7 @@ import ch.unisg.executorbase.executor.domain.ExecutorType;
public class Executor extends ExecutorBase { public class Executor extends ExecutorBase {
private static final Executor executor = new Executor(ExecutorType.ADDITION); private static final Executor executor = new Executor(ExecutorType.COMPUTATION);
public static Executor getExecutor() { public static Executor getExecutor() {
return executor; return executor;