Comment out unused settings

Valekta · Valekta · commit fd02e03ff7bd · 2018-07-11T16:19:33.000+02:00
diff --git a/generator/org.svis.generator.tests/src/org/svis/generator/tests/rd/dynamix/Bank_X3DomFlashingMethodsTest.xtend b/generator/org.svis.generator.tests/src/org/svis/generator/tests/rd/dynamix/Bank_X3DomFlashingMethodsTest.xtend
@@ -7,7 +7,7 @@ import java.io.File
 import java.io.FileNotFoundException
 import org.eclipse.emf.mwe2.launch.runtime.Mwe2Launcher
 import org.apache.commons.io.FileUtils
-import org.svis.generator.rd.RDSettings.OutputFormat
+//import org.svis.generator.rd.RDSettings.OutputFormat
 import org.svis.generator.rd.RDSettings
 import org.svis.generator.rd.RDSettings.InvocationRepresentation
 import org.svis.generator.rd.RDSettings.Variant
diff --git a/generator/org.svis.generator.tests/src/org/svis/generator/tests/rd/dynamix/Bank_X3DomMovingFlashingTest.xtend b/generator/org.svis.generator.tests/src/org/svis/generator/tests/rd/dynamix/Bank_X3DomMovingFlashingTest.xtend
@@ -7,7 +7,7 @@ import java.io.File
 import java.io.FileNotFoundException
 import org.eclipse.emf.mwe2.launch.runtime.Mwe2Launcher
 import org.apache.commons.io.FileUtils
-import org.svis.generator.rd.RDSettings.OutputFormat
+//import org.svis.generator.rd.RDSettings.OutputFormat
 import org.svis.generator.rd.RDSettings
 import org.svis.generator.rd.RDSettings.InvocationRepresentation
 import org.svis.generator.rd.RDSettings.Variant
diff --git a/generator/org.svis.generator.tests/src/org/svis/generator/tests/rd/dynamix/Bank_X3DomMovingSpheresTest.xtend b/generator/org.svis.generator.tests/src/org/svis/generator/tests/rd/dynamix/Bank_X3DomMovingSpheresTest.xtend
@@ -7,7 +7,7 @@ import java.io.File
 import java.io.FileNotFoundException
 import org.eclipse.emf.mwe2.launch.runtime.Mwe2Launcher
 import org.apache.commons.io.FileUtils
-import org.svis.generator.rd.RDSettings.OutputFormat
+//import org.svis.generator.rd.RDSettings.OutputFormat
 import org.svis.generator.rd.RDSettings
 import org.svis.generator.rd.RDSettings.InvocationRepresentation
 import org.svis.generator.rd.RDSettings.Variant
diff --git a/generator/org.svis.generator.tests/src/org/svis/generator/tests/rd/dynamix/Bank_X3DomNoneTest.xtend b/generator/org.svis.generator.tests/src/org/svis/generator/tests/rd/dynamix/Bank_X3DomNoneTest.xtend
@@ -7,7 +7,7 @@ import java.io.File
 import java.io.FileNotFoundException
 import org.eclipse.emf.mwe2.launch.runtime.Mwe2Launcher
 import org.apache.commons.io.FileUtils
-import org.svis.generator.rd.RDSettings.OutputFormat
+//import org.svis.generator.rd.RDSettings.OutputFormat
 import org.svis.generator.rd.RDSettings
 import org.svis.generator.SettingsConfiguration
 
diff --git a/generator/org.svis.generator.tests/src/org/svis/generator/tests/rd/dynamix/Prawn_X3DomFlashingMethodsTest.xtend b/generator/org.svis.generator.tests/src/org/svis/generator/tests/rd/dynamix/Prawn_X3DomFlashingMethodsTest.xtend
@@ -7,7 +7,7 @@ import java.io.File
 import java.io.FileNotFoundException
 import org.eclipse.emf.mwe2.launch.runtime.Mwe2Launcher
 import org.apache.commons.io.FileUtils
