Why would contributions with and without reference be separate?

Because those with reference need a few extra functions, mostly to handle showing the reference in the help menu at present, though the functionality could be extended over time.

But why add a new type, rather than just adding support to the current code to cover reference?

I didn't add a new type, just a new class which the library and tool contribution types extend in place of the LocalContribution class, and which, in turn, extends from the LocalContribution class, as per Florian's suggestion; primarily to avoid repetition of code in both the Library and Tool types (since the code is identical), and also to enable adding more features to contribution types that have references, later, if needed. Should I remove the class, and distribute the code across the Library and Tool classes instead?

A new class is a new type. ;-)

Is it necessary to have a subclass, or can this simply go in LocalContribution?

Sure, I agree. I'll remove the new class, add all changes to LocalContribution and resolve all merge conflicts.
Thanks.

Thanks! We're all together in Denver working on 3.0 this weekend, so if you have a chance to do it soon, that'd be great.

Sure thing! I'll have it in by tomorrow?

On Sat, Nov 15, 2014 at 10:26 PM, Ben Fry notifications@github.com wrote:

Thanks! We're all together in Denver working on 3.0 this weekend, so if
you have a chance to do it soon, that'd be great.

—
Reply to this email directly or view it on GitHub
#2804 (comment)
.

That'd be great, thanks.

Also, your recent check-in had your file encoded with a Unicode BOM (byte order mark) at the beginning for the file. Make sure those are turned off in your editor. All files should just be UTF-8, no BOM.

Oops. Sure thing. Thanks.

On Sun, Nov 16, 2014 at 2:35 AM, Ben Fry notifications@github.com wrote:

That'd be great, thanks.

Also, your recent check-in had your file encoded with a Unicode BOM (byte
order mark) at the beginning for the file. Make sure those are turned off
in your editor. All files should just be UTF-8, no BOM.

—
Reply to this email directly or view it on GitHub
#2804 (comment)
.

@benfry : The LocalContribWithReference class has been removed, and all merge conflicts have been resolved. Sorry for the slight delay.

@joelmoniz regarding #2954 (comment), you said you've reverted the commit, though I'm still seeing this stuff here:

final String potentialFileList[] = {
      "reference/index.html", "reference/index.htm",
      "documentation/index.html", "documentation/index.htm", "docs/index.html",
      "docs/index.htm", "documentation.html", "documentation.htm",
      "reference.html", "reference.htm", "docs.html", "docs.htm", "readme.txt" };

(Or perhaps you're in the middle of finishing the PR?)

Sorry. When reverting, things didn't merge properly, and it also seems that a simple revert wouldn't suffice, since some of the later commits depend on functions declared in the commit that I had reverted (although things built and worked fine because of the improper revert). Everything should hopefully be alright now. Thanks.

Thanks! Much better (and half as much code!)

This pull request has been automatically locked since there has not been any recent activity after it was closed. Please open a new issue for related bugs.