Skip to content

Commit

Permalink
Merge pull request #2 from MesquiteProject/development
Browse files Browse the repository at this point in the history 
Final version 1.5
  • Loading branch information
@DMaddison
DMaddison authored Jan 1, 2017
2 parents 4435c69 + eee9116 commit cf104e9
Show file tree
Hide file tree
Showing 18 changed files with 41 additions and 42 deletions.
4 changes: 2 additions & 2 deletions Source/mesquite/cartographer/aCartographerIntro/Templates/standard.dwt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<div id="banner"><img src="../splash.gif" width="164" height="64"></div>
<div id="mainTitle"><font id="packageName"><b>Cartographer</b></font><BR>
<font id="version">Version 1.5<br>
23 December 2016</font><BR>
1 January 2017</font><BR>
David R. Maddison and Wayne P. Maddison</div>
<div id="subtitle"><!-- TemplateBeginEditable name="subtitle" -->subtitle<!-- TemplateEndEditable --></div>

Expand Down Expand Up @@ -54,7 +54,7 @@
</div>
<div id="navBarExtension">&nbsp;</div>
<!--end navbar -->
<div id="siteInfo"> Copyright &copy; 2016 <a href="http://david.bembidion.org">David
<div id="siteInfo"> Copyright &copy; 2017 <a href="http://david.bembidion.org">David
R. Maddison</a> and <a href="http://salticidae.org/wpm/home.html">Wayne P.
Maddison</a> </div>
<br>
Expand Down
2 changes: 1 addition & 1 deletion Source/mesquite/cartographer/aCartographerIntro/aCartographerIntro.java
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
/* Mesquite.cartographer source code. Copyright 2008-2009 D. Maddison and W. Maddison. Version 1.3, June 2008.Disclaimer: The Mesquite source code is lengthy and we are few. There are no doubt inefficiencies and goofs in this code. The commenting leaves much to be desired. Please approach this source code with the spirit of helping out.Perhaps with your help we can be more than a few, and make Mesquite better.Mesquite is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY.Mesquite's web site is http://mesquiteproject.orgThis source code and its compiled class files are free and modifiable under the terms of GNU Lesser General Public License. (http://www.gnu.org/copyleft/lesser.html)*/package mesquite.cartographer.aCartographerIntro;import mesquite.lib.MesquiteTrunk;import mesquite.lib.duties.*;/* ======================================================================== */public class aCartographerIntro extends PackageIntro { /*.................................................................................................................*/ public boolean startJob(String arguments, Object condition, boolean hiredByName) { return true; } public Class getDutyClass(){ return aCartographerIntro.class; } /*.................................................................................................................*/ public String getExplanation() { return "Cartographer is a package of Mesquite modules providing tools for plotting data in geographic space."; } /*.................................................................................................................*/ public String getName() { return "Cartographer Package"; } /*.................................................................................................................*/ /** Returns the name of the package of modules (e.g., "Basic Mesquite Package", "Rhetenor")*/ public String getPackageName(){ return "Cartographer Package"; } /*.................................................................................................................*/ /** Returns citation for a package of modules*/ public String getPackageCitation(){ return "Maddison, D.R., & W.P. Maddison. 2017. Cartographer: A Mesquite package for plotting geographic data. Version " + getPackageVersion() +" http://mesquiteproject.org/packages/cartographer"; } /*.................................................................................................................*/ /** Returns whether there is a splash banner*/ public boolean hasSplash(){ return true; } /*.................................................................................................................*/ /** returns the URL of the notices file for this module so that it can phone home and check for messages */ /*.................................................................................................................*/ public String getHomePhoneNumber(){ if (MesquiteTrunk.debugMode) return "https://raw.githubusercontent.com/MesquiteProject/Cartographer/development/noticesAndUpdates/noticesDev.xml"; else if (!isPrerelease()) return "https://raw.githubusercontent.com/MesquiteProject/Cartographer/master/noticesAndUpdates/notices.xml"; else return "https://raw.githubusercontent.com/MesquiteProject/Cartographer/development/noticesAndUpdates/noticesPrerelease.xml"; } /*.................................................................................................................*/ public String getPackageURL(){ return "http://mesquiteproject.org/packages/cartographer"; } /*.................................................................................................................*/ /** Returns version for a package of modules*/ public String getPackageVersion(){ return "1.5-"; } /*.................................................................................................................*/ /** Returns version for a package of modules as an integer*/ public int getPackageVersionInt(){ return 150; } public String getPackageDateReleased(){ return "31 December 2016"; } /*.................................................................................................................*/ /** Returns build number for a package of modules as an integer*/ public int getPackageBuildNumber(){ return 26; } /* release dates: v1.0 5 May 2006 v1.2 19 September 2007 v1.3 8 June 2008 v1.31 1 January 2009 v1.4 19 August 2014 v1.41 29 August 2014 * */ /*.................................................................................................................*/ public int getVersionOfFirstRelease(){ return 260; }}
/* Mesquite.cartographer source code. Copyright 2008-2009 D. Maddison and W. Maddison. Version 1.3, June 2008.Disclaimer: The Mesquite source code is lengthy and we are few. There are no doubt inefficiencies and goofs in this code. The commenting leaves much to be desired. Please approach this source code with the spirit of helping out.Perhaps with your help we can be more than a few, and make Mesquite better.Mesquite is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY.Mesquite's web site is http://mesquiteproject.orgThis source code and its compiled class files are free and modifiable under the terms of GNU Lesser General Public License. (http://www.gnu.org/copyleft/lesser.html)*/package mesquite.cartographer.aCartographerIntro;import mesquite.lib.MesquiteTrunk;import mesquite.lib.duties.*;/* ======================================================================== */public class aCartographerIntro extends PackageIntro { /*.................................................................................................................*/ public boolean startJob(String arguments, Object condition, boolean hiredByName) { return true; } public Class getDutyClass(){ return aCartographerIntro.class; } /*.................................................................................................................*/ public String getExplanation() { return "Cartographer is a package of Mesquite modules providing tools for plotting data in geographic space."; } /*.................................................................................................................*/ public String getName() { return "Cartographer Package"; } /*.................................................................................................................*/ /** Returns the name of the package of modules (e.g., "Basic Mesquite Package", "Rhetenor")*/ public String getPackageName(){ return "Cartographer Package"; } /*.................................................................................................................*/ /** Returns citation for a package of modules*/ public String getPackageCitation(){ return "Maddison, D.R., & W.P. Maddison. 2017. Cartographer: A Mesquite package for plotting geographic data. Version " + getPackageVersion() +" http://mesquiteproject.org/packages/cartographer"; } /*.................................................................................................................*/ /** Returns whether there is a splash banner*/ public boolean hasSplash(){ return true; } /*.................................................................................................................*/ /** returns the URL of the notices file for this module so that it can phone home and check for messages */ /*.................................................................................................................*/ public String getHomePhoneNumber(){ if (MesquiteTrunk.debugMode) return "https://raw.githubusercontent.com/MesquiteProject/Cartographer/development/noticesAndUpdates/noticesDev.xml"; else if (!isPrerelease()) return "https://raw.githubusercontent.com/MesquiteProject/Cartographer/master/noticesAndUpdates/notices.xml"; else return "https://raw.githubusercontent.com/MesquiteProject/Cartographer/development/noticesAndUpdates/noticesPrerelease.xml"; } /*.................................................................................................................*/ public String getPackageURL(){ return "http://mesquiteproject.org/packages/cartographer"; } /*.................................................................................................................*/ /** Returns version for a package of modules*/ public String getPackageVersion(){ return "1.50"; } /*.................................................................................................................*/ /** Returns version for a package of modules as an integer*/ public int getPackageVersionInt(){ return 150; } public String getPackageDateReleased(){ return "1 January 2017"; } /*.................................................................................................................*/ /** Returns build number for a package of modules as an integer*/ public int getPackageBuildNumber(){ return 30; } /* release dates: v1.0 5 May 2006 v1.2 19 September 2007 v1.3 8 June 2008 v1.31 1 January 2009 v1.4 19 August 2014 v1.41 29 August 2014 v1.50 1 January 2017 (build 30) * */ /*.................................................................................................................*/ public int getVersionOfFirstRelease(){ return 260; }}
Expand Down
4 changes: 2 additions & 2 deletions Source/mesquite/cartographer/aCartographerIntro/acknowledgements.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<div id="banner"><img src="splash.gif" width="164" height="64"></div>
<div id="mainTitle"><font id="packageName"><b>Cartographer</b></font><BR>
<font id="version">Version 1.5<br>
23 December 2016</font><BR>
1 January 2017</font><BR>
David R. Maddison and Wayne P. Maddison</div>
<div id="subtitle"><!-- #BeginEditable "subtitle" --><font size="5" face="Georgia, Times New Roman, Times, serif"><em>Acknowledgements</em></font><!-- #EndEditable --></div>