-import org.svis.generator.rd.RDSettings.OutputFormat
+//import org.svis.generator.rd.RDSettings.OutputFormat
 import org.svis.generator.rd.RDSettings
 import org.svis.generator.rd.RDSettings.InvocationRepresentation
 import org.svis.generator.rd.RDSettings.Variant
diff --git a/generator/org.svis.generator.tests/src/org/svis/generator/tests/rd/dynamix/Prawn_X3DomMovingFlashingTest.xtend b/generator/org.svis.generator.tests/src/org/svis/generator/tests/rd/dynamix/Prawn_X3DomMovingFlashingTest.xtend
@@ -7,7 +7,7 @@ import java.io.File
 import java.io.FileNotFoundException
 import org.eclipse.emf.mwe2.launch.runtime.Mwe2Launcher
 import org.apache.commons.io.FileUtils
-import org.svis.generator.rd.RDSettings.OutputFormat
+//import org.svis.generator.rd.RDSettings.OutputFormat
 import org.svis.generator.rd.RDSettings
 import org.svis.generator.rd.RDSettings.InvocationRepresentation
 import org.svis.generator.rd.RDSettings.Variant
diff --git a/generator/org.svis.generator.tests/src/org/svis/generator/tests/rd/dynamix/Prawn_X3DomMovingSpheresTest.xtend b/generator/org.svis.generator.tests/src/org/svis/generator/tests/rd/dynamix/Prawn_X3DomMovingSpheresTest.xtend
@@ -7,7 +7,7 @@ import java.io.File
 import java.io.FileNotFoundException
 import org.eclipse.emf.mwe2.launch.runtime.Mwe2Launcher
 import org.apache.commons.io.FileUtils
-import org.svis.generator.rd.RDSettings.OutputFormat
+//import org.svis.generator.rd.RDSettings.OutputFormat
 import org.svis.generator.rd.RDSettings
 import org.svis.generator.rd.RDSettings.InvocationRepresentation
 import org.svis.generator.rd.RDSettings.Variant
diff --git a/generator/org.svis.generator.tests/src/org/svis/generator/tests/rd/dynamix/Prawn_X3DomTest.xtend b/generator/org.svis.generator.tests/src/org/svis/generator/tests/rd/dynamix/Prawn_X3DomTest.xtend
@@ -7,7 +7,7 @@ import java.io.File
 import java.io.FileNotFoundException
 import org.eclipse.emf.mwe2.launch.runtime.Mwe2Launcher
 import org.apache.commons.io.FileUtils
-import org.svis.generator.rd.RDSettings.OutputFormat
+//import org.svis.generator.rd.RDSettings.OutputFormat
 import org.svis.generator.rd.RDSettings
 import org.svis.generator.SettingsConfiguration
 
diff --git a/generator/org.svis.generator.tests/src/org/svis/generator/tests/rd/famix/AndroidPhone_CompressedTest.xtend b/generator/org.svis.generator.tests/src/org/svis/generator/tests/rd/famix/AndroidPhone_CompressedTest.xtend
@@ -17,7 +17,7 @@ import static org.hamcrest.Matchers.*
 import static org.junit.Assert.assertThat
 import org.svis.generator.tests.helper.JSONUtil
 import org.svis.generator.rd.RDSettings
