Skip to content

Commit

Permalink
CorrectLegend
Browse files Browse the repository at this point in the history
Correct the year in the initial settings dialog and the imprint in
produced output files.
  • Loading branch information
hansenjn committed Dec 10, 2019
1 parent 2fdf34c commit 61d3afd
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 3 deletions.
9 changes: 9 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
target/
pom.xml.tag
pom.xml.releaseBackup
pom.xml.versionsBackup
pom.xml.next
release.properties
dependency-reduced-pom.xml
buildNumber.properties
.mvn/timing.properties
9 changes: 6 additions & 3 deletions src/main/java/ciliaQ_jnh/CiliaQMain.java
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ public class CiliaQMain implements PlugIn, Measurements {
static SimpleDateFormat NameDateFormatter = new SimpleDateFormat("yyMMdd_HHmmss");
static SimpleDateFormat FullDateFormatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
static SimpleDateFormat FullDateFormatter2 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
static SimpleDateFormat YearOnly = new SimpleDateFormat("yyyy");

//Progress Dialog
ProgressDialog progress;
Expand Down Expand Up @@ -113,7 +114,7 @@ public void run(String arg) {
GenericDialog gd = new GenericDialog(PLUGINNAME + " - set parameters");
//show Dialog-----------------------------------------------------------------
//Note: .setInsets(top, left, bottom)
gd.setInsets(0,0,0); gd.addMessage(PLUGINNAME + ", Version " + PLUGINVERSION + ", \u00a9 2016 - 2019 JN Hansen", SuperHeadingFont);
gd.setInsets(0,0,0); gd.addMessage(PLUGINNAME + ", Version " + PLUGINVERSION + ", \u00a9 2017 - 2019 JN Hansen", SuperHeadingFont);
gd.setInsets(5,0,0); gd.addChoice("process ", taskVariant, selectedTaskVariant);

// gd.setInsets(10,0,0); gd.addMessage("Calibration", HeadingFont);
Expand Down Expand Up @@ -450,7 +451,8 @@ public void windowClosing(WindowEvent winEvt) {

public void addFooter(TextPanel tp, Date currentDate){
tp.append("");
tp.append("Datafile was generated on " + FullDateFormatter2.format(currentDate) + " by '"+PLUGINNAME+"', an ImageJ plug-in by Jan Niklas Hansen ([email protected]).");
tp.append("Datafile was generated on " + FullDateFormatter2.format(currentDate) + " by the imagej plug-in '"+PLUGINNAME+"', "
+ "\u00a9 2017 - " + YearOnly.format(new Date()) + " Jan Niklas Hansen ([email protected]).");
tp.append("The plug-in '"+PLUGINNAME+"' 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.");
Expand All @@ -459,7 +461,8 @@ public void addFooter(TextPanel tp, Date currentDate){
}

public String getOneRowFooter(Date currentDate){
String appendTxt = " " + ("Datafile was generated on " + FullDateFormatter2.format(currentDate) + " by '"+PLUGINNAME+"', an ImageJ plug-in by Jan Niklas Hansen ([email protected]).");
String appendTxt = " " + ("Datafile was generated on " + FullDateFormatter2.format(currentDate) + " by the imagej plug-in '"+PLUGINNAME+"', "
+ "\u00a9 2017 - " + YearOnly.format(new Date()) + " Jan Niklas Hansen ([email protected]).");
appendTxt += " " + ("The plug-in '"+PLUGINNAME+"' 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.");
Expand Down

0 comments on commit 61d3afd

Please sign in to comment.