diff --git a/.gitattributes b/.gitattributes index c4ee7d7e6..93534f51d 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,15 +1,5 @@ # These settings are for any web project -# Handle line endings automatically for files detected as text -# and leave all files detected as binary untouched. -* text=auto - -# Force the following filetypes to have unix eols, so Windows does not break them -*.* text eol=lf - -# Windows forced line-endings -/.idea/* text eol=crlf - # ## These files are binary and should be left untouched # @@ -37,3 +27,19 @@ *.ez binary *.bz2 binary *.swp binary + + +# Handle line endings automatically for files detected as text +# and leave all files detected as binary untouched. +* text=auto + +# Force the following filetypes to have unix eols, so Windows does not break them +# WARNING *.* causes problems with image files in GeneMap (see #448). +#*.* text eol=lf + +*.sh + + +# Windows forced line-endings +/.idea/* text eol=crlf + diff --git a/common/client-base/src/main/webapp/html/GeneMap/assets/img/Thumbs.db b/common/client-base/src/main/webapp/html/GeneMap/assets/img/Thumbs.db index 3928b8103..e00cbd364 100644 Binary files a/common/client-base/src/main/webapp/html/GeneMap/assets/img/Thumbs.db and b/common/client-base/src/main/webapp/html/GeneMap/assets/img/Thumbs.db differ diff --git a/common/client-base/src/main/webapp/html/GeneMap/assets/img/cluster_expand.png b/common/client-base/src/main/webapp/html/GeneMap/assets/img/cluster_expand.png index f14af21ed..dcaae0136 100644 Binary files a/common/client-base/src/main/webapp/html/GeneMap/assets/img/cluster_expand.png and b/common/client-base/src/main/webapp/html/GeneMap/assets/img/cluster_expand.png differ diff --git a/common/client-base/src/main/webapp/html/GeneMap/assets/img/cluster_expand_hover.png b/common/client-base/src/main/webapp/html/GeneMap/assets/img/cluster_expand_hover.png index 0a2bd6d67..0545d6638 100644 Binary files a/common/client-base/src/main/webapp/html/GeneMap/assets/img/cluster_expand_hover.png and b/common/client-base/src/main/webapp/html/GeneMap/assets/img/cluster_expand_hover.png differ diff --git a/common/client-base/src/main/webapp/html/GeneMap/assets/img/fence.png b/common/client-base/src/main/webapp/html/GeneMap/assets/img/fence.png index 3d435b229..f64ee8a1e 100644 Binary files a/common/client-base/src/main/webapp/html/GeneMap/assets/img/fence.png and b/common/client-base/src/main/webapp/html/GeneMap/assets/img/fence.png differ diff --git a/common/client-base/src/main/webapp/html/GeneMap/assets/img/fence_hover.png b/common/client-base/src/main/webapp/html/GeneMap/assets/img/fence_hover.png index 7826f4bd5..6e58742c1 100644 Binary files a/common/client-base/src/main/webapp/html/GeneMap/assets/img/fence_hover.png and b/common/client-base/src/main/webapp/html/GeneMap/assets/img/fence_hover.png differ diff --git a/common/client-base/src/main/webapp/html/GeneMap/assets/img/fit_to_size.png b/common/client-base/src/main/webapp/html/GeneMap/assets/img/fit_to_size.png index 5b9112f16..001e4efc2 100644 Binary files a/common/client-base/src/main/webapp/html/GeneMap/assets/img/fit_to_size.png and b/common/client-base/src/main/webapp/html/GeneMap/assets/img/fit_to_size.png differ diff --git a/common/client-base/src/main/webapp/html/GeneMap/assets/img/fit_to_size_disabled.png b/common/client-base/src/main/webapp/html/GeneMap/assets/img/fit_to_size_disabled.png index 4985e7e3a..98cac608f 100644 Binary files a/common/client-base/src/main/webapp/html/GeneMap/assets/img/fit_to_size_disabled.png and b/common/client-base/src/main/webapp/html/GeneMap/assets/img/fit_to_size_disabled.png differ diff --git a/common/client-base/src/main/webapp/html/GeneMap/assets/img/fit_to_size_hover.png b/common/client-base/src/main/webapp/html/GeneMap/assets/img/fit_to_size_hover.png index 5c439065f..98d0dfa8f 100644 Binary files a/common/client-base/src/main/webapp/html/GeneMap/assets/img/fit_to_size_hover.png and b/common/client-base/src/main/webapp/html/GeneMap/assets/img/fit_to_size_hover.png differ diff --git a/common/client-base/src/main/webapp/html/GeneMap/assets/img/gearwheel.png b/common/client-base/src/main/webapp/html/GeneMap/assets/img/gearwheel.png index 2e045d154..01d42bfaf 100644 Binary files a/common/client-base/src/main/webapp/html/GeneMap/assets/img/gearwheel.png and b/common/client-base/src/main/webapp/html/GeneMap/assets/img/gearwheel.png differ diff --git a/common/client-base/src/main/webapp/html/GeneMap/assets/img/gearwheel_disabled.png b/common/client-base/src/main/webapp/html/GeneMap/assets/img/gearwheel_disabled.png index 597c75fb3..4ae2616f2 100644 Binary files a/common/client-base/src/main/webapp/html/GeneMap/assets/img/gearwheel_disabled.png and b/common/client-base/src/main/webapp/html/GeneMap/assets/img/gearwheel_disabled.png differ diff --git a/common/client-base/src/main/webapp/html/GeneMap/assets/img/gearwheel_hover.png b/common/client-base/src/main/webapp/html/GeneMap/assets/img/gearwheel_hover.png index e0628d404..598f08b03 100644 Binary files a/common/client-base/src/main/webapp/html/GeneMap/assets/img/gearwheel_hover.png and b/common/client-base/src/main/webapp/html/GeneMap/assets/img/gearwheel_hover.png differ diff --git a/common/client-base/src/main/webapp/html/GeneMap/assets/img/graph.png b/common/client-base/src/main/webapp/html/GeneMap/assets/img/graph.png index 3c571990f..fbb6bf032 100644 Binary files a/common/client-base/src/main/webapp/html/GeneMap/assets/img/graph.png and b/common/client-base/src/main/webapp/html/GeneMap/assets/img/graph.png differ diff --git a/common/client-base/src/main/webapp/html/GeneMap/assets/img/graph_disabled.png b/common/client-base/src/main/webapp/html/GeneMap/assets/img/graph_disabled.png index e1378a565..3efb4b0cd 100644 Binary files a/common/client-base/src/main/webapp/html/GeneMap/assets/img/graph_disabled.png and b/common/client-base/src/main/webapp/html/GeneMap/assets/img/graph_disabled.png differ diff --git a/common/client-base/src/main/webapp/html/GeneMap/assets/img/graph_hover.png b/common/client-base/src/main/webapp/html/GeneMap/assets/img/graph_hover.png index 72d1b4da6..dd1d5ca44 100644 Binary files a/common/client-base/src/main/webapp/html/GeneMap/assets/img/graph_hover.png and b/common/client-base/src/main/webapp/html/GeneMap/assets/img/graph_hover.png differ diff --git a/common/client-base/src/main/webapp/html/GeneMap/assets/img/help.png b/common/client-base/src/main/webapp/html/GeneMap/assets/img/help.png index 9df5d3596..756dedb55 100644 Binary files a/common/client-base/src/main/webapp/html/GeneMap/assets/img/help.png and b/common/client-base/src/main/webapp/html/GeneMap/assets/img/help.png differ diff --git a/common/client-base/src/main/webapp/html/GeneMap/assets/img/help_disabled.png b/common/client-base/src/main/webapp/html/GeneMap/assets/img/help_disabled.png index 4db01d3f2..a1ece7f9a 100644 Binary files a/common/client-base/src/main/webapp/html/GeneMap/assets/img/help_disabled.png and b/common/client-base/src/main/webapp/html/GeneMap/assets/img/help_disabled.png differ diff --git a/common/client-base/src/main/webapp/html/GeneMap/assets/img/help_hover.png b/common/client-base/src/main/webapp/html/GeneMap/assets/img/help_hover.png index 72e02fdb4..c1a546369 100644 Binary files a/common/client-base/src/main/webapp/html/GeneMap/assets/img/help_hover.png and b/common/client-base/src/main/webapp/html/GeneMap/assets/img/help_hover.png differ diff --git a/common/client-base/src/main/webapp/html/GeneMap/assets/img/information.png b/common/client-base/src/main/webapp/html/GeneMap/assets/img/information.png index d9fcf028d..716db5a97 100644 Binary files a/common/client-base/src/main/webapp/html/GeneMap/assets/img/information.png and b/common/client-base/src/main/webapp/html/GeneMap/assets/img/information.png differ diff --git a/common/client-base/src/main/webapp/html/GeneMap/assets/img/information_hover.png b/common/client-base/src/main/webapp/html/GeneMap/assets/img/information_hover.png index 23ff0537d..92f752fd2 100644 Binary files a/common/client-base/src/main/webapp/html/GeneMap/assets/img/information_hover.png and b/common/client-base/src/main/webapp/html/GeneMap/assets/img/information_hover.png differ diff --git a/common/client-base/src/main/webapp/html/GeneMap/assets/img/layout_center.png b/common/client-base/src/main/webapp/html/GeneMap/assets/img/layout_center.png index 26030965a..5bb18fe08 100644 Binary files a/common/client-base/src/main/webapp/html/GeneMap/assets/img/layout_center.png and b/common/client-base/src/main/webapp/html/GeneMap/assets/img/layout_center.png differ diff --git a/common/client-base/src/main/webapp/html/GeneMap/assets/img/layout_center_disabled.png b/common/client-base/src/main/webapp/html/GeneMap/assets/img/layout_center_disabled.png index 679f347b7..b25479c2d 100644 Binary files a/common/client-base/src/main/webapp/html/GeneMap/assets/img/layout_center_disabled.png and b/common/client-base/src/main/webapp/html/GeneMap/assets/img/layout_center_disabled.png differ diff --git a/common/client-base/src/main/webapp/html/GeneMap/assets/img/layout_center_hover.png b/common/client-base/src/main/webapp/html/GeneMap/assets/img/layout_center_hover.png index a422b6447..0de4f7e3a 100644 Binary files a/common/client-base/src/main/webapp/html/GeneMap/assets/img/layout_center_hover.png and b/common/client-base/src/main/webapp/html/GeneMap/assets/img/layout_center_hover.png differ diff --git a/common/client-base/src/main/webapp/html/GeneMap/assets/img/minimize.png b/common/client-base/src/main/webapp/html/GeneMap/assets/img/minimize.png index f17c28c36..018552179 100644 Binary files a/common/client-base/src/main/webapp/html/GeneMap/assets/img/minimize.png and b/common/client-base/src/main/webapp/html/GeneMap/assets/img/minimize.png differ diff --git a/common/client-base/src/main/webapp/html/GeneMap/assets/img/minimize_disabled.png b/common/client-base/src/main/webapp/html/GeneMap/assets/img/minimize_disabled.png index aefcdca6f..238fbdc9d 100644 Binary files a/common/client-base/src/main/webapp/html/GeneMap/assets/img/minimize_disabled.png and b/common/client-base/src/main/webapp/html/GeneMap/assets/img/minimize_disabled.png differ diff --git a/common/client-base/src/main/webapp/html/GeneMap/assets/img/minimize_hover.png b/common/client-base/src/main/webapp/html/GeneMap/assets/img/minimize_hover.png index 66cba7916..3b027ffa4 100644 Binary files a/common/client-base/src/main/webapp/html/GeneMap/assets/img/minimize_hover.png and b/common/client-base/src/main/webapp/html/GeneMap/assets/img/minimize_hover.png differ diff --git a/common/client-base/src/main/webapp/html/GeneMap/assets/img/reset.png b/common/client-base/src/main/webapp/html/GeneMap/assets/img/reset.png index 12ff651f4..4358aeb3a 100644 Binary files a/common/client-base/src/main/webapp/html/GeneMap/assets/img/reset.png and b/common/client-base/src/main/webapp/html/GeneMap/assets/img/reset.png differ diff --git a/common/client-base/src/main/webapp/html/GeneMap/assets/img/reset_hover.png b/common/client-base/src/main/webapp/html/GeneMap/assets/img/reset_hover.png index 15cd26b70..1f5b8833e 100644 Binary files a/common/client-base/src/main/webapp/html/GeneMap/assets/img/reset_hover.png and b/common/client-base/src/main/webapp/html/GeneMap/assets/img/reset_hover.png differ diff --git a/common/client-base/src/main/webapp/html/GeneMap/assets/img/reset_selection.png b/common/client-base/src/main/webapp/html/GeneMap/assets/img/reset_selection.png index 708afdca9..8969d40d7 100644 Binary files a/common/client-base/src/main/webapp/html/GeneMap/assets/img/reset_selection.png and b/common/client-base/src/main/webapp/html/GeneMap/assets/img/reset_selection.png differ diff --git a/common/client-base/src/main/webapp/html/GeneMap/assets/img/reset_selection_hover.png b/common/client-base/src/main/webapp/html/GeneMap/assets/img/reset_selection_hover.png index 16ef7a2cc..83bafae13 100644 Binary files a/common/client-base/src/main/webapp/html/GeneMap/assets/img/reset_selection_hover.png and b/common/client-base/src/main/webapp/html/GeneMap/assets/img/reset_selection_hover.png differ diff --git a/common/client-base/src/main/webapp/html/GeneMap/assets/img/save.png b/common/client-base/src/main/webapp/html/GeneMap/assets/img/save.png index b0730e414..4eb747891 100644 Binary files a/common/client-base/src/main/webapp/html/GeneMap/assets/img/save.png and b/common/client-base/src/main/webapp/html/GeneMap/assets/img/save.png differ diff --git a/common/client-base/src/main/webapp/html/GeneMap/assets/img/save_all.png b/common/client-base/src/main/webapp/html/GeneMap/assets/img/save_all.png index 3975a62b2..32e1c2725 100644 Binary files a/common/client-base/src/main/webapp/html/GeneMap/assets/img/save_all.png and b/common/client-base/src/main/webapp/html/GeneMap/assets/img/save_all.png differ diff --git a/common/client-base/src/main/webapp/html/GeneMap/assets/img/save_all_hover.png b/common/client-base/src/main/webapp/html/GeneMap/assets/img/save_all_hover.png index fda618566..416c4793a 100644 Binary files a/common/client-base/src/main/webapp/html/GeneMap/assets/img/save_all_hover.png and b/common/client-base/src/main/webapp/html/GeneMap/assets/img/save_all_hover.png differ diff --git a/common/client-base/src/main/webapp/html/GeneMap/assets/img/save_hover.png b/common/client-base/src/main/webapp/html/GeneMap/assets/img/save_hover.png index 6cb85797e..7484956bb 100644 Binary files a/common/client-base/src/main/webapp/html/GeneMap/assets/img/save_hover.png and b/common/client-base/src/main/webapp/html/GeneMap/assets/img/save_hover.png differ diff --git a/common/client-base/src/main/webapp/html/GeneMap/assets/img/tag_auto.png b/common/client-base/src/main/webapp/html/GeneMap/assets/img/tag_auto.png index 62c041262..5dd15957d 100644 Binary files a/common/client-base/src/main/webapp/html/GeneMap/assets/img/tag_auto.png and b/common/client-base/src/main/webapp/html/GeneMap/assets/img/tag_auto.png differ diff --git a/common/client-base/src/main/webapp/html/GeneMap/assets/img/tag_auto_hover.png b/common/client-base/src/main/webapp/html/GeneMap/assets/img/tag_auto_hover.png index 17f4650fb..bd1eaeb9e 100644 Binary files a/common/client-base/src/main/webapp/html/GeneMap/assets/img/tag_auto_hover.png and b/common/client-base/src/main/webapp/html/GeneMap/assets/img/tag_auto_hover.png differ diff --git a/common/client-base/src/main/webapp/html/GeneMap/assets/img/tag_hide.png b/common/client-base/src/main/webapp/html/GeneMap/assets/img/tag_hide.png index 7fb078534..dd825b4f1 100644 Binary files a/common/client-base/src/main/webapp/html/GeneMap/assets/img/tag_hide.png and b/common/client-base/src/main/webapp/html/GeneMap/assets/img/tag_hide.png differ diff --git a/common/client-base/src/main/webapp/html/GeneMap/assets/img/tag_hide_hover.png b/common/client-base/src/main/webapp/html/GeneMap/assets/img/tag_hide_hover.png index bfdf10a04..db055e910 100644 Binary files a/common/client-base/src/main/webapp/html/GeneMap/assets/img/tag_hide_hover.png and b/common/client-base/src/main/webapp/html/GeneMap/assets/img/tag_hide_hover.png differ diff --git a/common/client-base/src/main/webapp/html/GeneMap/assets/img/tag_manual.png b/common/client-base/src/main/webapp/html/GeneMap/assets/img/tag_manual.png index cd4bbcbc6..3ebc1ae96 100644 Binary files a/common/client-base/src/main/webapp/html/GeneMap/assets/img/tag_manual.png and b/common/client-base/src/main/webapp/html/GeneMap/assets/img/tag_manual.png differ diff --git a/common/client-base/src/main/webapp/html/GeneMap/assets/img/tag_manual_hover.png b/common/client-base/src/main/webapp/html/GeneMap/assets/img/tag_manual_hover.png index f40fc20e6..9cf94d0b1 100644 Binary files a/common/client-base/src/main/webapp/html/GeneMap/assets/img/tag_manual_hover.png and b/common/client-base/src/main/webapp/html/GeneMap/assets/img/tag_manual_hover.png differ diff --git a/common/client-base/src/main/webapp/html/GeneMap/assets/img/tag_show.png b/common/client-base/src/main/webapp/html/GeneMap/assets/img/tag_show.png index f246bbca2..a5e5dba09 100644 Binary files a/common/client-base/src/main/webapp/html/GeneMap/assets/img/tag_show.png and b/common/client-base/src/main/webapp/html/GeneMap/assets/img/tag_show.png differ diff --git a/common/client-base/src/main/webapp/html/GeneMap/assets/img/tag_show_hover.png b/common/client-base/src/main/webapp/html/GeneMap/assets/img/tag_show_hover.png index 4a40f29d9..0d7d1457e 100644 Binary files a/common/client-base/src/main/webapp/html/GeneMap/assets/img/tag_show_hover.png and b/common/client-base/src/main/webapp/html/GeneMap/assets/img/tag_show_hover.png differ diff --git a/common/client-base/src/main/webapp/html/GeneMap/docs/img/fit_to_size.png b/common/client-base/src/main/webapp/html/GeneMap/docs/img/fit_to_size.png index 5b9112f16..001e4efc2 100644 Binary files a/common/client-base/src/main/webapp/html/GeneMap/docs/img/fit_to_size.png and b/common/client-base/src/main/webapp/html/GeneMap/docs/img/fit_to_size.png differ diff --git a/common/client-base/src/main/webapp/html/GeneMap/docs/img/gearwheel.png b/common/client-base/src/main/webapp/html/GeneMap/docs/img/gearwheel.png index 2e045d154..01d42bfaf 100644 Binary files a/common/client-base/src/main/webapp/html/GeneMap/docs/img/gearwheel.png and b/common/client-base/src/main/webapp/html/GeneMap/docs/img/gearwheel.png differ diff --git a/common/client-base/src/main/webapp/html/GeneMap/docs/img/graph.png b/common/client-base/src/main/webapp/html/GeneMap/docs/img/graph.png index 3c571990f..fbb6bf032 100644 Binary files a/common/client-base/src/main/webapp/html/GeneMap/docs/img/graph.png and b/common/client-base/src/main/webapp/html/GeneMap/docs/img/graph.png differ diff --git a/common/client-base/src/main/webapp/html/GeneMap/docs/img/layout_center.png b/common/client-base/src/main/webapp/html/GeneMap/docs/img/layout_center.png index 26030965a..5bb18fe08 100644 Binary files a/common/client-base/src/main/webapp/html/GeneMap/docs/img/layout_center.png and b/common/client-base/src/main/webapp/html/GeneMap/docs/img/layout_center.png differ diff --git a/common/client-base/src/main/webapp/html/GeneMap/docs/img/reset_selection.png b/common/client-base/src/main/webapp/html/GeneMap/docs/img/reset_selection.png index 708afdca9..8969d40d7 100644 Binary files a/common/client-base/src/main/webapp/html/GeneMap/docs/img/reset_selection.png and b/common/client-base/src/main/webapp/html/GeneMap/docs/img/reset_selection.png differ diff --git a/common/client-base/src/main/webapp/html/GeneMap/docs/img/save.png b/common/client-base/src/main/webapp/html/GeneMap/docs/img/save.png index b0730e414..4eb747891 100644 Binary files a/common/client-base/src/main/webapp/html/GeneMap/docs/img/save.png and b/common/client-base/src/main/webapp/html/GeneMap/docs/img/save.png differ diff --git a/common/server-datasource-ondexlocal/src/main/java/rres/knetminer/datasource/ondexlocal/OndexServiceProvider.java b/common/server-datasource-ondexlocal/src/main/java/rres/knetminer/datasource/ondexlocal/OndexServiceProvider.java index 372f7ca0b..c34b4c5dc 100644 --- a/common/server-datasource-ondexlocal/src/main/java/rres/knetminer/datasource/ondexlocal/OndexServiceProvider.java +++ b/common/server-datasource-ondexlocal/src/main/java/rres/knetminer/datasource/ondexlocal/OndexServiceProvider.java @@ -465,7 +465,7 @@ private void indexOndexGraph(String graphFileName, String dataPath) { lenv = new LuceneEnv(indexFile.getAbsolutePath(), !indexFile.exists()); lenv.addONDEXListener(new ONDEXLogger()); // sends certain events to the logger. lenv.setONDEXGraph(graph); - log.info("Lucene Index created"); + log.info("Lucene Index created"); } catch (Exception e) {