jmeter-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject svn commit: r1688532 - in /jmeter/trunk/src: components/org/apache/jmeter/assertions/ components/org/apache/jmeter/assertions/gui/ components/org/apache/jmeter/extractor/ components/org/apache/jmeter/modifiers/ components/org/apache/jmeter/timers/ comp...
Date Tue, 30 Jun 2015 23:25:05 GMT
Author: sebb
Date: Tue Jun 30 23:25:04 2015
New Revision: 1688532

URL: http://svn.apache.org/r1688532
Log:
Add spaces around catch clause alternation operator

Modified:
    jmeter/trunk/src/components/org/apache/jmeter/assertions/JSR223Assertion.java
    jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/XPathPanel.java
    jmeter/trunk/src/components/org/apache/jmeter/extractor/JSR223PostProcessor.java
    jmeter/trunk/src/components/org/apache/jmeter/modifiers/JSR223PreProcessor.java
    jmeter/trunk/src/components/org/apache/jmeter/timers/BSFTimer.java
    jmeter/trunk/src/components/org/apache/jmeter/timers/JSR223Timer.java
    jmeter/trunk/src/components/org/apache/jmeter/timers/SyncTimer.java
    jmeter/trunk/src/components/org/apache/jmeter/visualizers/AxisGraph.java
    jmeter/trunk/src/components/org/apache/jmeter/visualizers/JSR223Listener.java
    jmeter/trunk/src/core/org/apache/jmeter/engine/DistributedRunner.java
    jmeter/trunk/src/core/org/apache/jmeter/gui/GuiPackage.java
    jmeter/trunk/src/core/org/apache/jmeter/gui/MainFrame.java
    jmeter/trunk/src/core/org/apache/jmeter/gui/SavePropertyDialog.java
    jmeter/trunk/src/core/org/apache/jmeter/gui/action/LookAndFeelCommand.java
    jmeter/trunk/src/core/org/apache/jmeter/gui/util/PowerTableModel.java
    jmeter/trunk/src/core/org/apache/jmeter/reporters/ResultCollector.java
    jmeter/trunk/src/core/org/apache/jmeter/samplers/DiskStoreSampleSender.java
    jmeter/trunk/src/core/org/apache/jmeter/save/CSVSaveService.java
    jmeter/trunk/src/core/org/apache/jmeter/save/SaveService.java
    jmeter/trunk/src/core/org/apache/jmeter/save/ScriptWrapperConverter.java
    jmeter/trunk/src/core/org/apache/jmeter/save/converters/TestElementConverter.java
    jmeter/trunk/src/core/org/apache/jmeter/save/converters/TestElementPropertyConverter.java
    jmeter/trunk/src/core/org/apache/jmeter/testbeans/TestBeanHelper.java
    jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/GenericTestBeanCustomizer.java
    jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/TestBeanGUI.java
    jmeter/trunk/src/core/org/apache/jmeter/testelement/AbstractTestElement.java
    jmeter/trunk/src/core/org/apache/jmeter/util/BeanShellInterpreter.java
    jmeter/trunk/src/core/org/apache/jmeter/util/JMeterUtils.java
    jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/sampler/JSR223Sampler.java

Modified: jmeter/trunk/src/components/org/apache/jmeter/assertions/JSR223Assertion.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/assertions/JSR223Assertion.java?rev=1688532&r1=1688531&r2=1688532&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/assertions/JSR223Assertion.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/assertions/JSR223Assertion.java Tue Jun
30 23:25:04 2015
@@ -46,7 +46,7 @@ public class JSR223Assertion extends JSR
             bindings.put("AssertionResult", result);
             processFileOrScript(scriptEngine, bindings);
             result.setError(false);