-import org.svis.generator.rd.RDSettings.OutputFormat
+//import org.svis.generator.rd.RDSettings.OutputFormat
 import org.svis.generator.SettingsConfiguration
 
 class AndroidPhone_CompressedTest {
diff --git a/generator/org.svis.generator.tests/src/org/svis/generator/tests/rd/famix/Bank_AttributeDiskTest.xtend b/generator/org.svis.generator.tests/src/org/svis/generator/tests/rd/famix/Bank_AttributeDiskTest.xtend
@@ -237,6 +237,6 @@ class Bank_AttributeDiskTest {
     
     @AfterClass
     def static void end() {
-    	RDSettings::DATA_DISKS = false
+//    	RDSettings::DATA_DISKS = false
     }
 }
diff --git a/generator/org.svis.generator.tests/src/org/svis/generator/tests/rd/famix/Bank_JdtParserTest.xtend b/generator/org.svis.generator.tests/src/org/svis/generator/tests/rd/famix/Bank_JdtParserTest.xtend
@@ -243,6 +243,6 @@ class Bank_JdtParserTest {
     
     @AfterClass
     def static void end() {
-    	FAMIXSettings::FAMIX_PARSER = FAMIXSettings::FamixParser.VERVEINEJ
+//    	FAMIXSettings::FAMIX_PARSER = FAMIXSettings::FamixParser.VERVEINEJ
     }
 }
diff --git a/generator/org.svis.generator.tests/src/org/svis/generator/tests/rd/famix/Bank_MethodTypeTest.xtend b/generator/org.svis.generator.tests/src/org/svis/generator/tests/rd/famix/Bank_MethodTypeTest.xtend
@@ -240,7 +240,7 @@ class Bank_MethodTypeTest {
     
     @AfterClass
     def static void end(){
-    	RDSettings::METHOD_TYPE_MODE = false
-    	FAMIXSettings::HIDE_PRIVATE_ELEMENTS = false
+//    	RDSettings::METHOD_TYPE_MODE = false
+//    	FAMIXSettings::HIDE_PRIVATE_ELEMENTS = false
     }
 }
diff --git a/generator/org.svis.generator.tests/src/org/svis/generator/tests/rd/famix/MasterRootTest.xtend b/generator/org.svis.generator.tests/src/org/svis/generator/tests/rd/famix/MasterRootTest.xtend
@@ -134,7 +134,7 @@ class MasterRootTest {
     
     @AfterClass
     def static void end() {
-    	FAMIXSettings::MASTER_ROOT = false
-    	FAMIXSettings::MERGE_PACKAGES = false
+//    	FAMIXSettings::MASTER_ROOT = false
+//    	FAMIXSettings::MERGE_PACKAGES = false
     }
 }
diff --git a/generator/org.svis.generator.tests/src/org/svis/generator/tests/rd/hismo/Sidekiq_DynamicEvolutionTest.xtend b/generator/org.svis.generator.tests/src/org/svis/generator/tests/rd/hismo/Sidekiq_DynamicEvolutionTest.xtend
@@ -7,7 +7,7 @@ import java.io.File
 import java.io.FileNotFoundException
 import org.eclipse.emf.mwe2.launch.runtime.Mwe2Launcher
 import org.apache.commons.io.FileUtils
-import org.svis.generator.rd.RDSettings.OutputFormat
+//import org.svis.generator.rd.RDSettings.OutputFormat
 import org.svis.generator.rd.RDSettings
 import org.svis.generator.rd.RDSettings.Variant
 import org.svis.generator.rd.RDSettings.EvolutionRepresentation
diff --git a/generator/org.svis.generator.tests/src/org/svis/generator/tests/rd/hismo/Sidekiq_MultipleDynamicEvolutionTest.xtend b/generator/org.svis.generator.tests/src/org/svis/generator/tests/rd/hismo/Sidekiq_MultipleDynamicEvolutionTest.xtend
@@ -7,7 +7,7 @@ import java.io.File
 import java.io.FileNotFoundException
 import org.eclipse.emf.mwe2.launch.runtime.Mwe2Launcher
 import org.apache.commons.io.FileUtils
-import org.svis.generator.rd.RDSettings.OutputFormat
+//import org.svis.generator.rd.RDSettings.OutputFormat
 import org.svis.generator.rd.RDSettings
 import org.svis.generator.rd.RDSettings.Variant
 import org.svis.generator.rd.RDSettings.EvolutionRepresentation
diff --git a/generator/org.svis.generator.tests/src/org/svis/generator/tests/rd/hismo/Sidekiq_MultipleTimeLineTest.xtend b/generator/org.svis.generator.tests/src/org/svis/generator/tests/rd/hismo/Sidekiq_MultipleTimeLineTest.xtend
@@ -7,7 +7,7 @@ import java.io.File
 import java.io.FileNotFoundException
 import org.eclipse.emf.mwe2.launch.runtime.Mwe2Launcher
 import org.apache.commons.io.FileUtils
-import org.svis.generator.rd.RDSettings.OutputFormat
+//import org.svis.generator.rd.RDSettings.OutputFormat
 import org.svis.generator.rd.RDSettings
 import org.svis.generator.rd.RDSettings.EvolutionRepresentation
 import org.svis.generator.SettingsConfiguration
diff --git a/generator/org.svis.generator.tests/src/org/svis/generator/tests/rd/hismo/Sidekiq_TimeLineTest.xtend b/generator/org.svis.generator.tests/src/org/svis/generator/tests/rd/hismo/Sidekiq_TimeLineTest.xtend
@@ -7,7 +7,7 @@ import java.io.File
 import java.io.FileNotFoundException
 import org.eclipse.emf.mwe2.launch.runtime.Mwe2Launcher
 import org.apache.commons.io.FileUtils
-import org.svis.generator.rd.RDSettings.OutputFormat
+//import org.svis.generator.rd.RDSettings.OutputFormat
 import org.svis.generator.rd.RDSettings
 import org.svis.generator.SettingsConfiguration
 
diff --git a/generator/org.svis.generator.tests/src/org/svis/generator/tests/simpleglyphs/GlyphSimplifierTest.xtend b/generator/org.svis.generator.tests/src/org/svis/generator/tests/simpleglyphs/GlyphSimplifierTest.xtend
@@ -9,7 +9,7 @@ import java.io.FileNotFoundException
 import org.eclipse.emf.mwe2.launch.runtime.Mwe2Launcher
 import org.apache.commons.io.FileUtils
 import org.svis.generator.rd.RDSettings
-import org.svis.generator.rd.RDSettings.OutputFormat
+//import org.svis.generator.rd.RDSettings.OutputFormat
 import org.svis.generator.SettingsConfiguration
 
 class GlyphSimplifierTest {
diff --git a/generator/org.svis.generator/src/org/svis/generator/rd/m2t/RD2X3DCompressed.xtend b/generator/org.svis.generator/src/org/svis/generator/rd/m2t/RD2X3DCompressed.xtend
@@ -158,6 +158,7 @@ class RD2X3DCompressed {
 		«FOR segs : segments.values»
 			«FOR segment :segs»
 				«IF(segment.color == config.RDDataColorAsPercentage)»
+				«log.info("Data: " + segment.color + " : " + config.RDDataColorAsPercentage)»
 					<Transform  translation='«(segment.
 			eContainer as Disk).position.x + " " + (segment.eContainer as Disk).position.y + " " +
 			(segment.eContainer as Disk).position.z»' rotation='0 0 1 1.57'>
@@ -202,7 +203,8 @@ class RD2X3DCompressed {
 		«var firstMethSegId = ""»
 		«FOR segs : segments.values»
 			«FOR segment :segs»
-				«IF(segment.color !== config.RDDataColorAsPercentage)»
+				«IF(segment.color != config.RDDataColorAsPercentage)»
+				«log.info("Method: " + segment.color + " : " + config.RDDataColorAsPercentage)»
 					<Transform  translation='«(segment.
 			eContainer as Disk).position.x + " " + (segment.eContainer as Disk).position.y + " " +
 			(segment.eContainer as Disk).position.z»' rotation='0 0 1 1.57'>

Original file line number	Diff line number	Diff line change
`@@ -237,6 +237,6 @@ class Bank_AttributeDiskTest {`
`237`	`237`
`238`	`238`	`@AfterClass`
`239`	`239`	`def static void end() {`
`240`		`- RDSettings::DATA_DISKS = false`
	`240`	`+// RDSettings::DATA_DISKS = false`
`241`	`241`	`}`
`242`	`242`	`}`