1.1 --- a/src/share/classes/com/sun/tools/javah/JavahTask.java Sat Sep 25 12:02:32 2010 -0700
1.2 +++ b/src/share/classes/com/sun/tools/javah/JavahTask.java Mon Sep 27 14:05:33 2010 -0700
1.3 @@ -1,5 +1,5 @@
1.4 /*
1.5 - * Copyright (c) 2002, 2009, Oracle and/or its affiliates. All rights reserved.
1.6 + * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
1.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
1.8 *
1.9 * This code is free software; you can redistribute it and/or modify it
1.10 @@ -526,15 +526,17 @@
1.11 }
1.12
1.13 private void showVersion(boolean full) {
1.14 - log.println(version(full ? "full" : "release"));
1.15 + log.println(version(full));
1.16 }
1.17
1.18 private static final String versionRBName = "com.sun.tools.javah.resources.version";
1.19 private static ResourceBundle versionRB;
1.20
1.21 - private String version(String key) {
1.22 - // key=version: mm.nn.oo[-milestone]
1.23 - // key=full: mm.mm.oo[-milestone]-build
1.24 + private String version(boolean full) {
1.25 + String msgKey = (full ? "javah.fullVersion" : "javah.version");
1.26 + String versionKey = (full ? "full" : "release");
1.27 + // versionKey=product: mm.nn.oo[-milestone]
1.28 + // versionKey=full: mm.mm.oo[-milestone]-build
1.29 if (versionRB == null) {
1.30 try {
1.31 versionRB = ResourceBundle.getBundle(versionRBName);
1.32 @@ -543,7 +545,7 @@
1.33 }
1.34 }
1.35 try {
1.36 - return versionRB.getString(key);
1.37 + return getMessage(msgKey, "javah", versionRB.getString(versionKey));
1.38 }
1.39 catch (MissingResourceException e) {
1.40 return getMessage("version.unknown", System.getProperty("java.version"));