-        } catch (IOException|ScriptException e) {
+        } catch (IOException | ScriptException e) {
             log.error("Problem in JSR223 script "+getName(), e);
             result.setError(true);
             result.setFailureMessage(e.toString());

Modified: jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/XPathPanel.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/XPathPanel.java?rev=1688532&r1=1688531&r2=1688532&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/XPathPanel.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/XPathPanel.java Tue Jun 30
23:25:04 2015
@@ -205,7 +205,7 @@ public class XPathPanel extends JPanel {
             log.warn(e.getLocalizedMessage());
             success = false;
             ret = e.getLocalizedMessage();
-        } catch (ParserConfigurationException|TransformerException e) {
+        } catch (ParserConfigurationException | TransformerException e) {
             success = false;
             ret = e.getLocalizedMessage();
         }

Modified: jmeter/trunk/src/components/org/apache/jmeter/extractor/JSR223PostProcessor.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/extractor/JSR223PostProcessor.java?rev=1688532&r1=1688531&r2=1688532&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/extractor/JSR223PostProcessor.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/extractor/JSR223PostProcessor.java Tue Jun
30 23:25:04 2015
@@ -40,7 +40,7 @@ public class JSR223PostProcessor extends
         try {
             ScriptEngine scriptEngine = getScriptEngine();
             processFileOrScript(scriptEngine, null);
-        } catch (ScriptException|IOException e) {
+        } catch (ScriptException | IOException e) {
             log.error("Problem in JSR223 script "+getName(), e);
         }
     }

Modified: jmeter/trunk/src/components/org/apache/jmeter/modifiers/JSR223PreProcessor.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/modifiers/JSR223PreProcessor.java?rev=1688532&r1=1688531&r2=1688532&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/modifiers/JSR223PreProcessor.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/modifiers/JSR223PreProcessor.java Tue Jun
30 23:25:04 2015
@@ -40,7 +40,7 @@ public class JSR223PreProcessor extends
         try {
             ScriptEngine scriptEngine = getScriptEngine();
             processFileOrScript(scriptEngine, null);
-        } catch (ScriptException|IOException e) {
+        } catch (ScriptException | IOException e) {
             log.error("Problem in JSR223 script "+getName(), e);
         }
     }

Modified: jmeter/trunk/src/components/org/apache/jmeter/timers/BSFTimer.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/timers/BSFTimer.java?rev=1688532&r1=1688531&r2=1688532&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/timers/BSFTimer.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/timers/BSFTimer.java Tue Jun 30 23:25:04
2015
@@ -43,7 +43,7 @@ public class BSFTimer extends BSFTestEle
                 return 0;
             }
             delay = Long.parseLong(o.toString());
-        } catch (NumberFormatException|BSFException e) {
+        } catch (NumberFormatException | BSFException e) {
             log.warn("Problem in BSF script "+e);
         } finally {
             if(mgr != null) {

Modified: jmeter/trunk/src/components/org/apache/jmeter/timers/JSR223Timer.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/timers/JSR223Timer.java?rev=1688532&r1=1688531&r2=1688532&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/timers/JSR223Timer.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/timers/JSR223Timer.java Tue Jun 30 23:25:04
2015
@@ -45,7 +45,7 @@ public class JSR223Timer extends JSR223T
                 return 0;
             }
             delay = Long.parseLong(o.toString());
-        } catch (NumberFormatException|IOException|ScriptException e) {
+        } catch (NumberFormatException | IOException | ScriptException e) {
             log.error("Problem in JSR223 script "+getName(), e);
         }
         return delay;

Modified: jmeter/trunk/src/components/org/apache/jmeter/timers/SyncTimer.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/timers/SyncTimer.java?rev=1688532&r1=1688531&r2=1688532&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/timers/SyncTimer.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/timers/SyncTimer.java Tue Jun 30 23:25:04
2015
@@ -178,7 +178,7 @@ public class SyncTimer extends AbstractT
                 } else {
                     throw new IllegalArgumentException("Negative value for timeout:"+timeoutInMs+"
in Synchronizing Timer "+getName());
                 }
-            } catch (InterruptedException|BrokenBarrierException e) {
+            } catch (InterruptedException | BrokenBarrierException e) {
                 return 0;
             } catch (TimeoutException e) {
                 LOGGER.warn("SyncTimer "+ getName() + " timeouted waiting for users after:"+getTimeoutInMs()+"ms");

Modified: jmeter/trunk/src/components/org/apache/jmeter/visualizers/AxisGraph.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/visualizers/AxisGraph.java?rev=1688532&r1=1688531&r2=1688532&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/visualizers/AxisGraph.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/visualizers/AxisGraph.java Tue Jun 30 23:25:04
2015
@@ -426,7 +426,7 @@ public class AxisGraph extends JPanel {
                     legendProperties, _width, _height );
             axisChart.setGraphics2D((Graphics2D) g);
             axisChart.render();
-        } catch (ChartDataException|PropertyException e) {
+        } catch (ChartDataException | PropertyException e) {
             log.warn("",e);
         }
     }

