You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@depot.apache.org by ni...@apache.org on 2004/08/18 03:51:03 UTC
svn commit: rev 36546 - in incubator/depot/trunk/version: . src/java/org/apache/depot/version/generation src/templates
Author: nickchalko
Date: Tue Aug 17 20:51:01 2004
New Revision: 36546
Removed:
incubator/depot/trunk/version/.jetproperties
Modified:
incubator/depot/trunk/version/src/java/org/apache/depot/version/generation/VersionSourceGenerator.java
incubator/depot/trunk/version/src/templates/VersionSourceGenerator.javajet
Log:
Finally got the comments right.
Modified: incubator/depot/trunk/version/src/java/org/apache/depot/version/generation/VersionSourceGenerator.java
==============================================================================
--- incubator/depot/trunk/version/src/java/org/apache/depot/version/generation/VersionSourceGenerator.java (original)
+++ incubator/depot/trunk/version/src/java/org/apache/depot/version/generation/VersionSourceGenerator.java Tue Aug 17 20:51:01 2004
@@ -35,51 +35,53 @@
protected final String TEXT_9 = NL + " * @generated" + NL + " */" + NL + "public final class ";
protected final String TEXT_10 = " { " + NL + "\t/* SINGLETON PATTERN */" + NL + "\tprivate final static ";
protected final String TEXT_11 = " INSTANCE = new ";
- protected final String TEXT_12 = "();" + NL + "\t/**" + NL + "\t * Get the Singleton instance of this class." + NL + "\t * @return the Singleton instance of this class" + NL + "\t */" + NL + " public static ";
- protected final String TEXT_13 = " getInstance() {return INSTANCE ;}" + NL + " " + NL + " private final Map attributes;" + NL + "\t" + NL + "\t/**" + NL + "\t * Private constructor for Singleton." + NL + "\t */" + NL + "\tprivate ";
- protected final String TEXT_14 = "() {" + NL + "\tMap temp = new HashMap();" + NL + "\t";
- protected final String TEXT_15 = NL + " temp.put(";
- protected final String TEXT_16 = ",";
- protected final String TEXT_17 = NL + " ";
- protected final String TEXT_18 = ");// ";
- protected final String TEXT_19 = NL + "\tattributes = Collections.unmodifiableMap(temp);" + NL + "\t" + NL + "\t}" + NL + "\t" + NL + "\t" + NL + "\t" + NL + "\t/**" + NL + "\t * ";
- protected final String TEXT_20 = " is the Id of this project." + NL + "\t * @return the String \"";
- protected final String TEXT_21 = "\"" + NL + "\t */" + NL + "\tpublic String getId() {return \"";
- protected final String TEXT_22 = "\"; }" + NL + "\t" + NL + "\t\t" + NL + "\t/**" + NL + "\t * The user that built ";
- protected final String TEXT_23 = " was ";
- protected final String TEXT_24 = "." + NL + "\t * @return the String \"";
- protected final String TEXT_25 = "\"" + NL + "\t */" + NL + "\tpublic String getUser() {return \"";
- protected final String TEXT_26 = "\"; }" + NL + "\t" + NL + "\t\t" + NL + "\t/**" + NL + "\t * ";
- protected final String TEXT_27 = " was built on ";
- protected final String TEXT_28 = "." + NL + "\t * @return the String \"";
- protected final String TEXT_29 = "\"" + NL + "\t */" + NL + "\tpublic String getHost() {return \"";
- protected final String TEXT_30 = "\"; }" + NL + "\t" + NL + "\t/**" + NL + "\t * ";
- protected final String TEXT_31 = " was built at ";
- protected final String TEXT_32 = "." + NL + "\t * @return the Date \"";
- protected final String TEXT_33 = "\"" + NL + "\t */" + NL + "\tpublic Date getDate() {return ";
- protected final String TEXT_34 = "; }" + NL + "\t" + NL + "\t/**" + NL + "\t * The ID of the Version Specification." + NL + "\t * @return the String \"";
- protected final String TEXT_35 = "\"." + NL + "\t * @see org.apache.depot.version.specification.VersionSpecificationFactory" + NL + "\t */" + NL + "\tpublic String getSpecificationId(){return \"";
- protected final String TEXT_36 = "\";} " + NL + "\t" + NL + "\t" + NL + "\t/**" + NL + "\t * ";
- protected final String TEXT_37 = " ";
- protected final String TEXT_38 = "." + NL + "\t * @return the String \"";
- protected final String TEXT_39 = "\"" + NL + "\t */" + NL + "\tpublic String getShortVersion() {return \"";
- protected final String TEXT_40 = "\";}" + NL + "\t" + NL + "\t/**" + NL + "\t * ";
- protected final String TEXT_41 = " ";
- protected final String TEXT_42 = "." + NL + "\t * @return the String \"";
- protected final String TEXT_43 = "\"" + NL + "\t */" + NL + "\tpublic String getLongVersion() {return \"";
- protected final String TEXT_44 = "\";}" + NL + "" + NL + "\t/**" + NL + "\t * ";
- protected final String TEXT_45 = " ";
- protected final String TEXT_46 = "." + NL + "\t * @return the String \"";
- protected final String TEXT_47 = "\"" + NL + "\t */" + NL + "\tpublic String getDefaultVersion() {return \"";
- protected final String TEXT_48 = "\";}\t" + NL + "" + NL + "\t/**" + NL + "\t * Get the Unmodifiable map of attributes. \t" + NL + "\t * <dl>";
- protected final String TEXT_49 = NL + " * <dt>";
- protected final String TEXT_50 = "</dt>" + NL + " * <dd>";
- protected final String TEXT_51 = "</dd>";
- protected final String TEXT_52 = NL + " * </dl>" + NL + "\t * @return unmodifiable Map of attributes." + NL + "\t */" + NL + "\tpublic Map getAttributes () {return attributes;}" + NL + "" + NL + "" + NL + "\t" + NL + "\t/**" + NL + "\t * ";
- protected final String TEXT_53 = " ";
- protected final String TEXT_54 = "." + NL + "\t * @return the String \"";
- protected final String TEXT_55 = "\"" + NL + "\t */" + NL + "\tpublic String toString() {return \"";
- protected final String TEXT_56 = "\";}" + NL + "} ";
+ protected final String TEXT_12 = "();" + NL + "" + NL + "\t/**" + NL + "\t * Get the single instance of ";
+ protected final String TEXT_13 = "." + NL + "\t * @return the single instance of ";
+ protected final String TEXT_14 = "." + NL + "\t */" + NL + " public static ";
+ protected final String TEXT_15 = " getInstance() {return INSTANCE ;}" + NL + "" + NL + " " + NL + " private final Map attributes;" + NL + "\t" + NL + "\t/**" + NL + "\t * Private constructor for Singleton." + NL + "\t */" + NL + "\tprivate ";
+ protected final String TEXT_16 = "() {" + NL + "\tMap temp = new HashMap();" + NL + "\t";
+ protected final String TEXT_17 = NL + " temp.put(";
+ protected final String TEXT_18 = ",";
+ protected final String TEXT_19 = NL + " ";
+ protected final String TEXT_20 = ");// ";
+ protected final String TEXT_21 = NL + "\tattributes = Collections.unmodifiableMap(temp);" + NL + "\t" + NL + "\t}" + NL + "\t" + NL + "\t" + NL + "\t" + NL + "\t/**" + NL + "\t * ";
+ protected final String TEXT_22 = " is the Id of this project." + NL + "\t * @return the String \"";
+ protected final String TEXT_23 = "\"" + NL + "\t */" + NL + "\tpublic String getId() {return \"";
+ protected final String TEXT_24 = "\"; }" + NL + "\t" + NL + "\t\t" + NL + "\t/**" + NL + "\t * The user that built ";
+ protected final String TEXT_25 = " was ";
+ protected final String TEXT_26 = "." + NL + "\t * @return the String \"";
+ protected final String TEXT_27 = "\"" + NL + "\t */" + NL + "\tpublic String getUser() {return \"";
+ protected final String TEXT_28 = "\"; }" + NL + "\t" + NL + "\t\t" + NL + "\t/**" + NL + "\t * ";
+ protected final String TEXT_29 = " was built on ";
+ protected final String TEXT_30 = "." + NL + "\t * @return the String \"";
+ protected final String TEXT_31 = "\"" + NL + "\t */" + NL + "\tpublic String getHost() {return \"";
+ protected final String TEXT_32 = "\"; }" + NL + "\t" + NL + "\t/**" + NL + "\t * ";
+ protected final String TEXT_33 = " was built at ";
+ protected final String TEXT_34 = "." + NL + "\t * @return the Date \"";
+ protected final String TEXT_35 = "\"" + NL + "\t */" + NL + "\tpublic Date getDate() {return ";
+ protected final String TEXT_36 = "; }" + NL + "\t" + NL + "\t/**" + NL + "\t * The ID of the Version Specification." + NL + "\t * @return the String \"";
+ protected final String TEXT_37 = "\"." + NL + "\t * @see org.apache.depot.version.specification.VersionSpecificationFactory" + NL + "\t */" + NL + "\tpublic String getSpecificationId(){return \"";
+ protected final String TEXT_38 = "\";} " + NL + "\t" + NL + "\t" + NL + "\t/**" + NL + "\t * ";
+ protected final String TEXT_39 = " ";
+ protected final String TEXT_40 = "." + NL + "\t * @return the String \"";
+ protected final String TEXT_41 = "\"" + NL + "\t */" + NL + "\tpublic String getShortVersion() {return \"";
+ protected final String TEXT_42 = "\";}" + NL + "\t" + NL + "\t/**" + NL + "\t * ";
+ protected final String TEXT_43 = " ";
+ protected final String TEXT_44 = "." + NL + "\t * @return the String \"";
+ protected final String TEXT_45 = "\"" + NL + "\t */" + NL + "\tpublic String getLongVersion() {return \"";
+ protected final String TEXT_46 = "\";}" + NL + "" + NL + "\t/**" + NL + "\t * ";
+ protected final String TEXT_47 = " ";
+ protected final String TEXT_48 = "." + NL + "\t * @return the String \"";
+ protected final String TEXT_49 = "\"" + NL + "\t */" + NL + "\tpublic String getDefaultVersion() {return \"";
+ protected final String TEXT_50 = "\";}\t" + NL + "" + NL + "\t/**" + NL + "\t * Get the Unmodifiable map of attributes. \t" + NL + "\t * <dl>";
+ protected final String TEXT_51 = NL + " * <dt>";
+ protected final String TEXT_52 = "</dt>" + NL + " * <dd>";
+ protected final String TEXT_53 = "</dd>";
+ protected final String TEXT_54 = NL + " * </dl>" + NL + "\t * @return unmodifiable Map of attributes." + NL + "\t */" + NL + "\tpublic Map getAttributes () {return attributes;}" + NL + "" + NL + "" + NL + "\t" + NL + "\t/**" + NL + "\t * ";
+ protected final String TEXT_55 = " ";
+ protected final String TEXT_56 = "." + NL + "\t * @return the String \"";
+ protected final String TEXT_57 = "\"" + NL + "\t */" + NL + "\tpublic String toString() {return \"";
+ protected final String TEXT_58 = "\";}" + NL + "} ";
public String generate(String packageName, String className, VersionMarker marker)
{
@@ -131,100 +133,104 @@
stringBuffer.append(TEXT_13);
stringBuffer.append(className);
stringBuffer.append(TEXT_14);
+ stringBuffer.append(className);
+ stringBuffer.append(TEXT_15);
+ stringBuffer.append(className);
+ stringBuffer.append(TEXT_16);
for (Iterator i = marker.getAttributes().entrySet().iterator(); i.hasNext();) {
Map.Entry entry = (Map.Entry) i.next();
// TODO need to escape key and value.
- stringBuffer.append(TEXT_15);
- stringBuffer.append(getValueFrom(entry.getKey()));
- stringBuffer.append(TEXT_16);
stringBuffer.append(TEXT_17);
- stringBuffer.append(getValueFrom(entry.getValue()));
+ stringBuffer.append(getValueFrom(entry.getKey()));
stringBuffer.append(TEXT_18);
+ stringBuffer.append(TEXT_19);
+ stringBuffer.append(getValueFrom(entry.getValue()));
+ stringBuffer.append(TEXT_20);
stringBuffer.append(entry.getValue());
}
- stringBuffer.append(TEXT_19);
- stringBuffer.append(marker.getId());
- stringBuffer.append(TEXT_20);
- stringBuffer.append(marker.getId());
stringBuffer.append(TEXT_21);
stringBuffer.append(marker.getId());
stringBuffer.append(TEXT_22);
stringBuffer.append(marker.getId());
stringBuffer.append(TEXT_23);
- stringBuffer.append(getUser());
+ stringBuffer.append(marker.getId());
stringBuffer.append(TEXT_24);
- stringBuffer.append(getUser());
+ stringBuffer.append(marker.getId());
stringBuffer.append(TEXT_25);
stringBuffer.append(getUser());
stringBuffer.append(TEXT_26);
- stringBuffer.append(marker.getId());
+ stringBuffer.append(getUser());
stringBuffer.append(TEXT_27);
- stringBuffer.append(getHost());
+ stringBuffer.append(getUser());
stringBuffer.append(TEXT_28);
- stringBuffer.append(getHost());
+ stringBuffer.append(marker.getId());
stringBuffer.append(TEXT_29);
stringBuffer.append(getHost());
stringBuffer.append(TEXT_30);
- stringBuffer.append(marker.getId());
+ stringBuffer.append(getHost());
stringBuffer.append(TEXT_31);
- stringBuffer.append(getDate());
+ stringBuffer.append(getHost());
stringBuffer.append(TEXT_32);
- stringBuffer.append(getDate());
+ stringBuffer.append(marker.getId());
stringBuffer.append(TEXT_33);
- stringBuffer.append(getValueFrom(getDate()));
+ stringBuffer.append(getDate());
stringBuffer.append(TEXT_34);
- stringBuffer.append(marker.getSpecification().getId());
+ stringBuffer.append(getDate());
stringBuffer.append(TEXT_35);
- stringBuffer.append(marker.getSpecification().getId());
+ stringBuffer.append(getValueFrom(getDate()));
stringBuffer.append(TEXT_36);
- stringBuffer.append(marker.getId());
+ stringBuffer.append(marker.getSpecification().getId());
stringBuffer.append(TEXT_37);
- stringBuffer.append(marker.getShortVersion());
+ stringBuffer.append(marker.getSpecification().getId());
stringBuffer.append(TEXT_38);
- stringBuffer.append(marker.getShortVersion());
+ stringBuffer.append(marker.getId());
stringBuffer.append(TEXT_39);
stringBuffer.append(marker.getShortVersion());
stringBuffer.append(TEXT_40);
- stringBuffer.append(marker.getId());
+ stringBuffer.append(marker.getShortVersion());
stringBuffer.append(TEXT_41);
- stringBuffer.append(marker.getLongVersion());
+ stringBuffer.append(marker.getShortVersion());
stringBuffer.append(TEXT_42);
- stringBuffer.append(marker.getLongVersion());
+ stringBuffer.append(marker.getId());
stringBuffer.append(TEXT_43);
stringBuffer.append(marker.getLongVersion());
stringBuffer.append(TEXT_44);
- stringBuffer.append(marker.getId());
+ stringBuffer.append(marker.getLongVersion());
stringBuffer.append(TEXT_45);
- stringBuffer.append(marker.getDefaultVersion());
+ stringBuffer.append(marker.getLongVersion());
stringBuffer.append(TEXT_46);
- stringBuffer.append(marker.getDefaultVersion());
+ stringBuffer.append(marker.getId());
stringBuffer.append(TEXT_47);
stringBuffer.append(marker.getDefaultVersion());
stringBuffer.append(TEXT_48);
+ stringBuffer.append(marker.getDefaultVersion());
+ stringBuffer.append(TEXT_49);
+ stringBuffer.append(marker.getDefaultVersion());
+ stringBuffer.append(TEXT_50);
for (Iterator i = marker.getAttributes().entrySet().iterator(); i.hasNext();) {
Map.Entry entry = (Map.Entry) i.next();
// TODO need to escape key and value.
- stringBuffer.append(TEXT_49);
+ stringBuffer.append(TEXT_51);
stringBuffer.append(entry.getKey());
- stringBuffer.append(TEXT_50);
+ stringBuffer.append(TEXT_52);
stringBuffer.append(entry.getValue());
- stringBuffer.append(TEXT_51);
+ stringBuffer.append(TEXT_53);
}
- stringBuffer.append(TEXT_52);
- stringBuffer.append(marker.getId());
- stringBuffer.append(TEXT_53);
- stringBuffer.append(marker.getLongVersion());
stringBuffer.append(TEXT_54);
- stringBuffer.append(marker.getLongVersion());
+ stringBuffer.append(marker.getId());
stringBuffer.append(TEXT_55);
stringBuffer.append(marker.getLongVersion());
stringBuffer.append(TEXT_56);
+ stringBuffer.append(marker.getLongVersion());
+ stringBuffer.append(TEXT_57);
+ stringBuffer.append(marker.getLongVersion());
+ stringBuffer.append(TEXT_58);
return stringBuffer.toString();
}
}
Modified: incubator/depot/trunk/version/src/templates/VersionSourceGenerator.javajet
==============================================================================
--- incubator/depot/trunk/version/src/templates/VersionSourceGenerator.javajet (original)
+++ incubator/depot/trunk/version/src/templates/VersionSourceGenerator.javajet Tue Aug 17 20:51:01 2004
@@ -5,7 +5,7 @@
imports="org.apache.depot.version.VersionMarker java.util.Iterator java.util.Map"
%>
<%
-/*
+/*
* Copyright 2004 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
@@ -54,13 +54,15 @@
public final class <%=className%> {
/* SINGLETON PATTERN */
private final static <%=className%> INSTANCE = new <%=className%>();
+
/**
* Get the single instance of <%=className%>.
* @return the single instance of <%=className%>.
*/
- public static <%=className%> getInstance() {return INSTANCE ;}
+ public static <%=className%> getInstance() {return INSTANCE ;}
+
- private final Map attributes;
+ private final Map attributes;
/**
* Private constructor for Singleton.