This is an automated email from the ASF dual-hosted git repository.
vladimirsitnikov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jmeter.git
The following commit(s) were added to refs/heads/master by this push:
new f364516 Fix import order
f364516 is described below
commit f364516611a990df0f6f182598419d7885ca76e1
Author: Vladimir Sitnikov <[email protected]>
AuthorDate: Mon Mar 23 01:40:27 2020 +0300
Fix import order
---
.../src/main/java/org/apache/jmeter/gui/util/IconToolbarBean.java | 6 +++---
.../src/main/java/org/apache/jmeter/gui/util/JMeterToolBar.java | 3 +--
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git
a/src/core/src/main/java/org/apache/jmeter/gui/util/IconToolbarBean.java
b/src/core/src/main/java/org/apache/jmeter/gui/util/IconToolbarBean.java
index 70ce6e7..009f5aa 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/util/IconToolbarBean.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/util/IconToolbarBean.java
@@ -17,13 +17,13 @@
package org.apache.jmeter.gui.util;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
import org.apache.jmeter.gui.action.ActionNames;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
public final class IconToolbarBean {
private static final Logger log =
LoggerFactory.getLogger(IconToolbarBean.class);
diff --git
a/src/core/src/main/java/org/apache/jmeter/gui/util/JMeterToolBar.java
b/src/core/src/main/java/org/apache/jmeter/gui/util/JMeterToolBar.java
index bede9ee..7c64eee 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/util/JMeterToolBar.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/util/JMeterToolBar.java
@@ -32,8 +32,6 @@ import javax.swing.JButton;
import javax.swing.JOptionPane;
import javax.swing.JToolBar;
-import com.github.weisj.darklaf.icons.ThemedSVGIcon;
-
import org.apache.commons.lang3.StringUtils;
import org.apache.jmeter.gui.UndoHistory;
import org.apache.jmeter.gui.action.ActionNames;
@@ -44,6 +42,7 @@ import org.apache.jmeter.util.LocaleChangeListener;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import com.github.weisj.darklaf.icons.ThemedSVGIcon;
import com.github.weisj.darklaf.ui.button.DarkButtonUI;
/**
