Fix version tagging for info strings

4 files changed, 10 insertions, 10 deletions

diff --git a/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/ajc/BuildArgParser.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/ajc/BuildArgParser.java
index 66488fa8c..1b18b980d 100644
--- a/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/ajc/BuildArgParser.java
+++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/ajc/BuildArgParser.java
@@ -291,7 +291,7 @@ public class BuildArgParser extends Main {
 	public void printVersion() {
 		final String version = bind("misc.version", //$NON-NLS-1$
 				new String[] { bind("compiler.name"), //$NON-NLS-1$
-						Version.text + " - Built: " + Version.time_text, bind("compiler.version"), //$NON-NLS-1$
+						Version.getText() + " - Built: " + Version.getTimeText(), bind("compiler.version"), //$NON-NLS-1$
 						bind("compiler.copyright") //$NON-NLS-1$
 				});
 		System.out.println(version);
diff --git a/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/core/builder/AjBuildManager.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/core/builder/AjBuildManager.java
index 9c58c24a0..25557035a 100644
--- a/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/core/builder/AjBuildManager.java
+++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/core/builder/AjBuildManager.java
@@ -1331,7 +1331,7 @@ public class AjBuildManager implements IOutputClassFileNameProvider, IBinarySour
 	 */
 	private String checkRtJar(AjBuildConfig buildConfig) {
 		// omitting dev info
-		if (Version.text.equals(Version.DEVELOPMENT)) {
+		if (Version.getText().equals(Version.DEVELOPMENT) || Version.getText().endsWith("BUILD-SNAPSHOT")) {
 			// in the development version we can't do this test usefully
 			// MessageUtil.info(holder, "running development version of aspectj compiler");
 			return null;
@@ -1342,7 +1342,7 @@ public class AjBuildManager implements IOutputClassFileNameProvider, IBinarySour
 		}
 
 		String ret = null;
-		for (Iterator it = buildConfig.getFullClasspath().iterator(); it.hasNext();) {
+		for (Iterator<String> it = buildConfig.getFullClasspath().iterator(); it.hasNext();) {
 			File p = new File((String) it.next());
 			// pr112830, allow variations on aspectjrt.jar of the form aspectjrtXXXXXX.jar
 			if (p.isFile() && p.getName().startsWith("aspectjrt") && p.getName().endsWith(".jar")) {
@@ -1351,7 +1351,7 @@ public class AjBuildManager implements IOutputClassFileNameProvider, IBinarySour
 					String version = null;
 					Manifest manifest = new JarFile(p).getManifest();
 					if (manifest == null) {
-						ret = "no manifest found in " + p.getAbsolutePath() + ", expected " + Version.text;
+						ret = "no manifest found in " + p.getAbsolutePath() + ", expected " + Version.getText();
 						continue;
 					}
 					Attributes attr = manifest.getAttributes("org/aspectj/lang/");
@@ -1367,8 +1367,8 @@ public class AjBuildManager implements IOutputClassFileNameProvider, IBinarySour
 						// "running with development version of aspectjrt.jar in " +
 						// p.getAbsolutePath());
 						return null;
-					} else if (!Version.text.equals(version)) {
-						ret = "bad version number found in " + p.getAbsolutePath() + " expected " + Version.text + " found "
+					} else if (!Version.getText().equals(version)) {
+						ret = "bad version number found in " + p.getAbsolutePath() + " expected " + Version.getText() + " found "
 								+ version;
 						continue;
 					}
diff --git a/org.aspectj.ajdt.core/src/main/java/org/aspectj/tools/ajc/Main.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/tools/ajc/Main.java
index c8b111ec3..4e8235cf2 100644
--- a/org.aspectj.ajdt.core/src/main/java/org/aspectj/tools/ajc/Main.java
+++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/tools/ajc/Main.java
@@ -60,7 +60,7 @@ import org.aspectj.weaver.Dump;
  */
 public class Main {
 	/** Header used when rendering exceptions for users */
-	public static final String THROWN_PREFIX = "Exception thrown from AspectJ " + Version.text + LangUtil.EOL + "" + LangUtil.EOL
+	public static final String THROWN_PREFIX = "Exception thrown from AspectJ " + Version.getText() + LangUtil.EOL + "" + LangUtil.EOL
 			+ "This might be logged as a bug already -- find current bugs at" + LangUtil.EOL
 			+ "  http://bugs.eclipse.org/bugs/buglist.cgi?product=AspectJ&component=Compiler" + LangUtil.EOL + "" + LangUtil.EOL
 			+ "Bugs for exceptions thrown have titles File:line from the top stack, " + LangUtil.EOL
@@ -70,7 +70,7 @@ public class Main {
 			+ "To make the bug a priority, please include a test program" + LangUtil.EOL + "that can reproduce this exception."
 			+ LangUtil.EOL;
 
-	private static final String OUT_OF_MEMORY_MSG = "AspectJ " + Version.text + " ran out of memory during compilation:"
+	private static final String OUT_OF_MEMORY_MSG = "AspectJ " + Version.getText() + " ran out of memory during compilation:"
 			+ LangUtil.EOL + LangUtil.EOL + "Please increase the memory available to ajc by editing the ajc script " + LangUtil.EOL
 			+ "found in your AspectJ installation directory. The -Xmx parameter value" + LangUtil.EOL
 			+ "should be increased from 64M (default) to 128M or even 256M." + LangUtil.EOL + LangUtil.EOL
diff --git a/org.aspectj.ajdt.core/src/main/resources/org/aspectj/ajdt/ajc/messages.properties b/org.aspectj.ajdt.core/src/main/resources/org/aspectj/ajdt/ajc/messages.properties
index d40571fb5..e9f6b6d65 100644
--- a/org.aspectj.ajdt.core/src/main/resources/org/aspectj/ajdt/ajc/messages.properties
+++ b/org.aspectj.ajdt.core/src/main/resources/org/aspectj/ajdt/ajc/messages.properties
@@ -4,7 +4,7 @@
      The -Xlintfile:lint.properties allows fine-grained control. In tools.jar, see
      org/aspectj/weaver/XlintDefault.properties for the default behavior and a template to copy. 
 ### AspectJ-specific messages 
-compiler.name = AspectJ Compiler 1.9.2
+compiler.name = AspectJ Compiler
 compiler.version = Eclipse Compiler #6373b82afa49b(1-Oct-2018), 3.16
 compiler.copyright = 
 
@@ -475,4 +475,4 @@ unit.missing = File {0} is missing
 output.noClassFileCreated = No .class file created for file named {0} because of an IOException.
 
 ### miscellaneous
-misc.version = {0} ({1}) - {2} {3}
+misc.version = {0} {1} - {2} {3}