Modified: jmeter/trunk/src/components/org/apache/jmeter/visualizers/JSR223Listener.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/visualizers/JSR223Listener.java?rev=1688532&r1=1688531&r2=1688532&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/visualizers/JSR223Listener.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/visualizers/JSR223Listener.java Tue Jun
30 23:25:04 2015
@@ -48,7 +48,7 @@ public class JSR223Listener extends JSR2
             bindings.put("sampleEvent", event);
             bindings.put("sampleResult", event.getResult());
             processFileOrScript(scriptEngine, bindings);
-        } catch (ScriptException|IOException e) {
+        } catch (ScriptException | IOException e) {
             log.error("Problem in JSR223 script "+getName(), e);
         }
     }

Modified: jmeter/trunk/src/core/org/apache/jmeter/engine/DistributedRunner.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/engine/DistributedRunner.java?rev=1688532&r1=1688531&r2=1688532&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/engine/DistributedRunner.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/engine/DistributedRunner.java Tue Jun 30 23:25:04
2015
@@ -133,7 +133,7 @@ public class DistributedRunner {
                 } else {
                     log.warn("Host not found in list of active engines: " + address);
                 }
-            } catch (IllegalStateException|JMeterEngineException e) {
+            } catch (IllegalStateException | JMeterEngineException e) {
                 JMeterUtils.reportErrorToUser(e.getMessage(), JMeterUtils.getResString("remote_error_starting"));
// $NON-NLS-1$
             }
         }

Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/GuiPackage.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/GuiPackage.java?rev=1688532&r1=1688531&r2=1688532&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/GuiPackage.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/GuiPackage.java Tue Jun 30 23:25:04 2015
@@ -351,7 +351,7 @@ public final class GuiPackage implements
                     "Missing jar? See log file." ,
                     JOptionPane.ERROR_MESSAGE);
             throw new RuntimeException(e.toString(), e); // Probably a missing jar
-        } catch (ClassNotFoundException|InstantiationException|IllegalAccessException e)
{
+        } catch (ClassNotFoundException | InstantiationException | IllegalAccessException
e) {
             log.error("Problem retrieving gui for " + objClass, e);
             throw new RuntimeException(e.toString(), e); // Programming error: bail out.
         }

Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/MainFrame.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/MainFrame.java?rev=1688532&r1=1688531&r2=1688532&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/MainFrame.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/MainFrame.java Tue Jun 30 23:25:04 2015
@@ -770,7 +770,7 @@ public class MainFrame extends JFrame im
                     return;
                 }
             }
-        } catch (UnsupportedFlavorException|IOException e) {
+        } catch (UnsupportedFlavorException | IOException e) {
             log.warn("Dnd failed" , e);
         }
 
@@ -861,7 +861,7 @@ public class MainFrame extends JFrame im
                 final Field awtAppClassName = xtoolkit.getDeclaredField("awtAppClassName");
// $NON-NLS-1$
                 awtAppClassName.setAccessible(true);
                 awtAppClassName.set(null, DEFAULT_APP_NAME);
-            } catch (NoSuchFieldException|IllegalAccessException nsfe) {
+            } catch (NoSuchFieldException | IllegalAccessException nsfe) {
                 log.warn("Error awt title: " + nsfe); // $NON-NLS-1$
             }
        }

Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/SavePropertyDialog.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/SavePropertyDialog.java?rev=1688532&r1=1688531&r2=1688532&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/SavePropertyDialog.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/SavePropertyDialog.java Tue Jun 30 23:25:04
2015
@@ -114,7 +114,7 @@ public class SavePropertyDialog extends
                     if (!functors.containsKey(actionCommand)) {
                         functors.put(actionCommand, new Functor(actionCommand));
                     }
-                } catch (IllegalAccessException|InvocationTargetException e) {
+                } catch (IllegalAccessException | InvocationTargetException e) {
                     log.warn("Problem creating save config dialog", e);
                 }
             }

Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/action/LookAndFeelCommand.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/action/LookAndFeelCommand.java?rev=1688532&r1=1688531&r2=1688532&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/action/LookAndFeelCommand.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/action/LookAndFeelCommand.java Tue Jun 30
23:25:04 2015
@@ -139,7 +139,7 @@ public class LookAndFeelCommand implemen
                 }
             }
             PREFS.put(USER_PREFS_KEY, className);
