Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

worker changes #8

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

worker changes #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
aa04749
worker changes
DorWolfgor Feb 23, 2022
15bafcd
Delete misc.xml
shlior7 Feb 23, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
68 changes: 0 additions & 68 deletions .idea/misc.xml
View file
Open in desktop

This file was deleted.

6 changes: 4 additions & 2 deletions Admin/Admin.iml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,14 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="Maven: com.squareup.okio:okio:1.15.0" level="project" />
<orderEntry type="library" name="Maven: com.squareup.okhttp3:okhttp:3.12.10" level="project" />
<orderEntry type="library" name="Maven: com.google.code.gson:gson:2.8.9" level="project" />
<orderEntry type="module" module-name="SharedEngine" />
<orderEntry type="module" module-name="Graph" />
<orderEntry type="module" module-name="GraphFx" />
<orderEntry type="library" name="Maven: org.controlsfx:controlsfx:8.40.18" level="project" />
<orderEntry type="module" module-name="SharedEngine" />
<orderEntry type="module" module-name="GPUPServer" />
<orderEntry type="library" name="Maven: com.squareup.okio:okio:1.17.5" level="project" />
<orderEntry type="library" name="Maven: com.google.code.gson:gson:2.9.0" level="project" />
</component>
</module>
2 changes: 1 addition & 1 deletion Chat/Chat.iml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="Maven: com.squareup.okhttp3:okhttp:3.12.10" level="project" />
<orderEntry type="library" name="Maven: com.google.code.gson:gson:2.8.9" level="project" />
<orderEntry type="library" name="Maven: com.squareup.okio:okio:1.15.0" level="project" />
<orderEntry type="library" name="Maven: org.jetbrains:annotations:23.0.0" level="project" />
<orderEntry type="library" name="Maven: com.squareup.okio:okio:1.17.5" level="project" />
</component>
</module>
14 changes: 4 additions & 10 deletions GPUP.iml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,22 +4,16 @@
<output url="file://$MODULE_DIR$/target/classes" />
<output-test url="file://$MODULE_DIR$/target/test-classes" />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
<excludeFolder url="file://$MODULE_DIR$/target" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/annotations/20.1.0/annotations-20.1.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="library" name="Maven: org.projectlombok:lombok:1.18.22" level="project" />
<orderEntry type="library" name="Maven: org.controlsfx:controlsfx:8.40.18" level="project" />
<orderEntry type="library" name="Maven: org.json:json:20200518" level="project" />
<orderEntry type="library" name="Maven: com.squareup.okhttp3:okhttp:3.12.10" level="project" />
<orderEntry type="library" name="Maven: com.google.code.gson:gson:2.9.0" level="project" />
<orderEntry type="library" name="Maven: com.squareup.okio:okio:1.17.5" level="project" />
<orderEntry type="library" name="Maven: org.jetbrains:annotations:22.0.0" level="project" />
</component>
</module>
21 changes: 11 additions & 10 deletions GPUPServer/GPUPServer.iml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,30 +4,31 @@
<facet type="web" name="Web">
<configuration>
<descriptors>
<deploymentDescriptor name="web.xml" url="file://$MODULE_DIR$/../GPUPServer/web/WEB-INF/web.xml" />
<deploymentDescriptor name="web.xml" url="file://$MODULE_DIR$/web/WEB-INF/web.xml" />
</descriptors>
<webroots>
<root url="file://$MODULE_DIR$/../GPUPServer/web" relative="/" />
<root url="file://$MODULE_DIR$/web" relative="/" />
</webroots>
<sourceRoots />
</configuration>
</facet>
</component>
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
<output url="file://$MODULE_DIR$/../GPUPServer/target/classes" />
<output-test url="file://$MODULE_DIR$/../GPUPServer/target/test-classes" />
<content url="file://$MODULE_DIR$/../GPUPServer">
<sourceFolder url="file://$MODULE_DIR$/../GPUPServer/src/main/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/../GPUPServer/src/main/resources" type="java-resource" />
<excludeFolder url="file://$MODULE_DIR$/../GPUPServer/target" />
<output url="file://$MODULE_DIR$/target/classes" />
<output-test url="file://$MODULE_DIR$/target/test-classes" />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
<excludeFolder url="file://$MODULE_DIR$/target" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="Engine" />
<orderEntry type="module" module-name="Graph" />
<orderEntry type="module" module-name="SharedEngine" />
<orderEntry type="library" scope="PROVIDED" name="Tomcat 10.0.16" level="application_server_libraries" />
<orderEntry type="library" name="Maven: com.google.code.gson:gson:2.8.9" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: jakarta.servlet:jakarta.servlet-api:5.0.0" level="project" />
<orderEntry type="module" module-name="SharedEngine" />
<orderEntry type="library" name="Maven: com.google.code.gson:gson:2.9.0" level="project" />
<orderEntry type="library" name="Maven: jakarta.servlet:jakarta.servlet-api:5.0.0" level="project" />
</component>
</module>
4 changes: 2 additions & 2 deletions GPUPServer/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,14 @@
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
<version>2.8.9</version>
<version>2.9.0</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<version>5.0.0</version>
<scope>provided</scope>
<scope>compile</scope>
</dependency>
</dependencies>

