merge master

.gitignore

@@ -31,6 +31,9 @@ nbactions.xml
 nbbuild.xml
 nb-configuration.xml
 
+# VSCode
+.vscode
+
 # Miscellaneous
 *~
 *.swp

pom.xml

@@ -332,7 +332,7 @@
 			<plugin>  <!-- Create javadoc.jar -->
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-javadoc-plugin</artifactId>
-				<version>3.2.0</version>
+				<version>3.6.3</version>
 				<configuration>
 					<doclint>all,-missing</doclint>
 				</configuration>

src/main/java/org/osm2world/console/CLIArguments.java

@@ -113,9 +113,6 @@ public interface CLIArguments {
 
 	/* logging */
 
-	@Option(description="writes execution times to the command line")
-	boolean getPerformancePrint();
-
 	@Option(description="output directory for log files")
 	File getLogDir();
 	boolean isLogDir();

src/main/java/org/osm2world/console/ImageExporter.java

@@ -1,12 +1,20 @@
 package org.osm2world.console;
 
-import static java.lang.Math.*;
-import static org.osm2world.core.target.jogl.JOGLRenderingParameters.Winding.*;
+import static java.lang.Math.max;
+import static java.lang.Math.min;
+import static org.osm2world.core.target.jogl.JOGLRenderingParameters.Winding.CCW;
 import static org.osm2world.core.util.ConfigUtil.*;
 
-import java.awt.*;
-import java.awt.image.*;
-import java.io.*;
+import java.awt.AlphaComposite;
+import java.awt.Color;
+import java.awt.Graphics2D;
+import java.awt.image.BufferedImage;
+import java.awt.image.DataBuffer;
+import java.awt.image.DataBufferInt;
+import java.io.DataOutputStream;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.nio.channels.FileChannel;
 import java.nio.charset.Charset;
@@ -25,7 +33,9 @@
 import com.jogamp.opengl.*;
 import com.jogamp.opengl.util.awt.AWTGLReadBufferUtil;
 
-import ar.com.hjg.pngj.*;
+import ar.com.hjg.pngj.ImageInfo;
+import ar.com.hjg.pngj.ImageLineByte;
+import ar.com.hjg.pngj.PngWriter;
 import ar.com.hjg.pngj.chunks.PngChunkTextVar;
 import ar.com.hjg.pngj.chunks.PngMetadata;
 
@@ -94,7 +104,7 @@ private ImageExporter(Configuration config, Results results,
 		}
 
 		if (config.containsKey(BG_IMAGE_KEY)) {
-			backgroundImage = ConfigUtil.resolveFileConfigProperty(config, BG_IMAGE_KEY);
+			backgroundImage = ConfigUtil.resolveFileConfigProperty(config, config.getString(BG_IMAGE_KEY));
 			if (backgroundImage == null || !backgroundImage.exists()) {
 				System.err.println("background image file doesn't exist: "
 						+ backgroundImage);

src/main/java/org/osm2world/console/OSM2World.java

@@ -1,9 +1,9 @@
 package org.osm2world.console;
 
 import static java.util.Arrays.asList;
+import static org.osm2world.console.CLIArgumentsUtil.getProgramMode;
 import static org.osm2world.console.CLIArgumentsUtil.ProgramMode.CONVERT;
 import static org.osm2world.console.CLIArgumentsUtil.ProgramMode.GUI;
-import static org.osm2world.console.CLIArgumentsUtil.getProgramMode;
 import static org.osm2world.core.GlobalValues.VERSION_STRING;
 
 import java.io.File;
@@ -15,7 +15,7 @@
 import java.util.stream.Stream;
 
 import javax.annotation.Nullable;
-import javax.swing.*;
+import javax.swing.UIManager;
 
 import org.apache.commons.configuration.BaseConfiguration;
 import org.apache.commons.configuration.Configuration;
@@ -170,10 +170,7 @@ private static void executeArgumentsGroup(CLIArgumentsGroup argumentsGroup) {
 
 		CLIArguments representativeArgs = argumentsGroup.getRepresentative();
 
-		LevelOfDetail lod = null;
-		if (representativeArgs.getLod() != null) {
-			lod = LevelOfDetail.values()[representativeArgs.getLod()];
-		}
+		LevelOfDetail lod = LevelOfDetail.fromInt(representativeArgs.getLod());
 
 		/* load configuration file */
 
@@ -238,6 +235,13 @@ public static Configuration loadConfigFiles(@Nullable LevelOfDetail lod, File...
 			config.load(it);
 		}
 
+		Arrays.stream(configFiles)
+			.filter(f -> f.exists())
+			.findFirst()
+			.ifPresent(f -> {
+				config.addProperty("configPath", f.getAbsoluteFile().getParent());
+			});
+
 		if (lod != null) {
 			config.clearProperty("lod");
 			config.addProperty("lod", lod.ordinal());