You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jmeter.apache.org by fs...@apache.org on 2015/08/30 15:13:39 UTC
svn commit: r1700117 - in /jmeter/trunk/src/core/org/apache/jmeter:
JMeter.java gui/util/JMeterMenuBar.java
Author: fschumacher
Date: Sun Aug 30 13:13:39 2015
New Revision: 1700117
URL: http://svn.apache.org/r1700117
Log:
Whitespace police. Part of patch (part 2) from Graham Russell.
Bugzilla Id: 57981
Modified:
jmeter/trunk/src/core/org/apache/jmeter/JMeter.java
jmeter/trunk/src/core/org/apache/jmeter/gui/util/JMeterMenuBar.java
Modified: jmeter/trunk/src/core/org/apache/jmeter/JMeter.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/JMeter.java?rev=1700117&r1=1700116&r2=1700117&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/JMeter.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/JMeter.java Sun Aug 30 13:13:39 2015
@@ -601,7 +601,7 @@ public class JMeter implements JMeterPlu
// Should not have any text arguments
case CLOption.TEXT_ARGUMENT:
- throw new IllegalArgumentException("Unknown arg: "+option.getArgument());
+ throw new IllegalArgumentException("Unknown arg: " + option.getArgument());
case PROPFILE2_OPT: // Bug 33920 - allow multiple props
try {
@@ -624,7 +624,7 @@ public class JMeter implements JMeterPlu
fis = new FileInputStream(new File(name));
System.getProperties().load(fis);
} catch (IOException e) {
- log.warn("Cannot find system property file "+e.getLocalizedMessage());
+ log.warn("Cannot find system property file " + e.getLocalizedMessage());
} finally {
JOrphanUtils.closeQuietly(fis);
}
@@ -654,14 +654,14 @@ public class JMeter implements JMeterPlu
} else {
File propFile = new File(name);
if (propFile.canRead()) {
- log.info("Setting Global properties from the file "+name);
+ log.info("Setting Global properties from the file " + name);
try {
fis = new FileInputStream(propFile);
remoteProps.load(fis);
} catch (FileNotFoundException e) {
- log.warn("Could not find properties file: "+e.getLocalizedMessage());
+ log.warn("Could not find properties file: " + e.getLocalizedMessage());
} catch (IOException e) {
- log.warn("Could not load properties file: "+e.getLocalizedMessage());
+ log.warn("Could not load properties file: " + e.getLocalizedMessage());
} finally {
JOrphanUtils.closeQuietly(fis);
}
Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/util/JMeterMenuBar.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/util/JMeterMenuBar.java?rev=1700117&r1=1700116&r2=1700117&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/util/JMeterMenuBar.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/util/JMeterMenuBar.java Sun Aug 30 13:13:39 2015
@@ -278,7 +278,7 @@ public class JMeterMenuBar extends JMenu
for (MenuCreator menuCreator : menuCreators) {
JMenu[] topLevelMenus = menuCreator.getTopLevelMenus();
for (JMenu topLevelMenu : topLevelMenus) {
- this.add(topLevelMenu);
+ this.add(topLevelMenu);
}
}
this.add(helpMenu);