-        } catch (javax.swing.UnsupportedLookAndFeelException|InstantiationException|ClassNotFoundException|IllegalAccessException
e) {
+        } catch (javax.swing.UnsupportedLookAndFeelException | InstantiationException | ClassNotFoundException
| IllegalAccessException e) {
             JMeterUtils.reportErrorToUser("Look and Feel unavailable:" + e.toString());
         }
     }

Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/util/PowerTableModel.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/util/PowerTableModel.java?rev=1688532&r1=1688531&r2=1688532&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/util/PowerTableModel.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/util/PowerTableModel.java Tue Jun 30 23:25:04
2015
@@ -141,47 +141,47 @@ public class PowerTableModel extends Def
             try {
                 Constructor<?> constr = colClass.getConstructor(new Class[] { String.class
});
                 return constr.newInstance(new Object[] { "" });
-            } catch (NoSuchMethodException|InstantiationException|IllegalAccessException|InvocationTargetException
ignored) {
+            } catch (NoSuchMethodException | InstantiationException | IllegalAccessException
| InvocationTargetException ignored) {
             }
             try {
                 Constructor<?> constr = colClass.getConstructor(new Class[] { Integer.TYPE
});
                 return constr.newInstance(new Object[] { Integer.valueOf(0) });
-            } catch (NoSuchMethodException|InstantiationException|IllegalAccessException|InvocationTargetException
ignored) {
+            } catch (NoSuchMethodException | InstantiationException | IllegalAccessException
| InvocationTargetException ignored) {
             }
             try {
                 Constructor<?> constr = colClass.getConstructor(new Class[] { Long.TYPE
});
                 return constr.newInstance(new Object[] { Long.valueOf(0L) });
-            } catch (NoSuchMethodException|InstantiationException|IllegalAccessException|InvocationTargetException
ignored) {
+            } catch (NoSuchMethodException | InstantiationException | IllegalAccessException
| InvocationTargetException ignored) {
             }
             try {
                 Constructor<?> constr = colClass.getConstructor(new Class[] { Boolean.TYPE
});
                 return constr.newInstance(new Object[] { Boolean.FALSE });
-            } catch (NoSuchMethodException|InstantiationException|IllegalAccessException|InvocationTargetException
ignored) {
+            } catch (NoSuchMethodException | InstantiationException | IllegalAccessException
| InvocationTargetException ignored) {
             }
             try {
                 Constructor<?> constr = colClass.getConstructor(new Class[] { Float.TYPE
});
                 return constr.newInstance(new Object[] { Float.valueOf(0F) });
-            } catch (NoSuchMethodException|InstantiationException|IllegalAccessException|InvocationTargetException
ignored) {
+            } catch (NoSuchMethodException | InstantiationException | IllegalAccessException
| InvocationTargetException ignored) {
             }
             try {
                 Constructor<?> constr = colClass.getConstructor(new Class[] { Double.TYPE
});
                 return constr.newInstance(new Object[] { Double.valueOf(0D) });
-            } catch (NoSuchMethodException|InstantiationException|IllegalAccessException|InvocationTargetException
ignored) {
+            } catch (NoSuchMethodException | InstantiationException | IllegalAccessException
| InvocationTargetException ignored) {
             }
             try {
                 Constructor<?> constr = colClass.getConstructor(new Class[] { Character.TYPE
});
                 return constr.newInstance(new Object[] { Character.valueOf(' ') });
-            } catch (NoSuchMethodException|InstantiationException|IllegalAccessException|InvocationTargetException
ignored) {
+            } catch (NoSuchMethodException | InstantiationException | IllegalAccessException
| InvocationTargetException ignored) {
             }
             try {
                 Constructor<?> constr = colClass.getConstructor(new Class[] { Byte.TYPE
});
                 return constr.newInstance(new Object[] { Byte.valueOf(Byte.MIN_VALUE) });
-            } catch (NoSuchMethodException|InstantiationException|IllegalAccessException|InvocationTargetException
ignored) {
+            } catch (NoSuchMethodException | InstantiationException | IllegalAccessException
| InvocationTargetException ignored) {
             }
             try {
                 Constructor<?> constr = colClass.getConstructor(new Class[] { Short.TYPE
});
                 return constr.newInstance(new Object[] { Short.valueOf(Short.MIN_VALUE) });
-            } catch (NoSuchMethodException|InstantiationException|IllegalAccessException|InvocationTargetException
ignored) {
+            } catch (NoSuchMethodException | InstantiationException | IllegalAccessException
| InvocationTargetException ignored) {
             }
         }
         return "";

