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

ui: added java licenses

Browse Source 
* added license info for 3rd party jars to license ui
* removed unused jars for java indexer
This commit is contained in:
malte_langkabel
2016-08-22 15:57:54 +02:00
parent 858364b385
commit 274eca0e5d
25 changed files with 29 additions and 360 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib/JavaProject.cpp
+6 -11
View File
@@ -22,27 +22,22 @@ JavaProject::JavaProject(std::shared_ptr<JavaProjectSettings> projectSettings, S
: Project(storageAccessProxy)
, m_projectSettings(projectSettings)
{
#ifdef _WIN32
const std::string separator = ";";
#else
const std::string separator = ":";
#endif
if (!JavaEnvironmentFactory::getInstance() && !isTrial())
{
#ifdef _WIN32
const std::string separator = ";";
#else
const std::string separator = ":";
#endif
JavaEnvironmentFactory::createInstance(
"data/java/asm-5.0.3.jar" + separator +
"data/java/cglib-3.1.jar" + separator +
"data/java/easymock-3.3.1.jar" + separator +
"data/java/guava-18.0.jar" + separator +
"data/java/hamcrest-core-1.3.jar" + separator +
"data/java/java-indexer.jar" + separator +
"data/java/javaparser-core.jar" + separator +
"data/java/javaslang-2.0.0-beta.jar" + separator +
"data/java/javassist-3.19.0-GA.jar" + separator +
"data/java/java-symbol-solver-core.jar" + separator +
"data/java/java-symbol-solver-logic.jar" + separator +
"data/java/java-symbol-solver-model.jar" + separator +
"data/java/objenesis-2.1.jar" + separator
"data/java/java-symbol-solver-model.jar" + separator
);
}
}
src/lib_gui/qt/window/QtAboutLicense.cpp
+3
View File
@@ -36,6 +36,7 @@ void QtAboutLicense::populateWindow(QWidget* widget)
licenseName->setText( QString::fromLatin1(license.name));
QFont _font = licenseName->font();
_font.setPixelSize(36);
_font.setBold(true);
licenseName->setFont(_font);
layout->addWidget(licenseName);
@@ -50,6 +51,8 @@ void QtAboutLicense::populateWindow(QWidget* widget)
licenseText->setWordWrap(true);
licenseText->setText(QString::fromLatin1(license.license));
layout->addWidget(licenseText);
layout->addSpacing(50);
}
}
src/test/JavaParserTestSuite.h
+15 -13
View File
@@ -1189,20 +1189,22 @@ private:
if (!JavaEnvironmentFactory::getInstance())
{
#ifdef _WIN32
const std::string separator = ";";
#else
const std::string separator = ":";
#endif
JavaEnvironmentFactory::createInstance(
"../app/data/java/asm-5.0.3.jar;"
"../app/data/java/cglib-3.1.jar;"
"../app/data/java/easymock-3.3.1.jar;"
"../app/data/java/guava-18.0.jar;"
"../app/data/java/hamcrest-core-1.3.jar;"
"../app/data/java/java-indexer.jar;"
"../app/data/java/javaparser-core.jar;"
"../app/data/java/javaslang-2.0.0-beta.jar;"
"../app/data/java/javassist-3.19.0-GA.jar;"
"../app/data/java/java-symbol-solver-core.jar;"
"../app/data/java/java-symbol-solver-logic.jar;"
"../app/data/java/java-symbol-solver-model.jar;"
"../app/data/java/objenesis-2.1.jar;");
"../app/data/java/guava-18.0.jar" + separator +
"../app/data/java/java-indexer.jar" + separator +
"../app/data/java/javaparser-core.jar" + separator +
"../app/data/java/javaslang-2.0.0-beta.jar" + separator +
"../app/data/java/javassist-3.19.0-GA.jar" + separator +
"../app/data/java/java-symbol-solver-core.jar" + separator +
"../app/data/java/java-symbol-solver-logic.jar" + separator +
"../app/data/java/java-symbol-solver-model.jar" + separator
);
}
JavaParser parser(client.get());