reverted toString() change in AnchorURL to prevent mistakenly used

toString(). This fixes also the update link bug.
pull/1/head
orbiter 11 years ago
parent 697b9743e7
commit e441831a24

@ -228,7 +228,7 @@ public class ConfigUpdate_p {
for (int i = rlist.size() - 1; i >= 0; i--) {
release = rlist.get(i);
prop.put("candeploy_availreleases_" + relcount + "_name", ((release.isMainRelease()) ? "main" : "dev") + " " + release.getReleaseNr() + "/" + release.getSvn());
prop.put("candeploy_availreleases_" + relcount + "_url", release.getUrl().toString());
prop.put("candeploy_availreleases_" + relcount + "_url", release.getUrl().toNormalform(false));
prop.put("candeploy_availreleases_" + relcount + "_signatures", (release.getPublicKey()!=null?"1":"0"));
prop.put("candeploy_availreleases_" + relcount + "_selected", (relcount == 0) ? "1" : "0");
relcount++;

@ -131,12 +131,16 @@ public class AnchorURL extends DigestURL {
return this.relProperty.indexOf("nofollow") >= 0;
}
@Override
public String toString() {
public String toHTML() {
return "<a href=\"" + this.toNormalform(false) + "\"" +
(this.nameProperty.length() > 0 ? (" name=\"" + this.nameProperty + "\"") : "") +
(this.relProperty.length() > 0 ? (" rel=\"" + this.relProperty + "\"") : "") +
">" + this.textProperty + "</a>";
}
@Override
public String toString() {
return this.toNormalform(false);
}
}

Loading…
Cancel
Save