Modified: jmeter/trunk/src/core/org/apache/jmeter/reporters/ResultCollector.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/reporters/ResultCollector.java?rev=1688532&r1=1688531&r2=1688532&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/reporters/ResultCollector.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/reporters/ResultCollector.java Tue Jun 30 23:25:04
2015
@@ -404,10 +404,10 @@ public class ResultCollector extends Abs
                         }
                     }
                 }
-            } catch (IOException|JMeterError|RuntimeException|OutOfMemoryError e) {
+            } catch (IOException | JMeterError | RuntimeException | OutOfMemoryError e) {
                 // FIXME Why do we catch OOM ?
                 log.warn("Problem reading JTL file: "+file);
-            } catch (ConfigurationException|SAXException e) { // Avalon only
+            } catch (ConfigurationException | SAXException e) { // Avalon only
                 log.warn("Problem reading Avalon JTL file: "+file,e);
             } finally {
                 JOrphanUtils.closeQuietly(dataReader);

Modified: jmeter/trunk/src/core/org/apache/jmeter/samplers/DiskStoreSampleSender.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/samplers/DiskStoreSampleSender.java?rev=1688532&r1=1688531&r2=1688532&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/samplers/DiskStoreSampleSender.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/samplers/DiskStoreSampleSender.java Tue Jun 30
23:25:04 2015
@@ -107,7 +107,7 @@ public class DiskStoreSampleSender exten
             }                    
         } catch (EOFException err) {
             // expected
-        } catch (IOException|ClassNotFoundException err) {
+        } catch (IOException | ClassNotFoundException err) {
             log.error("returning sample", err);
         } finally {
             try {

Modified: jmeter/trunk/src/core/org/apache/jmeter/save/CSVSaveService.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/save/CSVSaveService.java?rev=1688532&r1=1688531&r2=1688532&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/save/CSVSaveService.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/save/CSVSaveService.java Tue Jun 30 23:25:04 2015
@@ -363,7 +363,7 @@ public final class CSVSaveService {
                         + ". Extra fields have been ignored.");
             }
 
-        } catch (NumberFormatException|ParseException e) {
+        } catch (NumberFormatException | ParseException e) {
             log.warn("Error parsing field '" + field + "' at line "
                     + lineNumber + " " + e);
             throw new JMeterError(e);

Modified: jmeter/trunk/src/core/org/apache/jmeter/save/SaveService.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/save/SaveService.java?rev=1688532&r1=1688531&r2=1688532&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/save/SaveService.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/save/SaveService.java Tue Jun 30 23:25:04 2015
@@ -253,8 +253,8 @@ public class SaveService {
                                 registerConverter(key, JMXSAVER, false);
                                 registerConverter(key, JTLSAVER, false);
                             }
-                        } catch (IllegalAccessException|InstantiationException|ClassNotFoundException|IllegalArgumentException|
-                                SecurityException|InvocationTargetException|NoSuchMethodException
e1) {
+                        } catch (IllegalAccessException | InstantiationException | ClassNotFoundException
| IllegalArgumentException|
+                                SecurityException | InvocationTargetException | NoSuchMethodException
e1) {
                             log.warn("Can't register a converter: " + key, e1);
                         }
                     }