Expand Down
2 changes: 1 addition & 1 deletion GraphFx/GraphFx.iml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@
<orderEntry type="module" module-name="SharedEngine" />
<orderEntry type="library" name="Maven: org.controlsfx:controlsfx:8.40.18" level="project" />
<orderEntry type="library" name="Maven: com.squareup.okhttp3:okhttp:3.12.10" level="project" />
<orderEntry type="library" name="Maven: com.squareup.okio:okio:1.15.0" level="project" />
<orderEntry type="library" name="Maven: com.squareup.okio:okio:1.17.5" level="project" />
</component>
</module>
3 changes: 2 additions & 1 deletion SharedEngine/SharedEngine.iml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="Graph" />
<orderEntry type="library" name="Maven: org.projectlombok:lombok:1.18.22" level="project" />
<orderEntry type="library" name="Maven: com.google.code.gson:gson:2.8.9" level="project" />
<orderEntry type="module" module-name="Graph" />
<orderEntry type="library" name="Maven: com.google.code.gson:gson:2.9.0" level="project" />
</component>
</module>
51 changes: 51 additions & 0 deletions SharedEngine/src/types/GraphInfoWorker.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
package types;

import TargetGraph.Result;
import TargetGraph.Status;
import TargetGraph.Target;
import TargetGraph.TargetGraph;

public class GraphInfoWorker {
private final String taskName;
private String workersOnTask;
private String progress;
private String targetFinished;
private String credits;


public GraphInfoWorker(Task task, TargetGraph target) {
this.taskName = task.getName();
this.workersOnTask = task.toString();

}

// public String getTaskName() {
// return taskName;
// }
//
// public String getTargetName() {
// return targetName;
// }
//
// public String getTaskType() {
// return taskType;
// }
//
// public String getPrice() {
// return price;
// }
//
// public String getTargetStatus() {
// return targetStatus;
// }
//
// public String getLog() {return log;}
//
// public synchronized void setLog(String log) {
// this.log = log;
// }
//
// public synchronized void setTargetStatus(String targetStatus) {
// this.targetStatus = targetStatus;
// }
}
69 changes: 69 additions & 0 deletions SharedEngine/src/types/TargetInfo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
package types;

import TargetGraph.Result;
import TargetGraph.Status;
import TargetGraph.Target;
import lombok.ToString;

@ToString
public class TargetInfo {
private final String taskName;
private final String targetName;
private final String taskType;
private final String price;
private String targetStatus;
private String log;


public TargetInfo(Task task, Target target) {
this.taskName = task.getName();
this.targetName = target.toString();
this.price = String.valueOf(task.getPricePerTarget());
this.taskType = task.getType();
if (target.getStatus() == Status.FINISHED) {
this.targetStatus = target.getResult().toString();
if(target.getResult() == Result.Success||target.getResult() == Result.Warning) {
this.log = targetName + ".log";
}
else{
this.log = "";
}
}
else {
this.targetStatus = target.getStatus().toString();
this.log = "";
}
}

public String getTaskName() {
return taskName;
}

public String getTargetName() {
return targetName;
}

public String getTaskType() {
return taskType;
}

public String getPrice() {
return price;
}

public String getTargetStatus() {
return targetStatus;
}

public String getLog() {return log;}

public synchronized void setLog(String log) {
this.log = log;
}

public synchronized void setTargetStatus(String targetStatus) {
this.targetStatus = targetStatus;
}

}

7 changes: 7 additions & 0 deletions SharedEngine/src/types/Task.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ public void setTarget(Target targetToRunOn) {
this.targetToRunOn = targetToRunOn;
}

public Worker getWorkerOnIt(){return workerOnIt;}

public void setOutputText(Consumer<String> outputText) {
this.outputText = outputText;
Expand All @@ -42,6 +43,12 @@ public void setPricePerTarget(int pricePerTarget) {
this.pricePerTarget = pricePerTarget;
}

public int getPricePerTarget() {
return pricePerTarget;
}

public String getType(){return type;}

public Target getTarget() {
return targetToRunOn;
}
Expand Down
16 changes: 13 additions & 3 deletions Worker/Worker.iml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,24 @@
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="Maven: com.squareup.okhttp3:okhttp:3.12.10" level="project" />
<orderEntry type="library" name="Maven: com.google.code.gson:gson:2.8.9" level="project" />
<orderEntry type="library" name="Maven: com.squareup.okio:okio:1.15.0" level="project" />
<orderEntry type="library" name="Maven: org.controlsfx:controlsfx:8.40.18" level="project" />
<orderEntry type="library" name="Maven: org.jetbrains:annotations:23.0.0" level="project" />
<orderEntry type="library" name="Maven: org.projectlombok:lombok:1.18.22" level="project" />
<orderEntry type="module" module-name="Engine" />
<orderEntry type="module" module-name="GraphFx" />
<orderEntry type="module" module-name="Graph" />
<orderEntry type="module" module-name="SharedEngine" />
<orderEntry type="module" module-name="SharedEngine" />
<orderEntry type="module" module-name="GPUPServer" />
<orderEntry type="library" name="Maven: com.google.code.gson:gson:2.9.0" level="project" />
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/annotations/20.1.0/annotations-20.1.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="library" name="Maven: com.squareup.okio:okio:1.17.5" level="project" />
</component>
</module>
Loading