Klagarge/MinecraftElectricalAge
Archived
1
0
Fork 0
Code Issues Pull Requests Activity

Merge pull request #2 from HEI-SYND-221-231-SIn/features

Browse Source 
Features - Core
This commit is contained in:
Rémi Heredero 2023-05-12 13:23:35 +02:00 committed by GitHub
commit ff5bfc409b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 14 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@ -3,5 +3,4 @@
/.idea/jarRepositories.xml /.idea/jarRepositories.xml
/.idea/codeStyles /.idea/codeStyles
/.idea/*.xml /.idea/*.xml
/target/ /target/
# TODO: add your build folder here

6
src/main/java/ch/hevs/isi/core/DataPoint.java
View File

@ -4,16 +4,14 @@ import ch.hevs.isi.db.DatabaseConnector;
import ch.hevs.isi.field.FieldConnector; import ch.hevs.isi.field.FieldConnector;
import ch.hevs.isi.web.WebConnector; import ch.hevs.isi.web.WebConnector;
import java.util.HashMap;
import java.util.Map; import java.util.Map;
public abstract class DataPoint{ public abstract class DataPoint{
private static Map<String, DataPoint> dataPointMap; private static Map<String, DataPoint> dataPointMap = new HashMap<>();
private String label; private String label;
private boolean isOutput; private boolean isOutput;
protected DataPoint(String label, boolean isOutput){ protected DataPoint(String label, boolean isOutput){
if(dataPointMap.containsKey(label)){
}
this.label = label; this.label = label;
this.isOutput = isOutput; this.isOutput = isOutput;
} }

2
src/main/java/ch/hevs/isi/db/DatabaseConnector.java
View File

@ -22,7 +22,7 @@ public class DatabaseConnector implements DataPointListener {
} }
private void pushToDatabase(DataPoint dp){ private void pushToDatabase(DataPoint dp){
System.out.println("To Database: " + dp.toString()); System.out.println(dp.toString() + " -> Database");
} }
@Override @Override

7
src/main/java/ch/hevs/isi/field/FieldConnector.java
View File

@ -23,13 +23,8 @@ public class FieldConnector implements DataPointListener {
} }
public void uselessTest(){
FloatDataPoint dp = new FloatDataPoint("Voltage", false);
dp.setValue(5);
}
private void pushToField(DataPoint dp){ private void pushToField(DataPoint dp){
System.out.println("To Field: " + dp.toString()); System.out.println(dp.toString() + " -> Field");
} }
@Override @Override

2
src/main/java/ch/hevs/isi/web/WebConnector.java
View File

@ -21,7 +21,7 @@ public class WebConnector implements DataPointListener {
} }
private void pushToWeb(DataPoint dp){ private void pushToWeb(DataPoint dp){
System.out.println("To Web: " + dp.toString()); System.out.println(dp.toString() + " -> Web");
} }
@Override @Override

21
src/test/java/Core.java
View File

@ -1,22 +1,17 @@
import ch.hevs.isi.core.BooleanDataPoint; import ch.hevs.isi.core.BooleanDataPoint;
import ch.hevs.isi.core.FloatDataPoint; import ch.hevs.isi.core.FloatDataPoint;
import ch.hevs.isi.field.FieldConnector;
public class Core { public class Core {
public static void main(String[] args) { public static void main(String[] args) {
/*
BooleanDataPoint bDp = new BooleanDataPoint("foo", true);
FloatDataPoint floatDp = new FloatDataPoint("bar", true);
System.out.println(bDp.toString());
System.out.println(floatDp.toString());
bDp.setValue(true);;
floatDp.setValue(42);
System.out.println(bDp.toString());
System.out.println(floatDp.toString());
*/
FieldConnector fc; BooleanDataPoint bDp = new BooleanDataPoint("foo", true);
// TODO some test new FloatDataPoint("bar", true).setValue(42);
bDp.setValue(true);
FloatDataPoint v = new FloatDataPoint("Voltage", false);
v.setValue(5);
v.setValue(3.3f);
} }
} }