sebb 2004/06/01 18:07:40
Modified: src/core/org/apache/jmeter/util Tag: rel-2_0
JMeterUtils.java
src/core/org/apache/jmeter/gui/action Tag: rel-2_0
AboutCommand.java
src/core/org/apache/jmeter Tag: rel-2_0 JMeter.java
Log:
Use shared copyright string
Revision Changes Path
No revision
No revision
1.66.2.1 +11 -2 jakarta-jmeter/src/core/org/apache/jmeter/util/JMeterUtils.java
Index: JMeterUtils.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/util/JMeterUtils.java,v
retrieving revision 1.66
retrieving revision 1.66.2.1
diff -u -r1.66 -r1.66.2.1
--- JMeterUtils.java 5 Mar 2004 01:20:30 -0000 1.66
+++ JMeterUtils.java 2 Jun 2004 01:07:40 -0000 1.66.2.1
@@ -1060,6 +1060,15 @@
}
/**
+ * Gets the JMeter copyright.
+ * @return the JMeter copyright string
+ */
+ public static String getJMeterCopyright()
+ {
+ return JMeterVersion.COPYRIGHT;
+ }
+
+ /**
* Builds the string used as the main frame title
*
* @param fname the fully qualified name of the current working file
No revision
No revision
1.4.2.1 +3 -3
jakarta-jmeter/src/core/org/apache/jmeter/gui/action/AboutCommand.java
Index: AboutCommand.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/gui/action/AboutCommand.java,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -r1.4 -r1.4.2.1
--- AboutCommand.java 13 Feb 2004 02:21:36 -0000 1.4
+++ AboutCommand.java 2 Jun 2004 01:07:40 -0000 1.4.2.1
@@ -102,7 +102,7 @@
JLabel jmeter = new JLabel(JMeterUtils.getImage("jmeter.jpg"));
JLabel copyright =
new JLabel(
- "Copyright (c) 1998-2003 The Apache Software Foundation",
+ JMeterUtils.getJMeterCopyright(),
JLabel.CENTER);
JLabel rights = new JLabel("All Rights Reserved.", JLabel.CENTER);
JLabel version =
No revision
No revision
1.27.2.1 +4 -5 jakarta-jmeter/src/core/org/apache/jmeter/JMeter.java
Index: JMeter.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/JMeter.java,v
retrieving revision 1.27
retrieving revision 1.27.2.1
diff -u -r1.27 -r1.27.2.1
--- JMeter.java 13 Feb 2004 02:21:38 -0000 1.27
+++ JMeter.java 2 Jun 2004 01:07:40 -0000 1.27.2.1
@@ -256,11 +256,10 @@
setProxy(parser);
log.info("Version " + JMeterUtils.getJMeterVersion());
log.info("java.version="+System.getProperty("java.version"));
+ log.info(JMeterUtils.getJMeterCopyright());
if (parser.getArgumentById(VERSION_OPT) != null)
{
- System.out.println(
- "Apache JMeter, Copyright (c) 2002,2003 " +
- "The Apache Software Foundation");
+ System.out.println(JMeterUtils.getJMeterCopyright());
System.out.println("Version " + JMeterUtils.getJMeterVersion());
}
else if (parser.getArgumentById(HELP_OPT) != null)
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
