From 279ad230550411c01e95b5617f5a3ae3598b3f85 Mon Sep 17 00:00:00 2001 From: Graham Russell Date: Tue, 7 Nov 2017 16:20:53 +0000 Subject: [PATCH] General comment improvements --- .../backend/influxdb/HttpMetricsSender.java | 5 ----- src/core/org/apache/jmeter/gui/NamePanel.java | 2 +- .../org/apache/jmeter/gui/action/ActionRouter.java | 7 +------ src/core/org/apache/jmeter/gui/action/Save.java | 4 ++-- .../processor/graph/AbstractGraphConsumer.java | 12 ------------ .../testbeans/gui/GenericTestBeanCustomizer.java | 3 --- .../org/apache/jorphan/reflect/ClassFinder.java | 2 +- 7 files changed, 5 insertions(+), 30 deletions(-) diff --git a/src/components/org/apache/jmeter/visualizers/backend/influxdb/HttpMetricsSender.java b/src/components/org/apache/jmeter/visualizers/backend/influxdb/HttpMetricsSender.java index 81296450c7d..894f2e203cb 100644 --- a/src/components/org/apache/jmeter/visualizers/backend/influxdb/HttpMetricsSender.java +++ b/src/components/org/apache/jmeter/visualizers/backend/influxdb/HttpMetricsSender.java @@ -110,11 +110,6 @@ public void setup(String influxdbUrl) throws Exception { httpClient.start(); } - /** - * @param influxdbUrl - * @return - * @throws URISyntaxException - */ private HttpPost createRequest(URL url) throws URISyntaxException { RequestConfig defaultRequestConfig = RequestConfig.custom() .setConnectTimeout(JMeterUtils.getPropDefault("backend_influxdb.connection_timeout", 1000)) diff --git a/src/core/org/apache/jmeter/gui/NamePanel.java b/src/core/org/apache/jmeter/gui/NamePanel.java index 3b0032efb41..189b7559c03 100644 --- a/src/core/org/apache/jmeter/gui/NamePanel.java +++ b/src/core/org/apache/jmeter/gui/NamePanel.java @@ -53,7 +53,7 @@ public NamePanel() { */ private void init() { // WARNING: called from ctor so must not be overridden (i.e. must be private or final) setLayout(new BorderLayout(5, 0)); - /** The label for the text field. */ + // The label for the text field. JLabel nameLabel = new JLabel(JMeterUtils.getResString("name")); // $NON-NLS-1$ nameLabel.setName("name"); nameLabel.setLabelFor(nameField); diff --git a/src/core/org/apache/jmeter/gui/action/ActionRouter.java b/src/core/org/apache/jmeter/gui/action/ActionRouter.java index fac00281188..a1695e93891 100644 --- a/src/core/org/apache/jmeter/gui/action/ActionRouter.java +++ b/src/core/org/apache/jmeter/gui/action/ActionRouter.java @@ -216,11 +216,6 @@ public void removePreActionListener(Class action, ActionListener listener) { removeActionListener(action, listener, preActionListeners); } - /** - * @param action {@link Class} - * @param e {@link ActionListener} - * @param actionListeners {@link Set} - */ private void removeActionListener(Class action, ActionListener listener, Map> actionListeners) { if (action != null) { Set set = actionListeners.get(action.getName()); @@ -248,7 +243,7 @@ public void addPostActionListener(Class action, ActionListener listener) { /** * @param action {@link Class} - * @param list {@link ActionListener} + * @param listener {@link ActionListener} * @param actionListeners {@link Set} */ private void addActionListener(Class action, ActionListener listener, Map> actionListeners) { diff --git a/src/core/org/apache/jmeter/gui/action/Save.java b/src/core/org/apache/jmeter/gui/action/Save.java index 7fc332d0e4f..bc2c36c40de 100644 --- a/src/core/org/apache/jmeter/gui/action/Save.java +++ b/src/core/org/apache/jmeter/gui/action/Save.java @@ -329,8 +329,8 @@ private List createBackupFile(File fileToBackup) { backupDir.getAbsolutePath()); //$NON-NLS-2$ } - /** - * select files matching + /* + * select files matching * {baseName}{versionSeparator}{version}{jmxExtension} * where {version} is a 6 digits number */ diff --git a/src/core/org/apache/jmeter/report/processor/graph/AbstractGraphConsumer.java b/src/core/org/apache/jmeter/report/processor/graph/AbstractGraphConsumer.java index d49913822d0..298f429d87f 100644 --- a/src/core/org/apache/jmeter/report/processor/graph/AbstractGraphConsumer.java +++ b/src/core/org/apache/jmeter/report/processor/graph/AbstractGraphConsumer.java @@ -252,11 +252,6 @@ private void setMaxResult(MapResultData result, String name, Double value) { /** * Adds a value map build from specified parameters to the result map. - * - * @param seriesData - * the seriesData - * @param map - * the groupData map */ private void addKeyData(MapResultData result, String group, String series, SeriesData seriesData, boolean aggregated) { @@ -387,13 +382,6 @@ private void addKeyData(MapResultData result, String group, String series, /** * Aggregate a value to the aggregator defined by the specified parameters. - * - * @param groupData - * the map - * @param key - * the key - * @param value - * the value */ private void aggregateValue(AggregatorFactory factory, SeriesData data, Double key, double value) { diff --git a/src/core/org/apache/jmeter/testbeans/gui/GenericTestBeanCustomizer.java b/src/core/org/apache/jmeter/testbeans/gui/GenericTestBeanCustomizer.java index 27f1243254b..6f115b8e3de 100644 --- a/src/core/org/apache/jmeter/testbeans/gui/GenericTestBeanCustomizer.java +++ b/src/core/org/apache/jmeter/testbeans/gui/GenericTestBeanCustomizer.java @@ -202,9 +202,6 @@ public GenericTestBeanCustomizer(){ } /** * Create a customizer for a given test bean type. - * - * @param testBeanClass - * a subclass of TestBean * @see org.apache.jmeter.testbeans.TestBean */ GenericTestBeanCustomizer(BeanInfo beanInfo) { diff --git a/src/jorphan/org/apache/jorphan/reflect/ClassFinder.java b/src/jorphan/org/apache/jorphan/reflect/ClassFinder.java index 2fae6cc6f0c..6aa39b32799 100644 --- a/src/jorphan/org/apache/jorphan/reflect/ClassFinder.java +++ b/src/jorphan/org/apache/jorphan/reflect/ClassFinder.java @@ -307,7 +307,7 @@ public static List findClasses(String[] searchPathsOrJars, ClassFilter f /** * Returns the classpath entries that match the search list of jars and paths - * @param List can contain {@code null} element but must not be {@code null} + * @param strPathsOrJars can contain {@code null} element but must not be {@code null} * @return List of paths (jars or folders) that ends with one of the rows of strPathsOrJars */ private static List getClasspathMatches(List strPathsOrJars) {