logic: disabled console logging in Java indexer

documentation: log windows images
build: updated windows installer
2016-10-14 11:15:30 +02:00 · 2016-10-14 11:07:16 +02:00 · 2016-10-14 10:25:47 +02:00 · 2016-10-14 09:55:04 +02:00 · 2016-10-14 00:45:37 +02:00 · 2016-10-13 20:48:06 +02:00
1247 changed files with 123212 additions and 20933 deletions
@@ -1,27 +0,0 @@
-#!/bin/bash
-
-ABORT="\033[31mAbort:\033[00m"
-SUCCESS="\033[32mSuccess:\033[00m"
-INFO="\033[33mInfo:\033[00m"
-
-BRANCH_NAME=$(git symbolic-ref -q --short HEAD)
-
-if [ -z $BRANCH_NAME ]
-then
-	echo -e $ABORT "You are not on any branch."
-	exit 1
-fi
-
-if [ $BRANCH_NAME == "master" ]
-then
-	echo -e $ABORT "Commiting to master is prohibited."
-	exit 1
-fi
-
-if [ $BRANCH_NAME == "public_beta" ]
-then
-	echo -e $ABORT "Commiting to public_beta is prohibited."
-	exit 1
-fi
-
-exit 0
@@ -5,6 +5,7 @@
 /bin/app/Debug/
 /bin/app/Release/
 /bin/app/data/projects/ignored/
+/bin/app/data/java/
 /bin/app/user/log/
 /bin/app/user/ApplicationSettings.xml
 /bin/app/user/window_settings.ini
@@ -23,7 +24,10 @@
 /bin/test/data/temp.xml
 /bin/test/data/TestSettings.xml

