Author: nickchalko
Date: Wed Apr 14 16:35:43 2004
New Revision: 10010
Modified:
incubator/depot/trunk/version/src/java/org/apache/depot/version/generation/source/AbstractVersionMarkerClassGenerator.java
incubator/depot/trunk/version/src/java/org/apache/depot/version/generation/source/DependentVersionMarkerClassGenerator.java
Log:
More package rename.
Use the actuall class te get the strings so we will catch this in the future.
Modified: incubator/depot/trunk/version/src/java/org/apache/depot/version/generation/source/AbstractVersionMarkerClassGenerator.java
==============================================================================
--- incubator/depot/trunk/version/src/java/org/apache/depot/version/generation/source/AbstractVersionMarkerClassGenerator.java
(original)
+++ incubator/depot/trunk/version/src/java/org/apache/depot/version/generation/source/AbstractVersionMarkerClassGenerator.java
Wed Apr 14 16:35:43 2004
@@ -28,6 +28,7 @@
import org.apache.depot.version.impl.ApacheVersionMarker;
import org.apache.depot.version.impl.VersionImplementationConstants;
import org.apache.depot.version.impl.data.ReleaseLevel;
+import org.apache.depot.version.impl.data.VersionData;
import org.apache.depot.version.interfacing.ApacheVersionMarkerInterfaceProxy;
/**
@@ -121,12 +122,12 @@
out.indent();
out.println("\"" + m_versionMarker.getId() + "\",");
- out.println("new org.apache.version.impl.data.VersionData(");
+ out.println("new "+VersionData.class.getName()+"(");
out.indent();
out.println(m_compoundVersion.getMajor() + ",");
out.println(m_compoundVersion.getMinor() + ",");
out.println(
- "org.apache.version.impl.data."
+ ReleaseLevel.class.getPackage().getName()+"."
+ ReleaseLevel
.getFromStringFailSafe(m_compoundVersion.getReleaseLevel())
.getSourceCodeName()
Modified: incubator/depot/trunk/version/src/java/org/apache/depot/version/generation/source/DependentVersionMarkerClassGenerator.java
==============================================================================
--- incubator/depot/trunk/version/src/java/org/apache/depot/version/generation/source/DependentVersionMarkerClassGenerator.java
(original)
+++ incubator/depot/trunk/version/src/java/org/apache/depot/version/generation/source/DependentVersionMarkerClassGenerator.java
Wed Apr 14 16:35:43 2004
@@ -20,6 +20,7 @@
import org.apache.depot.common.util.IndentWriter;
import org.apache.depot.version.VersionMarker;
+import org.apache.depot.version.impl.ApacheVersionMarker;
import org.apache.depot.version.interfacing.ApacheVersionMarkerInterfaceProxy;
/**
@@ -56,7 +57,7 @@
out.println(
"public class "
+ getClassName()
- + " extends org.apache.version.impl.ApacheVersionMarker {");
+ + " extends "+ApacheVersionMarker.class.getName()+" {");
out.println();
out.indent();
@@ -83,7 +84,7 @@
out.println("}");
out.println();
- out.println("public static final org.apache.version.VersionMarker getInstance() {");
+ out.println("public static final "+VersionMarker.class.getName() +" getInstance() {");
out.indent();
out.println("return INSTANCE;");
out.undent();
|