Class relationships (issue #109)

.gitignore

@@ -1,6 +1,7 @@
 **/bin/**
 **/target/**
 **/tmp/**
+**/.idea/**
 **/.metadata/**
 **/.settings/**
 **/.recommenders/**

README.md

@@ -4,3 +4,5 @@ CodeMetropolis
 See your software as never before.
 
 Official community page: https://plus.google.com/communities/110235162339639686953
+
+BlockModifier-API aviable at: https://github.com/blip24/BlockModifier-API

sources/codemetropolis-toolchain-commons/.classpath

@@ -24,6 +24,7 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
+	<classpathentry kind="src" path="test"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>

sources/codemetropolis-toolchain-commons/pom.xml

@@ -17,5 +17,13 @@
     <artifactId>gson</artifactId>
     <version>2.6.1</version>
   </dependency>
+
+   <!-- JUnit 4 -->
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.4</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 </project>

sources/codemetropolis-toolchain-commons/src/main/java/codemetropolis/toolchain/commons/cmxml/Buildable.java

@@ -16,7 +16,9 @@ public enum Type {
 		GARDEN,
 		FLOOR,
 		CELLAR,
-		CONTAINER;
+		CONTAINER,
+		TUNNEL,
+		BRIDGE;
 	}
 
 	private String id;
@@ -28,6 +30,8 @@ public enum Type {
 	private List<Buildable> children;
 	private Buildable parent;
 	private String cdfNames;
+	private boolean hasLowerStairs;
+	private boolean hasUpperStairs;
 
 	public Buildable(String id, String name, Type type) {
 		this(id, name, type, new Point(), new Point());
@@ -41,6 +45,8 @@ public Buildable(String id, String name, Type type, Point position, Point size)
 		this.size = size;
 		this.attributes = new ArrayList<Attribute>();
 		this.children = new ArrayList<Buildable>();
+		this.setHasLowerStairs(false);
+		this.setHasUpperStairs(false);
 	}
 
 	public boolean isOverlapping(Buildable b) {
@@ -459,5 +465,22 @@ public Element toXmlElement(Document doc, boolean recursive) {
 
 		return buildable;
 	}
+
+	public boolean hasLowerStairs() {
+		return hasLowerStairs;
+	}
+
+	public void setHasLowerStairs(boolean hasLowerStairs) {
+		this.hasLowerStairs = hasLowerStairs;
+	}
+
+	public boolean hasUpperStairs() {
+		return hasUpperStairs;
+	}
+
+	public void setHasUpperStairs(boolean hasUpperStairs) {
+		this.hasUpperStairs = hasUpperStairs;
+	}
+
 
 }

sources/codemetropolis-toolchain-commons/src/main/java/codemetropolis/toolchain/commons/cmxml/BuildableTree.java

@@ -113,7 +113,9 @@ public void loadFromFile(String path) throws CmxmlReaderException {
 			Document doc = dBuilder.parse(xmlFile);
 			doc.getDocumentElement().normalize();
 			NodeList nList = doc.getElementsByTagName("buildable");
-
+
+
+
 			for (int temp = 0; temp < nList.getLength(); temp++) {
 				Node nNode = nList.item(temp);
 				if (nNode.getNodeType() == Node.ELEMENT_NODE) {
@@ -132,6 +134,10 @@ public void loadFromFile(String path) throws CmxmlReaderException {
 						break;
 						case "container": type = Type.CONTAINER;
 						break;
+						case "tunnel": type = Type.TUNNEL;
+						break;
+						case "bridge": type = Type.BRIDGE;
+						break;
 					}
 
 					Point position;
@@ -165,7 +171,6 @@ public void loadFromFile(String path) throws CmxmlReaderException {
 							);
 
 					NodeList attributeNodes = eElement.getElementsByTagName("attributes").item(0).getChildNodes();
-
 					for(int i = 1; attributeNodes.item(i) != null; i += 2) {
 						b.addAttribute(
 								((Element)attributeNodes.item(i)).getAttribute("name"),

sources/codemetropolis-toolchain-commons/src/main/java/codemetropolis/toolchain/commons/util/FileLogger.java

@@ -29,14 +29,17 @@ public static void load(String filePath) {
 	}
 
 	public static void logInfo(String message) {
+		if(logger == null) return;
 		logger.log(Level.INFO, message);
 	}
 
 	public static void logWarning(String message, Exception exception) {
+		if(logger == null) return;
 		logger.log(Level.WARNING, message, exception);
 	}
 
 	public static void logError(String message, Exception exception) {
+		if(logger == null) return;
 		logger.log(Level.SEVERE, message, exception);
 	}
 

sources/codemetropolis-toolchain-commons/test/codemetropolis/toolchain/commons/cmxml/BuildableTest.java

@@ -0,0 +1,86 @@
+package codemetropolis.toolchain.commons.cmxml;
+
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+import codemetropolis.toolchain.commons.cmxml.Buildable.Type;
+
+/** Test class for {@link Tunnel} to test basic functions.
+ * 
+ * @author Csuvik Viktor {@literal D1YZL5}
+ * @version %I%
+ *
+ */
+
+public class BuildableTest {
+
+	private static Buildable b1;
+	private static Buildable b2;
+
+	@BeforeClass
+	public static void setUpBeforeClass() { 
+		b1 = new Buildable("UNIQUE_ID_1", "SAMPLE_TUNNEL_1", Type.TUNNEL, new Point(0, 0, 0), new Point(10, 5, 2));
+		b2 = new Buildable("UNIQUE_ID_2", "SAMPLE_TUNNEL_2", Type.TUNNEL, new Point(0, 0, 0), new Point(2, 5, 10));
+
+		b1.addChild(b2);
+	}
+
+
+	@Test
+	public void testIsOverlapping() {
+
+		assertTrue(b1.isOverlapping(b2));
+		assertTrue(b1.isOverlapping(b2.getPositionX(), b2.getPositionZ()));
+
+		b2.setPositionX(11);
+		assertFalse(b1.isOverlapping(b2));
+		assertFalse(b1.isOverlapping(b2.getPositionX(), b2.getPositionZ()));
+	}
+
+	@Test
+	public void testGetDescendants() {
+		List<Buildable> buildables1 = b1.getDescendants();
+
+		List<Buildable> buildables2 = new ArrayList<Buildable>();
+		buildables2.add(b2);
+
+		assertArrayEquals(buildables1.toArray(), buildables2.toArray());
+	}
+
+	@Test
+	public void testGetAncestors() {
+		List<Buildable> buildables = new ArrayList<Buildable>();
+		buildables.add(b1);
+
+		assertArrayEquals(buildables.toArray(), b2.getAncestors());
+	}
+
+	@Test
+	public void testEquals() {
+		assertTrue(b1.equals(b1));
+		assertTrue(b2.equals(b2));
+
+		assertFalse(b1.equals(b2));
+		assertFalse(b2.equals(b1));
+
+		assertFalse(b1.equals(null));
+
+
+		Buildable b3 = new Buildable("UNIQUE_ID_1", "SAMPLE_TUNNEL_1", Type.TUNNEL, new Point(0, 0, 0), new Point(10, 5, 2));
+		assertTrue(b1.equals(b3));
+
+		b3.setName("SOMETHING_ELSE");
+		assertFalse(b1.equals(b3));
+
+		b3.setName("SAMPLE_TUNNEL_1");
+		b3.setType(Type.GARDEN);
+		assertFalse(b3.equals(b1));
+	}
+}

sources/codemetropolis-toolchain-commons/test/codemetropolis/toolchain/commons/cmxml/comparators/BuildableDepthComparatorTest.java

@@ -0,0 +1,33 @@
+package codemetropolis.toolchain.commons.cmxml.comparators;
+
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Test;
+
+import codemetropolis.toolchain.commons.cmxml.Buildable;
+import codemetropolis.toolchain.commons.cmxml.Buildable.Type;
+import codemetropolis.toolchain.commons.cmxml.Point;
+
+/** Test class for {@link Tunnel}, to test depth comparator.
+ * 
+ * @author Csuvik Viktor {@literal D1YZL5}
+ * @version %I%
+ *
+ */
+
+public class BuildableDepthComparatorTest {
+
+	@Test
+	public void testCompare() {
+		BuildableDepthComparator c = new BuildableDepthComparator();
+		Buildable b1 = new Buildable("UNIQUE_ID_1", "SAMPLE_TUNNEL_1", Type.TUNNEL, new Point(0, 0, 0), new Point(10, 10, 10));
+		Buildable b2 = new Buildable("UNIQUE_ID_2", "SAMPLE_TUNNEL_2", Type.TUNNEL, new Point(0, 0, 0), new Point(10, 10, 10));
+		assertTrue(c.compare(b1, b2) == 0);
+
+		Buildable b3 = new Buildable("UNIQUE_ID_3", "SAMPLE_TUNNEL_3", Type.TUNNEL, new Point(0, 0, 0), new Point(15, 15, 15));
+		assertTrue(c.compare(b1, b3) != 0);
+
+		Buildable b4 = new Buildable("UNIQUE_ID_4", "SAMPLE_GARDEN_1", Type.GARDEN, new Point(0, 0, 0), new Point(10, 10, 10));
+		assertTrue(c.compare(b1, b4) == 0);
+	}
+}

sources/codemetropolis-toolchain-commons/test/codemetropolis/toolchain/commons/cmxml/comparators/BuildableSizeComparatorTest.java

@@ -0,0 +1,35 @@
+package codemetropolis.toolchain.commons.cmxml.comparators;
+
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Test;
+
+import codemetropolis.toolchain.commons.cmxml.Buildable;
+import codemetropolis.toolchain.commons.cmxml.Point;
+import codemetropolis.toolchain.commons.cmxml.Buildable.Type;
+
+/** Test class for {@link Tunnel}, to test size comparator.
+ * 
+ * @author Csuvik Viktor {@literal D1YZL5}
+ * @version %I%
+ *
+ */
+
+
+public class BuildableSizeComparatorTest {
+
+	@Test
+	public void testCompare() {
+		BuildableSizeComparator c = new BuildableSizeComparator();
+		Buildable b1 = new Buildable("UNIQUE_ID_1", "SAMPLE_TUNNEL_1", Type.TUNNEL, new Point(0, 0, 0), new Point(10, 10, 10));
+		Buildable b2 = new Buildable("UNIQUE_ID_2", "SAMPLE_TUNNEL_2", Type.TUNNEL, new Point(0, 0, 0), new Point(10, 10, 10));
+		assertTrue(c.compare(b1, b2) == 0);
+
+		Buildable b3 = new Buildable("UNIQUE_ID_3", "SAMPLE_TUNNEL_3", Type.TUNNEL, new Point(0, 0, 0), new Point(15, 15, 15));
+		assertTrue(c.compare(b1, b3) != 0);
+
+		Buildable b4 = new Buildable("UNIQUE_ID_4", "SAMPLE_GARDEN_1", Type.GARDEN, new Point(0, 0, 0), new Point(10, 10, 10));
+		assertTrue(c.compare(b1, b4) == 0);
+	}
+
+}

sources/codemetropolis-toolchain-converter/pom.xml

@@ -49,6 +49,12 @@
     </plugins>
   </build>
   <dependencies>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>3.8.1</version>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>codemetropolis.toolchain</groupId>
       <artifactId>codemetropolis-toolchain-commons</artifactId>

sources/codemetropolis-toolchain-converter/src/main/java/codemetropolis/toolchain/converter/CommandLineOptions.java

@@ -19,7 +19,7 @@ public class CommandLineOptions {
 
 	@Option(name="-p", handler = StringArrayOptionHandler.class, aliases = {"--params"})
 	private String[] params = null;
-	
+
 	public String getOutputFile(){
 		return outputFile;
 	}
@@ -39,5 +39,4 @@ public boolean showHelp() {
 	public String[] getParams() {
 		return params;
 	}
-
 }

sources/codemetropolis-toolchain-converter/src/main/java/codemetropolis/toolchain/converter/ConverterExecutor.java

@@ -10,6 +10,7 @@
 import codemetropolis.toolchain.commons.executor.ExecutorArgs;
 import codemetropolis.toolchain.commons.util.Resources;
 import codemetropolis.toolchain.converter.control.ConverterLoader;
+import codemetropolis.toolchain.converter.relations.Relations;
 
 public class ConverterExecutor extends AbstractExecutor {
 
@@ -26,7 +27,7 @@ public void onConverterEvent(ConverterEvent event) {
 			}
 
 		});
-		
+
 		print(Resources.get("converting_to_cdf"));
 		CdfTree cdfTree = null;
 		try {

sources/codemetropolis-toolchain-converter/src/main/java/codemetropolis/toolchain/converter/ConverterExecutorArgs.java

@@ -1,5 +1,6 @@
 package codemetropolis.toolchain.converter;
 
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -12,7 +13,7 @@ public class ConverterExecutorArgs extends ExecutorArgs {
 	private String source;
 	private String outputFile;
 	private Map<String, String> params;
-	
+
 	public ConverterExecutorArgs(ConverterType type, String source, String outputFile) {
 		this(type, source, outputFile, null);
 	}
@@ -38,7 +39,7 @@ public String getOutputFile(){
 	}
 
 	public Map<String, String> getParams() {
-		return new HashMap<>(params);
+		return Collections.unmodifiableMap(params);
 	}
 
 	public String getParameter(String key) {

sources/codemetropolis-toolchain-converter/src/main/java/codemetropolis/toolchain/converter/Main.java

@@ -3,6 +3,7 @@
 import java.util.HashMap;
 import java.util.Map;
 
+import codemetropolis.toolchain.converter.relations.Relations;
 import org.kohsuke.args4j.CmdLineException;
 import org.kohsuke.args4j.CmdLineParser;
 
@@ -11,6 +12,8 @@
 import codemetropolis.toolchain.commons.util.Settings;
 import codemetropolis.toolchain.converter.control.ConverterType;
 
+import javax.management.relation.RelationService;
+
 public class Main {
 
 	public static void main(String[] args) {