-/setup/Linux/lib/*
+/java_indexer/bin/
+/java_indexer/lib/
+
+/setup/Linux/lib/

 .DS_Store
 .idea
@@ -31,28 +35,40 @@
 /ide_plugins/vs/vs2012/CoatiPlugin/CoatiPlugin/bin
 /ide_plugins/vs/vs2012/CoatiPlugin/CoatiPlugin/obj

-.clang_complete
-
 *.coatidb
-
-/deployment/windows/CoatiSetup/CoatiSetup/Debug
-/deployment/windows/CoatiSetup/CoatiSetup/Release
-
-/deployment/windows/CoatiSetup/CoatiSetup.v12.suo
-
-/deployment/windows/CoatiSetup/SetupApplicationSettingsLib/bin/
-/deployment/windows/CoatiSetup/SetupApplicationSettingsLib/obj/
-
-/deployment/windows/CoatiSetup/SetupCreateDesktopShortcutLib/bin/
-/deployment/windows/CoatiSetup/SetupCreateDesktopShortcutLib/obj/
-
-/deployment/windows/CoatiSetup/SetupCreateStartMenuShortcutLib/bin/
-/deployment/windows/CoatiSetup/SetupCreateStartMenuShortcutLib/obj/
-
-/deployment/windows/CoatiSetup/SetupRemoveCacheFiles/bin/
-/deployment/windows/CoatiSetup/SetupRemoveCacheFiles/obj/
-
+*.suo
 *.sqlite
 *.pch
 *.swp
-.clang_complete
+*.swo
+.clang_complete
+.ycm_extra_conf.py
+.ycm_extra_conf.pyc
+coati.coatiproject
+compile_commands.json
+Makefile
+/__pycache__/
+
+/deployment/windows/CoatiAppSetup/CoatiSetup/Debug
+/deployment/windows/CoatiAppSetup/CoatiSetup/Release
+/deployment/windows/CoatiAppSetup/SetupApplicationSettingsLib/bin/
+/deployment/windows/CoatiAppSetup/SetupApplicationSettingsLib/obj/
+/deployment/windows/CoatiAppSetup/SetupCreateDesktopShortcutLib/bin/
+/deployment/windows/CoatiAppSetup/SetupCreateDesktopShortcutLib/obj/
+/deployment/windows/CoatiAppSetup/SetupCreateStartMenuShortcutLib/bin/
+/deployment/windows/CoatiAppSetup/SetupCreateStartMenuShortcutLib/obj/
+/deployment/windows/CoatiAppSetup/SetupRemoveCacheFiles/bin/
+/deployment/windows/CoatiAppSetup/SetupRemoveCacheFiles/obj/
+
+/deployment/windows/CoatiTrialSetup/CoatiSetup/Debug
+/deployment/windows/CoatiTrialSetup/CoatiSetup/Release
+/deployment/windows/CoatiTrialSetup/SetupApplicationSettingsLib/bin/
+/deployment/windows/CoatiTrialSetup/SetupApplicationSettingsLib/obj/
+/deployment/windows/CoatiTrialSetup/SetupCreateDesktopShortcutLib/bin/
+/deployment/windows/CoatiTrialSetup/SetupCreateDesktopShortcutLib/obj/
+/deployment/windows/CoatiTrialSetup/SetupCreateStartMenuShortcutLib/bin/
+/deployment/windows/CoatiTrialSetup/SetupCreateStartMenuShortcutLib/obj/
+/deployment/windows/CoatiTrialSetup/SetupRemoveCacheFiles/bin/
+/deployment/windows/CoatiTrialSetup/SetupRemoveCacheFiles/obj/
+
+/deployment/windows/wixSetup/
@@ -1,9 +1,4 @@
-cmake_minimum_required(VERSION 2.8.9)
-
-# to get CMP0043 warnings, upgrade to version 3 and change the line above to VERSION 3.0 and remove the line below
-if(POLICY CMP0043)
-   cmake_policy(SET CMP0043 OLD)
-endif()
+cmake_minimum_required(VERSION 3.1)

 include(cmake/add_files.cmake)
 include(cmake/create_source_groups.cmake)
@@ -11,15 +6,16 @@ include(cmake/version.cmake)
 include(cmake/version_setup.cmake)
 include(cmake/licenses.cmake)

+
 # Variables --------------------------------------------------------------------

 set(PROJECT_NAME Coati)

 set(APP_PROJECT_NAME "${PROJECT_NAME}")
-set(TRIAL_PROJECT_NAME "${PROJECT_NAME}_trial")
 set(LIB_LICENSE_PROJECT_NAME "${PROJECT_NAME}_lib_license")
 set(LIB_GUI_PROJECT_NAME "${PROJECT_NAME}_lib_gui")
-set(LIB_PARSER_PROJECT_NAME "${PROJECT_NAME}_lib_parser")
+set(LIB_CXX_PROJECT_NAME "${PROJECT_NAME}_lib_cxx")
+set(LIB_JAVA_PROJECT_NAME "${PROJECT_NAME}_lib_java")
 set(LIB_PROJECT_NAME "${PROJECT_NAME}_lib")
 set(LICENSE_GENERATOR_PROJECT_NAME "${PROJECT_NAME}_license_generator")
 set(TEST_PROJECT_NAME "${PROJECT_NAME}_test")
@@ -30,135 +26,99 @@ if (WIN32)
 elseif (APPLE)
 	set(PLATFORM_INCLUDE "includesMac.h")
 else ()
-	set(PLATFORM_INCLUDE "includesDefault.h")
-endif ()
-
-# Settings ---------------------------------------------------------------------
-
-if (UNIX)
-	add_definitions(-std=c++11 -Wno-unknown-warning-option -fcolor-diagnostics -DQT_COMPILING_QSTRING_COMPAT_CPP )
+	set(PLATFORM_INCLUDE "includesLinux.h")
 endif ()

 # Project ----------------------------------------------------------------------
+
 project(${PROJECT_NAME})

+# set Standard build type to Release
+set(CMAKE_BUILD_TYPE_INIT "Release")
+
+#RPATH
+if(UNIX AND NOT APPLE)
+	set(CMAKE_SKIP_BUILD_RPATH FALSE)
+	set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
+	set(CMAKE_INSTALL_RPATH "$ORIGIN/lib/:$$ORIGIN/lib/")
+	include(cmake/external.cmake)
+endif()
+
+set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
+set(CMAKE_CXX_STANDARD 11)
+set(CMAKE_C_STANDARD 99)
+
+# Settings ---------------------------------------------------------------------
+if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unknown-warning-option -fcolor-diagnostics")
+endif()
+
+if (UNIX AND "${CMAKE_BUILD_TYPE}" STREQUAL "Release")
+	add_definitions(-fno-omit-frame-pointer -DQT_COMPILING_QSTRING_COMPAT_CPP )
+endif ()
+
 # Clang ------------------------------------------------------------------------

-if (UNIX)
+if (UNIX AND APPLE)
 	if ("${CMAKE_BUILD_TYPE}" STREQUAL "Release")
 		find_package(LLVM REQUIRED PATHS "$ENV{CLANG_DIR}/build_release/share/llvm/cmake" NO_DEFAULT_PATH)
 	else()
 		find_package(LLVM REQUIRED PATHS "$ENV{CLANG_DIR}/build_debug/share/llvm/cmake" NO_DEFAULT_PATH)
 	endif()
+elseif(UNIX)
+	find_package(LLVM REQUIRED PATHS "${EXTERNAL_BUILD}/llvm/share/llvm/cmake" NO_DEFAULT_PATH)
 else()
 	find_package(LLVM REQUIRED PATHS "$ENV{CLANG_DIR}/build/share/llvm/cmake")
 endif()

-find_package(CLANG REQUIRED PATHS "${CMAKE_SOURCE_DIR}/cmake")
+find_package(CLANG REQUIRED PATHS "${CMAKE_SOURCE_DIR}/cmake" NO_DEFAULT_PATH)

 add_definitions(${CLANG_DEFINITIONS})

 # Boost ------------------------------------------------------------------------

-set(BOOST_ROOT $ENV{BOOST_159_DIR})
+if(UNIX AND NOT APPLE)
+	set(BOOST_ROOT ${EXTERNAL_BUILD}/boost)
+else()
+	set(BOOST_ROOT $ENV{BOOST_159_DIR})
+endif()
 set(Boost_USE_MULTITHREAD ON)
 set(Boost_USE_STATIC_LIBS ON)
 set(Boost_USE_STATIC_RUNTIME OFF)
-Set(Boost_NO_SYSTEM_PATHS ON)
+set(Boost_NO_SYSTEM_PATHS ON)
 set(BOOST_LIBRARYDIR $ENV{BOOST_159_DIR})

 find_package(Boost 1.59 COMPONENTS system program_options filesystem date_time REQUIRED)

-# Eigen ------------------------------------------------------------------------
-
-add_definitions(-DEIGEN_MPL2_ONLY)
-set(EIGEN_ROOT $ENV{EIGEN_DIR})
-
 # Botan -------------------------------------------------------------------------

-if(UNIX)
-    find_library(BOTAN botan-1.11 $ENV{BOTAN_DIR}/release NO_DEFAULT_PATH)
-    find_library(BOTAN_D botan-1.11 $ENV{BOTAN_DIR}/debug NO_DEFAULT_PATH)
+set(BOTAN_VERSION "botan-1.11")
+
+if(APPLE)
+	find_library(BOTAN ${BOTAN_VERSION} $ENV{BOTAN_DIR}/release NO_DEFAULT_PATH)
+	find_library(BOTAN_D ${BOTAN_VERSION} $ENV{BOTAN_DIR}/debug NO_DEFAULT_PATH)
+elseif(UNIX)
+	find_library(BOTAN ${BOTAN_VERSION} "${EXTERNAL_BUILD}/botan" NO_DEFAULT_PATH)
 else()
-    find_library(BOTAN botan "$ENV{BOTAN_DIR}/release")
+	find_library(BOTAN botan "$ENV{BOTAN_DIR}/release")
 	find_library(BOTAN_D botan "$ENV{BOTAN_DIR}/debug")
 endif()

-# Lib --------------------------------------------------------------------------
+if(${BOTAN} STREQUAL "BOTAN-NOTFOUND")
+	message(FATAL_ERROR "Botan not found")
+else()
+	message(STATUS "Botan found")
+endif()

-set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/bin/lib)
-set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/bin/lib)
+if(UNIX AND NOT APPLE)
+	set(BOTAN_INCLUDE_DIR "${EXTERNAL_BUILD}/botan")
+else()
+	set(BOTAN_INCLUDE_DIR "$ENV{BOTAN_DIR}")
+endif()

-add_subdirectory(src/lib)
-add_subdirectory(src/external)
-
-set_source_files_properties(${EXTERNAL_FILES} PROPERTIES COMPILE_FLAGS "-w")
-set_source_files_properties(${EXTERNAL_C_FILES} PROPERTIES COMPILE_FLAGS "-std=gnu89 -w")
-
-add_library(${LIB_PROJECT_NAME} ${LIB_FILES} ${EXTERNAL_FILES} ${EXTERNAL_C_FILES})
-
-create_source_groups(${LIB_FILES})
-create_source_groups(${EXTERNAL_FILES})
-create_source_groups(${EXTERNAL_C_FILES})
-
-set_target_properties(
-	${LIB_PROJECT_NAME}
-	PROPERTIES
-		DEBUG_OUTPUT_NAME ${PROJECT_NAME}_d
-		RELEASE_OUTPUT_NAME ${PROJECT_NAME}
-)
-
-set_property(
-	TARGET ${LIB_PROJECT_NAME}
-	PROPERTY INCLUDE_DIRECTORIES
-		"${CMAKE_SOURCE_DIR}/src/lib"
-)
-
-target_include_directories(${LIB_PROJECT_NAME} SYSTEM
-	PUBLIC ${LLVM_INCLUDE_DIRS}
-	${CLANG_INCLUDE_DIRS}
-	${Boost_INCLUDE_DIRS}
-	${EIGEN_ROOT}
-    "${CMAKE_SOURCE_DIR}/src/external"
-)
-
-target_link_libraries(${LIB_PROJECT_NAME} ${Boost_LIBRARIES})
-
-# Lib Parser -------------------------------------------------------------------
-
-set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/bin/lib_parser)
-set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/bin/lib_parser)
-
-add_subdirectory(src/lib_parser)
-
-set_source_files_properties(${CLANG_FILES} PROPERTIES COMPILE_FLAGS "-fno-rtti")
-
-add_library(${LIB_PARSER_PROJECT_NAME} ${CLANG_FILES})
-
-create_source_groups(${CLANG_FILES})
-
-set_property(
-		TARGET ${LIB_PARSER_PROJECT_NAME}
-		PROPERTY INCLUDE_DIRECTORIES
-		"${CMAKE_SOURCE_DIR}/src/lib_parser"
-		"${CMAKE_SOURCE_DIR}/src/lib"
-)
-
-target_include_directories(${LIB_PARSER_PROJECT_NAME} SYSTEM
-	PUBLIC ${LLVM_INCLUDE_DIRS}
-	${CLANG_INCLUDE_DIRS}
-	${Boost_INCLUDE_DIRS}
-)
-
-link_directories(${LLVM_LIBRARY_DIRS} ${CLANG_LIBRARY_DIRS} ${Boost_LIBRARY_DIRS})
-
-target_link_libraries(${LIB_PARSER_PROJECT_NAME} ${CLANG_LIBRARIES} ${LLVM_AVAILABLE_LIBS})

 # Lib License -------------------------------------------------------------------

-set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/bin/lib_license)
-set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/bin/lib_license)
-
 add_subdirectory(src/lib_license)

 add_library(${LIB_LICENSE_PROJECT_NAME} ${LIB_LICENSE_FILES})
@@ -174,13 +134,9 @@ set_property(
 target_include_directories(${LIB_LICENSE_PROJECT_NAME} SYSTEM
 	PUBLIC
 	${Boost_INCLUDE_DIRS}
-	${LIB_LICENSE_PROJECT_NAME}
-	"$ENV{BOTAN_DIR}"
+	${BOTAN_INCLUDE_DIR}
 )

-# target_include_directories(${LIB_LICENSE_PROJECT_NAME} optimized "$ENV{BOTAN_DIR}/release")
-# target_include_directories(${LIB_LICENSE_PROJECT_NAME} debug "$ENV{BOTAN_DIR}/debug")
-
 if(UNIX)
 	target_link_libraries(${LIB_LICENSE_PROJECT_NAME} ${BOTAN})
 else()
@@ -191,10 +147,96 @@ else()
 	target_link_libraries(${LIB_LICENSE_PROJECT_NAME} optimized ${BOTAN})
 endif()

-# Lib Gui ----------------------------------------------------------------------

-set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/bin/lib_gui)
-set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/bin/lib_gui)
+# Lib --------------------------------------------------------------------------
+
+add_subdirectory(src/lib)
+add_subdirectory(src/external)
+
+set_source_files_properties(${EXTERNAL_FILES} PROPERTIES COMPILE_FLAGS "-w")
+set_source_files_properties(${EXTERNAL_C_FILES} PROPERTIES COMPILE_FLAGS "-std=gnu89 -w")
+
+add_library(${LIB_PROJECT_NAME} ${LIB_FILES} ${EXTERNAL_FILES} ${EXTERNAL_C_FILES})
+
+create_source_groups(${LIB_FILES})
+create_source_groups(${EXTERNAL_FILES})
+create_source_groups(${EXTERNAL_C_FILES})
+
+set_property(
+	TARGET ${LIB_PROJECT_NAME}
+	PROPERTY INCLUDE_DIRECTORIES
+		"${CMAKE_SOURCE_DIR}/src/lib"
+		"${CMAKE_SOURCE_DIR}/src/external"
+		"${CMAKE_SOURCE_DIR}/src/lib_license"
+		"${CMAKE_SOURCE_DIR}/src/lib_cxx"
+		"${CMAKE_SOURCE_DIR}/src/lib_java"
+		"${CMAKE_SOURCE_DIR}/build/src/lib_license"
+)
+
+target_include_directories(${LIB_PROJECT_NAME} SYSTEM
+	PUBLIC ${Boost_INCLUDE_DIRS}
+	"${CMAKE_SOURCE_DIR}/src/external"
+)
+
+target_link_libraries(${LIB_PROJECT_NAME} ${Boost_LIBRARIES} ${LIB_LICENSE_PROJECT_NAME})
+
+
+# Lib Cxx -------------------------------------------------------------------
+
+add_subdirectory(src/lib_cxx)
+
+set_source_files_properties(${CLANG_FILES} PROPERTIES COMPILE_FLAGS "-fno-rtti")
+
+add_library(${LIB_CXX_PROJECT_NAME} ${CLANG_FILES} ${LIB_CXX_FILES})
+
+create_source_groups(${CLANG_FILES})
+create_source_groups(${LIB_CXX_FILES})
+
+set_property(
+	TARGET ${LIB_CXX_PROJECT_NAME}
+	PROPERTY INCLUDE_DIRECTORIES
+		"${CMAKE_SOURCE_DIR}/src/lib_cxx"
+		"${CMAKE_SOURCE_DIR}/src/lib"
+)
+
+target_include_directories(${LIB_CXX_PROJECT_NAME} SYSTEM
+	PUBLIC ${LLVM_INCLUDE_DIRS}
+	${CLANG_INCLUDE_DIRS}
+	${Boost_INCLUDE_DIRS}
+)
+
+link_directories(${LLVM_LIBRARY_DIRS} ${CLANG_LIBRARY_DIRS} ${Boost_LIBRARY_DIRS})
+llvm_map_components_to_libnames(REQ_LLVM_LIBS support core libdriver)
+
+target_link_libraries(${LIB_CXX_PROJECT_NAME} ${CLANG_LIBRARIES} ${REQ_LLVM_LIBS})
+
+
+# Lib Java -------------------------------------------------------------------
+
+find_package(JNI)
+
+add_subdirectory(src/lib_java)
+
+add_library(${LIB_JAVA_PROJECT_NAME} ${LIB_JAVA_FILES})
+
+create_source_groups(${LIB_JAVA_FILES})
+
+set_property(
+	TARGET ${LIB_JAVA_PROJECT_NAME}
+	PROPERTY INCLUDE_DIRECTORIES
+		"${CMAKE_SOURCE_DIR}/src/lib_java"
+		"${CMAKE_SOURCE_DIR}/src/lib"
+)
+
+target_include_directories(${LIB_JAVA_PROJECT_NAME} SYSTEM
+	PUBLIC ${JNI_INCLUDE_DIRS}
+	${Boost_INCLUDE_DIRS}
+)
+
+link_directories(${Boost_LIBRARY_DIRS})
+
+
+# Lib Gui ----------------------------------------------------------------------

 add_subdirectory(src/lib_gui)

@@ -204,21 +246,27 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON)
 set(CMAKE_AUTOMOC ON)

 # Find the QtWidgets library
-set(CMAKE_PREFIX_PATH "$ENV{QT_DIR}/")
+if(UNIX AND NOT APPLE)
+	set(CMAKE_PREFIX_PATH ${EXTERNAL_BUILD}/qt)
+else()
+	set(CMAKE_PREFIX_PATH "$ENV{QT_DIR}/")
+endif()

-set(Qt5Widgets_DIR "$ENV{QT_DIR}/cmake/Qt5Widgets/")
-set(Qt5PrintSupport_DIR "$ENV{QT_DIR}/cmake/Qt5PrintSupport/")
+if(UNIX AND APPLE)
+	set(Qt5Widgets_DIR "$ENV{QT_DIR}/cmake/Qt5Widgets/")
+	set(Qt5PrintSupport_DIR "$ENV{QT_DIR}/cmake/Qt5PrintSupport/")
+endif()

 find_package(Qt5Widgets)
 find_package(Qt5PrintSupport)
 find_package(Qt5Network)

 if(Qt5Widgets_FOUND)
-    MESSAGE(STATUS "Found Qt ${Qt5Widgets_VERSION_STRING}")
-    # FIX: Qt was built with -reduce-relocations
-    if (Qt5_POSITION_INDEPENDENT_CODE)
-        SET(CMAKE_POSITION_INDEPENDENT_CODE ON)
-    endif()
+	MESSAGE(STATUS "Found Qt ${Qt5Widgets_VERSION_STRING}")
+	# FIX: Qt was built with -reduce-relocations
+	if (Qt5_POSITION_INDEPENDENT_CODE)
+		SET(CMAKE_POSITION_INDEPENDENT_CODE ON)
+	endif()
 endif()

 # target for running versionnumber script
@@ -236,7 +284,7 @@ add_custom_command(
 	COMMAND ${CMAKE_COMMAND} -P ${CMAKE_SOURCE_DIR}/cmake/version.cmake
 	BYPRODUCTS ${PROJECT_SOURCE_DIR}/build/src/lib_gui/version.h
 	DEPENDS ${LIB_GUI_PROJECT_NAME}
-    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+	WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
 	COMMENT "check/update version number"
 )
 add_dependencies(${LIB_GUI_PROJECT_NAME} versionnumber)
@@ -246,16 +294,17 @@ create_source_groups(${LIB_GUI_FILES})
 set_property(
 	TARGET ${LIB_GUI_PROJECT_NAME}
 	PROPERTY INCLUDE_DIRECTORIES
+		"${CMAKE_SOURCE_DIR}/src/lib_gui"
 		"${CMAKE_SOURCE_DIR}/build/src/lib_gui"
 		"${CMAKE_SOURCE_DIR}/src/lib"
-		"${CMAKE_SOURCE_DIR}/src/lib_gui"
+		"${CMAKE_SOURCE_DIR}/src/lib_cxx"
 		"${CMAKE_SOURCE_DIR}/src/lib_license"
+		"${CMAKE_SOURCE_DIR}/build/src/lib_license"
 )

 # include external header without warnings
 target_include_directories(${LIB_GUI_PROJECT_NAME} SYSTEM
 		PUBLIC "${CMAKE_SOURCE_DIR}/src/external"
-		PUBLIC "$ENV{BOTAN_DIR}"
 		PUBLIC ${Boost_INCLUDE_DIRS}
 )

@@ -271,8 +320,8 @@ configure_file(

 #configure the versioning file
 configure_file(
-  ${CMAKE_SOURCE_DIR}/cmake/version.h.in
-  ${CMAKE_SOURCE_DIR}/build/src/lib_gui/version.h
+	${CMAKE_SOURCE_DIR}/cmake/version.h.in
+	${CMAKE_SOURCE_DIR}/build/src/lib_gui/version.h
 )

 # configure public key for the coati version
@@ -290,7 +339,6 @@ endif ()

 add_subdirectory(src/app)

-
 # Find includes in corresponding build directories
 set(CMAKE_INCLUDE_CURRENT_DIR ON)

@@ -301,7 +349,7 @@ if (WIN32)
 		"IDI_ICON1               ICON                    \"${CMAKE_SOURCE_DIR}/build/coati.ico\"\n"
 	)

-	add_executable(${APP_PROJECT_NAME} ${APP_FILES} ${CLANG_FILES} ${GEN_FILES} ${CMAKE_SOURCE_DIR}/build/Coati.rc ${CMAKE_SOURCE_DIR}/build/src/lib_gui/version.h)
+	add_executable(${APP_PROJECT_NAME} ${APP_FILES} ${CMAKE_SOURCE_DIR}/build/Coati.rc)

 	# hide the console when running a release build.
 	set_target_properties(${APP_PROJECT_NAME} PROPERTIES LINK_FLAGS_DEBUG "/SUBSYSTEM:CONSOLE")
@@ -311,12 +359,12 @@ if (WIN32)
 	set_target_properties(${APP_PROJECT_NAME} PROPERTIES LINK_FLAGS_RELEASE "/ENTRY:\"mainCRTStartup\" /SUBSYSTEM:WINDOWS")
 	set_target_properties(${APP_PROJECT_NAME} PROPERTIES LINK_FLAGS_MINSIZEREL "/SUBSYSTEM:WINDOWS")
 else ()
-	add_executable(${APP_PROJECT_NAME} ${APP_FILES} ${GEN_FILES} ${CMAKE_SOURCE_DIR}/build/src/lib_gui/version.h)
+	add_executable(${APP_PROJECT_NAME} ${APP_FILES})
 endif ()

 create_source_groups(${APP_FILES})

-target_link_libraries(${APP_PROJECT_NAME} ${LIB_GUI_PROJECT_NAME} ${LIB_PARSER_PROJECT_NAME} ${LIB_PROJECT_NAME} ${LIB_LICENSE_PROJECT_NAME})
+target_link_libraries(${APP_PROJECT_NAME} ${LIB_GUI_PROJECT_NAME} ${LIB_CXX_PROJECT_NAME} ${LIB_JAVA_PROJECT_NAME} ${LIB_PROJECT_NAME} ${LIB_LICENSE_PROJECT_NAME})

 set_property(
 	TARGET ${APP_PROJECT_NAME}
@@ -325,9 +373,11 @@ set_property(
 		"${CMAKE_SOURCE_DIR}/src/lib"
 		"${CMAKE_SOURCE_DIR}/src/lib_gui"
 		"${CMAKE_SOURCE_DIR}/src/lib_license"
-		"${CMAKE_SOURCE_DIR}/src/lib_parser"
+		"${CMAKE_SOURCE_DIR}/src/lib_cxx"
+		"${CMAKE_SOURCE_DIR}/src/lib_java"
 		"${CMAKE_SOURCE_DIR}/build/src/lib_gui"
-		"${CMAKE_SOURCE_DIR}/build/src/app"
+		"${CMAKE_SOURCE_DIR}/build/src/lib_license"
+		#"${CMAKE_SOURCE_DIR}/build/src/app"
 )

 target_include_directories(${APP_PROJECT_NAME} SYSTEM
@@ -345,70 +395,6 @@ if (APPLE)
 	target_link_libraries(${APP_PROJECT_NAME} ${CORE_FOUNDATION})
 endif ()

-# Trial ---------------------------------------------------------------------
-
-if (UNIX)
-	set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/bin/app/${CMAKE_BUILD_TYPE})
-else ()
-	set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/bin/app/)
-endif ()
-
-add_subdirectory(src/trial)
-
-# Find includes in corresponding build directories
-set(CMAKE_INCLUDE_CURRENT_DIR ON)
-
-if (WIN32)
-	file(WRITE ${CMAKE_SOURCE_DIR}/build/Coati.rc
-		"// Icon with lowest ID value placed first to ensure application icon\n"
-		"// remains consistent on all systems.\n"
-		"IDI_ICON1               ICON                    \"${CMAKE_SOURCE_DIR}/build/coati.ico\"\n"
-	)
-	add_executable(${TRIAL_PROJECT_NAME} ${TRIAL_FILES} ${CMAKE_SOURCE_DIR}/build/Coati.rc)
-
-	# hide the console when running a release build.
-	set_target_properties(${TRIAL_PROJECT_NAME} PROPERTIES LINK_FLAGS_DEBUG "/SUBSYSTEM:CONSOLE")
-	set_target_properties(${TRIAL_PROJECT_NAME} PROPERTIES COMPILE_DEFINITIONS_DEBUG "_CONSOLE")
-	set_target_properties(${TRIAL_PROJECT_NAME} PROPERTIES LINK_FLAGS_RELWITHDEBINFO "/SUBSYSTEM:CONSOLE")
-	set_target_properties(${TRIAL_PROJECT_NAME} PROPERTIES COMPILE_DEFINITIONS_RELWITHDEBINFO "_CONSOLE")
-	set_target_properties(${TRIAL_PROJECT_NAME} PROPERTIES LINK_FLAGS_RELEASE "/ENTRY:\"mainCRTStartup\" /SUBSYSTEM:WINDOWS")
-	set_target_properties(${TRIAL_PROJECT_NAME} PROPERTIES LINK_FLAGS_MINSIZEREL "/SUBSYSTEM:WINDOWS")
-
-else ()
-	add_executable(${TRIAL_PROJECT_NAME} ${TRIAL_FILES} ${GEN_FILES})
-endif ()
-
-create_source_groups(${TRIAL_FILES})
-
-target_link_libraries(${TRIAL_PROJECT_NAME} ${LIB_GUI_PROJECT_NAME} ${LIB_PROJECT_NAME} ${LIB_LICENSE_PROJECT_NAME} )
-
-if(UNIX AND NOT APPLE)
-	target_link_libraries(${TRIAL_PROJECT_NAME} pthread dl)
-endif()
-
-set_property(
-	TARGET ${TRIAL_PROJECT_NAME}
-	PROPERTY INCLUDE_DIRECTORIES
-		"${CMAKE_SOURCE_DIR}/src/trial"
-		"${CMAKE_SOURCE_DIR}/src/lib"
-		"${CMAKE_SOURCE_DIR}/src/lib_gui"
-		"${CMAKE_SOURCE_DIR}/build/src/lib_gui"
-)
-
-target_include_directories(${TRIAL_PROJECT_NAME} SYSTEM
-		PUBLIC "${CMAKE_SOURCE_DIR}/src/external"
-		PUBLIC ${Boost_INCLUDE_DIRS}
-)
-
-# Use the Widgets module from Qt 5.
-qt5_use_modules(${TRIAL_PROJECT_NAME} Widgets)
-qt5_use_modules(${TRIAL_PROJECT_NAME} Network)
-
-# add platform specific libraries
-if (APPLE)
-	find_library(CORE_FOUNDATION CoreFoundation)
-	target_link_libraries(${TRIAL_PROJECT_NAME} ${CORE_FOUNDATION})
-endif ()

 # MacOSX Bundle ----------------------------------------------------------------

@@ -479,7 +465,7 @@ target_include_directories(${LICENSE_GENERATOR_PROJECT_NAME} SYSTEM
 )

 if(UNIX AND NOT APPLE)
-	target_link_libraries(${LICENSE_GENERATOR_PROJECT_NAME} pthread dl)
+	target_link_libraries(${LICENSE_GENERATOR_PROJECT_NAME} pthread dl rt)
 endif()

 target_link_libraries(${LICENSE_GENERATOR_PROJECT_NAME} ${LIB_LICENSE_PROJECT_NAME} ${Boost_LIBRARIES} )
@@ -494,7 +480,11 @@ endif ()

 add_subdirectory(src/test)

-set(CXXTEST_INCLUDE_DIR $ENV{CXX_TEST_DIR})
+if(UNIX AND NOT APPLE)
+	set(CXXTEST_INCLUDE_DIR ${EXTERNAL_SRC}/cxxtest)
+else()
+	set(CXXTEST_INCLUDE_DIR $ENV{CXX_TEST_DIR})
+endif()
 set(CXXTEST_PYTHON_TESTGEN_EXECUTABLE ${CXXTEST_INCLUDE_DIR}/bin/cxxtestgen)
 set(TESTGEN_FILE ${CMAKE_CURRENT_BINARY_DIR}/test_main.cpp)

@@ -504,7 +494,7 @@ add_executable (${TEST_PROJECT_NAME} ${TESTGEN_FILE} ${TEST_FILES} )

 create_source_groups(${TEST_FILES})

-target_link_libraries(${TEST_PROJECT_NAME} ${LIB_PARSER_PROJECT_NAME} ${LIB_PROJECT_NAME} ${LIB_LICENSE_PROJECT_NAME})
+target_link_libraries(${TEST_PROJECT_NAME} ${LIB_CXX_PROJECT_NAME} ${LIB_JAVA_PROJECT_NAME} ${LIB_PROJECT_NAME} ${LIB_LICENSE_PROJECT_NAME})

 find_package(CxxTest)
 if (CXXTEST_FOUND)
@@ -513,10 +503,11 @@ if (CXXTEST_FOUND)
 		PROPERTY INCLUDE_DIRECTORIES
 			"${CXXTEST_INCLUDE_DIR}"
 			"${CMAKE_SOURCE_DIR}/src/lib"
-			"${CMAKE_SOURCE_DIR}/src/lib_parser"
+			"${CMAKE_SOURCE_DIR}/src/lib_cxx"
+			"${CMAKE_SOURCE_DIR}/src/lib_java"
 			"${CMAKE_SOURCE_DIR}/src/external"
 			"${CMAKE_SOURCE_DIR}/src/lib_license"
-			${Boost_INCLUDE_DIRS}
+			"${Boost_INCLUDE_DIRS}"
 	)
 endif (CXXTEST_FOUND)

@@ -541,6 +532,7 @@ elseif (UNIX)
 	add_custom_command(
 		OUTPUT ${TESTGEN_FILE}
 		PRE_BUILD
+		COMMAND rm -f ${TESTGEN_FILE}
 		COMMAND cd ${PROJECT_SOURCE_DIR} && ${PYTHON_EXECUTABLE} ${CXXTEST_PYTHON_TESTGEN_EXECUTABLE} --runner=ParenPrinter -o ${TESTGEN_FILE} ${TEST_FILES}
 		COMMENT "Generating unittest code with cxxtestgen"
 	)
@@ -1,31 +1,29 @@
-### Masterproject
+## Coati

-#### Setup
+### Setup

-##### External Software
+#### External Software

-* QT 5.5
+* QT 5.6
 * CxxTest 4.3
 * Valgrind 3.9.0 (linux)
-* Clang & LLVM (doesnt quite work for windows, use unix setup below and skip all the ninja stuff)(installation guide http://clang.llvm.org/docs/LibASTMatchersTutorial.html)
+* Clang & LLVM 3.8 (doesnt quite work for windows, use unix setup below and skip all the ninja stuff)(installation guide http://clang.llvm.org/docs/LibASTMatchersTutorial.html)
 * Boost 1.59
-* Eigen 3.2.6
 * Botan 1.11.24

-##### Environment Variables
+#### Environment Variables

-* QT_DIR - ...\Qt\Qt5.2.1\5.2.1\<IDE>\
-* CXX_TEST_DIR - .../cxxtest-4.3/
-* CLANG_DIR - .../clang-llvm/
+* QT_DIR - .../Qt/Qt5.6.0/5.6/<IDE>
+* CXX_TEST_DIR - .../cxxtest-4.3
+* CLANG_DIR - .../clang-llvm
 * BOOST_159_DIR - .../boost_1_59_0
-* EIGEN_DIR - .../eigen
 * BOTAN_DIR - .../Botan-1.11.24

 For Win32:
 * VLD_DIR - .../Visual Leak Detector
 * path - apped path to git.exe

-###### Botan setup
+##### Botan setup

 Build release lib in ${BOTAN_DIR}/release
 Build debug lib in ${BOTAN_DIR}/debug
@@ -39,30 +37,30 @@ python configure.py --cc=msvc --cpu=x86_32 --via-amalgamation --disable-shared -
 for other:
 $ python configure.py --via-amalgamation --disable-shared

-##### Settings
+#### Settings

 Run setup script:
 $ ./script/setup.sh

-#### Release
+### Release

-##### App
+#### App
 * create release build
 * make sure it uses the Coati icon
 * obfuscate the executable using upx

-##### Data folder
+#### Data folder
 * put data folder in working directory
 * add empty log folder
 * add working tictactoe.xml project to /projects/tictactoe with sources in /projects/tictactoe/src
 * add empty app settings with one recent project tictactoe.xml
 * leave window_settings.ini with correct Coati start layout

-##### Package
+#### Package
 * add app
 * add web/coati_manual.pdf to package

-##### Updating Clang on UNIX
+#### Updating Clang on UNIX

 $ cd .../clang_llvm

@@ -83,61 +81,316 @@ $ cd ../release_build
 $ cmake -G Ninja -DCMAKE_BUILD_TYPE=Release ../llvm
 $ ninja -j4 check-all

-##### Remarks
+#### Remarks

 * Boost lib dir: rename library directory for your system (e.g.: 'lib32-msvc-12.0') to 'lib'

-#### Changelog
+### Tagging

-##### 0.3.0
+$ git tag -a VERSION_NUMBER -m "DESCRIPTION"
+$ git push --tags

-* Added Tutorial project
-* Added communication interface from and to Coati via TCP sockets
-* Added plugin for Visual Studio (2012, 2013, 2015)
-* Added plugin for Sublime Text (2 & 3)
-* Increased autocompletion performance by caching and limiting results to 100
-* Save Coati version to sqlite and reparse project whenever the version changes
-* Improved source locations of template scopes
-* Fixed horizontal scroll in code view not activated while scrolling vertically
-* Save errors to storage and reactivate them via button in the status bar
-* Save macro scopes
-* Fixed old data was still in new project window when creating another project
-* Save comment locations and display them when right next to active symbol
-* Reworked code view highlighting
-* Fixed cursor was jumping at end of query when editing a search query
-* Fixed search query disappeared when not token was found for it
-* Improved code view auto scroll to center the first active line in the middle
-* Focus all overlapping source locations in the code view
-* Added recent projects menu option
-* Saving all template arguments type uses
+### Loader gif creation from png sequence

-##### 0.4.0
+// from png sequence
+convert -delay 3 -loop 0 coati_*.png coati.gif
+
+// less colors
+gifsicle --colors 255 coati.gif > color.gif
+
+// crop size
+gifsicle --crop 0,5+0x-5 color.gif > crop.gif
+
+// add transparency
+gifsicle --unoptimize --disposal=previous --transparent="#FFFFFF" crop.gif > trans.gif
+
+// resize
+gifsicle --resize-height 18 trans.gif > loader.gif
+
+### Changelog
+
+#### 0.8.21
+released 2016-09-16
+
+* Added options for checking multiple paths in Indexed Header Paths dialog during project setup from Compilation Database #190
+* Added all C/C++ standards supported by clang
+* Fixed C language setting in empty project setup not propagated to indexer #177
+* Added Sublime plugin to Sublime Text Package Control
+* Improved indexer parallelization for faster indexing
+* Changed all font-sizes to px for similar look on all platforms
+* Added font face dropdown to Preferences showing all available monospace fonts #172
+* Smoother font rendering on Windows by setting font engine to FreeType via qt.conf file #137
+* Interrupt indexing while AST visiting for C/C++ for shorter waiting time
+* Save graph as PNG image via context menu in graph view #180
+* Added base folder to Linux package #181
+* Use inverted golden ratio in indexing progress dialog
+
+#### 0.8.0
+released 2016-09-01
+
+* Improved titles and help texts in project setup UI
+* Fixed error locations not saved with absolute file paths in Compilation Database projects
+* Added missing source files extensions setting to the Edit Project dialog #132
+* Changed default text colors to black in project setup UI #140
+* Added plugin ports settings to Preferences #145
+* Improved project state handling on refreshing
+* Added Java sample project JavaParser: http://javaparser.org/
+* Fixed regex for system includes used wrongly in syntax highlighter
+* Added setting to disable file and console logging, default is off #157
+* Added migrations between different ApplicationSettings versions
+* Added auto detection for Java library to Preferences
+* Removed auto refresh option from Search view
+* Added progress dialogs for indexing and block UI #143
+* Hide name qualifiers for graph nodes in Java projects
+* Added handling when java library not found
+* Added plain text editing dialog to path list boxes
+* Use language dependent symbol name delimiter in UI
+* Added scroll speed setting to preferences #112
+* Added Java project setup UI
+* Record start and end locations of scopes in Java
+* Display unresolved types names in Java as 'unresolved-type'
+* Cache stats for overview to speed up display
+* Fixed graph nodes to restore their expand state when going back #118
+* Added shortcuts for navigating to next and previous reference in code view
+* Pressing Tab in search completes up to next ::, Delete erases to last :: #133
+* Bundle anonymous namespaces separately in graph overview #126
+* Added 'Show Data Folder' and 'Show Log Folder' items to Help menu
+* Added new status bar loader gif with higher resolution
+* Record type aliases in C++
+* Added Java indexer
+* Changed public icon in graph and added default icon
+* Scroll to file location when finding no symbol at specified location from plugin message
+* Added shortcut for Preferences on Windows/Linux
+* Leave code view at original line when expanding scopes
+* Pan graph view to center on name of active symbol after activation
+* Moved color scheme selection to Preferences
+* Moved Preferences menu item to Edit menu on Windows/Linux #113
+* Added setting for hiding non-fatal errors in unindexed files to preferences, turned on by default
+* Fixed file out-of-date asterisk disappearing when showing snippets after minimize state
+* Implemented Atom plugin: https://github.com/CoatiSoftware/atom-coati
+* Implemented CLion/IntelliJ plugin: https://github.com/CoatiSoftware/idea-coati
+* Implemented Eclipse plugin: https://github.com/CoatiSoftware/eCoati
+* Implemented emacs plugin: https://github.com/CoatiSoftware/emacs-coati
+* Improved code view rendering times
+* Don't show implicit nodes in search auto completion list
+
+
+#### 0.7.0.22
+released 2016-07-07
+
+* Fixed detected global header search paths lost correct order and caused problems with #include_next directives
+* Fixed MaxOSX build crashed on launch due to unknown command line option passed
+* Removed 'Save Project' and 'Save Project As' actions from menu
+* Fixed indexer getting stuck at 'building caches' when indexing is interrupted
+* Fixed database not properly closed when errors appeared during indexing
+* Fixed autocompletions popup flickering while typing
+* Added resize grip to bottom right corner of every dialog window
+* Fixed 'paths don't exist' dialog window getting too big with lots of paths shown
+* Added context menu with 'back' and 'forward' actions available in all views
+* Removed Clang compiler warnings from console output
+* Added handling of project specific VS macros to VS solution parser
+
+#### 0.7.0.0
+released 2016-06-15
+
+* Updated to clang 3.8
+* Fixed crash in search autocompletion retrieval due to edge case in sorting
+* Fixed size policies in code view to avoid global scrollbar
+* Added full text search via search field: ?<query> for case-insensitive search, ??<query> for case-sensitive search
+* Made initialization for full text search lazy: done on first full text search
+* Defined full text search color in all color schemes
+* Increased code view performance by caching file IDs and paths
+* Added multithreaded indexing. Number of threads can be set in the Preferences UI, default is 4
+* Reworked graph node bundling to only distinguish defined and undefined nodes in each bucket
+* Made graph node sorting alphabetical and put bundles at end
+* Changed code view snippet sorting to always show definition on top
+* Fixed local symbols were not available within lambdas
+* Added settings for font family, font size and tab with to Preferences UI
+* Fixed VS solution parser issue with internal macros
+* Removed header extensions, all included files within the project paths are now analyzed
+* Fixed crash in sqlite when symbol name has special characters
+* Improved code view performance by reducing amount of initially open code files
+* Improved graph view performance through faster data retrieval and smarter structures
+* Increased aggregation click speed with faster edge id retrieval
+* Fixed png color profiles to avoid console warning: "libpng warning: iCCP: known incorrect sRGB profile"
+* Fixed graph edge drawn wrong when leaving from child node of smaller node
+* Fixed Sublime Text Plugin issue with wrong encoding
+* Randomized source file order for multithreaded analysis to increase performance
+* Show name of removed symbol when going back after refreshing
+* Fixed macro definition not connected to file
+* Fixed macro use not found in #ifdef, #ifndef, defined() and some expand cases
+* Removed back and forward steps for some graph and code view manipulations
+* Fixed code view style broken on Mac due to change of working directory when analyzing compilation database
+* Added database optimization step after indexing to reduce database size by ~25%
+* Fixed artifacts after graph view change by clearing view
+* Fixed autocompletion list highlights at wrong location for long names
+* Allow files and directories to be excluded from analysis in advanced settings for project setup
+* Added Qt gif plugin to Mac Release so that loader gif in status bar is visible
+* Added link to download page to start screen to remind users of updating once in a while
+* Check if compilation database still exists before refreshing
+* Added separate step for defining project name, project location and compiliation database to project setup
+* Explain that the project stays up-to-date with the compilation databes on refresh in project setup UI
+* Disregard source extensions when loading from compilation database
+* Removed error logs in name resolver
+* Added plugin for VIM: https://github.com/CoatiSoftware/vim-coati
+
+#### 0.6.0.0
+released 2016-04-27
+
+* Smoother graph panning and zooming on keyboard using update loop
+* Differentiate between explicit and implicit nodes and only show implicit nodes in the graph view when connected
+* Improved file clearing performance on project refresh
+* Show deleted projects on the start screen and show messagebox to delete them
+* Show analysis duration in hh:mm:ss
+* Added suppport for temporary test licenses and show error message when it expired
+* Increased graph performance by reducing to fixed number of requests
+* Add vs-clang compatibility flags when creating project from Visual Studio solution
+* Increased graph edge drawing performance
+* Added auto detection for system header paths to project wizard and preferences when using gcc, clang or vs compilers
+* Added bug tracker to help menu
+* Increased search autocompletion performance to stay mostly below 100ms
+* Changed style of aggregation edge to cleaner look
+* Allow certain edge types to enter and leave at top and bottom of nodes as well e.g. inheritance
+* Increased project load performance
+* Increased graph creation performance for overview screen
+* Changed namespace activation to show the namespace name in the search bar and the namespace definitions in the code view
+* Updated to Qt 5.6
+* Added analysis for local symbols and allow selecting them in the code view
+* Improved error display performance by not expanding all of them at once
+* Added home button next to search field for showing the project overview
+* Added shortcut and menu item to show project overview
+* Fixed Path boxes not sized correctly when switching back and forth in the project wizard
+* Allow support for environment variables in project setup with syntax ${VARIABLE_NAME}
+* Show quit button on license enter screen when no valid license was entered yet
+* Allow color schemes to define text colors for code view highlights
+* Added support for function pointers to analysis
+* Added Windows system dlls to installer on Windows so users don't not need to install the redistributable package
+* Changed style of out-of-date files to be followed by *
+* Set Qt flag for high DPI scaling
+* Check analyzed paths for existence in project wizard
+* Inform the user about project changes and ask before reparsing the project
+* Removed "simple setup" step in project wizard and added "lazy include search"-checkbox
+* Edit the project settings by clicking the project name in the overview stats
+* Added welcome message to Coati trial
+* Defined new highlight colors for code view in all color schemes
+
+#### 0.5.1.21
+released 2016-03-16
+
+* Fixed file logger using wrong directory for first log file
+* Fixed crash when accessing files without read permission
+* Center windows on top of main window
+* Added font size limits
+* Prevent network message handling without valid license
+* Fixed type references in headers saved multiple times
+* Improved context detection for template parameters
+* Fixed Visual Studio plugin project loading
+* Added delay for changing fontsize via mouse wheel
+* Disabled config file warnings
+* Fixed interrupting of analysis to show message in status bar
+* Fixed children on namespace activation were bundled
+* Fixed expanding file with errors showed all locations in red
+* Show loader animation when loading project
+* Removed high traffic log messages
+* Fixed crash when opening newer project with older version of Coati
+* Fixed project paths are now saved relative if defined relative
+* Fixed project setup window sizes to adapt to content size
+* Fixed linux package creating ~/.config if not there
+* Show fatal errors in UI that stopped analysis
+* Added compiler flags UI to advanced settings in project setup summary
+* Added file extension UI to advanced settings in project setup summary
+* Added graph zooming with Shift + mouse wheel or Shift + WS
+* Added graph panning with WASD
+* Improved project load and code view performance
+* Improved analysis performance for large projects (10x as fast for 1.000.000 LoC)
+* Added project setup for Compilation Databases
+
+#### 0.5.0.4
+released 2016-02-25
+
+* Fixed preferences not saved
+* Added link to documentation to Help menu
+* Improved painting of icons in graph to be smoother
+* Improved logging to alternate between 2 files of 1000 lines to decrease logfile sizes
+* Improved analysis performance to take only 66% of the time
+* Save user data in ~/Library/Application Support/Coati on Mac
+* Improved style of ui windows
+* Added Visual Studio solution parsing via project wizard or VS plugin
+* Added project setup wizard for step-by-step project setup
+* Added overview and error keywords to search view
+* Show overview on project open with node bundles per type
+* Added application move protection to reenter license key
+* Improved log file names to be sorted chronologically
+* Improved graph view node bundeling to bundle more
+* Display scope name at bottom of code snippet
+* Added .coatiproject file associations with icon for Mac and Windows
+* Return to last scroll position when going back in code view
+* Improved back & forward in code view
+* Update error count while analysis
+* Improved code view annotation painting performance
+* Added web documentation
+* Added trial target without analysis
+* Added license key window and license checker
+* Refresh project editing settings
+* Added C and C++ standard setting to project
+* Fixed cursor changing for resize and text interactions
+* Added commandline option for project file
+* Improved performance of token name saving
+* Fixed number postions in graph
+* Added shortcuts for font size resetting to View menu
+* Added C support
+* Added option to hide widget window title bars to View menu
+
+#### 0.4.0
+released 2016-01-07

-* Network ports for IDE communication can be defined in the ApplicationSettings.xml
-* Coati can now handle inclass initialization of members
-* Improved handling of template arguments in analysis
-* Coati now handles anonymous symbols when parsing files
-* Extended color schemes to allow more extensive use in the graph
-* Added new color scheme called "bad_rainbow"
-* Coati shows a template's general definition when an implicit specialization is activated
-* Fixed source locations of many declarations
-* Fixed syntax highlighting to correctly identify strings, comments and block comments
-* Added analysis for template parameter packs
-* Show function and method signature in tooltip when hovering the graph node
-* Fixed graph font size was too small for Windows and Linux
-* Removed Coati directory from Linux package
-* Introduced file endings .coatiproject and .coatidb for Coati's project files
-* Added installer for Windows
-* Installing prerequisits in Windows Installer
-* Redesigned the about window
-* Parse errors will be displayed as they appear during analysis
-* Fixed constructors and destructors using return type 'void' withou source location
-* Removed 'close window' action from menu
-* Added help texts to project setup and preferences window
-* Improved lambda handling in analysis
-* Fixed style of function or method nodes with children
-* Fixed tooltip colors in dark color scheme
-* renamed undo&redo to back&forward
-* navigate back&forward via mouse buttons
 * navigate back via backspace key
+* navigate back&forward via mouse buttons
+* renamed undo&redo to back&forward
+* Fixed tooltip colors in dark color scheme
+* Fixed style of function or method nodes with children
+* Improved lambda handling in analysis
+* Added help texts to project setup and preferences window
+* Removed 'close window' action from menu
+* Fixed constructors and destructors using return type 'void' withou source location
+* Parse errors will be displayed as they appear during analysis
+* Redesigned the about window
+* Installing prerequisits in Windows Installer
+* Added installer for Windows
+* Introduced file endings .coatiproject and .coatidb for Coati's project files
+* Removed Coati directory from Linux package
+* Fixed graph font size was too small for Windows and Linux
+* Show function and method signature in tooltip when hovering the graph node
+* Added analysis for template parameter packs
+* Fixed syntax highlighting to correctly identify strings, comments and block comments
+* Fixed source locations of many declarations
+* Coati shows a template's general definition when an implicit specialization is activated
+* Added new color scheme called "bad_rainbow"
+* Extended color schemes to allow more extensive use in the graph
+* Coati now handles anonymous symbols when parsing files
+* Improved handling of template arguments in analysis
+* Coati can now handle inclass initialization of members
+* Network ports for IDE communication can be defined in the ApplicationSettings.xml

+#### 0.3.0
+released 2015-12-14
+
+* Saving all template arguments type uses
+* Added recent projects menu option
+* Focus all overlapping source locations in the code view
+* Improved code view auto scroll to center the first active line in the middle
+* Fixed search query disappeared when not token was found for it
+* Fixed cursor was jumping at end of query when editing a search query
+* Reworked code view highlighting
+* Save comment locations and display them when right next to active symbol
+* Fixed old data was still in new project window when creating another project
+* Save macro scopes
+* Save errors to storage and reactivate them via button in the status bar
+* Fixed horizontal scroll in code view not activated while scrolling vertically
+* Improved source locations of template scopes
+* Save Coati version to sqlite and reparse project whenever the version changes
+* Increased autocompletion performance by caching and limiting results to 100
+* Added plugin for Sublime Text (2 & 3)
+* Added plugin for Visual Studio (2012, 2013, 2015)
+* Added communication interface from and to Coati via TCP sockets
+* Added Tutorial project
@@ -7,6 +7,8 @@
 <!-- COLOR: int int int int - rgba e.g. 125 125 125 255 -->

 <config>
+	<version><!-- INTEGER: Version number --></version>
+
 	<info>
 		<description><!-- STRING: optional description shown in overview. Symbols can be linked with syntax [main] --></description>
 	</info>
@@ -35,9 +37,18 @@
 		</framework_search_paths>

 		<extensions>
-			<header_extensions><!-- STRING: extension for header/include e.g. .h --></header_extensions>
 			<source_extensions><!-- STRING: extension for source e.g. .cpp --></source_extensions>
 		</extensions>

+		<use_source_paths_for_header_search><!-- BOOL: If enabled all subfolder of the source paths will be used for header search --></use_source_paths_for_header_search>
+
+		<exclude_paths>
+			<exclude_path><!-- STRING: path to file or directory to exclude from analysis --></source_path>
+		</exclude_paths>
+
+		<build_file_path>
+			<vs_solution_path><!-- STRING: path to Visual Studio solution *.sln --></vs_solution_path>
+			<compilation_db_path><!-- STRING: path to Compilation Database --></compilation_db_path>
+		</build_file_path>
 	</source>
 </config>
@@ -173,11 +173,14 @@

 			<!-- OPTIONAL: type specific node colors can be overriden by using the TEMPLATE within a type tag below -->
 			<type></type>
+			<builtin_type></builtin_type>
 			<class></class>
+			<interface></interface>
 			<struct></struct>
 			<enum></enum>
 			<typedef></typedef>
 			<template_parameter_type></template_parameter_type>
+			<type_parameter></type_parameter>

 			<function></function>
 			<method></method>
@@ -188,6 +191,7 @@

 			<undefined></undefined>
 			<namespace></namespace>
+			<package></package>

 			<file></file>
 			<macro></macro>
@@ -13,7 +13,7 @@
 		</button>

 		<field>
-			<text>#3D3D3D</text>
+			<text>#FFFFFF</text>
 			<background>#808080</background>
 			<highlight>#B1B1B1</highlight>
 		</field>
@@ -27,17 +27,45 @@

 		<query>
 			<none>
-				<normal>#B1B1B1</normal>
-				<hover>#CCCCCC</hover>
+				<normal>
+					<fill>#B1B1B1</fill>
+					<text>#3D3D3D</text>
+				</normal>
+				<hover>
+					<fill>#CCCCCC</fill>
+					<text>#3D3D3D</text>
+				</hover>
 			</none>
 			<command>
-				<normal>#86BD40</normal>
-				<hover>#9EC769</hover>
+				<normal>
+					<fill>#86BD40</fill>
+					<text>#3D3D3D</text>
+				</normal>
+				<hover>
+					<fill>#9EC769</fill>
+					<text>#3D3D3D</text>
+				</hover>
 			</command>
 			<operator>
-				<normal>#7D2724</normal>
-				<hover>#8C2B29</hover>
+				<normal>
+					<fill>#7D2724</fill>
+					<text>#3D3D3D</text>
+				</normal>
+				<hover>
+					<fill>#8C2B29</fill>
+					<text>#3D3D3D</text>
+				</hover>
 			</operator>
+			<fulltext>
+				<normal>
+					<fill>#C2AFEF</fill>
+					<text>#3D3D3D</text>
+				</normal>
+				<hover>
+					<fill>#AB96EA</fill>
+					<text>#3D3D3D</text>
+				</hover>
+			</fulltext>
 		</query>
 	</search>

@@ -72,7 +100,9 @@

 			<line_number>
 				<text>#C4C4C4</text>
+				<inactive_text>#A0A0A0</inactive_text>
 				<background>#494949</background>
+				<marker>#C4C4C4</marker>
 			</line_number>

 			<syntax>
@@ -87,49 +117,68 @@
 			</syntax>

 			<selection>
-				<location>
+				<text>black</text>
+				<background>#CCCCCC</background>
+			</selection>
+
+			<annotation>
+				<token>
 					<normal>
 						<border>transparent</border>
 						<fill>transparent</fill>
 					</normal>
 					<focus>
-						<border>#B2B2B2</border>
+						<border>#EDEDED</border>
 						<fill>transparent</fill>
 					</focus>
 					<active>
-						<border>#B2B2B2</border>
-						<fill>#4A4A4A</fill>
+						<border>#EDEDED</border>
+						<fill>#EDEDED</fill>
+						<text>#262626</text>
 					</active>
-				</location>
+				</token>
+				<local_symbol>
+					<normal>
+						<border>transparent</border>
+						<fill>transparent</fill>
+					</normal>
+					<focus>
+						<border>#9BDAFF</border>
+						<fill>#A5DEFF</fill>
+						<text>#262626</text>
+					</focus>
+					<active>
+						<border>transparent</border>
+						<fill>#A5DEFF</fill>
+						<text>#262626</text>
+					</active>
+				</local_symbol>
 				<scope>
 					<normal>
 						<border>transparent</border>
 						<fill>transparent</fill>
 					</normal>
-					<focus>
-						<border>transparent</border>
-						<fill>transparent</fill>
-					</focus>
-					<active>
-						<border>transparent</border>
-						<fill>transparent</fill>
-					</active>
 				</scope>
 				<error>
 					<normal>
 						<border>transparent</border>
 						<fill>#A0FF0000</fill>
+						<text>#000000</text>
 					</normal>
 					<focus>
-						<border>transparent</border>
 						<fill>#FFFF0000</fill>
 					</focus>
-					<active>
-						<border>transparent</border>
-						<fill>#FFFF0000</fill>
-					</active>
 				</error>
-			</selection>
+				<fulltext>
+					<normal>
+						<fill>#C2AFEF</fill>
+						<text>#3D3D3D</text>
+					</normal>
+					<focus>
+						<fill>#987CEA</fill>
+					</focus>
+				</fulltext>
+			</annotation>
 		</snippet>
 	</code>

@@ -167,9 +216,15 @@
 					<normal>#FFFFFF</normal>
 				</icon>
 			</type>
+			<builtin_type>
+				<like>type</like>
+			</builtin_type>
 			<class>
 				<like>type</like>
 			</class>
+			<interface>
+				<like>type</like>
+			</interface>
 			<struct>
 				<like>type</like>
 			</struct>
@@ -182,6 +237,9 @@
 			<template_parameter_type>
 				<like>type</like>
 			</template_parameter_type>
+			<type_parameter>
+				<like>type</like>
+			</type_parameter>

 			<function>
 				<fill>
@@ -221,6 +279,9 @@
 			</enum_constant>

 			<undefined>
+				<like>type</like>
+			</undefined>
+			<namespace>
 				<fill>
 					<normal>#EE7326</normal>
 					<focus>#EE8A4C</focus>
@@ -229,10 +290,10 @@
 					<normal>#80FFFFFF</normal>
 					<focus>#FFFFFF</focus>
 				</border>
-			</undefined>
-			<namespace>
-				<like>undefined</like>
 			</namespace>
+			<package>
+				<like>namespace</like>
+			</package>

 			<file>
 				<fill>
@@ -243,6 +304,12 @@
 					<normal>#20FFFFFF</normal>
 					<focus>#FFFFFF</focus>
 				</border>
+				<text>
+					<normal>#FFFFFF</normal>
+				</text>
+				<icon>
+					<normal>#FFFFFF</normal>
+				</icon>
 			</file>
 			<macro>
 				<like>file</like>
@@ -297,18 +364,21 @@
 				<normal>#2A6484</normal>
 			</use>

-			<template_parameter>
-				<normal>#C1305D</normal>
-			</template_parameter>
 			<template_argument>
 				<normal>#C1305D</normal>
 			</template_argument>
+			<type_argument>
+				<like>template_argument</like>
+			</type_argument>
 			<template_default_argument>
-				<normal>#C1305D</normal>
+				<like>template_argument</like>
 			</template_default_argument>
 			<template_specialization>
-				<normal>#C1305D</normal>
+				<like>template_argument</like>
 			</template_specialization>
+			<template_member_specialization>
+				<like>template_argument</like>
+			</template_member_specialization>

 			<include>
 				<normal>#4E82F6</normal>
@@ -323,4 +393,26 @@
 			</aggregation>
 		</edge>
 	</graph>
+	<error>
+		<background>#494949</background>
+		<table>#C4C4C4</table>
+		<text>
+			<normal>#C4C4C4</normal>
+			<active>black</active>
+		</text>
+		<table_line_1>
+			<normal>#494949</normal>
+			<active>#7B7B7B</active>
+		</table_line_1>
+		<table_line_2>
+			<normal>#383838</normal>
+			<active>#7B7B7B</active>
+		</table_line_2>
+	</error>
+	<tab>
+		<background>#494949</background>
+		<active>#C4C4C4</active>
+		<hover>#878787</hover>
+		<text>#878787</text>
+	</tab>
 </config>
@@ -27,17 +27,45 @@

 		<query>
 			<none>
-				<normal>white</normal>
-				<hover>#F5F5F5</hover>
+				<normal>
+					<fill>white</fill>
+					<text>black</text>
+				</normal>
+				<hover>
+					<fill>#F5F5F5</fill>
+					<text>black</text>
+				</hover>
 			</none>
 			<command>
-				<normal>#8FBC92</normal>
-				<hover>#5EA071</hover>
+				<normal>
+					<fill>#8FBC92</fill>
+					<text>black</text>
+				</normal>
+				<hover>
+					<fill>#5EA071</fill>
+					<text>black</text>
+				</hover>
 			</command>
 			<operator>
-				<normal>#FCA47E</normal>
-				<hover>#F97A4E</hover>
+				<normal>
+					<fill>#FCA47E</fill>
+					<text>black</text>
+				</normal>
+				<hover>
+					<fill>#F97A4E</fill>
+					<text>black</text>
+				</hover>
 			</operator>
+			<fulltext>
+				<normal>
+					<fill>#C7C7E2</fill>
+					<text>black</text>
+				</normal>
+				<hover>
+					<fill>#ABABDD</fill>
+					<text>black</text>
+				</hover>
+			</fulltext>
 		</query>
 	</search>

@@ -72,7 +100,9 @@

 			<line_number>
 				<text>black</text>
+				<inactive_text>#A0A0A0</inactive_text>
 				<background>white</background>
+				<marker>#A0A0A0</marker>
 			</line_number>

 			<syntax>
@@ -87,49 +117,66 @@
 			</syntax>

 			<selection>
-				<location>
+				<text>black</text>
+				<background>#E0E0E0</background>
+			</selection>
+
+			<annotation>
+				<token>
 					<normal>
 						<border>transparent</border>
 						<fill>transparent</fill>
 					</normal>
 					<focus>
-						<border>#B2B2B2</border>
+						<border>#8E8E8E</border>
 						<fill>transparent</fill>
 					</focus>
 					<active>
-						<border>#B2B2B2</border>
-						<fill>#EDEDED</fill>
+						<border>#A0A0A0</border>
+						<fill>#A0A0A0</fill>
+						<text>#FFFFFF</text>
 					</active>
-				</location>
+				</token>
+				<local_symbol>
+					<normal>
+						<border>transparent</border>
+						<fill>transparent</fill>
+					</normal>
+					<focus>
+						<border>#AAE0FF</border>
+						<fill>#C6EAFF</fill>
+					</focus>
+					<active>
+						<border>transparent</border>
+						<fill>#C6EAFF</fill>
+					</active>
+				</local_symbol>
 				<scope>
 					<normal>
 						<border>transparent</border>
 						<fill>transparent</fill>
 					</normal>
-					<focus>
-						<border>transparent</border>
-						<fill>transparent</fill>
-					</focus>
-					<active>
-						<border>transparent</border>
-						<fill>transparent</fill>
-					</active>
 				</scope>
 				<error>
 					<normal>
 						<border>transparent</border>
 						<fill>#80FF0000</fill>
+						<text>#000000</text>
 					</normal>
 					<focus>
-						<border>transparent</border>
 						<fill>#FFFF0000</fill>
 					</focus>
-					<active>
-						<border>transparent</border>
-						<fill>#FFFF0000</fill>
-					</active>
 				</error>
-			</selection>
+				<fulltext>
+					<normal>
+						<fill>#C7C7E2</fill>
+						<text>#000000</text>
+					</normal>
+					<focus>
+						<fill>#ABABDD</fill>
+					</focus>
+				</fulltext>
+			</annotation>
 		</snippet>
 	</code>

@@ -161,9 +208,15 @@
 					<focus>#3C3C3C</focus>
 				</border>
 			</type>
+			<builtin_type>
+				<like>type</like>
+			</builtin_type>
 			<class>
 				<like>type</like>
 			</class>
+			<interface>
+				<like>type</like>
+			</interface>
 			<struct>
 				<like>type</like>
 			</struct>
@@ -176,6 +229,9 @@
 			<template_parameter_type>
 				<like>type</like>
 			</template_parameter_type>
+			<type_parameter>
+				<like>type</like>
+			</type_parameter>

 			<function>
 				<fill>
@@ -209,6 +265,9 @@
 			</enum_constant>

 			<undefined>
+				<like>type</like>
+			</undefined>
+			<namespace>
 				<fill>
 					<normal>#CC8D91</normal>
 				</fill>
@@ -216,10 +275,10 @@
 					<normal>#803C3C3C</normal>
 					<focus>#3C3C3C</focus>
 				</border>
-			</undefined>
-			<namespace>
-				<like>undefined</like>
 			</namespace>
+			<package>
+				<like>namespace</like>
+			</package>

 			<file>
 				<fill>
@@ -278,26 +337,48 @@
 				<normal>#3190BA</normal>
 			</use>

-			<template_parameter>
-				<normal>#C1305D</normal>
-			</template_parameter>
 			<template_argument>
-				<like>template_parameter</like>
+				<normal>#C1305D</normal>
 			</template_argument>
+			<type_argument>
+				<like>template_argument</like>
+			</type_argument>
 			<template_default_argument>
-				<like>template_parameter</like>
+				<like>template_argument</like>
 			</template_default_argument>
 			<template_specialization>
-				<like>template_parameter</like>
+				<like>template_argument</like>
 			</template_specialization>
 			<template_member_specialization>
-				<like>template_parameter</like>
+				<like>template_argument</like>
 			</template_member_specialization>

 			<aggregation>
-				<normal>#EEE</normal>
-				<focus>#DDD</focus>
+				<normal>#DDD</normal>
+				<focus>#CCC</focus>
 			</aggregation>
 		</edge>
 	</graph>
+	<error>
+		<background>white</background>
+		<table>#aaa</table>
+		<text>
+			<normal>black</normal>
+			<active>white</active>
+		</text>
+		<table_line_1>
+			<normal>white</normal>
+			<active>grey</active>
+		</table_line_1>
+		<table_line_2>
+			<normal>#F1F1F1</normal>
+			<active>grey</active>
+		</table_line_2>
+	</error>
+	<tab>
+		<background>white</background>
+		<active>black</active>
+		<hover>#878787</hover>
+		<text>#878787</text>
+	</tab>
 </config>
@@ -27,17 +27,64 @@

 		<query>
 			<none>
-				<normal>#2F2F2F</normal>
-				<hover>black</hover>
+				<normal></normal>
+				<hover></hover>
 			</none>
 			<command>
-				<normal>#406D4D</normal>
-				<hover>#4E855E</hover>
+				<normal></normal>
+				<hover></hover>
 			</command>
 			<operator>
-				<normal>#7D2724</normal>
-				<hover>#8C2B29</hover>
+				<normal></normal>
+				<hover></hover>
 			</operator>
+			<fulltext>
+				<normal></normal>
+				<hover></hover>
+			</fulltext>
+		</query>
+
+		<query>
+			<none>
+				<normal>
+					<fill>#2F2F2F</fill>
+					<text>#F7F7F7</text>
+				</normal>
+				<hover>
+					<fill>black</fill>
+					<text>#F7F7F7</text>
+				</hover>
+			</none>
+			<command>
+				<normal>
+					<fill>#406D4D</fill>
+					<text>#F7F7F7</text>
+				</normal>
+				<hover>
+					<fill>#4E855E</fill>
+					<text>#F7F7F7</text>
+				</hover>
+			</command>
+			<operator>
+				<normal>
+					<fill>#7D2724</fill>
+					<text>#F7F7F7</text>
+				</normal>
+				<hover>
+					<fill>#8C2B29</fill>
+					<text>#F7F7F7</text>
+				</hover>
+			</operator>
+			<fulltext>
+				<normal>
+					<fill>#207EA8</fill>
+					<text>#F7F7F7</text>
+				</normal>
+				<hover>
+					<fill>#006D93</fill>
+					<text>#F7F7F7</text>
+				</hover>
+			</fulltext>
 		</query>
 	</search>

@@ -72,7 +119,9 @@

 			<line_number>
 				<text>#F7F7F7</text>
+				<inactive_text>#A0A0A0</inactive_text>
 				<background>#272728</background>
+				<marker>#969696</marker>
 			</line_number>

 			<syntax>
@@ -87,49 +136,69 @@
 			</syntax>

 			<selection>
-				<location>
+				<text>white</text>
+				<background>#777777</background>
+			</selection>
+
+			<annotation>
+				<token>
 					<normal>
 						<border>transparent</border>
 						<fill>transparent</fill>
 					</normal>
 					<focus>
-						<border>#B2B2B2</border>
+						<border>#F7F7F7</border>
 						<fill>transparent</fill>
 					</focus>
 					<active>
-						<border>#B2B2B2</border>
-						<fill>#4A4A4A</fill>
+						<border>transparent</border>
+						<fill>#F7F7F7</fill>
+						<text>#272728</text>
 					</active>
-				</location>
+				</token>
+				<local_symbol>
+					<normal>
+						<border>transparent</border>
+						<fill>transparent</fill>
+					</normal>
+					<focus>
+						<border>#A0A0A0</border>
+						<fill>#969696</fill>
+						<text>#191919</text>
+					</focus>
+					<active>
+						<border>transparent</border>
+						<fill>#969696</fill>
+						<text>#272728</text>
+					</active>
+				</local_symbol>
 				<scope>
 					<normal>
 						<border>transparent</border>
 						<fill>transparent</fill>
 					</normal>
-					<focus>
-						<border>transparent</border>
-						<fill>transparent</fill>
-					</focus>
-					<active>
-						<border>transparent</border>
-						<fill>transparent</fill>
-					</active>
 				</scope>
 				<error>
 					<normal>
 						<border>transparent</border>
 						<fill>#A0FF0000</fill>
+						<text>#000000</text>
 					</normal>
 					<focus>
-						<border>transparent</border>
 						<fill>#FFFF0000</fill>
 					</focus>
-					<active>
-						<border>transparent</border>
-						<fill>#FFFF0000</fill>
-					</active>
 				</error>
-			</selection>
+				<fulltext>
+					<normal>
+						<fill>#207EA8</fill>
+						<text>#F7F7F7</text>
+					</normal>
+					<focus>
+						<border>#006D93</border>
+						<fill>#134B63</fill>
+					</focus>
+				</fulltext>
+			</annotation>
 		</snippet>
 	</code>

@@ -161,36 +230,30 @@
 					<focus>#C3C3C3</focus>
 				</border>
 			</type>
+			<builtin_type>
+				<like>type</like>
+			</builtin_type>
 			<class>
-				<border>
-					<normal>#20C3C3C3</normal>
-					<focus>#C3C3C3</focus>
-				</border>
+				<like>type</like>
 			</class>
+			<interface>
+				<like>type</like>
+			</interface>
 			<struct>
-				<border>
-					<normal>#20C3C3C3</normal>
-					<focus>#C3C3C3</focus>
-				</border>
+				<like>type</like>
 			</struct>
 			<enum>
-				<border>
-					<normal>#20C3C3C3</normal>
-					<focus>#C3C3C3</focus>
-				</border>
+				<like>type</like>
 			</enum>
 			<typedef>
-				<border>
-					<normal>#20C3C3C3</normal>
-					<focus>#C3C3C3</focus>
-				</border>
+				<like>type</like>
 			</typedef>
 			<template_parameter_type>
-				<border>
-					<normal>#20C3C3C3</normal>
-					<focus>#C3C3C3</focus>
-				</border>
+				<like>type</like>
 			</template_parameter_type>
+			<type_parameter>
+				<like>type</like>
+			</type_parameter>

 			<function>
 				<fill>
@@ -224,6 +287,9 @@
 			</enum_constant>

 			<undefined>
+				<like>type</like>
+			</undefined>
+			<namespace>
 				<fill>
 					<normal>#78282D</normal>
 				</fill>
@@ -231,10 +297,10 @@
 					<normal>#80C3C3C3</normal>
 					<focus>#C3C3C3</focus>
 				</border>
-			</undefined>
-			<namespace>
-				<like>undefined</like>
 			</namespace>
+			<package>
+				<like>namespace</like>
+			</package>

 			<file>
 				<fill>
@@ -293,20 +359,20 @@
 				<normal>#2A6484</normal>
 			</use>

-			<template_parameter>
-				<normal>#C1305D</normal>
-			</template_parameter>
 			<template_argument>
 				<normal>#C1305D</normal>
 			</template_argument>
+			<type_argument>
+				<like>template_argument</like>
+			</type_argument>
 			<template_default_argument>
-				<normal>#C1305D</normal>
+				<like>template_argument</like>
 			</template_default_argument>
 			<template_specialization>
-				<normal>#C1305D</normal>
+				<like>template_argument</like>
 			</template_specialization>
 			<template_member_specialization>
-				<normal>#C1305D</normal>
+				<like>template_argument</like>
 			</template_member_specialization>

 			<include>
@@ -317,9 +383,31 @@
 			</macro_use>

 			<aggregation>
-				<normal>#5D5D5D</normal>
-				<focus>#6D6D6D</focus>
+				<normal>#3D3D3D</normal>
+				<focus>#4D4D4D</focus>
 			</aggregation>
 		</edge>
 	</graph>
+	<error>
+		<background>#272728</background>
+		<table>white</table>
+		<text>
+			<normal>white</normal>
+			<active>black</active>
+		</text>
+		<table_line_1>
+			<normal>darkgrey</normal>
+			<active>#969696</active>
+		</table_line_1>
+		<table_line_2>
+			<normal>#343434</normal>
+			<active>#969696</active>
+		</table_line_2>
+	</error>
+	<tab>
+		<background>#272728</background>
+		<active>white</active>
+		<hover>#878787</hover>
+		<text>#878787</text>
+	</tab>
 </config>
@@ -4,15 +4,11 @@
 	font-weight: 100;
 }

-#small {
-	font-size: 12px;
-}
-
 #closeButton {
 	background: transparent;
 	border: none;
 	color: white;
-	font-size: 14pt;
+	font-size: 14px;
 	height: 24px;
 	width: 24px;
 }
@@ -1,17 +1,14 @@
-#code_file_list_base, #code_file_list {
+#code_container, #code_file_list {
 	background-color: <color:code/background>;
 }

-* {
-	font-size: <setting:font_size>pt;
-}
-
 #code_file {
 	background-color: <color:code/snippet/background>;
 	border: 2px solid <color:code/file/background>;
 	border-radius: 12px;
 	border-top-left-radius: 14px;
 	border-top-right-radius: 14px;
+	font-size: <setting:font_size>px;
 	padding-bottom: 7px;
 }

@@ -19,6 +16,7 @@
 	background-color: <color:code/file/background>;
 	border-top-left-radius: 7px;
 	border-top-right-radius: 7px;
+	font-size: <setting:font_size>px;
 	padding-right: 5px;
 }

@@ -27,6 +25,7 @@
 	border: none;
 	border-radius: 3px;
 	color: <color:code/file/title/text>;
+	font-size: <setting:font_size>px;
 	padding: 2px 4px;
 	margin: 1px 8px 3px;
 }
@@ -44,7 +43,7 @@
 	border: none;
 	border-radius: 10px;
 	color: <color:code/file/ref_count/text>;
-	font-size: <setting:font_size-2>pt;
+	font-size: <setting:font_size-2>px;
 	padding: 0px 3px;
 	margin: 4px 0px 4px;
 }
@@ -52,10 +51,7 @@
 #code_file #code_snippet {
 	background-color: <color:code/snippet/background>;
 	border-top: 2px solid <color:code/file/background>;
-}
-
-#code_file #code_snippet * {
-	font-family: "<setting:font_name>";
+	font-size: <setting:font_size>px;
 }

 #code_file #code_snippet[isFirst=true] {
@@ -65,8 +61,10 @@

 #code_file #code_snippet #scope_name, #code_file #code_snippet #dots {
 	background-color: <color:code/snippet/title/background>;
-	color: <color:code/snippet/title/text>;
 	border: none;
+	color: <color:code/snippet/title/text>;
+	font-family: "<setting:font_name>";
+	font-size: <setting:font_size>px;
 }

 #code_file #code_snippet #scope_name:hover {
@@ -75,7 +73,7 @@

 #code_file #code_snippet #dots {
 	background-color: <color:code/snippet/line_number/background>;
-	padding-right: 13px;
+	padding-right: 16px;
 	text-align: right;
 }

@@ -88,11 +86,17 @@
 	background-color: <color:code/snippet/line_number/background>;
 	border: none;
 	color: <color:code/snippet/line_number/text>;
+	font-family: "<setting:font_name>";
+	font-size: <setting:font_size>px;
 }

 #code_area {
 	background-color: transparent;
 	color: <color:code/snippet/syntax/normal>;
+	font-family: "<setting:font_name>";
+	font-size: <setting:font_size>px;
+	selection-color: <color:code/snippet/selection/text>;
+	selection-background-color: <color:code/snippet/selection/background>;
 }

 #code_file #maximize_button, #code_file #snippet_button, #code_file #minimize_button {
@@ -0,0 +1,90 @@
+QTableView {
+	color: <color:error/text/normal>;
+	background-color: <color:error/table_line_1/normal>;
+	alternate-background-color: <color:error/table_line_2/normal>;
+	border-radius: 10px;
+	border: 1px solid <color:error/table>;
+	margin: 10px;
+	padding-right: 10px;
+	font-size: <setting:font_size>px;
+}
+
+QFrame {
+	background-color: <color:error/background>;
+}
+
+QTableView::item {
+	border-left: 1px solid <color:error/table>;
+}
+
+QTableView::item:selected {
+	color: <color:error/text/active>;
+	background-color: <color:error/table_line_1/active>;
+	alternate-background-color: <color:error/table_line_2/active>;
+}
+
+QHeaderView {
+	background-color: transparent;
+}
+
+QHeaderView::section:horizontal {
+	background-color: transparent;
+	border: none;
+	border-bottom: 1px solid <color:error/table>;
+	border-left: 1px solid <color:error/table>;
+	color: <color:error/text/normal>;
+	font-size: <setting:font_size>px;
+	font-weight: bold;
+	padding: 1px 6px;
+	height: <setting:font_size+5>px;;
+}
+
+
+QCheckBox {
+	color: <color:error/text/normal>;
+	border-color: <color:error/table>;
+	/*background-color: <color:error/table>;*/
+}
+
+QHeaderView::section:vertical {
+	background-color: transparent;
+	border: none;
+	color: <color:error/text/normal>;
+	font-size: <setting:font_size>px;
+	padding-right: 5px;
+	padding-left: 5px;
+}
+
+QScrollBar:vertical {
+}
+
+QScrollBar::handle:vertical {
+	min-height: 20px;
+}
+
+QScrollBar::add-line:vertical {
+	height: 20px;
+	subcontrol-position: bottom;
+	subcontrol-origin: margin;
+}
+
+QScrollBar::sub-line:vertical {
+	height: 20px;
+	subcontrol-position: top;
+	subcontrol-origin: margin;
+}
+QScrollBar::up-arrow:vertical, QScrollBar::down-arrow:vertical {
+	width: 3px;
+	height: 3px;
+	background: white;
+}
+
+QScrollBar::add-page:vertical, QScrollBar::sub-page:vertical {
+	background: none;
+}
+
+QTableView QTableCornerButton::section {
+	background-color: <color:error/background>;
+	border-bottom: 1px solid <color:error/table>;
+	border-top-left-radius: 10px;
+}
@@ -0,0 +1,57 @@
+QLabel {
+	color: white;
+}
+
+#topHalf {
+	background: #007AC2;
+	border-top-left-radius: 15px;
+	border-top-right-radius: 15px;
+}
+
+#title {
+	color: white;
+	font-size: 22px;
+	font-weight: bold;
+}
+
+#percent {
+	font-size: 22px;
+	font-weight: bold;
+}
+
+#message {
+	font-size: 14px;
+	font-weight: bold;
+}
+
+#filePath {
+	font-size: 11px;
+}
+
+#errorCount {
+	border: none;
+	background: transparent;
+	color: white;
+	font-size: 14px;
+}
+
+#windowButton {
+	background: transparent;
+	border: 1px solid white;
+	color: white;
+}
+
+#windowButton:hover {
+	background: transparent;
+	border: 1px solid white;
+	color: white;
+}
+
+#windowButton:hover {
+	color: #2E3C86;
+	background: white;
+}
+
+#windowButton:default {
+	border: 2px solid white;
+}
@@ -1,98 +1,76 @@
-{\rtf1\ansi\ansicpg1252\deff0\deflang3079{\fonttbl{\f0\fnil\fcharset0 Calibri;}}
+{\rtf1\ansi\ansicpg1252\deff0\deflang3079{\fonttbl{\f0\fnil\fcharset0 Calibri;}{\f1\fnil\fcharset2 Symbol;}}
 {\colortbl ;\red0\green0\blue255;}
-{\*\generator Msftedit 5.41.21.2510;}\viewkind4\uc1\pard\sa200\sl276\slmult1\lang7\f0\fs22 Coati\par
+{\*\generator Msftedit 5.41.21.2510;}\viewkind4\uc1\pard\sl240\slmult1\lang7\f0\fs22 Coati\par
 Software License Agreement\par
 Effective 1.1.2016\par
-\par
+\pard\sa200\sl276\slmult1\par
 BY INSTALLING OR USING THIS SOFTWARE, YOU ARE BECOMING A PARTY TO, AND ARE CONSENTING TO BE BOUND BY, THIS AGREEMENT. IF YOU DO NOT AGREE TO ALL OF THE TERMS OF THIS AGREEMENT, DO NOT INSTALL OR USE THIS SOFTWARE.\par
 \par
-\par
 \b DEFINITIONS\b0\par
-\par
 "Software" means:\par
-\bullet\tab A major version of Coati in executable form. The major version is defined by the leading number of the version string (e.g. the major version of Coati 1.x.x.x is version 1); \par
-\bullet\tab documentation for that major version of Coati;\par
-\bullet\tab minor updates included in software maintenance which are indicated by an increase in the numbers that follow the major version number (e.g. the update from Coati 1.0.0.0 to Coati 1.0.1.4).\par
-"Licensor" means:\par
-\bullet\tab Coati Software OG, having a place of business at Schlossallee 7/1, 5412 Puch/Hallein, Austria.\par
-"Licensee" means:\par
-\bullet\tab the individual evaluating the trial version of the Software;\par
-\bullet\tab the company, corporation, or organization that purchased a License(s) for the Software;\par
-\bullet\tab the individual who purchased a License for the Software.\par
-"Activation Key" means:\par
-\bullet\tab the name of the Licensee, the kind of license, the major version of the software that is licensed, and a hashcode; the combination of these values allows the Licensee to activate a genuine copy of the Software.\par
-"Authorized User" means:\par
-\bullet\tab the individual evaluating the Software during a trial;\par
-\bullet\tab an employee or independent contractor who might at any time use the Software, of the company, corporation, or organization that purchased a License(s) for the Software; an entity has one Authorized User for each License purchased;\par
-\bullet\tab the individual who purchased a License for the Software; the individual is the only Authorized User.\par
-\par
-\par
+\pard{\pntext\f1\'B7\tab}{\*\pn\pnlvlblt\pnf1\pnindent0{\pntxtb\'B7}}\fi-360\li720\sa200\sl276\slmult1 A major version of Coati in executable form. The major version is defined by the leading number of the version string (e.g. the major version of Coati 1.x.x.x is version 1);\par
+{\pntext\f1\'B7\tab}documentation for that major version of Coati;\par
+{\pntext\f1\'B7\tab}minor updates included in software maintenance which are indicated by an increase in the numbers that follow the major version number (e.g. the update from Coati 1.0.0.0 to Coati 1.0.1.4).\par
+\pard\sa200\sl276\slmult1 "Licensor" means:\par
+\pard{\pntext\f1\'B7\tab}{\*\pn\pnlvlblt\pnf1\pnindent0{\pntxtb\'B7}}\fi-360\li720\sa200\sl276\slmult1 Coati Software OG, having a place of business at Schlossallee 7/1, 5412 Puch/Hallein, Austria.\par
+\pard\sa200\sl276\slmult1 "Licensee" means:\par
+\pard{\pntext\f1\'B7\tab}{\*\pn\pnlvlblt\pnf1\pnindent0{\pntxtb\'B7}}\fi-360\li720\sa200\sl276\slmult1 the individual evaluating the trial version of the Software;\par
+{\pntext\f1\'B7\tab}the company, corporation, or organization that purchased a License(s) for the Software;\par
+{\pntext\f1\'B7\tab}the individual who purchased a License for the Software.\par
+\pard\sa200\sl276\slmult1 "Activation Key" means:\par
+\pard{\pntext\f1\'B7\tab}{\*\pn\pnlvlblt\pnf1\pnindent0{\pntxtb\'B7}}\fi-360\li720\sa200\sl276\slmult1 the name of the Licensee, the kind of license, the major version of the software that is licensed, and a hashcode; the combination of these values allows the Licensee to activate a genuine copy of the Software.\par
+\pard\sa200\sl276\slmult1 "Authorized User" means:\par
+\pard{\pntext\f1\'B7\tab}{\*\pn\pnlvlblt\pnf1\pnindent0{\pntxtb\'B7}}\fi-360\li720\sa200\sl276\slmult1 the individual evaluating the Software during a trial;\par
+{\pntext\f1\'B7\tab}an employee or independent contractor who might at any time use the Software, of the company, corporation, or organization that purchased a License(s) for the Software; an entity has one Authorized User for each License purchased;\par
+{\pntext\f1\'B7\tab}the individual who purchased a License for the Software; the individual is the only Authorized User.\par
+\pard\sa200\sl276\slmult1\par
 \b GRANT\b0\par
-\par
-Subject to the terms of this Agreement, the Licensor hereby grants the Licensee a non-transferable, non-exclusive, non-sub-licensable, limited license that allows:\par
-\bullet\tab the Licensee to distribute (an) Activation Key(s) to Authorized User(s);\par
-\bullet\tab Authorized User(s) to install the licensed version of the Software on computer PCs where potential use of the Software is restricted exclusively to Authorized User(s);\par
-\bullet\tab Authorized User(s) to use the Software on computer PCs, in virtual machines, in combination with multiple IDEs, and in combination with multiple instances of an IDE;\par
-\bullet\tab Authorized User(s) to use the trial version of the software in order to examine the provided example project;\par
-\bullet\tab Licensee to make a copy of the Software for archival purposes provided the copy contains all of the proprietary notices of the Software.\par
-In case the Licensee of the software is a company, corporation, or organization the Licensor has the right to mention this usage of the Software on its own website.\par
-\par
-\par
+\pard{\pntext\f1\'B7\tab}{\*\pn\pnlvlblt\pnf1\pnindent0{\pntxtb\'B7}}\fi-360\li720\sa200\sl276\slmult1 Subject to the terms of this Agreement, the Licensor hereby grants the Licensee a non-transferable, non-exclusive, non-sub-licensable, limited license that allows:\par
+{\pntext\f1\'B7\tab}the Licensee to distribute (an) Activation Key(s) to Authorized User(s);\par
+{\pntext\f1\'B7\tab}Authorized User(s) to install the licensed version of the Software on computer PCs where potential use of the Software is restricted exclusively to Authorized User(s);\par
+{\pntext\f1\'B7\tab}Authorized User(s) to use the Software on computer PCs, in virtual machines, in combination with multiple IDEs, and in combination with multiple instances of an IDE;\par
+{\pntext\f1\'B7\tab}Authorized User(s) to use the trial version of the software in order to examine the provided example projects;\par
+{\pntext\f1\'B7\tab}Licensee to make a copy of the Software for archival purposes provided the copy contains all of the proprietary notices of the Software.\par
+{\pntext\f1\'B7\tab}In case the Licensee of the software is a company, corporation, or organization the Licensor has the right to mention this usage of the Software on its own website.\par
+\pard\sa200\sl276\slmult1\par
 \b RESTRICTIONS\b0\par
-\par
 Licensee will not, and will have no right to:\par
-\bullet\tab use the trial version of the software for any commercial purposes;\par
-\bullet\tab distribute, use, or transfer an Activation Key(s) that has been superseded by an Activation Key(s) provided with software maintenance;\par
-\bullet\tab modify, translate, reverse engineer, decompile, disassemble (except to the extent applicable laws specifically prohibit such restriction), create derivative works based on, or otherwise attempt to discover the source code or underlying ideas or algorithms of the Software;\par
-\bullet\tab sell, rent, lease, distribute, or otherwise transfer rights to the Software without prior written consent from Licensor;\par
-\bullet\tab remove any proprietary notices or labels from the Software.\par
-\par
-\par
-\b TITLE AND COPYRIGHT\par
-\b0\par
+\pard{\pntext\f1\'B7\tab}{\*\pn\pnlvlblt\pnf1\pnindent0{\pntxtb\'B7}}\fi-360\li720\sa200\sl276\slmult1 use the trial version of the software in order to examine project other than the provided examples;\par
+{\pntext\f1\'B7\tab}use a private/academic license of the software for any commercial purposes;\par
+{\pntext\f1\'B7\tab}distribute, use, or transfer an Activation Key(s) that has been superseded by an Activation Key(s) provided with software maintenance;\par
+{\pntext\f1\'B7\tab}modify, translate, reverse engineer, decompile, disassemble (except to the extent applicable laws specifically prohibit such restriction), create derivative works based on, or otherwise attempt to discover the source code or underlying ideas or algorithms of the Software;\par
+{\pntext\f1\'B7\tab}sell, rent, lease, distribute, or otherwise transfer rights to the Software without prior written consent from Licensor;\par
+{\pntext\f1\'B7\tab}remove any proprietary notices or labels from the Software.\par
+\pard\sa200\sl276\slmult1\par
+\b TITLE AND COPYRIGHT\b0\par
 Title, ownership rights, intellectual property rights, and copyright to the Software, and any copies or portions thereof, shall remain in Licensor. The Software is protected by European copyright directives, Austrian copyright laws as well as United States copyright laws and international treaty provisions.\par
-\par
-\par
-\b DISCLAIMER OF WARRANTY\b0\par
-\par
+\b\par
+DISCLAIMER OF WARRANTY\b0\par
 THE SOFTWARE IS PROVIDED AS IS, WITHOUT WARRANTY OF ANY KIND. LICENSOR HEREBY DISCLAIMS ALL EXPRESS OR IMPLIED WARRANTIES, INCLUDING WITHOUT LIMITATION WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND NON-INFRINGEMENT. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS AGREEMENT. SOME U.S. STATES DO NOT ALLOW EXCLUSIONS OF AN IMPLIED WARRANTY, SO THIS DISCLAIMER MAY NOT APPLY TO LICENSEE. LICENSEE MAY HAVE OTHER LEGAL RIGHTS THAT VARY FROM STATE TO STATE OR BY JURISDICTION.\par
 \par
-\par
-\b LIMITATION OF LIABILITY\par
-\b0\par
+\b LIMITATION OF LIABILITY\b0\par
 LICENSEE ASSUMES THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE SOFTWARE. LICENSOR ASSUMES NO LIABILITY FOR THE COST OF ANY SERVICE OR REPAIR IF THE SOFTWARE IS DEFECTIVE. UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, TORT, CONTRACT, STRICT LIABILITY, OR OTHERWISE, SHALL LICENSOR, OR ITS LICENSORS, SUPPLIERS OR RESELLERS, BE LIABLE TO LICENSEE OR ANY OTHER PERSON FOR ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOST PROFITS, LOSS OF GOODWILL, WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER COMMERCIAL DAMAGES OR LOSSES. IN NO EVENT WILL LICENSOR BE LIABLE FOR ANY DAMAGES IN EXCESS OF THE MONEY PAID FOR THE SOFTWARE, EVEN IF LICENSOR SHALL HAVE BEEN INFORMED OF THE POSSIBILITY OF SUCH DAMAGES, OR FOR ANY CLAIM BY ANY OTHER PARTY. THIS LIMITATION OF LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY TO THE EXTENT APPLICABLE LAW PROHIBITS SUCH LIMITATION. FURTHERMORE, SOME U.S. STATES DO NOT ALLOW THE EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO THIS LIMITATION AND EXCLUSION MAY NOT APPLY TO LICENSEE.\par
 \par
-\par
-\b TERMINATION\par
-\b0\par
+\b TERMINATION\b0\par
 The license granted herein shall be perpetual. If Licensee fails to comply with any of the terms of this Agreement, this Agreement and the rights granted herein will terminate immediately. Licensor may, at its sole discretion and at any time, terminate this Agreement. On termination, Licensee must cease using and destroy all copies of the Software.\par
-\par
-\par
-\b EXPORT CONTROLS\par
-\b0\par
+\b\par
+EXPORT CONTROLS\b0\par
 Licensee shall comply with all export laws, restrictions and regulations of the United States, the Directive 2009/428/EC of the European Parliament and of the Council and the Austrian Au\'dfenwirtschaftsgesetz 2011, BGBl I No. 26/2011. Licensee shall not export, re-export or otherwise transfer the Software to any country for which the United States or the European Union or Austria maintains an embargo, or to any person or entity on the U.S. Department of Treasury List of Specially Designated Nationals or the U.S. Department of Commerce Denied Persons List or Entity List. Licensee represents and warrants that licensee is not located in, under the control of, or a national or resident of any restricted country or on any such list.\par
 \par
-\par
-\b THIRD PARTY CREDITS\par
-\b0\par
+\b THIRD PARTY CREDITS\b0\par
 Portions of the Software utilize or include third party software and other copyrighted materials. Credits, licensing terms, and disclaimers for such materials are contained in the installation directory for the Software, and are accessible via the \ldblquote Licenses\rdblquote  dialog for the Software. Licensee agrees that use of such copyrighted materials is governed by their respective terms.\par
 \par
-\par
-\b ENTIRE AGREEMENT\par
-\b0\par
+\b ENTIRE AGREEMENT\b0\par
 This Agreement represents the complete agreement concerning this license between the parties and supersedes all prior agreements and representations between them. It may be amended only in writing executed by both parties. Coati Software OG reserves the exclusive right to periodically update this EULA at its discretion at any time, with reasonable notice to you by posting the new EULA at the following URL: {\field{\*\fldinst{HYPERLINK "http://www.coati.io/"}}{\fldrslt{\ul\cf1 http://www.coati.io/}}}\f0\fs22 . Any action arising out of or relating to this Agreement may be brought exclusively in Salzburg, Austria, and Coati Software OG and you irrevocably consent to the jurisdiction of such courts and venue in Salzburg, Austria.\par
 \par
-\par
-\b CONTACT\par
-\b0\par
+\b CONTACT\b0\par
 If you have questions regarding this agreement, contact:\par
-\par
-Coati Software OG\par
+\pard\sl276\slmult1 Coati Software OG\par
 Schlossallee 7/1\par
 5412 Puch/Hallein\par
-Austria\par
-\par
+\pard\sa200\sl276\slmult1 Austria\par
 support@coati.io\par
 \par
+\par
 }

@@ -0,0 +1,72 @@
+Coati
+Software License Agreement
+Effective 1.1.2016
+
+BY INSTALLING OR USING THIS SOFTWARE, YOU ARE BECOMING A PARTY TO, AND ARE CONSENTING TO BE BOUND BY, THIS AGREEMENT. IF YOU DO NOT AGREE TO ALL OF THE TERMS OF THIS AGREEMENT, DO NOT INSTALL OR USE THIS SOFTWARE.
+
+DEFINITIONS
+"Software" means:
+·0 A major version of Coati in executable form. The major version is defined by the leading number of the version string (e.g. the major version of Coati 1.x.x.x is version 1);
+·1 documentation for that major version of Coati;
+·2 minor updates included in software maintenance which are indicated by an increase in the numbers that follow the major version number (e.g. the update from Coati 1.0.0.0 to Coati 1.0.1.4).
+"Licensor" means:
+·3 Coati Software OG, having a place of business at Schlossallee 7/1, 5412 Puch/Hallein, Austria.
+"Licensee" means:
+·4 the individual evaluating the trial version of the Software;
+·5 the company, corporation, or organization that purchased a License(s) for the Software;
+·6 the individual who purchased a License for the Software.
+"Activation Key" means:
+·7 the name of the Licensee, the kind of license, the major version of the software that is licensed, and a hashcode; the combination of these values allows the Licensee to activate a genuine copy of the Software.
+"Authorized User" means:
+·8 the individual evaluating the Software during a trial;
+·9 an employee or independent contractor who might at any time use the Software, of the company, corporation, or organization that purchased a License(s) for the Software; an entity has one Authorized User for each License purchased;
+·10 the individual who purchased a License for the Software; the individual is the only Authorized User.
+
+GRANT
+·11 Subject to the terms of this Agreement, the Licensor hereby grants the Licensee a non-transferable, non-exclusive, non-sub-licensable, limited license that allows:
+·12 the Licensee to distribute (an) Activation Key(s) to Authorized User(s);
+·13 Authorized User(s) to install the licensed version of the Software on computer PCs where potential use of the Software is restricted exclusively to Authorized User(s);
+·14 Authorized User(s) to use the Software on computer PCs, in virtual machines, in combination with multiple IDEs, and in combination with multiple instances of an IDE;
+·15 Authorized User(s) to use the trial version of the software in order to examine the provided example projects;
+·16 Licensee to make a copy of the Software for archival purposes provided the copy contains all of the proprietary notices of the Software.
+·17 In case the Licensee of the software is a company, corporation, or organization the Licensor has the right to mention this usage of the Software on its own website.
+
+RESTRICTIONS
+Licensee will not, and will have no right to:
+·18 use the trial version of the software in order to examine project other than the provided examples;
+·19 use a private/academic license of the software for any commercial purposes;
+·20 distribute, use, or transfer an Activation Key(s) that has been superseded by an Activation Key(s) provided with software maintenance;
+·21 modify, translate, reverse engineer, decompile, disassemble (except to the extent applicable laws specifically prohibit such restriction), create derivative works based on, or otherwise attempt to discover the source code or underlying ideas or algorithms of the Software;
+·22 sell, rent, lease, distribute, or otherwise transfer rights to the Software without prior written consent from Licensor;
+·23 remove any proprietary notices or labels from the Software.
+
+TITLE AND COPYRIGHT
+Title, ownership rights, intellectual property rights, and copyright to the Software, and any copies or portions thereof, shall remain in Licensor. The Software is protected by European copyright directives, Austrian copyright laws as well as United States copyright laws and international treaty provisions.
+
+DISCLAIMER OF WARRANTY
+THE SOFTWARE IS PROVIDED AS IS, WITHOUT WARRANTY OF ANY KIND. LICENSOR HEREBY DISCLAIMS ALL EXPRESS OR IMPLIED WARRANTIES, INCLUDING WITHOUT LIMITATION WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND NON-INFRINGEMENT. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS AGREEMENT. SOME U.S. STATES DO NOT ALLOW EXCLUSIONS OF AN IMPLIED WARRANTY, SO THIS DISCLAIMER MAY NOT APPLY TO LICENSEE. LICENSEE MAY HAVE OTHER LEGAL RIGHTS THAT VARY FROM STATE TO STATE OR BY JURISDICTION.
+
+LIMITATION OF LIABILITY
+LICENSEE ASSUMES THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE SOFTWARE. LICENSOR ASSUMES NO LIABILITY FOR THE COST OF ANY SERVICE OR REPAIR IF THE SOFTWARE IS DEFECTIVE. UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, TORT, CONTRACT, STRICT LIABILITY, OR OTHERWISE, SHALL LICENSOR, OR ITS LICENSORS, SUPPLIERS OR RESELLERS, BE LIABLE TO LICENSEE OR ANY OTHER PERSON FOR ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOST PROFITS, LOSS OF GOODWILL, WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER COMMERCIAL DAMAGES OR LOSSES. IN NO EVENT WILL LICENSOR BE LIABLE FOR ANY DAMAGES IN EXCESS OF THE MONEY PAID FOR THE SOFTWARE, EVEN IF LICENSOR SHALL HAVE BEEN INFORMED OF THE POSSIBILITY OF SUCH DAMAGES, OR FOR ANY CLAIM BY ANY OTHER PARTY. THIS LIMITATION OF LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY TO THE EXTENT APPLICABLE LAW PROHIBITS SUCH LIMITATION. FURTHERMORE, SOME U.S. STATES DO NOT ALLOW THE EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO THIS LIMITATION AND EXCLUSION MAY NOT APPLY TO LICENSEE.
+
+TERMINATION
+The license granted herein shall be perpetual. If Licensee fails to comply with any of the terms of this Agreement, this Agreement and the rights granted herein will terminate immediately. Licensor may, at its sole discretion and at any time, terminate this Agreement. On termination, Licensee must cease using and destroy all copies of the Software.
+
+EXPORT CONTROLS
+Licensee shall comply with all export laws, restrictions and regulations of the United States, the Directive 2009/428/EC of the European Parliament and of the Council and the Austrian Außenwirtschaftsgesetz 2011, BGBl I No. 26/2011. Licensee shall not export, re-export or otherwise transfer the Software to any country for which the United States or the European Union or Austria maintains an embargo, or to any person or entity on the U.S. Department of Treasury List of Specially Designated Nationals or the U.S. Department of Commerce Denied Persons List or Entity List. Licensee represents and warrants that licensee is not located in, under the control of, or a national or resident of any restricted country or on any such list.
+
+THIRD PARTY CREDITS
+Portions of the Software utilize or include third party software and other copyrighted materials. Credits, licensing terms, and disclaimers for such materials are contained in the installation directory for the Software, and are accessible via the “Licenses” dialog for the Software. Licensee agrees that use of such copyrighted materials is governed by their respective terms.
+
+ENTIRE AGREEMENT
+This Agreement represents the complete agreement concerning this license between the parties and supersedes all prior agreements and representations between them. It may be amended only in writing executed by both parties. Coati Software OG reserves the exclusive right to periodically update this EULA at its discretion at any time, with reasonable notice to you by posting the new EULA at the following URL: http://www.coati.io/. Any action arising out of or relating to this Agreement may be brought exclusively in Salzburg, Austria, and Coati Software OG and you irrevocably consent to the jurisdiction of such courts and venue in Salzburg, Austria.
+
+CONTACT
+If you have questions regarding this agreement, contact:
+Coati Software OG
+Schlossallee 7/1
+5412 Puch/Hallein
+Austria
+support@coati.io
+
+
@@ -1,6 +1,11 @@
+QLabel {
+	font-size: 12px;
+	color: black;
+}
+
 #licenseField {
 	font-family: "<setting:font_name>";
-	font-size: 12pt;
+	font-size: 11px;
 	height: 200px;
 	padding: 5px;
 	width: 470px;
@@ -1,9 +1,6 @@
 QToolTip {
 	background-color: #E0E0E0;
 	color: black;
-	font-size: <setting:font_size>pt;
+	font-size: <setting:font_size>px;
 }

-* {
-	font-family: "Roboto";
-}
@@ -13,17 +13,16 @@ QPushButton:hover, QPushButton:checked {
 	background: <color:search/button/hover>;
 }

+QPushButton:disabled {
+	background: <color:search/button/disabled>;
+}
+
 QPushButton:pressed {
 	background: <color:search/button/press>;
 }

 #refresh_button {
-	border-bottom-left-radius: 12px;
-	border-top-left-radius: 12px;
-	margin-right: 2px;
-}
-
-#auto_refresh_button {
-	border-bottom-right-radius: 12px;
-	border-top-right-radius: 12px;
+	/*border-bottom-left-radius: 12px;*/
+	/*border-top-left-radius: 12px;*/
+	border-radius: 12px;
 }
@@ -1,10 +1,10 @@
 * {
-	font-size: <setting:font_size>pt;
+	font-size: <setting:font_size>px;
 }

 #search_box, #search_box * {
 	font-family: "<setting:font_name>";
-	font-size: <setting:font_size+2>pt;
+	font-size: <setting:font_size+2>px;
 }

 #search_bar {
@@ -16,6 +16,7 @@ QWidget#search_box_container {
 	border: none;
 	border-bottom-left-radius: 12px;
 	border-top-left-radius: 12px;
+	margin-left: 5px;
 	margin-right: 2px;
 }

@@ -23,6 +24,7 @@ QLineEdit#search_box {
 	background-color: transparent;
 	border: none;
 	color: <color:search/field/text>;
+	margin-left: 5px;
 	selection-background-color: <color:search/field/highlight>;
 }

@@ -41,19 +43,23 @@ QAbstractItemView#search_box_popup {
 	selection-background-color: <color:search/popup/highlight>;
 }

-QPushButton#search_button {
+#search_button, #home_button {
 	background: <color:search/button/normal>;
 	border: none;
-	border-bottom-right-radius: 12px;
-	border-top-right-radius: 12px;
+	border-radius: 12px;
 	background-position: 15px 5px;
 	width: 30px;
 }

-#search_button:hover {
+#search_button {
+	border-bottom-left-radius: 0px;
+	border-top-left-radius: 0px;
+}
+
+#search_button:hover, #home_button:hover {
 	background: <color:search/button/hover>;
 }

-#search_button:pressed {
+#search_button:pressed, #home_button:pressed {
 	background: <color:search/button/press>;
 }
@@ -1,57 +0,0 @@
-QtDirectoryListBox {
-	background-color: rgba(255, 255, 255, 200);
-	border: 1px solid lightgray;
-	border-radius: 12px;
-}
-
-QListWidget {
-	background: transparent;
-	border: none;
-	margin: 2px 0 2px 0;
-}
-
-QListWidget::item {
-	height: 20px;
-	border-bottom: 1px solid lightgray;
-}
-
-QListWidget::item:selected {
-	background-color: #EEE;
-}
-
-QtListItemWidget #field {
-	background-color: transparent;
-	border: none;
-	font-size: 12px;
-	margin-top: 2px;
-}
-
-QtListItemWidget #button {
-	border: 1px solid lightgray;
-	border-radius: 7px;
-	font-size: 12px;
-	height: 14px;
-	margin-right: 2px;
-	width: 20px;
-}
-
-QtListItemWidget #button:hover {
-	color: white;
-	background: #2D3F85;
-}
-
-#bar {
-	border-top: 1px solid lightgray;
-}
-
-#roundedButton {
-	color: white;
-	height: 16px;
-	margin-right: 3px;
-	width: 16px;
-	border: none;
-}
-
-#dropInfo {
-	color: lightgray;
-}
@@ -1,82 +0,0 @@
-#titleLabel {
-	color: black;
-	font-size: 16pt;
-	font-weight: bold;
-}
-
-QLineEdit {
-	background-color: rgba(255, 255, 255, 200);
-	border-radius: 10px;
-	border: 1px solid lightgrey;
-	height: 20px;
-	padding-left: 5px;
-	padding-right: 5px;
-}
-
-QLineEdit:disabled {
-	border: 1px solid lightgrey;
-}
-
-#formArea {
-	background-color: transparent;
-	border: none;
-	border-top: 1px solid lightgrey;
-	border-bottom: 1px solid lightgrey;
-}
-
-#form {
-	background-color: rgba(255, 255, 255, 150);
-}
-
-#form #label {
-	font-weight: bold;
-}
-
-#form #help {
-	background: transparent;
-	border: 1px solid #575656;
-	border-radius: 9px;
-	color: #575656;
-	height: 16px;
-	width: 16px;
-}
-
-#form #help:hover {
-	border-color: black;
-	color: black;
-}
-
-#moreButton {
-	background-color: rgba(255, 255, 255, 200);
-	border: 1px solid lightgray;
-	border-radius: 10px;
-	color: gray;
-	font-size: 15px;
-	height: 20px;
-	margin-left: 5px;
-	width: 28px;
-}
-
-#moreButton:hover {
-	color: white;
-	background: #2D3F85;
-}
-
-#windowButton {
-	background: white;
-	border: 1px solid lightgray;
-	border-radius: 10px;
-	color: black;
-	font-size: 17pt;
-	height: 30px;
-	width: 140px;
-}
-
-#windowButton:hover {
-	color: white;
-	background: #2D3F85;
-}
-
-#windowButton:disabled {
-	color: lightgray;
-}
@@ -1,29 +1,56 @@
 #projectButton {
 	background: white;
 	border: 1px solid lightgray;
-	border-radius: 10px;
-	font-size: 17pt;
+	border-radius: 8px;
+	color: black;
+	padding: 3px 5px 2px;
+	font-size: 14px;
+	min-width: 6em;
 }

 #projectButton:hover {
