Add a new logo and add credits (#195)

Replace logo, add it to the, fix contact information and add credits.

README.md

@@ -1,3 +1,7 @@
+<p align="center"> 
+	<img alt="JPlag logo" src="jplag/src/main/resources/de/jplag/reporting/data/logo-dark.png">
+</p>
+
 # JPlag - Detecting Software Plagiarism
 
 [![Maven Workflow](https://github.com/jplag/jplag/actions/workflows/maven.yml/badge.svg)](https://github.com/jplag/jplag/actions/workflows/maven.yml)

jplag/src/main/java/de/jplag/CLI.java

@@ -33,6 +33,8 @@ import net.sourceforge.argparse4j.inf.Namespace;
  */
 public class CLI {
 
+    private static final String CREDITS = "Created by IPD Tichy, Guido Malpohl, and others. JPlag logo designed by Sandro Koch. Currently maintained by Sebastian Hahner and Timur Saglam.";
+
     private static final String[] DESCRIPTIONS = {"Detecting Software Plagiarism", "Software-Archaeological Playground", "Since 1996",
             "Scientifically Published", "Maintained by SDQ", "RIP Structure and Table", "What else?", "You have been warned!", "Since Java 1.0",
             "More Abstract than Tree", "Students Nightmare", "No, changing variable names does not work", "The tech is out there!"};
@@ -116,6 +118,6 @@ public class CLI {
 
     private String generateDescription() {
         var randomDescription = DESCRIPTIONS[new Random().nextInt(DESCRIPTIONS.length)];
-        return String.format("JPlag - %s", randomDescription);
+        return String.format("JPlag - %s" + System.lineSeparator() + CREDITS, randomDescription);
     }
 }

jplag/src/main/java/de/jplag/reporting/Report.java

@@ -78,7 +78,7 @@ public class Report { // Mostly legacy code with some minor improvements.
      * This procedure copies all the data from "data/" into the result-directory.
      */
     private void copyStaticFiles() {
-        final String[] fileList = {"back.gif", "forward.gif", "help-en.html", "help-sim-en.html", "logo.gif", "fields.js"};
+        final String[] fileList = {"back.gif", "forward.gif", "help-en.html", "help-sim-en.html", "logo.png", "fields.js"};
 
         for (int i = fileList.length - 1; i >= 0; i--) {
             try {
@@ -430,7 +430,7 @@ public class Report { // Mostly legacy code with some minor improvements.
 
         htmlFile.println("<BODY BGCOLOR=#ffffff LINK=#000088 VLINK=#000000 TEXT=#000000>");
         htmlFile.println("<TABLE ALIGN=center CELLPADDING=2 CELLSPACING=1>");
-        htmlFile.println("<TR VALIGN=middle ALIGN=center BGCOLOR=#ffffff><TD>" + "<IMG SRC=\"logo.gif\" ALT=\"JPlag\" BORDER=0></TD>");
+        htmlFile.println("<TR VALIGN=middle ALIGN=center BGCOLOR=#ffffff><TD>" + "<IMG SRC=\"logo.png\" ALT=\"JPlag\" BORDER=0></TD>");
         htmlFile.println("<TD><H1><BIG>" + title + "</BIG></H1></TD></TR>");
 
         htmlFile.println("<TR BGCOLOR=#aaaaff VALIGN=top><TD>" + msg.getString("Report.Language") + ":</TD><TD>"

jplag/src/main/resources/de/jplag/reporting/data/help-de.html

@@ -5,7 +5,7 @@
 
 <BODY BGCOLOR="#ffffff" LINK="#000088" VLINK="#000000" TEXT="#000000">
 
-<center><IMG SRC="logo.gif" ALT="JPlag" BORDER="0"></center>
+<center><IMG SRC="logo.png" ALT="JPlag" BORDER="0"></center>
 
 <h1>Wie man die Ergebnisse liest</h1>
 
@@ -45,6 +45,6 @@ werden.
 <p>
 
 <hr>
-<small><a href="mailto:jplag@ipd.kit.edu">Guido Malpohl</a></small>
+<small><a href="mailto:jplag@ipd.kit.edu">Kontakt</a></small>
 </body>
 </html>

jplag/src/main/resources/de/jplag/reporting/data/help-en.html

@@ -5,7 +5,7 @@
 
 <BODY BGCOLOR="#ffffff" LINK="#000088" VLINK="#000000" TEXT="#000000">
 
-<center><IMG SRC="logo.gif" ALT="JPlag" BORDER="0"></center>
+<center><IMG SRC="logo.png" ALT="JPlag" BORDER="0"></center>
 
 <h1>How to read the results</h1>
 
@@ -47,6 +47,6 @@ of the row.
 <p>
 
 <hr>
-<small><a href="mailto:jplag@ipd.kit.edu">Guido Malpohl</a></small>
+<small><a href="mailto:jplag@ipd.kit.edu">contact us</a></small>
 </body>
 </html>

jplag/src/main/resources/de/jplag/reporting/data/help-es.html

@@ -5,7 +5,7 @@
 
 <BODY BGCOLOR="#ffffff" LINK="#000088" VLINK="#000000" TEXT="#000000">
 
-<center><IMG SRC="logo.gif" ALT="JPlag" BORDER="0"></center>
+<center><IMG SRC="logo.png" ALT="JPlag" BORDER="0"></center>
 
 <h1>Cómo leer los resultados</h1>
 
@@ -48,6 +48,6 @@ El parrafo tiene el color del rectángulo pequeño en el borde izquierdo de la f
 <p>
 
 <hr>
-<small><a href="mailto:jplag@ipd.kit.edu">Guido Malpohl</a></small>
+<small><a href="mailto:jplag@ipd.kit.edu">contacto</a></small>
 </body>
 </html>

jplag/src/main/resources/de/jplag/reporting/data/help-fr.html

@@ -5,7 +5,7 @@
 
 <BODY BGCOLOR="#ffffff" LINK="#000088" VLINK="#000000" TEXT="#000000">
 
-<center><IMG SRC="logo.gif" ALT="JPlag" BORDER="0"></center>
+<center><IMG SRC="logo.png" ALT="JPlag" BORDER="0"></center>
 
 <h1>How to read the results</h1>
 
@@ -47,6 +47,6 @@ of the row.
 <p>
 
 <hr>
-<small><a href="mailto:jplag@ipd.kit.edu">Guido Malpohl</a></small>
+<small><a href="mailto:jplag@ipd.kit.edu">contactez-nous</a></small>
 </body>
 </html>

jplag/src/main/resources/de/jplag/reporting/data/help-pt.html

@@ -5,7 +5,7 @@
 
 <BODY BGCOLOR="#ffffff" LINK="#000088" VLINK="#000000" TEXT="#000000">
 
-<center><IMG SRC="logo.gif" ALT="JPlag" BORDER="0"></center>
+<center><IMG SRC="logo.png" ALT="JPlag" BORDER="0"></center>
 
 <h1>How to read the results</h1>
 
@@ -47,6 +47,6 @@ of the row.
 <p>
 
 <hr>
-<small><a href="mailto:jplag@ipd.kit.edu">Guido Malpohl</a></small>
+<small><a href="mailto:jplag@ipd.kit.edu">contact us</a></small>
 </body>
 </html>

jplag/src/main/resources/de/jplag/reporting/data/help-ptbr.html

@@ -6,7 +6,7 @@
  content="text/html; charset=UTF-8">
 </head>
 <body bgcolor="#ffffff" link="#000088" text="#000000" vlink="#000000">
-<center><img src="logo.gif" alt="JPlag" border="0"></center>
+<center><img src="logo.png" alt="JPlag" border="0"></center>
 <h1>Como ler os resultados</h1>
 <p>A janela est&aacute; dividida em 4 blocos:
 </p>
@@ -68,6 +68,6 @@ O trecho tem a cor de um pequeno retângulo na fronteira esquerda da coluna.
 <p><a href="index.html">INDEX</a>
 </p>
 <p></p>
-<hr><small><a href="mailto:jplag@ipd.kit.edu">Guido Malpohl</a></small>
+<hr><small><a href="mailto:jplag@ipd.kit.edu">contact us</a></small>
 </body>
 </html>

jplag/src/main/resources/de/jplag/reporting/data/help-sim-de.html

@@ -5,7 +5,7 @@
 
 <BODY BGCOLOR="#ffffff" LINK="#000088" VLINK="#000000" TEXT="#000000">
 
-<center><IMG SRC="logo.gif" ALT="JPlag" BORDER="0"></center>
+<center><IMG SRC="logo.png" ALT="JPlag" BORDER="0"></center>
 
 <h1>Match ranking</h1>
 
@@ -33,6 +33,6 @@ of the plagiarized program.</p>
 <p/>
 
 <hr/>
-<small><a href="mailto:jplag@ipd.kit.edu">Guido Malpohl</a></small>
+<small><a href="mailto:jplag@ipd.kit.edu">contact us</a></small>
 </body>
 </html>

jplag/src/main/resources/de/jplag/reporting/data/help-sim-en.html

@@ -5,7 +5,7 @@
 
 <BODY BGCOLOR="#ffffff" LINK="#000088" VLINK="#000000" TEXT="#000000">
 
-<center><IMG SRC="logo.gif" ALT="JPlag" BORDER="0"></center>
+<center><IMG SRC="logo.png" ALT="JPlag" BORDER="0"></center>
 
 <h1>Match ranking</h1>
 
@@ -33,6 +33,6 @@ of the plagiarized program.</p>
 <p/>
 
 <hr/>
-<small><a href="mailto:jplag@ipd.kit.edu">Guido Malpohl</a></small>
+<small><a href="mailto:jplag@ipd.kit.edu">contact us</a></small>
 </body>
 </html>

jplag/src/main/resources/de/jplag/reporting/data/help-sim-es.html

@@ -5,7 +5,7 @@
 
 <BODY BGCOLOR="#ffffff" LINK="#000088" VLINK="#000000" TEXT="#000000">
 
-<center><IMG SRC="logo.gif" ALT="JPlag" BORDER="0"></center>
+<center><IMG SRC="logo.png" ALT="JPlag" BORDER="0"></center>
 
 <h1>Ranking de coincidencias</h1>
 
@@ -34,6 +34,6 @@ para que no se distinga respecto al programa plagiado.</p>
 <p/>
 
 <hr/>
-<small><a href="mailto:jplag@ipd.kit.edu">Guido Malpohl</a></small>
+<small><a href="mailto:jplag@ipd.kit.edu">contact us</a></small>
 </body>
 </html>

jplag/src/main/resources/de/jplag/reporting/data/help-sim-fr.html

@@ -5,7 +5,7 @@
 
 <BODY BGCOLOR="#ffffff" LINK="#000088" VLINK="#000000" TEXT="#000000">
 
-<center><IMG SRC="logo.gif" ALT="JPlag" BORDER="0"></center>
+<center><IMG SRC="logo.png" ALT="JPlag" BORDER="0"></center>
 
 <h1>Match ranking</h1>
 
@@ -33,6 +33,6 @@ of the plagiarized program.</p>
 <p/>
 
 <hr/>
-<small><a href="mailto:jplag@ipd.kit.edu">Guido Malpohl</a></small>
+<small><a href="mailto:jplag@ipd.kit.edu">contact us</a></small>
 </body>
 </html>

jplag/src/main/resources/de/jplag/reporting/data/help-sim-pt.html

@@ -5,7 +5,7 @@
 
 <BODY BGCOLOR="#ffffff" LINK="#000088" VLINK="#000000" TEXT="#000000">
 
-<center><IMG SRC="logo.gif" ALT="JPlag" BORDER="0"></center>
+<center><IMG SRC="logo.png" ALT="JPlag" BORDER="0"></center>
 
 <h1>Match ranking</h1>
 
@@ -33,6 +33,6 @@ of the plagiarized program.</p>
 <p/>
 
 <hr/>
-<small><a href="mailto:jplag@ipd.kit.edu">Guido Malpohl</a></small>
+<small><a href="mailto:jplag@ipd.kit.edu">contact us</a></small>
 </body>
 </html>

jplag/src/main/resources/de/jplag/reporting/data/help-sim-ptbr.html

@@ -5,7 +5,7 @@
 
 <BODY BGCOLOR="#ffffff" LINK="#000088" VLINK="#000000" TEXT="#000000">
 
-<center><IMG SRC="logo.gif" ALT="JPlag" BORDER="0"></center>
+<center><IMG SRC="logo.png" ALT="JPlag" BORDER="0"></center>
 
 <h1>Ranking de Equivalências</h1>
 
@@ -33,6 +33,6 @@ de enganar um programa que busca plágios.</p>
 <p/>
 
 <hr/>
-<small><a href="mailto:jplag@ipd.kit.edu">Guido Malpohl</a></small>
+<small><a href="mailto:jplag@ipd.kit.edu">contact us</a></small>
 </body>
 </html>

jplag/src/test/java/de/jplag/TestBase.java

@@ -2,9 +2,6 @@ package de.jplag;
 
 import java.util.function.Consumer;
 
-import de.jplag.ExitException;
-import de.jplag.JPlag;
-import de.jplag.JPlagResult;
 import de.jplag.options.JPlagOptions;
 import de.jplag.options.LanguageOption;
 import de.jplag.options.Verbosity;