Expand Down Expand Up @@ -69,7 +69,7 @@
</div>
<div id="navBarExtension">&nbsp;</div>
<!--end navbar -->
<div id="siteInfo"> Copyright &copy; 2016 <a href="http://david.bembidion.org">David
<div id="siteInfo"> Copyright &copy; 2017 <a href="http://david.bembidion.org">David
R. Maddison</a> and <a href="http://salticidae.org/wpm/home.html">Wayne P.
Maddison</a> </div>
<br>
Expand Down
4 changes: 2 additions & 2 deletions Source/mesquite/cartographer/aCartographerIntro/ancestral.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<div id="banner"><img src="splash.gif" width="164" height="64"></div>
<div id="mainTitle"><font id="packageName"><b>Cartographer</b></font><BR>
<font id="version">Version 1.5<br>
23 December 2016</font><BR>
1 January 2017</font><BR>
David R. Maddison and Wayne P. Maddison</div>
<div id="subtitle"><!-- #BeginEditable "subtitle" --><font size="5" face="Georgia, Times New Roman, Times, serif"><em>Ancestral
Locations</em></font><!-- #EndEditable --></div>
Expand Down Expand Up @@ -71,7 +71,7 @@
</div>
<div id="navBarExtension">&nbsp;</div>
<!--end navbar -->
<div id="siteInfo"> Copyright &copy; 2016 <a href="http://david.bembidion.org">David
<div id="siteInfo"> Copyright &copy; 2017 <a href="http://david.bembidion.org">David
R. Maddison</a> and <a href="http://salticidae.org/wpm/home.html">Wayne P.
Maddison</a> </div>
<br>
Expand Down
4 changes: 2 additions & 2 deletions Source/mesquite/cartographer/aCartographerIntro/calibration.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<div id="banner"><img src="splash.gif" width="164" height="64"></div>
<div id="mainTitle"><font id="packageName"><b>Cartographer</b></font><BR>
<font id="version">Version 1.5<br>
23 December 2016</font><BR>
1 January 2017</font><BR>
David R. Maddison and Wayne P. Maddison</div>
<div id="subtitle"><!-- #BeginEditable "subtitle" --><font size="5" face="Georgia, Times New Roman, Times, serif"><em>Calibration
&amp; Parameters</em></font><!-- #EndEditable --></div>
Expand Down Expand Up @@ -151,7 +151,7 @@ <h3 align="left">&nbsp;</h3>
</div>
<div id="navBarExtension">&nbsp;</div>
<!--end navbar -->
<div id="siteInfo"> Copyright &copy; 2016 <a href="http://david.bembidion.org">David
<div id="siteInfo"> Copyright &copy; 2017 <a href="http://david.bembidion.org">David
R. Maddison</a> and <a href="http://salticidae.org/wpm/home.html">Wayne P.
Maddison</a> </div>
<br>
Expand Down
6 changes: 3 additions & 3 deletions Source/mesquite/cartographer/aCartographerIntro/citation.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<div id="banner"><img src="splash.gif" width="164" height="64"></div>
<div id="mainTitle"><font id="packageName"><b>Cartographer</b></font><BR>
<font id="version">Version 1.5<br>
23 December 2016</font><BR>
1 January 2017</font><BR>
David R. Maddison and Wayne P. Maddison</div>
<div id="subtitle"><!-- #BeginEditable "subtitle" --><font size="5" face="Georgia, Times New Roman, Times, serif"><em>Citing Cartographer</em></font><!-- #EndEditable --></div>