@@ -563,7 +563,7 @@ public class SaveService {
             } else {
                 throw new IllegalArgumentException("Problem loading XML, cannot determine
class for element: " + e, e);
             }
-        } catch (ConversionException|NoClassDefFoundError e) {
+        } catch (ConversionException | NoClassDefFoundError e) {
             if(file != null) {
                 throw new IllegalArgumentException("Problem loading XML from:'"+file.getAbsolutePath()+"',
missing class "+e , e);
             } else {

Modified: jmeter/trunk/src/core/org/apache/jmeter/save/ScriptWrapperConverter.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/save/ScriptWrapperConverter.java?rev=1688532&r1=1688531&r2=1688532&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/save/ScriptWrapperConverter.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/save/ScriptWrapperConverter.java Tue Jun 30 23:25:04
2015
@@ -93,7 +93,7 @@ public class ScriptWrapperConverter impl
         // Catch errors and rethrow as ConversionException so we get location details
         try {
             wrap.testPlan = (HashTree) context.convertAnother(wrap, getNextType(reader));
-        } catch (NoClassDefFoundError|Exception e) {
+        } catch (NoClassDefFoundError | Exception e) {
             throw createConversionException(e);
         }
         return wrap;

Modified: jmeter/trunk/src/core/org/apache/jmeter/save/converters/TestElementConverter.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/save/converters/TestElementConverter.java?rev=1688532&r1=1688531&r2=1688532&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/save/converters/TestElementConverter.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/save/converters/TestElementConverter.java Tue
Jun 30 23:25:04 2015
@@ -113,7 +113,7 @@ public class TestElementConverter extend
                 reader.moveUp();
             }
             return el;
-        } catch (InstantiationException|IllegalAccessException e) {
+        } catch (InstantiationException | IllegalAccessException e) {
             log.error("TestElement not instantiable: " + type, e);
             return null;
         }

Modified: jmeter/trunk/src/core/org/apache/jmeter/save/converters/TestElementPropertyConverter.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/save/converters/TestElementPropertyConverter.java?rev=1688532&r1=1688531&r2=1688532&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/save/converters/TestElementPropertyConverter.java
(original)
+++ jmeter/trunk/src/core/org/apache/jmeter/save/converters/TestElementPropertyConverter.java
Tue Jun 30 23:25:04 2015
@@ -128,7 +128,7 @@ public class TestElementPropertyConverte
                 reader.moveUp();
             }
             return prop;
-        } catch (InstantiationException|IllegalAccessException e) {
+        } catch (InstantiationException | IllegalAccessException e) {
             log.error("Couldn't unmarshall TestElementProperty", e);
             return new TestElementProperty("ERROR", new ConfigTestElement());// $NON-NLS-1$
         }

