diff --git a/PeerAtCodeParser.jar b/PeerAtCodeParser.jar index 7938f81..ab9fe8f 100644 Binary files a/PeerAtCodeParser.jar and b/PeerAtCodeParser.jar differ diff --git a/src/dev/peerat/mapping/Ship.java b/src/dev/peerat/mapping/Ship.java new file mode 100644 index 0000000..60eb6cb --- /dev/null +++ b/src/dev/peerat/mapping/Ship.java @@ -0,0 +1,19 @@ +package dev.peerat.mapping; + +import dev.peerat.mapping.providers.Compass; +import dev.peerat.mapping.providers.Map; + +public class Ship{ + + private String type; + private Compass compass; + private Map map; + + public Ship(String type, Compass compass,Map map){ + this.type = type; + this.compass = compass; + this.map = map; + } + + public void setSails() throws Exception{} +} diff --git a/src/dev/peerat/mapping/TreasureCache.java b/src/dev/peerat/mapping/TreasureCache.java index 2f86a96..61ca7b4 100644 --- a/src/dev/peerat/mapping/TreasureCache.java +++ b/src/dev/peerat/mapping/TreasureCache.java @@ -53,7 +53,12 @@ public class TreasureCache { return null; } - public TreasureCache join(){ + public TreasureCache join(){ + breaker(); + return null; + } + + public TreasureCache rebase(){ breaker(); return null; } diff --git a/src/dev/peerat/mapping/TreasureProcessor.java b/src/dev/peerat/mapping/TreasureProcessor.java index 2b416fb..98e352a 100644 --- a/src/dev/peerat/mapping/TreasureProcessor.java +++ b/src/dev/peerat/mapping/TreasureProcessor.java @@ -19,15 +19,16 @@ import javax.tools.Diagnostic.Kind; import javax.tools.FileObject; import javax.tools.StandardLocation; -import be.jeffcheasey88.peeratcode.parser.Parser; -import be.jeffcheasey88.peeratcode.parser.TokenValidator; -import be.jeffcheasey88.peeratcode.parser.java.Annotation; -import be.jeffcheasey88.peeratcode.parser.java.Class; -import be.jeffcheasey88.peeratcode.parser.java.Function; -import be.jeffcheasey88.peeratcode.parser.java.JavaElement; -import be.jeffcheasey88.peeratcode.parser.java.JavaFile; -import be.jeffcheasey88.peeratcode.parser.java.JavaParser; -import be.jeffcheasey88.peeratcode.parser.java.operation.ReturnOperation; +import dev.peerat.parser.ElementBuilder.Builder; +import dev.peerat.parser.Parser; +import dev.peerat.parser.TokenValidator; +import dev.peerat.parser.java.Annotation; +import dev.peerat.parser.java.Class; +import dev.peerat.parser.java.Function; +import dev.peerat.parser.java.JavaElement; +import dev.peerat.parser.java.JavaFile; +import dev.peerat.parser.java.JavaParser; +import dev.peerat.parser.java.operation.ReturnOperation; public class TreasureProcessor extends AbstractProcessor{ @@ -78,8 +79,7 @@ public class TreasureProcessor extends AbstractProcessor{ PARSER.parse(reader, javaFile); process(source, output, file, javaFile); }catch(Exception ex){ - error(source, output, file, ex); - throw new Exception(file.getName()+" | "+ex.getMessage()); + error(source, output, file, new Exception(file.getName()+" | "+ex.getMessage())); } } @@ -88,9 +88,10 @@ public class TreasureProcessor extends AbstractProcessor{ File parent = out.getParentFile(); if(!parent.exists()) parent.mkdirs(); if(!out.exists()) out.createNewFile(); -// BufferedWriter writer = new BufferedWriter(new FileWriter(out)); -// PARSER.build(writer); if(TokenValidator.TOKENS != TokenValidator.MAX_VALIDATE) throw new Exception(TokenValidator.TOKENS +" < "+TokenValidator.MAX_VALIDATE); + + BufferedWriter writer = new BufferedWriter(new FileWriter(out)); +// PARSER.build(writer); Class treasure = file.find((element) -> { if(element instanceof Class){ @@ -110,6 +111,10 @@ public class TreasureProcessor extends AbstractProcessor{ }else{ processOthers(file); } + Builder builder = new Builder(); + file.build(builder); + builder.build(writer); + } private void processTreasure(JavaFile file, Class clazz){ diff --git a/src/dev/peerat/mapping/providers/Compass.java b/src/dev/peerat/mapping/providers/Compass.java new file mode 100644 index 0000000..8e40ba9 --- /dev/null +++ b/src/dev/peerat/mapping/providers/Compass.java @@ -0,0 +1,3 @@ +package dev.peerat.mapping.providers; + +public interface Compass{} \ No newline at end of file diff --git a/src/dev/peerat/mapping/providers/Map.java b/src/dev/peerat/mapping/providers/Map.java new file mode 100644 index 0000000..e427759 --- /dev/null +++ b/src/dev/peerat/mapping/providers/Map.java @@ -0,0 +1,3 @@ +package dev.peerat.mapping.providers; + +public interface Map{} \ No newline at end of file diff --git a/src/dev/peerat/mapping/providers/mysql/MySQLCompass.java b/src/dev/peerat/mapping/providers/mysql/MySQLCompass.java new file mode 100644 index 0000000..1305a8d --- /dev/null +++ b/src/dev/peerat/mapping/providers/mysql/MySQLCompass.java @@ -0,0 +1,40 @@ +package dev.peerat.mapping.providers.mysql; + +import dev.peerat.mapping.providers.Compass; + +public class MySQLCompass implements Compass{ + + private String host; + private int port; + private String database; + private String user; + private String password; + + public MySQLCompass(String host, int port, String database, String user, String password){ + this.host = host; + this.port = port; + this.database = database; + this.user = user; + this.password = password; + } + + public String getHost(){ + return this.host; + } + + public int getPort(){ + return this.port; + } + + public String getDatabase(){ + return this.database; + } + + public String getUser(){ + return this.user; + } + + public String getPassword(){ + return this.password; + } +} diff --git a/src/dev/peerat/mapping/providers/mysql/MySqlMap.java b/src/dev/peerat/mapping/providers/mysql/MySqlMap.java new file mode 100644 index 0000000..23f530e --- /dev/null +++ b/src/dev/peerat/mapping/providers/mysql/MySqlMap.java @@ -0,0 +1,21 @@ +package dev.peerat.mapping.providers.mysql; + +import dev.peerat.mapping.providers.Map; + +public class MySqlMap implements Map{ + + public MySqlMap(){} + + public MySqlMap link(Class clazz, String table){ + return this; + } + + public MySqlMap ref(String table_from, String column_from, String table_to, String column_to){ + return this; + } + + public MySqlMap bind(Class clazz, String jfield, String sfield){ + return this; + } + +}