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

logic: used wstring in FilePath constructor

Browse Source 
* used wstring in FilePath constructor where easily possible
* added FilePath concatenate method that accepts string parameter
* implemented using only wstring in MessageStatus
* used wstring in config
This commit is contained in:
mlangkabel
2018-01-30 11:00:23 +01:00
parent 143cf6a02d
commit 0dda63f7ae
157 changed files with 1230 additions and 945 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib_java/utility/utilityJava.cpp
+22 -23
View File
@@ -6,29 +6,28 @@
namespace utility
{
std::vector<std::string> getRequiredJarNames()
std::vector<std::wstring> getRequiredJarNames()
{
std::vector<std::string> jarNames = {
"gradle-tooling-api-4.2.jar",
"java-indexer.jar",
"org.eclipse.core.commands-3.9.0.jar",
"org.eclipse.core.contenttype-3.6.0.jar",
"org.eclipse.core.expressions-3.6.0.jar",
"org.eclipse.core.filesystem-1.7.0.jar",
"org.eclipse.core.jobs-3.9.2.jar",
"org.eclipse.core.resources-3.12.0.jar",
"org.eclipse.core.runtime-3.13.0.jar",
"org.eclipse.equinox.app-1.3.400.jar",
"org.eclipse.equinox.common-3.9.0.jar",
"org.eclipse.equinox.preferences-3.7.0.jar",
"org.eclipse.equinox.registry-3.7.0.jar",
"org.eclipse.jdt.core-3.13.0.jar",
"org.eclipse.osgi-3.12.50.jar",
"org.eclipse.text-3.6.100.jar",
"slf4j-api-1.7.10.jar",
"slf4j-simple-1.7.10.jar"
return {
L"gradle-tooling-api-4.2.jar",
L"java-indexer.jar",
L"org.eclipse.core.commands-3.9.0.jar",
L"org.eclipse.core.contenttype-3.6.0.jar",
L"org.eclipse.core.expressions-3.6.0.jar",
L"org.eclipse.core.filesystem-1.7.0.jar",
L"org.eclipse.core.jobs-3.9.2.jar",
L"org.eclipse.core.resources-3.12.0.jar",
L"org.eclipse.core.runtime-3.13.0.jar",
L"org.eclipse.equinox.app-1.3.400.jar",
L"org.eclipse.equinox.common-3.9.0.jar",
L"org.eclipse.equinox.preferences-3.7.0.jar",
L"org.eclipse.equinox.registry-3.7.0.jar",
L"org.eclipse.jdt.core-3.13.0.jar",
L"org.eclipse.osgi-3.12.50.jar",
L"org.eclipse.text-3.6.100.jar",
L"slf4j-api-1.7.10.jar",
L"slf4j-simple-1.7.10.jar"
};
return jarNames;
}
std::string prepareJavaEnvironment()
@@ -45,14 +44,14 @@ namespace utility
std::string classPath = "";
{
const std::vector<std::string> jarNames = getRequiredJarNames();
const std::vector<std::wstring> jarNames = getRequiredJarNames();
for (size_t i = 0; i < jarNames.size(); i++)
{
if (i != 0)
{
classPath += separator;
}
classPath += ResourcePaths::getJavaPath().str() + "lib/" + jarNames[i];
classPath += ResourcePaths::getJavaPath().concatenate(L"lib/" + jarNames[i]).str();
}
}