ynkmr/Sourcetrail
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

logic: minor maven fixes

Browse Source 
* changed maven related value name in project settings
* fixed JavaProjectSettings to return correct ProjectType for Maven project
This commit is contained in:
malte_langkabel
2017-03-09 11:57:22 +01:00
parent 3cbe83f9e6
commit 8533ad7535
2 changed files with 80 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bin/test/data/log/test_log.txt
+74
View File
@@ -0,0 +1,74 @@
Token.cpp ERROR: Location Id was not referenced by this Token.
Node.cpp WARNING: Cannot change NodeType after it was already set from namespace to class
Edge.cpp ERROR: Nodes are not plain copies.
INFO: send MessageStatus Enabled console and file logging.
INFO: send TestMessage
INFO: send TestMessage
INFO: send TestMessage
INFO: send TestMessage2
INFO: send TestMessage
INFO: send TestMessage2
INFO: send TestMessage
INFO: send TestMessage
INFO: send TestMessage2
INFO: send TestMessage
INFO: send TestMessage
INFO: send TestMessage
INFO: send TestMessage
INFO: send TestMessage
INFO: send TestMessage
NetworkProtocolHelper.cpp ERROR: Failed to parse message, invalid type token: foo. Expected setActiveToken
NetworkProtocolHelper.cpp ERROR: Failed to parse setActiveToken message, invalid token count
Settings.cpp WARNING: File for Settings not found: data/SettingsTestSuite/wrong_settings.xml
Settings.cpp WARNING: File for Settings not found: data/SettingsTestSuite/wrong_settings.xml
TextAccess.cpp ERROR: Could not open file path/to/test.h
TextAccess.cpp WARNING: Index 'firstLine' has to be lower or equal index 'lastLine', is 3 > 2
TextAccess.cpp WARNING: Tried to access index 10. Maximum index is 8
TextAccess.cpp WARNING: Tried to access index 10. Maximum index is 8
TextAccess.cpp WARNING: Line numbers start with one, is 0
TextAccess.cpp WARNING: Line numbers start with one, is 0
TokenLocationCollection.cpp ERROR: TokenLocation has wrong boundaries: file.c 2:3 2:1
TokenLocationCollection.cpp ERROR: TokenLocation has wrong boundaries: file.c 4:1 1:10
INFO: Indexer - indexing source file: input.cc
INFO: Indexer - indexing source file: input.cc
INFO: Indexer - indexing source file: input.cc
INFO: Indexer - indexing source file: input.cc
INFO: Indexer - indexing source file: input.cc
INFO: Indexer - indexing source file: input.cc
INFO: Indexer - indexing source file: input.cc
INFO: Indexer - indexing source file: input.cc
INFO: Indexer - indexing source file: input.cc
INFO: Indexer - indexing source file: input.cc
INFO: Indexer - indexing source file: input.cc
INFO: Indexer - indexing source file: input.cc
INFO: Indexer - indexing source file: input.cc
INFO: Indexer - indexing source file: input.cc
INFO: Indexer - indexing source file: input.cc
INFO: Indexer - indexing source file: input.cc
INFO: Indexer - indexing source file: input.cc
INFO: Indexer - indexing source file: input.cc
INFO: Indexer - indexing source file: input.cc
INFO: Indexer - indexing source file: input.cc
INFO: Indexer - indexing source file: input.cc
INFO: Indexer - indexing source file: input.cc
INFO: Indexer - indexing source file: input.cc
INFO: Indexer - indexing source file: input.cc
INFO: Indexer - indexing source file: input.cc
INFO: Indexer - indexing source file: input.cc
INFO: Indexer - indexing source file: input.cc
INFO: Indexer - indexing source file: input.cc
INFO: Indexer - indexing source file: input.cc
INFO: Indexer - indexing source file: input.cc
INFO: Indexer - indexing source file: input.cc
INFO: Indexer - indexing source file: input.cc
INFO: Indexer - indexing source file: input.cc
INFO: Indexer - indexing source file: input.cc
INFO: Indexer - indexing source file: input.cc
INFO: Indexer - indexing source file: input.cc
INFO: Indexer - indexing source file: input.cc
INFO: Indexer - indexing source file: input.cc
INFO: Indexer - indexing source file: input.cc
INFO: Indexer - indexing source file: input.cc
INFO: Indexer - indexing source file: input.cc
INFO: Indexer - indexing source file: input.cc
INFO: Indexer - indexing source file: input.cc
src/lib/settings/JavaProjectSettings.cpp
+6 -2
View File
@@ -25,6 +25,10 @@ JavaProjectSettings::~JavaProjectSettings()
ProjectType JavaProjectSettings::getProjectType() const
{
if (!getMavenProjectFilePath().empty())
{
return PROJECT_JAVA_MAVEN;
}
return PROJECT_JAVA_EMPTY;
}
@@ -63,7 +67,7 @@ bool JavaProjectSettings::setClasspaths(const std::vector<FilePath>& classpaths)
FilePath JavaProjectSettings::getMavenProjectFilePath() const
{
return FilePath(getValue<std::string>("source/maven/project_root", ""));
return FilePath(getValue<std::string>("source/maven/project_file_path", ""));
}
FilePath JavaProjectSettings::getAbsoluteMavenProjectFilePath() const
@@ -73,7 +77,7 @@ FilePath JavaProjectSettings::getAbsoluteMavenProjectFilePath() const
bool JavaProjectSettings::setMavenProjectFilePath(const FilePath& path)
{
return setValue("source/maven/project_root", path.str());
return setValue("source/maven/project_file_path", path.str());
}
FilePath JavaProjectSettings::getMavenDependenciesDirectory() const