Expand All @@ -29,7 +29,7 @@
<div id="content"><!-- #BeginEditable "content" -->
<P>Cartographer should be cited as:</P>
<P><br>
Maddison, D.R., &amp; W.P. Maddison. 2016. Cartographer, a Mesquite
Maddison, D.R., &amp; W.P. Maddison. 2017. Cartographer, a Mesquite
package for plotting geographic data. Version 1.5. <em>http://mesquiteproject.org/packages/cartographer</em></P>
<P>&nbsp;</P>
<!-- #EndEditable --></div>
Expand Down Expand Up @@ -63,7 +63,7 @@
</div>
<div id="navBarExtension">&nbsp;</div>
<!--end navbar -->
<div id="siteInfo"> Copyright &copy; 2016 <a href="http://david.bembidion.org">David
<div id="siteInfo"> Copyright &copy; 2017 <a href="http://david.bembidion.org">David
R. Maddison</a> and <a href="http://salticidae.org/wpm/home.html">Wayne P.
Maddison</a> </div>
<br>
Expand Down
4 changes: 2 additions & 2 deletions Source/mesquite/cartographer/aCartographerIntro/data.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<div id="banner"><img src="splash.gif" width="164" height="64"></div>
<div id="mainTitle"><font id="packageName"><b>Cartographer</b></font><BR>
<font id="version">Version 1.5<br>
23 December 2016</font><BR>
1 January 2017</font><BR>
David R. Maddison and Wayne P. Maddison</div>
<div id="subtitle"><!-- #BeginEditable "subtitle" --><font size="5" face="Georgia, Times New Roman, Times, serif"><em>Adding
and Editing Data</em></font><!-- #EndEditable --></div>
Expand Down Expand Up @@ -164,7 +164,7 @@ <h3><a name="importingData"></a>Importing data</h3>
</div>
<div id="navBarExtension">&nbsp;</div>
<!--end navbar -->
<div id="siteInfo"> Copyright &copy; 2016 <a href="http://david.bembidion.org">David
<div id="siteInfo"> Copyright &copy; 2017 <a href="http://david.bembidion.org">David
R. Maddison</a> and <a href="http://salticidae.org/wpm/home.html">Wayne P.
Maddison</a> </div>
<br>
Expand Down
4 changes: 2 additions & 2 deletions Source/mesquite/cartographer/aCartographerIntro/display.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<div id="banner"><img src="splash.gif" width="164" height="64"></div>
<div id="mainTitle"><font id="packageName"><b>Cartographer</b></font><BR>
<font id="version">Version 1.5<br>
23 December 2016</font><BR>
1 January 2017</font><BR>
David R. Maddison and Wayne P. Maddison</div>
<div id="subtitle"><!-- #BeginEditable "subtitle" --><font size="5" face="Georgia, Times New Roman, Times, serif"><em>Display Options</em></font><!-- #EndEditable --></div>

