Author: pmouawad
Date: Wed Nov 15 22:23:39 2017
New Revision: 1815391
URL: http://svn.apache.org/viewvc?rev=1815391&view=rev
Log:
Utilising more modern Java, simplifying code and formatting code and comments
This comment #327 (PART 1)
Modified:
jmeter/trunk/src/core/org/apache/jmeter/gui/CommentPanel.java
jmeter/trunk/src/core/org/apache/jmeter/gui/GUIFactory.java
jmeter/trunk/src/core/org/apache/jmeter/gui/GlobalUndoableEdit.java
jmeter/trunk/src/core/org/apache/jmeter/gui/GuiPackage.java
jmeter/trunk/src/core/org/apache/jmeter/gui/JMeterFileFilter.java
jmeter/trunk/src/core/org/apache/jmeter/gui/LoggerPanel.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/SimpleCompoundEdit.java
jmeter/trunk/src/core/org/apache/jmeter/gui/TreeState.java
jmeter/trunk/src/core/org/apache/jmeter/gui/UndoHistory.java
jmeter/trunk/src/core/org/apache/jmeter/gui/UndoHistoryItem.java
Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/CommentPanel.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/CommentPanel.java?rev=1815391&r1=1815390&r2=1815391&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/CommentPanel.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/CommentPanel.java Wed Nov 15
22:23:39 2017
@@ -28,7 +28,6 @@ import org.apache.jmeter.util.JMeterUtil
/**
* Generic comment panel for Test Elements
- *
*/
public class CommentPanel extends JPanel {
private static final long serialVersionUID = 240L;
Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/GUIFactory.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/GUIFactory.java?rev=1815391&r1=1815390&r2=1815391&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/GUIFactory.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/GUIFactory.java Wed Nov 15
22:23:39 2017
@@ -57,7 +57,6 @@ public final class GUIFactory {
*/
public static ImageIcon getIcon(Class<?> elementClass) {
return getIcon(elementClass, true);
-
}
/**
Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/GlobalUndoableEdit.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/GlobalUndoableEdit.java?rev=1815391&r1=1815390&r2=1815391&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/GlobalUndoableEdit.java
(original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/GlobalUndoableEdit.java Wed Nov
15 22:23:39 2017
@@ -25,9 +25,6 @@ import javax.swing.undo.CannotUndoExcept
public final class GlobalUndoableEdit extends AbstractUndoableEdit {
- /**
- *
- */
private static final long serialVersionUID = -4964577622742131354L;
private final UndoHistoryItem item;
private final UndoHistoryItem previous;
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=1815391&r1=1815390&r2=1815391&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/GuiPackage.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/GuiPackage.java Wed Nov 15
22:23:39 2017
@@ -24,7 +24,6 @@ import java.beans.Introspector;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.prefs.Preferences;
@@ -70,7 +69,7 @@ import org.slf4j.LoggerFactory;
*
*/
public final class GuiPackage implements LocaleChangeListener, HistoryListener
{
- /** Logging. */
+
private static final Logger log =
LoggerFactory.getLogger(GuiPackage.class);
private static final String SBR_PREFS_KEY = "save_before_run";
@@ -125,29 +124,19 @@ public final class GuiPackage implements
/** The main JMeter toolbar. */
private JToolBar toolbar;
- /**
- * The LoggerPanel menu item
- */
+ /** The LoggerPanel menu item */
private JCheckBoxMenuItem menuItemLoggerPanel;
- /**
- * The LoggerPanel menu item
- */
+ /** The LoggerPanel menu item */
private JCheckBoxMenuItem menuItemSaveBeforeRunPanel;
- /**
- * Logger Panel reference
- */
+ /** Logger Panel reference */
private LoggerPanel loggerPanel;
- /**
- * History for tree states
- */
+ /** History for tree states */
private UndoHistory undoHistory = new UndoHistory();
- /**
- * GUI Logging Event Bus.
- */
+ /** GUI Logging Event Bus. */
private GuiLogEventBus logEventBus = new GuiLogEventBus();
/**
@@ -156,7 +145,7 @@ public final class GuiPackage implements
*/
private GuiPackage(JMeterTreeModel treeModel, JMeterTreeListener
treeListener) {
this.treeModel = treeModel;
- if(UndoHistory.isEnabled()) {
+ if (UndoHistory.isEnabled()) {
this.treeModel.addTreeModelListener(undoHistory);
}
this.treeListener = treeListener;
@@ -451,7 +440,6 @@ public final class GuiPackage implements
* choosing the new node.
*/
public void updateCurrentNode() {
-
try {
if (currentNode != null && !currentNodeUpdated) {
log.debug("Updating current node {}", currentNode.getName());
@@ -464,11 +452,11 @@ public final class GuiPackage implements
int before = 0;
int after = 0;
final boolean historyEnabled = UndoHistory.isEnabled();
- if(historyEnabled) {
+ if (historyEnabled) {
before = getTestElementCheckSum(el);
}
comp.modifyTestElement(el);
- if(historyEnabled) {
+ if (historyEnabled) {
after = getTestElementCheckSum(el);
}
if (!historyEnabled || (before != after)) {
@@ -674,8 +662,7 @@ public final class GuiPackage implements
// would populate the current node with the contents of the new GUI --
// which is empty.]
MainFrame mf = getMainFrame(); // Fetch once
- if (mf == null) // Probably caused by unit testing on headless system
- {
+ if (mf == null) { // Probably caused by unit testing on headless system
log.warn("Mainframe is null");
} else {
mf.setMainPanel((javax.swing.JComponent) getCurrentGui());
@@ -752,7 +739,7 @@ public final class GuiPackage implements
public static void showMessage(final String message, final String title,
final int type){
if (guiPack == null) {
- return ;
+ return;
}
SwingUtilities.invokeLater(() ->
JOptionPane.showMessageDialog(null,message,title,type));
@@ -760,30 +747,23 @@ public final class GuiPackage implements
/**
* Unregister stoppable
- * @param stoppable Stoppable
+ *
+ * @param stoppableToUnregister Stoppable to unregister
*/
- public void unregister(Stoppable stoppable) {
- for (Iterator<Stoppable> iterator = stoppables .iterator();
iterator.hasNext();) {
- Stoppable stopable = iterator.next();
- if(stopable == stoppable)
- {
- iterator.remove();
- }
- }
+ public void unregister(Stoppable stoppableToUnregister) {
+ stoppables.removeIf(stoppable -> stoppable == stoppableToUnregister);
}
/**
* Register process to stop on reload
- *
- * @param stoppable
- * The {@link Stoppable} to be registered
+ *
+ * @param stoppable The {@link Stoppable} to be registered
*/
public void register(Stoppable stoppable) {
stoppables.add(stoppable);
}
/**
- *
* @return copy of list of {@link Stoppable}s
*/
public List<Stoppable> getStoppables() {
@@ -794,6 +774,7 @@ public final class GuiPackage implements
/**
* Set the menu item LoggerPanel.
+ *
* @param menuItemLoggerPanel The menu item LoggerPanel
*/
public void setMenuItemLoggerPanel(JCheckBoxMenuItem menuItemLoggerPanel) {
@@ -885,17 +866,17 @@ public final class GuiPackage implements
while (it.hasNext()) {
JMeterProperty obj = it.next();
if (obj instanceof TestElementProperty) {
- ret ^= getTestElementCheckSum(((TestElementProperty) obj)
- .getElement());
+ ret ^= getTestElementCheckSum(
+ ((TestElementProperty) obj).getElement());
} else {
ret ^= obj.getName().hashCode();
String stringValue = obj.getStringValue();
- if(stringValue != null) {
+ if (stringValue != null) {
ret ^= stringValue.hashCode();
} else {
- if(log.isDebugEnabled()) {
+ if (log.isDebugEnabled()) {
log.debug("obj.getStringValue() returned null for test
element:"
- +el.getName()+" at property:"+obj.getName());
+ + el.getName() + " at property:" +
obj.getName());
}
}
}
@@ -915,17 +896,17 @@ public final class GuiPackage implements
* @return {@link TreeNodeNamingPolicy}
*/
public TreeNodeNamingPolicy getNamingPolicy() {
- if(namingPolicy == null) {
- final String namingPolicyImplementation =
+ if (namingPolicy == null) {
+ final String namingPolicyImplementation =
JMeterUtils.getPropDefault("naming_policy.impl",
//$NON-NLS-1$
DefaultTreeNodeNamingPolicy.class.getName());
try {
Class<?> implementationClass =
Class.forName(namingPolicyImplementation);
this.namingPolicy = (TreeNodeNamingPolicy)
implementationClass.newInstance();
-
+
} catch (Exception ex) {
- log.error("Failed to create configured naming
policy:"+namingPolicyImplementation+", will use default one", ex);
+ log.error("Failed to create configured naming policy:" +
namingPolicyImplementation + ", will use default one", ex);
this.namingPolicy = new DefaultTreeNodeNamingPolicy();
}
}
Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/JMeterFileFilter.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/JMeterFileFilter.java?rev=1815391&r1=1815390&r2=1815391&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/JMeterFileFilter.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/JMeterFileFilter.java Wed Nov
15 22:23:39 2017
@@ -88,17 +88,7 @@ public class JMeterFileFilter extends ja
* @return true if the file should be allowed, false otherwise
*/
public boolean accept(String filename) {
- if (exts.length == 0) {
- return true;
- }
-
- for (String ext : exts) {
- if (filename.endsWith(ext)) {
- return true;
- }
- }
-
- return false;
+ return Arrays.stream(exts).anyMatch(filename::endsWith);
}
/**
Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/LoggerPanel.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/LoggerPanel.java?rev=1815391&r1=1815390&r2=1815391&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/LoggerPanel.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/LoggerPanel.java Wed Nov 15
22:23:39 2017
@@ -67,8 +67,7 @@ public class LoggerPanel extends JPanel
*/
public LoggerPanel() {
if (LOGGER_PANEL_MAX_LINES > 0) {
- events =
- new CircularFifoBuffer(LOGGER_PANEL_MAX_LINES);
+ events = new CircularFifoBuffer(LOGGER_PANEL_MAX_LINES);
} else {
events = new UnboundedFifoBuffer();
}
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=1815391&r1=1815390&r2=1815391&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/MainFrame.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/MainFrame.java Wed Nov 15
22:23:39 2017
@@ -70,7 +70,6 @@ import javax.swing.KeyStroke;
import javax.swing.MenuElement;
import javax.swing.SwingUtilities;
import javax.swing.tree.DefaultMutableTreeNode;
-import javax.swing.tree.DefaultTreeCellRenderer;
import javax.swing.tree.TreeCellRenderer;
import javax.swing.tree.TreeModel;
import javax.swing.tree.TreePath;
@@ -105,7 +104,6 @@ import org.slf4j.LoggerFactory;
/**
* The main JMeter frame, containing the menu bar, test tree, and an area for
* JMeter component GUIs.
- *
*/
public class MainFrame extends JFrame implements TestStateListener,
Remoteable, DropTargetListener, Clearable, ActionListener {
@@ -167,19 +165,13 @@ public class MainFrame extends JFrame im
private JMeterToolBar toolbar;
- /**
- * Label at top right showing test duration
- */
+ /** Label at top right showing test duration */
private JLabel testTimeDuration;
- /**
- * Indicator for Log errors and Fatals
- */
+ /** Indicator for Log errors and Fatals */
private JButton warnIndicator;
- /**
- * LogTarget that receives ERROR or FATAL
- */
+ /** LogTarget that receives ERROR or FATAL */
private transient ErrorsAndFatalsCounterLogTarget
errorsAndFatalsCounterLogTarget;
private javax.swing.Timer computeTestDurationTimer = new
javax.swing.Timer(1000,
@@ -228,13 +220,13 @@ public class MainFrame extends JFrame im
init();
initTopLevelDndHandler();
setDefaultCloseOperation(DO_NOTHING_ON_CLOSE);
-
+
addMouseWheelListener(e -> {
if (e.isControlDown()) {
final float scale = 1.1f;
int rotation = e.getWheelRotation();
if (rotation > 0) { // DOWN
- JMeterUtils.applyScaleOnFonts(1.0f/scale);
+ JMeterUtils.applyScaleOnFonts(1.0f / scale);
} else if (rotation < 0) { // UP
JMeterUtils.applyScaleOnFonts(scale);
}
@@ -248,7 +240,7 @@ public class MainFrame extends JFrame im
* @param evt {@link ActionEvent}
*/
private void refreshErrors(ActionEvent evt) {
- if(errorOrFatal.get()>0) {
+ if (errorOrFatal.get() > 0) {
warnIndicator.setForeground(Color.RED);
warnIndicator.setText(Integer.toString(errorOrFatal.get()));
}
@@ -257,7 +249,7 @@ public class MainFrame extends JFrame im
protected void computeTestDuration(ActionEvent evt) {
long startTime = JMeterContextService.getTestStartTime();
if (startTime > 0) {
- long elapsedSec = (System.currentTimeMillis()-startTime + 500) /
1000; // rounded seconds
+ long elapsedSec = (System.currentTimeMillis() - startTime + 500) /
1000; // rounded seconds
testTimeDuration.setText(JOrphanUtils.formatDuration(elapsedSec));
}
}
@@ -359,16 +351,17 @@ public class MainFrame extends JFrame im
* Close the currently selected menu.
*/
public void closeMenu() {
- if (menuBar.isSelected()) {
- MenuElement[] menuElement = menuBar.getSubElements();
- if (menuElement != null) {
- for (MenuElement element : menuElement) {
- JMenu menu = (JMenu) element;
- if (menu.isSelected()) {
- menu.setPopupMenuVisible(false);
- menu.setSelected(false);
- break;
- }
+ if (!menuBar.isSelected()) {
+ return;
+ }
+ MenuElement[] menuElement = menuBar.getSubElements();
+ if (menuElement != null) {
+ for (MenuElement element : menuElement) {
+ JMenu menu = (JMenu) element;
+ if (menu.isSelected()) {
+ menu.setPopupMenuVisible(false);
+ menu.setSelected(false);
+ break;
}
}
}
@@ -403,10 +396,11 @@ public class MainFrame extends JFrame im
}
public void updateCounts() {
- SwingUtilities.invokeLater(() -> {
- activeAndTotalThreads.setText(String.format("%d/%d",
JMeterContextService.getNumberOfThreads(),
- JMeterContextService.getTotalThreads()));
- });
+ SwingUtilities.invokeLater(() ->
+ activeAndTotalThreads.setText(
+ String.format("%d/%d",
+ JMeterContextService.getNumberOfThreads(),
+ JMeterContextService.getTotalThreads())));
}
public void setMainPanel(JComponent comp) {
@@ -541,7 +535,6 @@ public class MainFrame extends JFrame im
refreshErrorsTimer.start();
}
-
/**
* Support for Test Plan Dnd
* see BUG 52281 (when JDK6 will be minimum JDK target)
@@ -653,13 +646,13 @@ public class MainFrame extends JFrame im
String comment = ((TestElement)
testElement).getComment();
if (comment != null && comment.length() > 0) {
return comment;
- }
}
}
}
- return null;
}
- };
+ return null;
+ }
+ };
treevar.setToolTipText("");
treevar.setCellRenderer(getCellRenderer());
treevar.setRootVisible(false);
@@ -732,8 +725,7 @@ public class MainFrame extends JFrame im
* @return a renderer to draw the test tree nodes
*/
private TreeCellRenderer getCellRenderer() {
- DefaultTreeCellRenderer rend = new JMeterCellRenderer();
- return rend;
+ return new JMeterCellRenderer();
}
/**
@@ -792,7 +784,6 @@ public class MainFrame extends JFrame im
} catch (UnsupportedFlavorException | IOException e) {
log.warn("Dnd failed", e);
}
-
}
public boolean openJmxFilesFromDragAndDrop(Transferable tr) throws
UnsupportedFlavorException, IOException {
@@ -837,14 +828,13 @@ public class MainFrame extends JFrame im
public void clearData() {
errorOrFatal.set(0);
SwingUtilities.invokeLater(() -> {
- warnIndicator.setForeground(null);
-
warnIndicator.setText(Integer.toString(errorOrFatal.get()));
- });
+ warnIndicator.setForeground(null);
+ warnIndicator.setText(Integer.toString(errorOrFatal.get()));
+ });
}
}
-
@Override
public void clearData() {
logPanel.clear();
@@ -876,16 +866,14 @@ public class MainFrame extends JFrame im
log.warn("Error awt title: {}", nsfe.toString()); //
$NON-NLS-1$
}
}
- }
+ }
}
/**
* Update Undo/Redo icons state
- *
- * @param canUndo
- * Flag whether the undo button should be enabled
- * @param canRedo
- * Flag whether the redo button should be enabled
+ *
+ * @param canUndo Flag whether the undo button should be enabled
+ * @param canRedo Flag whether the redo button should be enabled
*/
public void updateUndoRedoIcons(boolean canUndo, boolean canRedo) {
toolbar.updateUndoRedoIcons(canUndo, canRedo);
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=1815391&r1=1815390&r2=1815391&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/SavePropertyDialog.java
(original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/SavePropertyDialog.java Wed Nov
15 22:23:39 2017
@@ -120,9 +120,6 @@ public class SavePropertyDialog extends
protected JRootPane createRootPane() {
JRootPane rootPane = new JRootPane();
Action escapeAction = new AbstractAction("ESCAPE") {
- /**
- *
- */
private static final long serialVersionUID = 2208129319916921772L;
@Override
Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/SimpleCompoundEdit.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/SimpleCompoundEdit.java?rev=1815391&r1=1815390&r2=1815391&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/SimpleCompoundEdit.java
(original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/SimpleCompoundEdit.java Wed Nov
15 22:23:39 2017
@@ -22,9 +22,6 @@ import javax.swing.undo.CompoundEdit;
public class SimpleCompoundEdit extends CompoundEdit {
- /**
- *
- */
private static final long serialVersionUID = 7125085226441904495L;
/**
Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/TreeState.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/TreeState.java?rev=1815391&r1=1815390&r2=1815391&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/TreeState.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/TreeState.java Wed Nov 15
22:23:39 2017
@@ -87,9 +87,7 @@ public interface TreeState {
final JTree tree = mainframe.getTree();
if (!savedExpanded.isEmpty()) {
- for (int rowN : savedExpanded) {
- tree.expandRow(rowN);
- }
+ savedExpanded.forEach(tree::expandRow);
} else {
tree.expandRow(0);
}
Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/UndoHistory.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/UndoHistory.java?rev=1815391&r1=1815390&r2=1815391&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/UndoHistory.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/UndoHistory.java Wed Nov 15
22:23:39 2017
@@ -43,9 +43,7 @@ import org.slf4j.LoggerFactory;
* @since 2.12
*/
public class UndoHistory implements TreeModelListener, Serializable {
- /**
- *
- */
+
private static final long serialVersionUID = 1L;
/**
@@ -59,14 +57,10 @@ public class UndoHistory implements Tree
private static final int HISTORY_SIZE =
JMeterUtils.getPropDefault("undo.history.size", 0);
- /**
- * flag to prevent recursive actions
- */
+ /** flag to prevent recursive actions */
private boolean working = false;
- /**
- * History listeners
- */
+ /** History listeners */
private List<HistoryListener> listeners = new ArrayList<>();
private final UndoManager manager = new UndoManager();
@@ -325,7 +319,7 @@ public class UndoHistory implements Tree
}
void beginUndoTransaction() {
- if(isEnabled()) {
+ if (isEnabled()) {
transactions.add(new SimpleCompoundEdit());
}
}
Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/UndoHistoryItem.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/UndoHistoryItem.java?rev=1815391&r1=1815390&r2=1815391&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/UndoHistoryItem.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/UndoHistoryItem.java Wed Nov 15
22:23:39 2017
@@ -29,9 +29,6 @@ import org.apache.jmeter.engine.TreeClon
*/
public class UndoHistoryItem implements Serializable {
- /**
- *
- */
private static final long serialVersionUID = -8683007040160205040L;
private final HashTree tree;
// TODO: find a way to show this comment in menu item and toolbar tooltip