Modified: jmeter/trunk/src/core/org/apache/jmeter/testbeans/TestBeanHelper.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/testbeans/TestBeanHelper.java?rev=1688532&r1=1688531&r2=1688532&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/testbeans/TestBeanHelper.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/testbeans/TestBeanHelper.java Tue Jun 30 23:25:04
2015
@@ -170,7 +170,7 @@ public class TestBeanHelper {
     private static Object invokeOrBailOut(Object invokee, Method method, Object[] params)
{
         try {
             return method.invoke(invokee, params);
-        } catch (IllegalArgumentException|IllegalAccessException|InvocationTargetException
e) {
+        } catch (IllegalArgumentException | IllegalAccessException | InvocationTargetException
e) {
             throw new Error(createMessage(invokee, method, params), e);
         }
     }

Modified: jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/GenericTestBeanCustomizer.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/GenericTestBeanCustomizer.java?rev=1688532&r1=1688531&r2=1688532&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/GenericTestBeanCustomizer.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/GenericTestBeanCustomizer.java Tue
Jun 30 23:25:04 2015
@@ -245,7 +245,7 @@ public class GenericTestBeanCustomizer e
                 if (editorClass != null) {
                     try {
                         propertyEditor = (PropertyEditor) editorClass.newInstance();
-                    } catch (InstantiationException|IllegalAccessException e) {
+                    } catch (InstantiationException | IllegalAccessException e) {
                         log.error("Can't create property editor.", e);
                         throw new Error(e.toString());
                     }

Modified: jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/TestBeanGUI.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/TestBeanGUI.java?rev=1688532&r1=1688531&r2=1688532&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/TestBeanGUI.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/TestBeanGUI.java Tue Jun 30 23:25:04
2015
@@ -187,7 +187,7 @@ public class TestBeanGUI extends Abstrac
     private Customizer createCustomizer() {
         try {
             return (Customizer) customizerClass.newInstance();
-        } catch (InstantiationException|IllegalAccessException e) {
+        } catch (InstantiationException | IllegalAccessException e) {
             log.error("Could not instantiate customizer of class " + customizerClass, e);
             throw new Error(e.toString());
         }
@@ -223,7 +223,7 @@ public TestElement createTestElement() {
             modifyTestElement(element); // put the default values back into the
             // new element
             return element;
-        } catch (InstantiationException|IllegalAccessException e) {
+        } catch (InstantiationException | IllegalAccessException e) {
             log.error("Can't create test element", e);
             throw new Error(e.toString()); // Programming error. Don't
                                             // continue.

Modified: jmeter/trunk/src/core/org/apache/jmeter/testelement/AbstractTestElement.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/testelement/AbstractTestElement.java?rev=1688532&r1=1688531&r2=1688532&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/testelement/AbstractTestElement.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/testelement/AbstractTestElement.java Tue Jun 30
23:25:04 2015
@@ -79,7 +79,7 @@ public abstract class AbstractTestElemen
             }
             clonedElement.setRunningVersion(runningVersion);
             return clonedElement;
-        } catch (InstantiationException|IllegalAccessException e) {
+        } catch (InstantiationException | IllegalAccessException e) {
             throw new AssertionError(e); // clone should never return null
         }
     }

Modified: jmeter/trunk/src/core/org/apache/jmeter/util/BeanShellInterpreter.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/util/BeanShellInterpreter.java?rev=1688532&r1=1688531&r2=1688532&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/util/BeanShellInterpreter.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/util/BeanShellInterpreter.java Tue Jun 30 23:25:04
2015
@@ -71,7 +71,7 @@ public class BeanShellInterpreter {
                     new Class[] { string, object });
             source = clazz.getMethod("source", //$NON-NLS-1$
                     new Class[] { string });
-        } catch (ClassNotFoundException|SecurityException|NoSuchMethodException e) {
+        } catch (ClassNotFoundException|SecurityException | NoSuchMethodException e) {
             log.error("Beanshell Interpreter not found", e);
         } finally {
             bshEval = eval;
@@ -112,7 +112,7 @@ public class BeanShellInterpreter {
         }
         try {
             bshInstance = bshClass.newInstance();
-        } catch (InstantiationException|IllegalAccessException e) {
+        } catch (InstantiationException | IllegalAccessException e) {
             log.error("Can't instantiate BeanShell", e);
             throw new ClassNotFoundException("Can't instantiate BeanShell", e);
         } 
@@ -161,7 +161,7 @@ public class BeanShellInterpreter {
         final String errorString = "Error invoking bsh method: ";
         try {
             r = m.invoke(bshInstance, o);
-        } catch (IllegalArgumentException|IllegalAccessException e) { // Programming error
+        } catch (IllegalArgumentException | IllegalAccessException e) { // Programming error
             final String message = errorString + m.getName();
             log.error(message);
             throw new JMeterError(message, e);

Modified: jmeter/trunk/src/core/org/apache/jmeter/util/JMeterUtils.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/util/JMeterUtils.java?rev=1688532&r1=1688531&r2=1688532&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/util/JMeterUtils.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/util/JMeterUtils.java Tue Jun 30 23:25:04 2015
@@ -583,7 +583,7 @@ public class JMeterUtils implements Unit
                 log.warn("no icon for " + name);
                 return null;                
             }
-        } catch (NoClassDefFoundError|InternalError e) {// Can be returned by headless hosts
+        } catch (NoClassDefFoundError | InternalError e) {// Can be returned by headless
hosts
             log.info("no icon for " + name + " " + e.getMessage());
             return null;
         }

Modified: jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/sampler/JSR223Sampler.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/sampler/JSR223Sampler.java?rev=1688532&r1=1688531&r2=1688532&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/sampler/JSR223Sampler.java
(original)
+++ jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/sampler/JSR223Sampler.java
Tue Jun 30 23:25:04 2015
@@ -71,7 +71,7 @@ public class JSR223Sampler extends JSR22
             if (ret != null && (result.getResponseData() == null || result.getResponseData()==SampleResult.EMPTY_BA)){
                 result.setResponseData(ret.toString(), null);
             }
-        } catch (IOException|ScriptException e) {
+        } catch (IOException | ScriptException e) {
             log.error("Problem in JSR223 script "+getName()+", message:"+e, e);
             result.setSuccessful(false);
             result.setResponseCode("500"); // $NON-NLS-1$



Mime
View raw message