Expand Down Expand Up @@ -110,7 +110,7 @@ <h3>Calibration Points</h3>
</div>
<div id="navBarExtension">&nbsp;</div>
<!--end navbar -->
<div id="siteInfo"> Copyright &copy; 2016 <a href="http://david.bembidion.org">David
<div id="siteInfo"> Copyright &copy; 2017 <a href="http://david.bembidion.org">David
R. Maddison</a> and <a href="http://salticidae.org/wpm/home.html">Wayne P.
Maddison</a> </div>
<br>
Expand Down
9 changes: 4 additions & 5 deletions Source/mesquite/cartographer/aCartographerIntro/download.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<div id="banner"><img src="splash.gif" width="164" height="64"></div>
<div id="mainTitle"><font id="packageName"><b>Cartographer</b></font><BR>
<font id="version">Version 1.5<br>
23 December 2016</font><BR>
1 January 2017</font><BR>
David R. Maddison and Wayne P. Maddison</div>
<div id="subtitle"><!-- #BeginEditable "subtitle" --><font size="5" face="Georgia, Times New Roman, Times, serif"><em>Download</em></font><!-- #EndEditable --></div>

Expand All @@ -29,8 +29,7 @@
<P>If you previously downloaded either the base system of Mesquite
or Cartographer, and intend to download a new version of Cartographer,
you
should download new versions of all packages to ensure compatibility. <font face="Trebuchet MS">Cartographer
requires Mesquite 3.1 or later.</font></P>
should download new versions of all packages to ensure compatibility. <font face="Trebuchet MS">Cartographer requires Mesquite 3.2 or later.</font></P>
<font face="Trebuchet MS">
<hr>
</font>
Expand All @@ -57,7 +56,7 @@
as one example data file. Please email us (<img src="images/email.jpg" width="189" height="17">)
with questions or comments about downloading and installing Cartographer.
Cartographer requires <a href="https://mesquiteproject.wikispaces.com">Mesquite
3.1</a> and higher, and Java 1.6
3.2</a> and higher, and Java 1.6
or higher.</font></p>
<p>To download the latest version of Cartographer, go to the <a href="https://github.com/MesquiteProject/Cartographer/releases">releases page</a>, and download the latest release by pressing the appropriate green button. We suggest you download the <strong>zip</strong> version if you have MacOSX or Windows, and the <strong>tgz</strong> version if you have a Linux system. </p>
<font face="Trebuchet MS"></font>
Expand Down Expand Up @@ -105,7 +104,7 @@
</div>
<div id="navBarExtension">&nbsp;</div>
<!--end navbar -->
<div id="siteInfo"> Copyright &copy; 2016 <a href="http://david.bembidion.org">David
<div id="siteInfo"> Copyright &copy; 2017 <a href="http://david.bembidion.org">David
R. Maddison</a> and <a href="http://salticidae.org/wpm/home.html">Wayne P.
Maddison</a> </div>
<br>
Expand Down
4 changes: 2 additions & 2 deletions Source/mesquite/cartographer/aCartographerIntro/files.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<div id="banner"><img src="splash.gif" width="164" height="64"></div>
<div id="mainTitle"><font id="packageName"><b>Cartographer</b></font><BR>
<font id="version">Version 1.5<br>
23 December 2016</font><BR>
1 January 2017</font><BR>
David R. Maddison and Wayne P. Maddison</div>
<div id="subtitle"><!-- #BeginEditable "subtitle" --><font size="5" face="Georgia, Times New Roman, Times, serif"><em>Saving Graphics Files</em></font><!-- #EndEditable --></div>

Expand Down Expand Up @@ -69,7 +69,7 @@ <H3>&nbsp;</H3>
</div>
<div id="navBarExtension">&nbsp;</div>
<!--end navbar -->
<div id="siteInfo"> Copyright &copy; 2016 <a href="http://david.bembidion.org">David
<div id="siteInfo"> Copyright &copy; 2017 <a href="http://david.bembidion.org">David
R. Maddison</a> and <a href="http://salticidae.org/wpm/home.html">Wayne P.
Maddison</a> </div>
<br>
Expand Down
Loading

0 comments on commit cf104e9

Please sign in to comment.