diff options
| author | Henrik Rentz-Reichert | 2018-11-23 13:08:16 +0000 |
|---|---|---|
| committer | Henrik Rentz-Reichert | 2018-11-23 16:07:24 +0000 |
| commit | 5f90e312dbeeffaa057b682e3becb2cee79f6ea0 (patch) | |
| tree | 714ee95ab99632e9f6a612024ae28458e0c2bce1 /plugins/org.eclipse.etrice.generator.config | |
| parent | 4c57977d9e3f098ffae44ee5f3373878b351feca (diff) | |
| download | org.eclipse.etrice-5f90e312dbeeffaa057b682e3becb2cee79f6ea0.tar.gz org.eclipse.etrice-5f90e312dbeeffaa057b682e3becb2cee79f6ea0.tar.xz org.eclipse.etrice-5f90e312dbeeffaa057b682e3becb2cee79f6ea0.zip | |
reduced warnings in eTrice Java and Xtend sources
Diffstat (limited to 'plugins/org.eclipse.etrice.generator.config')
| -rw-r--r-- | plugins/org.eclipse.etrice.generator.config/META-INF/MANIFEST.MF | 1 | ||||
| -rw-r--r-- | plugins/org.eclipse.etrice.generator.config/src/org/eclipse/etrice/generator/config/DataConfiguration.xtend | 8 |
2 files changed, 5 insertions, 4 deletions
diff --git a/plugins/org.eclipse.etrice.generator.config/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.generator.config/META-INF/MANIFEST.MF index ac386c668..e62e4d45a 100644 --- a/plugins/org.eclipse.etrice.generator.config/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.etrice.generator.config/META-INF/MANIFEST.MF @@ -17,4 +17,5 @@ Require-Bundle: org.eclipse.etrice.core.common;bundle-version="2.0.0", com.google.guava;bundle-version="8.0.0", org.eclipse.xtext.xbase.lib;bundle-version="2.6.0" Export-Package: org.eclipse.etrice.generator.config +Automatic-Module-Name: org.eclipse.etrice.generator.config diff --git a/plugins/org.eclipse.etrice.generator.config/src/org/eclipse/etrice/generator/config/DataConfiguration.xtend b/plugins/org.eclipse.etrice.generator.config/src/org/eclipse/etrice/generator/config/DataConfiguration.xtend index c9a5cef3d..01a36c9ef 100644 --- a/plugins/org.eclipse.etrice.generator.config/src/org/eclipse/etrice/generator/config/DataConfiguration.xtend +++ b/plugins/org.eclipse.etrice.generator.config/src/org/eclipse/etrice/generator/config/DataConfiguration.xtend @@ -100,7 +100,7 @@ class DataConfiguration implements IDataConfiguration { // dynamic override getPollingTimerUser(SubSystemInstance subsystem) { val dynConf = subsystem.config?.dynConfig - if (dynConf == null) + if (dynConf === null) 0 else dynConf.polling @@ -108,7 +108,7 @@ class DataConfiguration implements IDataConfiguration { override getUserCode1(SubSystemInstance subsystem) { var dynConfig = subsystem.config?.dynConfig - return if (dynConfig?.filePath != null) + return if (dynConfig?.filePath !== null) "import org.eclipse.etrice.runtime.java.config.ConfigSourceFile;" // TODO JH make lang independent else dynConfig?.userCode1 @@ -116,7 +116,7 @@ class DataConfiguration implements IDataConfiguration { override getUserCode2(SubSystemInstance subsystem) { var dynConfig = subsystem.config?.dynConfig - return if (dynConfig?.filePath != null) '''new ConfigSourceFile("«dynConfig.filePath»")''' else + return if (dynConfig?.filePath !== null) '''new ConfigSourceFile("«dynConfig.filePath»")''' else dynConfig?.userCode2 } @@ -137,7 +137,7 @@ class DataConfiguration implements IDataConfiguration { } override hasVariableService(SubSystemInstance subsystem) { - subsystem.config?.dynConfig != null + subsystem.config?.dynConfig !== null } def private toStringExpr(ConfigValueArray literal) { |