make attributes private

Author: David Baum

generator2/org.getaviz.generator/src/main/java/org/getaviz/generator/city/m2m/City2City.java

@@ -21,13 +21,13 @@
 import org.neo4j.driver.v1.types.Path;
 
 public class City2City {
-	SettingsConfiguration config = SettingsConfiguration.getInstance();
-	Log log = LogFactory.getLog(this.getClass());
-	List<RGBColor> PCKG_colors;
-	List<RGBColor> NOS_colors;
-	HashMap<Long, double[]> properties = new HashMap<Long, double[]>();
-	Node model;
-	DatabaseConnector connector = DatabaseConnector.getInstance();
+	private SettingsConfiguration config = SettingsConfiguration.getInstance();
+	private Log log = LogFactory.getLog(this.getClass());
+	private List<RGBColor> PCKG_colors;
+	private List<RGBColor> NOS_colors;
+	private HashMap<Long, double[]> properties = new HashMap<Long, double[]>();
+	private Node model;
+	private DatabaseConnector connector = DatabaseConnector.getInstance();
 
 	public City2City() {
 		log.info("City2City started");

generator2/org.getaviz.generator/src/main/java/org/getaviz/generator/city/m2t/City2AFrame.java

@@ -15,9 +15,9 @@
 import org.getaviz.generator.OutputFormatHelper;
 
 public class City2AFrame {
-	SettingsConfiguration config = SettingsConfiguration.getInstance();
-	DatabaseConnector connector = DatabaseConnector.getInstance();
-	Log log = LogFactory.getLog(this.getClass());
+	private SettingsConfiguration config = SettingsConfiguration.getInstance();
+	private DatabaseConnector connector = DatabaseConnector.getInstance();
+	private Log log = LogFactory.getLog(this.getClass());
 
 	public City2AFrame() {
 		log.info("City2AFrame has started");

generator2/org.getaviz.generator/src/main/java/org/getaviz/generator/city/m2t/City2X3D.java

@@ -16,9 +16,9 @@
 import org.getaviz.generator.OutputFormatHelper;
 
 public class City2X3D {
-	SettingsConfiguration config = SettingsConfiguration.getInstance();
-	DatabaseConnector connector = DatabaseConnector.getInstance();
-	Log log = LogFactory.getLog(this.getClass());
+	private SettingsConfiguration config = SettingsConfiguration.getInstance();
+	private DatabaseConnector connector = DatabaseConnector.getInstance();
+	private Log log = LogFactory.getLog(this.getClass());
 
 	public City2X3D() {
 		log.info("CityOutput started");

generator2/org.getaviz.generator/src/main/java/org/getaviz/generator/city/s2m/JQA2City.java

@@ -15,9 +15,9 @@
 import org.getaviz.generator.database.DatabaseConnector;
 
 public class JQA2City {
-	SettingsConfiguration config = SettingsConfiguration.getInstance();
-	Log log = LogFactory.getLog(this.getClass());
-	DatabaseConnector connector = DatabaseConnector.getInstance();
+	private SettingsConfiguration config = SettingsConfiguration.getInstance();
+	private Log log = LogFactory.getLog(this.getClass());
+	private DatabaseConnector connector = DatabaseConnector.getInstance();
 
 	public JQA2City() {
 		log.info("JQA2City started");

generator2/org.getaviz.generator/src/main/java/org/getaviz/generator/rd/m2m/RD2RD.java

@@ -24,15 +24,15 @@
 import java.util.stream.Collectors;
 
 public class RD2RD {
-	SettingsConfiguration config = SettingsConfiguration.getInstance();
-	DatabaseConnector connector = DatabaseConnector.getInstance();
-	Log log = LogFactory.getLog(RD2RD.class);
+	private SettingsConfiguration config = SettingsConfiguration.getInstance();
+	private DatabaseConnector connector = DatabaseConnector.getInstance();
+	private Log log = LogFactory.getLog(RD2RD.class);
 
 // TODO set colors via RGBColor class for all entities
 // color scheme
-	RGBColor NS_colorStart = new RGBColor(150, 150, 150);
-	RGBColor NS_colorEnd = new RGBColor(240, 240, 240); // from CodeCity
-	List<RGBColor> NS_colors;
+	private RGBColor NS_colorStart = new RGBColor(150, 150, 150);
+	private RGBColor NS_colorEnd = new RGBColor(240, 240, 240); // from CodeCity
+	private List<RGBColor> NS_colors;
 
 	public RD2RD() {
 		log.info("RD2RD started");

generator2/org.getaviz.generator/src/main/java/org/getaviz/generator/rd/m2t/RD2AFrame.java

@@ -12,9 +12,9 @@
 import java.util.List;
 
 public class RD2AFrame {
-	SettingsConfiguration config = SettingsConfiguration.getInstance();
-	DatabaseConnector connector = DatabaseConnector.getInstance();
-	Log log = LogFactory.getLog(this.getClass());
+	private SettingsConfiguration config = SettingsConfiguration.getInstance();
+	private DatabaseConnector connector = DatabaseConnector.getInstance();
+	private Log log = LogFactory.getLog(this.getClass());
 
 	public RD2AFrame() {
 		log.info("RD2AFrame has started");

generator2/org.getaviz.generator/src/main/java/org/getaviz/generator/rd/m2t/RD2X3D.java

@@ -10,9 +10,9 @@
 import org.neo4j.driver.v1.types.Node;
 
 public class RD2X3D {
-	SettingsConfiguration config = SettingsConfiguration.getInstance();
-	DatabaseConnector connector = DatabaseConnector.getInstance();
-	Log log = LogFactory.getLog(this.getClass());
+	private SettingsConfiguration config = SettingsConfiguration.getInstance();
+	private DatabaseConnector connector = DatabaseConnector.getInstance();
+	private Log log = LogFactory.getLog(this.getClass());
 
 	public RD2X3D() {
 		log.info("RD2X3D has started");

generator2/org.getaviz.generator/src/main/java/org/getaviz/generator/rd/s2m/JQA2RD.java

@@ -11,9 +11,9 @@
 import org.neo4j.driver.v1.types.Node;
 
 public class JQA2RD {
-	SettingsConfiguration config = SettingsConfiguration.getInstance();
-	DatabaseConnector connector = DatabaseConnector.getInstance();
-	Log log = LogFactory.getLog(JQA2RD.class );
+	private SettingsConfiguration config = SettingsConfiguration.getInstance();
+	private DatabaseConnector connector = DatabaseConnector.getInstance();
+	private Log log = LogFactory.getLog(JQA2RD.class );
 
 	public JQA2RD() {
 		log.info("JQA2RD started");