logic: added support for Java 10

* updated java indexed and dependencies to support java 10
* added java indexer test for java 10 "var" support
This commit is contained in:
mlangkabel
2018-07-10 11:26:51 +02:00
parent 2bbe696af2
commit 6bbb44309d
10 changed files with 46 additions and 18 deletions
+2 -2
View File
@@ -10,7 +10,7 @@ void SourceGroupSettingsJava::load(std::shared_ptr<const ConfigManager> config)
SourceGroupSettings::load(config);
const std::string key = s_keyPrefix + getId();
SourceGroupSettingsWithSourceExtensions::load(config, key);
SourceGroupSettingsWithExcludeFilters::load(config, key);
SourceGroupSettingsWithJavaStandard::load(config, key);
@@ -36,7 +36,7 @@ bool SourceGroupSettingsJava::equals(std::shared_ptr<SourceGroupSettings> other)
SourceGroupSettings::equals(other) &&
SourceGroupSettingsWithSourceExtensions::equals(otherJava) &&
SourceGroupSettingsWithExcludeFilters::equals(otherJava) &&
SourceGroupSettingsWithJavaStandard::equals(otherJava)
SourceGroupSettingsWithJavaStandard::equals(otherJava)
);
}
@@ -12,7 +12,7 @@ std::shared_ptr<SourceGroupSettings> SourceGroupSettingsJavaEmpty::createCopy()
void SourceGroupSettingsJavaEmpty::load(std::shared_ptr<const ConfigManager> config)
{
SourceGroupSettings::load(config);
SourceGroupSettingsJava::load(config);
const std::string key = s_keyPrefix + getId();
@@ -22,7 +22,7 @@ void SourceGroupSettingsJavaEmpty::load(std::shared_ptr<const ConfigManager> con
void SourceGroupSettingsJavaEmpty::save(std::shared_ptr<ConfigManager> config)
{
SourceGroupSettings::save(config);
SourceGroupSettingsJava::save(config);
const std::string key = s_keyPrefix + getId();
@@ -41,7 +41,7 @@ void SourceGroupSettingsWithJavaStandard::setJavaStandard(const std::string& sta
std::vector<std::string> SourceGroupSettingsWithJavaStandard::getAvailableJavaStandards() const
{
return {"1", "2", "3", "4", "5", "6", "7", "8"};
return {"1", "2", "3", "4", "5", "6", "7", "8", "9", "10"};
}
std::string SourceGroupSettingsWithJavaStandard::getDefaultJavaStandard() const