-	background: #2D3F85;
 	color: white;
+	background: #2D3F85;
 }

 #recentButton {
 	background: none;
 	border: none;
 	color: black;
-	font-size: 12pt;
+	font-size: 12px;
 }

-#recentButton:hover {
-	background-color: rgba(45, 63, 133, 70);
+#recentButtonMissing {
+	background: none;
+	border: none;
+	color: grey;
+	font-size: 12px;
+}
+
+#recentButton:hover, #recentButtonMissing:hover {
+	background-color: #CFD2E0;
 	border-radius: 10px;
 }

 #recentLabel {
 	color: black;
-	font-size: 16pt;
+	font-size: 16px;
+	font-weight: bold;
+	margin-left: 6px;
+}
+
+#versionLabel {
+	color: black;
+	font-size: 12px;
 	font-weight: bold;
 }
+
+#updateLabel {
+	color: black;
+	font-size: 12px;
+}
+
+#welcomeLabel {
+	color: black;
+	font-size: 12px;
+}
@@ -0,0 +1,31 @@
+QTabWidget::tab-bar {
+	alignment: left;
+}
+
+QTabBar::tab {
+	background-color: <color:tab/background>;
+	color: <color:tab/text>;
+	padding: 12px 75px 5px 12px;
+	border: 0px;
+	border-bottom: 4px solid <color:tab/background>;
+	/*font-size: <setting:font_size>px;*/
+	/*font-weight: bold;*/
+}
+
+QTabBar::tab:hover {
+	border-bottom: 4px solid <color:tab/hover>;
+}
+
+QTabBar::tab:selected {
+	border-bottom: 4px solid <color:tab/active>;
+	color: <color:tab/active>;
+}
+
+QTabWidget::pane {
+	top: 0px;
+	background: <color:tab/background>;
+	color: <color:tab/text>;
+	border: 0px;
+	margin: 0px;
+	padding: 0px;
+}
@@ -0,0 +1,85 @@
+* {
+	font-size: 12px;
+}
+
+QtDirectoryListBox {
+	background-color: white;
+	border: 1px solid lightgray;
+	border-radius: 12px;
+}
+
+QListWidget {
+	background: transparent;
+	border: none;
+	margin: 2px 0 2px 0;
+}
+
+QListWidget::item {
+	border-bottom: 1px solid lightgray;
+	height: 20px;
+}
+
+QListWidget::item:selected {
+	background-color: #EEE;
+}
+
+QtListItemWidget #field {
+	background-color: transparent;
+	border: none;
+	color: black;
+	margin-top: 2px;
+	margin-left: 5px;
+}
+
+#bar {
+	border-top: 1px solid lightgray;
+}
+
+#plusButton, #minusButton, #dotsButton, #editButton {
+	color: white;
+	height: 1em;
+	margin-right: 3px;
+	width: 1em;
+	border: none;
+}
+
+#dotsButton {
+	margin-top: 2px;
+}
+
+#plusButton {
+	border-image: url(<setting:gui_path>window/plus.png);
+}
+
+#plusButton:hover {
+	border-image: url(<setting:gui_path>window/plus_hover.png);
+}
+
+#minusButton {
+	border-image: url(<setting:gui_path>window/minus.png);
+}
+
+#minusButton:hover {
+	border-image: url(<setting:gui_path>window/minus_hover.png);
+}
+
+#dotsButton {
+	border-image: url(<setting:gui_path>window/dots.png);
+}
+
+#dotsButton:hover {
+	border-image: url(<setting:gui_path>window/dots_hover.png);
+}
+
+#editButton {
+	border-image: url(<setting:gui_path>code_view/images/edit.png);
+	margin-left: 6px;
+}
+
+#editButton:hover {
+	background-color: #EEE;
+}
+
+#dropInfo {
+	color: #999;
+}
@@ -0,0 +1,180 @@
+* {
+	font-size: 12px;
+}
+
+QLabel, QCheckBox {
+	color: black;
+}
+
+#title {
+	font-size: 16px;
+	font-weight: bold;
+}
+
+#projectTitle {
+	font-size: 14px;
+	font-weight: bold;
+}
+
+#projectTitle {
+	background: white;
+	padding: 5px;
+	margin-left: 40px;
+}
+
+#projectDescription {
+	font-size: 12px;
+	margin-left: 20px;
+}
+
+#description {
+	font-size: 12px;
+}
+
+#label {
+	font-size: 12px;
+	font-weight: bold;
+}
+
+#titleLabel {
+	font-size: 14px;
+	font-weight: bold;
+}
+
+#formArea {
+	background: transparent;
+	border: none;
+}
+
+#scrollArea {
+	background: transparent;
+	border: none;
+	border-top: 1px solid lightgrey;
+	border-bottom: 1px solid lightgrey;
+}
+
+#form {
+	background: transparent;
+}
+
+#helpButton, #dotsButton, #refreshButton {
+	border: none;
+	color: white;
+	height: 1em;
+	width: 1em;
+}
+
+#helpButton {
+	border-image: url(<setting:gui_path>window/help.png);
+}
+
+#helpButton:hover {
+	border-image: url(<setting:gui_path>window/help_hover.png);
+}
+
+#dotsButton {
+	border-image: url(<setting:gui_path>window/dots.png);
+}
+
+#dotsButton:hover {
+	border-image: url(<setting:gui_path>window/dots_hover.png);
+}
+
+#refreshButton {
+	border-image: url(<setting:gui_path>window/refresh.png);
+}
+
+#refreshButton:hover {
+	border-image: url(<setting:gui_path>window/refresh_hover.png);
+}
+
+#name, #picker {
+	background: white;
+	border-radius: 10px;
+	border: 1px solid lightgrey;
+	color: black;
+	padding: 2px 5px 0px;
+}
+
+#locationField {
+	background: white;
+	border: none;
+	border-radius: 5px;
+	color: black;
+	margin-left: 5px;
+	margin-top: 2px;
+}
+
+#dotsButton, #refreshButton {
+	margin-right: 2px;
+}
+
+#windowButton {
+	background: white;
+	border: 1px solid lightgray;
+	border-radius: 8px;
+	color: black;
+	padding: 3px 5px 2px;
+	font-size: 14px;
+	min-width: 5em;
+}
+
+#menuButton {
+	background: white;
+	border: none;
+	border-radius: 8px;
+	border-bottom-right-radius: 0px;
+	border-top-right-radius: 0px;
+	color: black;
+	font-size: 15px;
+	margin-right: 0px;
+	height: 25px;
+	width: 90px;
+}
+
+#windowButton:hover {
+	color: white;
+	background: #2D3C86;
+}
+
+#windowButton:default {
+	border: 2px solid lightgray;
+}
+
+#menuButton:hover, #menuButton:checked {
+	background: #CFD2E0;
+}
+
+#windowButton:disabled {
+	color: lightgray;
+}
+
+#projectContainer {
+	background: white;
+	border: 1px solid lightgray;
+	border-radius: 8px;
+	margin-top: 15px;
+	margin-left: 20px;
+}
+
+#projectButton {
+	background: white;
+	border-radius: 8px;
+	color: black;
+	font-size: 12px;
+	width: 7em;
+	height: 7em;
+	margin-top: 10px;
+}
+
+#projectButton:hover, #projectButton:checked {
+	background: #CFD2E0;
+}
+
+#textField, #pathList {
+	background: white;
+	border: 1px solid lightgray;
+	border-radius: 12px;
+	color: black;
+	padding: 6px;
+}
@@ -1 +0,0 @@
-%windir%\system32\msiexec.exe /I{2A3B2FF5-A114-4CAB-88FB-DE8942D5B8EB}
@@ -0,0 +1 @@
+%windir%\system32\msiexec.exe /x {596E7336-D5B9-449A-95E9-6040F354E283}
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<config>
+	<info>
+		<description>
+			WHAT IS THIS?\n
+			\tJavaParser is an open-source Java project for parsing Java code and\n 
+			\tgenerating an Abstract Syntax Tree (AST). Additionally it supports a\n
+			\tvisitor pattern to traverse the generated AST. For more information on\n
+			\tthis project please visit javaparser.org\n
+			\n
+			LET'S GET STARTED!\n
+			\tHave you ever wondered what a parser for a real programming language\n
+			\tmay look like? Go ahead and find out!\n
+			\n
+			\tIf you ask yourself where to start, click the symbol linked below.\n
+			\n
+			[com\ts\tp\tngithub\ts\tp\tnjavaparser\ts\tp\tnast\ts\tp\tnbody\ts\tp\tnClassOrInterfaceDeclaration\ts\tp] // &lt;- start here!\n\n
+		</description>
+	</info>
+	<language_settings>
+		<language>Java</language>
+		<standard>8</standard>
+	</language_settings>
+	<source>
+		<extensions>
+			<source_extensions>.java</source_extensions>
+		</extensions>
+		<source_paths>
+			<source_path>./src/main/java</source_path>
+			<source_path>./target/generated-sources/javacc</source_path>
+		</source_paths>
+	</source>
+</config>
@@ -0,0 +1,232 @@
+/*
+ * Copyright (C) 2007-2010 Júlio Vilmar Gesser.
+ * Copyright (C) 2011, 2013-2016 The JavaParser Team.
+ *
+ * This file is part of JavaParser.
+ * 
+ * JavaParser can be used either under the terms of
+ * a) the GNU Lesser General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ * b) the terms of the Apache License 
+ *
+ * You should have received a copy of both licenses in LICENCE.LGPL and
+ * LICENCE.APACHE. Please refer to those files for details.
+ *
+ * JavaParser is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ */
+
+package com.github.javaparser;
+
+import com.github.javaparser.ast.CompilationUnit;
+import com.github.javaparser.ast.Node;
+import com.github.javaparser.ast.comments.Comment;
+import com.github.javaparser.ast.comments.CommentsCollection;
+import com.github.javaparser.ast.comments.CommentsParser;
+import com.github.javaparser.ast.comments.LineComment;
+import com.github.javaparser.utils.PositionUtils;
+
+import java.io.IOException;
+import java.util.Collections;
+import java.util.LinkedList;
+import java.util.List;
+
+/**
+ * Assigns comments to nodes of the AST.
+ * 
+ * @author Sebastian Kuerten
+ * @author Júlio Vilmar Gesser
+ */
+class CommentsInserter {
+    private boolean doNotAssignCommentsPreceedingEmptyLines = true;
+    private boolean doNotConsiderAnnotationsAsNodeStartForCodeAttribution = false;
+    
+    CommentsInserter() {
+    }
+
+    /**
+     * Adds the comments found in the source code of a compilation unit to that compilation unit.
+     * @param cu an already created compilation unit
+     * @param cuSourceCode the source code of the compilation unit. It will be parsed to find comments.
+     */
+    public void insertComments(CompilationUnit cu, String cuSourceCode) throws IOException {
+        CommentsParser commentsParser = new CommentsParser();
+        CommentsCollection allComments = commentsParser.parse(cuSourceCode);
+
+        insertCommentsInCu(cu, allComments);
+    }
+
+    public boolean getDoNotConsiderAnnotationsAsNodeStartForCodeAttribution() {
+        return doNotConsiderAnnotationsAsNodeStartForCodeAttribution;
+    }
+
+    public void setDoNotConsiderAnnotationsAsNodeStartForCodeAttribution(boolean newValue) {
+        this.doNotConsiderAnnotationsAsNodeStartForCodeAttribution = newValue;
+    }
+
+    public boolean getDoNotAssignCommentsPreceedingEmptyLines() {
+        return doNotAssignCommentsPreceedingEmptyLines;
+    }
+
+    public void setDoNotAssignCommentsPreceedingEmptyLines(boolean newValue) {
+        this.doNotAssignCommentsPreceedingEmptyLines = newValue;
+    }
+
+    /**
+     * Comments are attributed to the thing the comment and are removed from
+     * allComments.
+     */
+    private void insertCommentsInCu(CompilationUnit cu,
+            CommentsCollection commentsCollection) {
+        if (commentsCollection.size() == 0)
+            return;
+
+        // I should sort all the direct children and the comments, if a comment
+        // is the first thing then it
+        // a comment to the CompilationUnit
+        // FIXME if there is no package it could be also a comment to the
+        // following class...
+        // so I could use some heuristics in these cases to distinguish the two
+        // cases
+
+        List<Comment> comments = commentsCollection.getAll();
+        PositionUtils.sortByBeginPosition(comments);
+        List<Node> children = cu.getChildrenNodes();
+        PositionUtils.sortByBeginPosition(children);
+
+        if (cu.getPackage() != null
+                && (children.isEmpty() || PositionUtils.areInOrder(
+                        comments.get(0), children.get(0)))) {
+            cu.setComment(comments.get(0));
+            comments.remove(0);
+        }
+
+        insertCommentsInNode(cu, comments);
+    }
+
+    /**
+     * This method try to attributes the nodes received to child of the node. It
+     * returns the node that were not attributed.
+     */
+    private void insertCommentsInNode(Node node,
+            List<Comment> commentsToAttribute) {
+        if (commentsToAttribute.isEmpty())
+            return;
+
+        // the comments can:
+        // 1) Inside one of the child, then it is the child that have to
+        // associate them
+        // 2) If they are not inside a child they could be preceeding nothing, a
+        // comment or a child
+        // if they preceed a child they are assigned to it, otherweise they
+        // remain "orphans"
+
+        List<Node> children = node.getChildrenNodes();
+        PositionUtils.sortByBeginPosition(children);
+
+        for (Node child : children) {
+            List<Comment> commentsInsideChild = new LinkedList<Comment>();
+            for (Comment c : commentsToAttribute) {
+                if (PositionUtils.nodeContains(child, c,
+                        doNotConsiderAnnotationsAsNodeStartForCodeAttribution)) {
+                    commentsInsideChild.add(c);
+                }
+            }
+            commentsToAttribute.removeAll(commentsInsideChild);
+            insertCommentsInNode(child, commentsInsideChild);
+        }
+
+        // I can attribute in line comments to elements preceeding them, if
+        // there
+        // is something contained in their line
+        List<Comment> attributedComments = new LinkedList<Comment>();
+        for (Comment comment : commentsToAttribute) {
+            if (comment.isLineComment()) {
+                for (Node child : children) {
+                    if (child.getEnd().line == comment.getBegin().line
+                        && attributeLineCommentToNodeOrChild(child,
+                                comment.asLineComment())) {
+                            attributedComments.add(comment);
+                    }
+                }
+            }
+        }
+
+        // at this point I create an ordered list of all remaining comments and
+        // children
+        Comment previousComment = null;
+        attributedComments = new LinkedList<Comment>();
+        List<Node> childrenAndComments = new LinkedList<Node>();
+        childrenAndComments.addAll(children);
+        childrenAndComments.addAll(commentsToAttribute);
+        PositionUtils.sortByBeginPosition(childrenAndComments,
+                doNotConsiderAnnotationsAsNodeStartForCodeAttribution);
+
+        for (Node thing : childrenAndComments) {
+            if (thing instanceof Comment) {
+                previousComment = (Comment) thing;
+                if (!previousComment.isOrphan()) {
+                    previousComment = null;
+                }
+            } else {
+                if (previousComment != null && !thing.hasComment()) {
+                    if (!doNotAssignCommentsPreceedingEmptyLines
+                            || !thereAreLinesBetween(previousComment, thing)) {
+                        thing.setComment(previousComment);
+                        attributedComments.add(previousComment);
+                        previousComment = null;
+                    }
+                }
+            }
+        }
+
+        commentsToAttribute.removeAll(attributedComments);
+
+        // all the remaining are orphan nodes
+        for (Comment c : commentsToAttribute) {
+            if (c.isOrphan()) {
+                node.addOrphanComment(c);
+            }
+        }
+    }
+
+    private boolean attributeLineCommentToNodeOrChild(Node node,
+            LineComment lineComment) {
+        // The node start and end at the same line as the comment,
+        // let's give to it the comment
+        if (node.getBegin().line == lineComment.getBegin().line
+                && !node.hasComment()) {
+            if(!(node instanceof Comment)) {
+                node.setComment(lineComment);
+            }
+            return true;
+        } else {
+            // try with all the children, sorted by reverse position (so the
+            // first one is the nearest to the comment
+            List<Node> children = new LinkedList<Node>();
+            children.addAll(node.getChildrenNodes());
+            PositionUtils.sortByBeginPosition(children);
+            Collections.reverse(children);
+
+            for (Node child : children) {
+                if (attributeLineCommentToNodeOrChild(child, lineComment)) {
+                    return true;
+                }
+            }
+
+            return false;
+        }
+    }
+
+    private boolean thereAreLinesBetween(Node a, Node b) {
+        if (!PositionUtils.areInOrder(a, b)) {
+            return thereAreLinesBetween(b, a);
+        }
+        int endOfA = a.getEnd().line;
+        return b.getBegin().line > (endOfA + 1);
+    }
+
+}
@@ -0,0 +1,563 @@
+/*
+ * Copyright (C) 2007-2010 Júlio Vilmar Gesser.
+ * Copyright (C) 2011, 2013-2016 The JavaParser Team.
+ *
+ * This file is part of JavaParser.
+ * 
+ * JavaParser can be used either under the terms of
+ * a) the GNU Lesser General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ * b) the terms of the Apache License 
+ *
+ * You should have received a copy of both licenses in LICENCE.LGPL and
+ * LICENCE.APACHE. Please refer to those files for details.
+ *
+ * JavaParser is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ */
+ 
+package com.github.javaparser;
+
+import java.io.*;
+
+import com.github.javaparser.ast.CompilationUnit;
+import com.github.javaparser.ast.ImportDeclaration;
+import com.github.javaparser.ast.body.BodyDeclaration;
+import com.github.javaparser.ast.expr.AnnotationExpr;
+import com.github.javaparser.ast.expr.Expression;
+import com.github.javaparser.ast.stmt.BlockStmt;
+import com.github.javaparser.ast.stmt.Statement;
+
+import java.nio.charset.Charset;
+import java.util.List;
+
+import static com.github.javaparser.utils.Utils.readerToString;
+
+/**
+ * Parse Java source code and creates Abstract Syntax Tree classes.
+ *
+ * @author Júlio Vilmar Gesser
+ */
+public final class JavaParser {
+    private static final CommentsInserter commentsInserter = new CommentsInserter();
+    private static final Charset UTF8 = Charset.forName("utf-8");
+    
+    private ASTParser astParser = null;
+    private Provider provider = null;
+
+    /**
+     * Instantiate the parser. Note that parsing can also be done with the static methods on this class.
+     * Creating an instance will reduce setup time between parsing files.
+     */
+    public JavaParser() {
+        // No specific constructors for this class.
+    }
+
+    public JavaParser setSource(Provider provider) {
+        this.provider=provider;
+        if(astParser==null) {
+            astParser = new ASTParser(provider);
+        }else{
+            astParser.ReInit(provider);
+        }
+        return this;
+    }
+
+    public JavaParser setSource(Reader reader) {
+        return setSource(new StreamProvider(reader));
+    }
+
+    public JavaParser setSource(InputStream input) throws IOException {
+        return setSource(new StreamProvider(input));
+    }
+
+    public JavaParser setSource(InputStream input, Charset encoding) throws IOException {
+        return setSource(new StreamProvider(input, encoding.name()));
+    }
+
+    public JavaParser setSource(File file) throws IOException {
+        return setSource(new FileInputStream(file));
+    }
+
+    public JavaParser setSource(File file, Charset encoding) throws IOException {
+        return setSource(new FileInputStream(file), encoding);
+    }
+
+    public JavaParser setSource(String source) {
+        return setSource(new StringReader(source));
+    }
+
+    /**
+     * Return the list of tokens that have been encountered while parsing code
+     * using this parser.
+     *
+     * @return a list of tokens
+     */
+    public List<Token> getTokens() {
+        checkSourceSet();
+        return astParser.getTokens();
+    }
+
+    private void checkSourceSet() {
+        if (astParser == null || provider == null) {
+            throw new IllegalStateException("Please setSource() before doing any parsing.");
+        }
+    }
+
+    /**
+     * Parses the Java code and returns a {@link CompilationUnit} that
+     * represents it.
+     *
+     * @return CompilationUnit representing the Java source code
+     * @throws ParseException
+     *             if the source code has parser errors
+     */
+    public CompilationUnit parse() throws ParseException {
+        try {
+            checkSourceSet();
+            return astParser.CompilationUnit();
+        } finally {
+            closeProvider();
+        }
+    }
+
+    private void closeProvider() {
+        try {
+            checkSourceSet();
+            provider.close();
+        } catch (IOException e) {
+            // Since we're done parsing and have our result, we don't care about any errors.
+        }
+    }
+
+    /**
+     * Parses the Java block and returns a {@link BlockStmt} that represents it.
+     *
+     * @return BlockStmt representing the Java block
+     * @throws ParseException
+     *             if the source code has parser errors
+     */
+    public BlockStmt parseBlock() throws ParseException {
+        try{
+            checkSourceSet();
+            return astParser.Block();
+        } finally {
+            closeProvider();
+        }
+    }
+
+    /**
+     * Parses the Java block and returns a {@link List} of {@link Statement}s
+     * that represents it.
+     *
+     * @return Statement representing the Java statement
+     * @throws ParseException
+     *             if the source code has parser errors
+     */
+    public List<Statement> parseStatements() throws ParseException {
+        try {
+            checkSourceSet();
+            return astParser.Statements();
+        } finally {
+            closeProvider();
+        }
+    }
+
+    /**
+     * Parses the Java statement and returns a {@link Statement} that represents
+     * it.
+     *
+     * @return Statement representing the Java statement
+     * @throws ParseException
+     *             if the source code has parser errors
+     */
+    public Statement parseStatement() throws ParseException {
+        try {
+            checkSourceSet();
+            return astParser.Statement();
+        } finally {
+            closeProvider();
+        }
+    }
+
+    /**
+     * Parses the Java import and returns a {@link ImportDeclaration} that
+     * represents it.
+     *
+     * @return ImportDeclaration representing the Java import declaration
+     * @throws ParseException
+     *             if the source code has parser errors
+     */
+    public ImportDeclaration parseImport() throws ParseException {
+        try {
+            checkSourceSet();
+            return astParser.ImportDeclaration();
+        } finally {
+            closeProvider();
+        }
+    }
+
+    /**
+     * Parses the Java expression and returns a {@link Expression} that
+     * represents it.
+     *
+     * @return Expression representing the Java expression
+     * @throws ParseException
+     *             if the source code has parser errors
+     */
+    public Expression parseExpression() throws ParseException {
+        try {
+            checkSourceSet();
+            return astParser.Expression();
+        } finally {
+            closeProvider();
+        }
+    }
+
+    /**
+     * Parses the Java annotation and returns a {@link AnnotationExpr} that
+     * represents it.
+     *
+     * @return AnnotationExpr representing the Java annotation
+     * @throws ParseException
+     *             if the source code has parser errors
+     */
+    public AnnotationExpr parseAnnotation() throws ParseException {
+        try {
+            checkSourceSet();
+            return astParser.Annotation();
+        } finally {
+            closeProvider();
+        }
+    }
+
+    /**
+     * Parses the Java body declaration(e.g fields or methods) and returns a
+     * {@link BodyDeclaration} that represents it.
+     *
+     * @return BodyDeclaration representing the Java body
+     * @throws ParseException
+     *             if the source code has parser errors
+     */
+    public BodyDeclaration<?> parseBodyDeclaration() throws ParseException {
+        try {
+            checkSourceSet();
+            return astParser.AnnotationBodyDeclaration();
+        } finally {
+            closeProvider();
+        }
+    }
+
+    /**
+     * Parses a Java class body declaration(e.g fields or methods) and returns a
+     * {@link BodyDeclaration} that represents it.
+     *
+     * @return BodyDeclaration representing the Java class body
+     * @throws ParseException
+     *             if the source code has parser errors
+     */
+    public BodyDeclaration<?> parseClassBodyDeclaration() throws ParseException {
+        try {
+            checkSourceSet();
+            return astParser.ClassOrInterfaceBodyDeclaration(false);
+        } finally {
+            closeProvider();
+        }
+    }
+
+    /**
+     * Parses a Java interface body declaration(e.g fields or methods) and returns a
+     * {@link BodyDeclaration} that represents it.
+     *
+     * @return BodyDeclaration representing the Java interface body
+     * @throws ParseException
+     *             if the source code has parser errors
+     */
+    public BodyDeclaration<?> parseInterfaceBodyDeclaration() throws ParseException {
+        try {
+            checkSourceSet();
+            return astParser.ClassOrInterfaceBodyDeclaration(true);
+        } finally {
+            closeProvider();
+        }
+    }
+    
+    public static boolean getDoNotConsiderAnnotationsAsNodeStartForCodeAttribution() {
+        return commentsInserter.getDoNotConsiderAnnotationsAsNodeStartForCodeAttribution();
+    }
+
+    public static void setDoNotConsiderAnnotationsAsNodeStartForCodeAttribution(boolean newValue) {
+        commentsInserter.setDoNotConsiderAnnotationsAsNodeStartForCodeAttribution(newValue);
+    }
+
+    public static boolean getDoNotAssignCommentsPreceedingEmptyLines() {
+        return commentsInserter.getDoNotAssignCommentsPreceedingEmptyLines();
+    }
+
+    public static void setDoNotAssignCommentsPreceedingEmptyLines(boolean newValue) {
+        commentsInserter.setDoNotAssignCommentsPreceedingEmptyLines(newValue);
+    }
+
+    public static CompilationUnit parse(final InputStream in,
+                                        final Charset encoding) throws ParseException {
+        return parse(in,encoding,true);
+    }
+
+    /**
+     * Parses the Java code contained in the {@link InputStream} and returns a
+     * {@link CompilationUnit} that represents it.
+     *
+     * @param in
+     *            {@link InputStream} containing Java source code
+     * @param encoding
+     *            encoding of the source code
+     * @return CompilationUnit representing the Java source code
+     * @throws ParseException
+     *             if the source code has parser errors
+     */
+    public static CompilationUnit parse(final InputStream in,
+                                        Charset encoding,
+                                        boolean considerComments) throws ParseException {
+        try {
+            try (InputStreamReader inputStreamReader = new InputStreamReader(in, encoding)) {
+                return parse(inputStreamReader, considerComments);
+            }
+        } catch (IOException ioe) {
+            throw new ParseException(ioe.getMessage());
+        }
+    }
+
+    /**
+     * Parses the Java code contained in the {@link InputStream} and returns a
+     * {@link CompilationUnit} that represents it.<br>
+     * Note: Uses UTF-8 encoding
+     * 
+     * @param in
+     *            {@link InputStream} containing Java source code
+     * @return CompilationUnit representing the Java source code
+     * @throws ParseException
+     *             if the source code has parser errors
+     */
+    public static CompilationUnit parse(final InputStream in)
+            throws ParseException {
+        return parse(in, UTF8, true);
+    }
+
+    public static CompilationUnit parse(final File file, final Charset encoding)
+            throws ParseException, IOException {
+        return parse(file,encoding,true);
+    }
+
+    /**
+     * Parses the Java code contained in a {@link File} and returns a
+     * {@link CompilationUnit} that represents it.
+     *
+     * @param file
+     *            {@link File} containing Java source code
+     * @param encoding
+     *            encoding of the source code
+     * @return CompilationUnit representing the Java source code
+     * @throws ParseException
+     *             if the source code has parser errors
+     */
+    public static CompilationUnit parse(final File file, final Charset encoding, boolean considerComments)
+            throws ParseException {
+        try {
+            try (FileInputStream in = new FileInputStream(file)) {
+                return parse(in, encoding, considerComments);
+            }
+        } catch (IOException ioe) {
+            throw new ParseException(ioe.getMessage());
+        }
+    }
+
+    /**
+     * Parses the Java code contained in a {@link File} and returns a
+     * {@link CompilationUnit} that represents it.<br>
+     * Note: Uses UTF-8 encoding
+     * 
+     *
+     * @param file
+     *            {@link File} containing Java source code
+     * @return CompilationUnit representing the Java source code
+     * @throws ParseException
+     *             if the source code has parser errors
+     * @throws IOException
+     */
+    public static CompilationUnit parse(final File file) throws ParseException,
+            IOException {
+        return parse(file, UTF8, true);
+    }
+
+    public static CompilationUnit parse(final Reader reader)
+            throws ParseException {
+        return parse(reader, true);
+    }
+    
+    public static CompilationUnit parse(final Reader reader, boolean considerComments)
+            throws ParseException {
+        try {
+            String comments = readerToString(reader);
+            CompilationUnit cu = new JavaParser().setSource(comments).parse();
+            if (considerComments){
+                commentsInserter.insertComments(cu, comments);
+            }
+            return cu;
+        } catch (IOException ioe){
+            throw new ParseException(ioe.getMessage());
+        }
+    }
+
+    /**
+     * Parses the Java code contained in code and returns a
+     * {@link CompilationUnit} that represents it.
+     *
+     * @param code Java source code
+     * @param considerComments parse or ignore comments
+     * @return CompilationUnit representing the Java source code
+     * @throws ParseException if the source code has parser errors
+     */
+    public static CompilationUnit parse(String code, boolean considerComments) throws ParseException {
+        return parse(new StringReader(code), considerComments);
+    }
+
+    /**
+     * Parses the Java code contained in code and returns a
+     * {@link CompilationUnit} that represents it.
+     *
+     * @param code Java source code
+     * @return CompilationUnit representing the Java source code
+     * @throws ParseException if the source code has parser errors
+     */
+    public static CompilationUnit parse(String code) throws ParseException {
+        return parse(code, true);
+    }
+
+    /**
+     * Parses the Java block contained in a {@link String} and returns a
+     * {@link BlockStmt} that represents it.
+     *
+     * @param blockStatement
+     *            {@link String} containing Java block code
+     * @return BlockStmt representing the Java block
+     * @throws ParseException
+     *             if the source code has parser errors
+     */
+    public static BlockStmt parseBlock(final String blockStatement)
+            throws ParseException {
+        return new JavaParser().setSource(blockStatement).parseBlock();
+    }
+
+    /**
+     * Parses the Java statement contained in a {@link String} and returns a
+     * {@link Statement} that represents it.
+     *
+     * @param statement
+     *            {@link String} containing Java statement code
+     * @return Statement representing the Java statement
+     * @throws ParseException
+     *             if the source code has parser errors
+     */
+    public static Statement parseStatement(final String statement) throws ParseException {
+        return new JavaParser().setSource(statement).parseStatement();
+    }
+
+    /**
+     * Parses the Java statements contained in a {@link String} and returns a
+     * list of {@link Statement} that represents it.
+     *
+     * @param statements
+     *            {@link String} containing Java statements
+     * @return list of Statement representing the Java statement
+     * @throws ParseException
+     *             if the source code has parser errors
+     */
+    public static List<Statement> parseStatements(final String statements) throws ParseException {
+        return new JavaParser().setSource(statements).parseStatements();
+    }
+
+    /**
+     * Parses the Java import contained in a {@link String} and returns a
+     * {@link ImportDeclaration} that represents it.
+     *
+     * @param importDeclaration
+     *            {@link String} containing Java import code
+     * @return ImportDeclaration representing the Java import declaration
+     * @throws ParseException
+     *             if the source code has parser errors
+     */
+    public static ImportDeclaration parseImport(final String importDeclaration) throws ParseException {
+        return new JavaParser().setSource(importDeclaration).parseImport();
+    }
+
+    /**
+     * Parses the Java expression contained in a {@link String} and returns a
+     * {@link Expression} that represents it.
+     *
+     * @param expression
+     *            {@link String} containing Java expression
+     * @return Expression representing the Java expression
+     * @throws ParseException
+     *             if the source code has parser errors
+     */
+    public static Expression parseExpression(final String expression) throws ParseException {
+        return new JavaParser().setSource(expression).parseExpression();
+    }
+
+    /**
+     * Parses the Java annotation contained in a {@link String} and returns a
+     * {@link AnnotationExpr} that represents it.
+     *
+     * @param annotation
+     *            {@link String} containing Java annotation
+     * @return AnnotationExpr representing the Java annotation
+     * @throws ParseException
+     *             if the source code has parser errors
+     */
+    public static AnnotationExpr parseAnnotation(final String annotation) throws ParseException {
+        return new JavaParser().setSource(annotation).parseAnnotation();
+    }
+
+    /**
+     * Parses the Java body declaration(e.g fields or methods) contained in a
+     * {@link String} and returns a {@link BodyDeclaration} that represents it.
+     *
+     * @param body
+     *            {@link String} containing Java body declaration
+     * @return BodyDeclaration representing the Java annotation
+     * @throws ParseException
+     *             if the source code has parser errors
+     */
+    public static BodyDeclaration<?> parseBodyDeclaration(final String body) throws ParseException {
+        return new JavaParser().setSource(body).parseBodyDeclaration();
+    }
+
+    /**
+     * Parses a Java class body declaration(e.g fields or methods) and returns a
+     * {@link BodyDeclaration} that represents it.
+     *
+     * @param body the body of a class
+     * @return BodyDeclaration representing the Java class body
+     * @throws ParseException
+     *             if the source code has parser errors
+     */
+    public static BodyDeclaration<?> parseClassBodyDeclaration(String body) throws ParseException {
+        return new JavaParser().setSource(body).parseClassBodyDeclaration();
+    }
+
+    /**
+     * Parses a Java interface body declaration(e.g fields or methods) and returns a
+     * {@link BodyDeclaration} that represents it.
+     *
+     * @param body the body of an interface
+     * @return BodyDeclaration representing the Java interface body
+     * @throws ParseException
+     *             if the source code has parser errors
+     */
+    public static BodyDeclaration parseInterfaceBodyDeclaration(String body) throws ParseException {
+        return new JavaParser().setSource(body).parseInterfaceBodyDeclaration();
+    }
+}
@@ -0,0 +1,137 @@
+/*
+ * Copyright (C) 2007-2010 Júlio Vilmar Gesser.
+ * Copyright (C) 2011, 2013-2016 The JavaParser Team.
+ *
+ * This file is part of JavaParser.
+ * 
+ * JavaParser can be used either under the terms of
+ * a) the GNU Lesser General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ * b) the terms of the Apache License 
+ *
+ * You should have received a copy of both licenses in LICENCE.LGPL and
+ * LICENCE.APACHE. Please refer to those files for details.
+ *
+ * JavaParser is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ */
+
+package com.github.javaparser;
+
+import com.github.javaparser.ast.Node;
+
+/**
+ * A position in a source file. Lines and columns start counting at 1.
+ */
+public class Position implements Comparable<Position> {
+	public final int line;
+	public final int column;
+
+	public static final Position ABSOLUTE_START = new Position(Node.ABSOLUTE_BEGIN_LINE, -1);
+	public static final Position ABSOLUTE_END = new Position(Node.ABSOLUTE_END_LINE, -1);
+
+	/**
+	 * The first position in the file
+	 */
+	public static final Position HOME = new Position(1, 1);
+	public static final Position UNKNOWN = new Position(0, 0);
+
+	public Position(int line, int column) {
+		if (line < Node.ABSOLUTE_END_LINE) {
+			throw new IllegalArgumentException("Can't position at line " + line);
+		}
+		if (column < -1) {
+			throw new IllegalArgumentException("Can't position at column " + column);
+		}
+		this.line = line;
+		this.column = column;
+	}
+
+	/**
+	 * Convenient factory method.
+	 */
+	public static Position pos(int line, int column) {
+		return new Position(line, column);
+	}
+
+	public Position withColumn(int column) {
+		return new Position(this.line, column);
+	}
+
+	public Position withLine(int line) {
+		return new Position(line, this.column);
+	}
+
+	/**
+	 * Check if the position is usable. Does not know what it is pointing at, so it can't check if the position is after the end of the source.
+	 */
+	public boolean valid() {
+		return line > 0 && column > 0;
+	}
+
+	public boolean invalid() {
+		return !valid();
+	}
+
+	public Position orIfInvalid(Position anotherPosition) {
+		if (valid()) {
+			return this;
+		}
+		return anotherPosition;
+	}
+	
+	public boolean isAfter(Position position) {
+		if (position.line == Node.ABSOLUTE_BEGIN_LINE) return true;
+		if (line > position.line) {
+			return true;
+		} else if (line == position.line) {
+			return column > position.column;
+		}
+		return false;
+
+	}
+
+	public boolean isBefore(Position position) {
+		if (position.line == Node.ABSOLUTE_END_LINE) return true;
+		if (line < position.line) {
+			return true;
+		} else if (line == position.line) {
+			return column < position.column;
+		}
+		return false;
+	}
+
+	@Override
+	public int compareTo(Position o) {
+		if (isBefore(o)) {
+			return -1;
+		}
+		if (isAfter(o)) {
+			return 1;
+		}
+		return 0;
+	}
+
+	@Override
+	public boolean equals(Object o) {
+		if (this == o) return true;
+		if (o == null || getClass() != o.getClass()) return false;
+
+		Position position = (Position) o;
+
+		return line == position.line && column == position.column;
+	}
+
+	@Override
+	public int hashCode() {
+		return 31 * line + column;
+	}
+
+	@Override
+	public String toString() {
+		return "(line " + line + ",col " + column + ")";
+	}
+}
@@ -0,0 +1,89 @@
+package com.github.javaparser;
+
+import static com.github.javaparser.Position.pos;
+
+/**
+ * A range of characters in a source file, from "begin" to "end", including the characters at "begin" and "end".
+ */
+public class Range {
+    public static final Range UNKNOWN = range(Position.UNKNOWN, Position.UNKNOWN);
+
+    public final Position begin;
+    public final Position end;
+
+    public Range(Position begin, Position end) {
+        if (begin == null) {
+            throw new IllegalArgumentException("begin can't be null");
+        }
+        if (end == null) {
+            throw new IllegalArgumentException("end can't be null");
+        }
+        this.begin = begin;
+        this.end = end;
+    }
+
+    public static Range range(Position begin, Position end) {
+        return new Range(begin, end);
+    }
+
+    public static Range range(int beginLine, int beginColumn, int endLine, int endColumn) {
+        return new Range(pos(beginLine, beginColumn), pos(endLine, endColumn));
+    }
+
+    public Range withBeginColumn(int column) {
+        return range(begin.withColumn(column), end);
+    }
+
+    public Range withBeginLine(int line) {
+        return range(begin.withLine(line), end);
+    }
+
+    public Range withEndColumn(int column) {
+        return range(begin, end.withColumn(column));
+    }
+
+    public Range withEndLine(int line) {
+        return range(begin, end.withLine(line));
+    }
+
+    public Range withBegin(Position begin) {
+        return range(begin, this.end);
+    }
+
+    public Range withEnd(Position end) {
+        return range(this.begin, end);
+    }
+
+    public boolean contains(Range other) {
+        return begin.isBefore(other.begin) && end.isAfter(other.end);
+    }
+
+    public boolean isBefore(Position position) {
+        return end.isBefore(position);
+    }
+
+    public boolean isAfter(Position position) {
+        return begin.isAfter(position);
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+
+        Range range = (Range) o;
+
+        return begin.equals(range.begin) && end.equals(range.end);
+
+    }
+
+    @Override
+    public int hashCode() {
+        return 31 * begin.hashCode() + end.hashCode();
+    }
+
+    @Override
+    public String toString() {
+        return begin+"-"+end;
+    }
+}
@@ -0,0 +1,47 @@
+/*
+ * Copyright (C) 2007-2010 Júlio Vilmar Gesser.
+ * Copyright (C) 2011, 2013-2016 The JavaParser Team.
+ *
+ * This file is part of JavaParser.
+ * 
+ * JavaParser can be used either under the terms of
+ * a) the GNU Lesser General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ * b) the terms of the Apache License 
+ *
+ * You should have received a copy of both licenses in LICENCE.LGPL and
+ * LICENCE.APACHE. Please refer to those files for details.
+ *
+ * JavaParser is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ */
+ 
+package com.github.javaparser.ast;
+
+/**
+ * Access specifier. Represents one of the possible levels of
+ * access permitted by the language.
+ *
+ * @author Federico Tomassetti
+ * @since July 2014
+ */
+public enum AccessSpecifier {
+
+    PUBLIC("public"),
+    PRIVATE("private"),
+    PROTECTED("protected"),
+    DEFAULT("");
+
+    private String codeRepresenation;
+
+    AccessSpecifier(String codeRepresentation) {
+        this.codeRepresenation = codeRepresentation;
+    }
+
+    public String getCodeRepresenation(){
+        return this.codeRepresenation;
+    }
+}
--- a/Show More
+++ b/Show More
				`@@ -1 +0,0 @@`
				`%windir%\system32\msiexec.exe /I{2A3B2FF5-A114-4CAB-88FB-DE8942D5B8EB}`
				`@@ -0,0 +1 @@`
				`%windir%\system32\msiexec.exe /x {596E7336-D5B9-449A-95E9-6040F354E283}`