Author: fschumacher
Date: Sat Jan 31 10:59:42 2015
New Revision: 1656177
URL: http://svn.apache.org/r1656177
Log:
Bug: 57110
Reformat code, no functional change. Remove empty javadoc comments.
Bugzilla Id: 57110
Modified:
jmeter/trunk/src/components/org/apache/jmeter/visualizers/PropertyControlGui.java
jmeter/trunk/src/components/org/apache/jmeter/visualizers/StatVisualizer.java
jmeter/trunk/src/core/org/apache/jmeter/config/gui/RowDetailDialog.java
jmeter/trunk/src/core/org/apache/jmeter/control/gui/TestPlanGui.java
jmeter/trunk/src/core/org/apache/jmeter/functions/gui/FunctionHelper.java
jmeter/trunk/src/core/org/apache/jmeter/gui/MainFrame.java
jmeter/trunk/src/core/org/apache/jmeter/gui/action/AddToTree.java
jmeter/trunk/src/core/org/apache/jmeter/gui/action/Load.java
jmeter/trunk/src/core/org/apache/jmeter/gui/action/SearchTreeDialog.java
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/AccessLogSampler.java
jmeter/trunk/test/src/org/apache/jmeter/visualizers/GenerateTreeGui.java
Modified:
jmeter/trunk/src/components/org/apache/jmeter/visualizers/PropertyControlGui.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/visualizers/PropertyControlGui.java?rev=1656177&r1=1656176&r2=1656177&view=diff
==============================================================================
---
jmeter/trunk/src/components/org/apache/jmeter/visualizers/PropertyControlGui.java
(original)
+++
jmeter/trunk/src/components/org/apache/jmeter/visualizers/PropertyControlGui.java
Sat Jan 31 10:59:42 2015
@@ -53,8 +53,8 @@ import org.apache.jmeter.util.JMeterUtil
import org.apache.jorphan.gui.ObjectTableModel;
import org.apache.jorphan.reflect.Functor;
-public class PropertyControlGui extends AbstractConfigGui
- implements ActionListener, UnsharedComponent {
+public class PropertyControlGui extends AbstractConfigGui implements
+ ActionListener, UnsharedComponent {
private static final long serialVersionUID = 1L;
@@ -72,7 +72,7 @@ public class PropertyControlGui extends
private static final String JMETER = "jmeter"; // $NON-NLS-1$
private final JCheckBox systemButton = new JCheckBox("System");
-
+
private final JCheckBox jmeterButton = new JCheckBox("JMeter");
private final JLabel tableLabel = new JLabel("Properties");
@@ -138,7 +138,7 @@ public class PropertyControlGui extends
private void setUpData(){
tableModel.clearData();
- Properties p=null;
+ Properties p = null;
if (systemButton.isSelected()){
p = System.getProperties();
}
@@ -153,14 +153,14 @@ public class PropertyControlGui extends
Collections.sort(al, new Comparator<Map.Entry<Object, Object>>(){
@Override
public int compare(Map.Entry<Object, Object> o1, Map.Entry<Object,
Object> o2) {
- String m1,m2;
- m1=(String)o1.getKey();
- m2=(String)o2.getKey();
+ String m1, m2;
+ m1 = (String) o1.getKey();
+ m2 = (String) o2.getKey();
return m1.compareTo(m2);
}
});
Iterator<Map.Entry<Object, Object>> i = al.iterator();
- while(i.hasNext()){
+ while (i.hasNext()) {
tableModel.addRow(i.next());
}
@@ -170,6 +170,7 @@ public class PropertyControlGui extends
public void modifyTestElement(TestElement element) {
configureTestElement(element);
}
+
private Component makeMainPanel() {
initializeTableModel();
table = new JTable(tableModel);
@@ -228,10 +229,10 @@ public class PropertyControlGui extends
private void init() {
JPanel p = this;
- setLayout(new BorderLayout(0, 5));
- setBorder(makeBorder());
- add(makeTitlePanel(), BorderLayout.NORTH);
- p = new JPanel();
+ setLayout(new BorderLayout(0, 5));
+ setBorder(makeBorder());
+ add(makeTitlePanel(), BorderLayout.NORTH);
+ p = new JPanel();
p.setLayout(new BorderLayout());
@@ -247,12 +248,13 @@ public class PropertyControlGui extends
private void initializeTableModel() {
tableModel = new ObjectTableModel(new String[] { COLUMN_NAMES_0,
COLUMN_NAMES_1 },
new Functor[] {
- new Functor(Map.Entry.class, "getKey"), // $NON-NLS-1$
- new Functor(Map.Entry.class, "getValue") }, // $NON-NLS-1$
+ new Functor(Map.Entry.class, "getKey"), // $NON-NLS-1$
+ new Functor(Map.Entry.class, "getValue") // $NON-NLS-1$
+ },
new Functor[] {
- null, //new Functor("setName"), // $NON-NLS-1$
- new Functor(Map.Entry.class,"setValue", new Class[] {
Object.class }) // $NON-NLS-1$
- },
+ null, //new Functor("setName"), // $NON-NLS-1$
+ new Functor(Map.Entry.class,"setValue", new Class[] {
Object.class }) // $NON-NLS-1$
+ },
new Class[] { String.class, String.class });
}
}
Modified:
jmeter/trunk/src/components/org/apache/jmeter/visualizers/StatVisualizer.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/visualizers/StatVisualizer.java?rev=1656177&r1=1656176&r2=1656177&view=diff
==============================================================================
---
jmeter/trunk/src/components/org/apache/jmeter/visualizers/StatVisualizer.java
(original)
+++
jmeter/trunk/src/components/org/apache/jmeter/visualizers/StatVisualizer.java
Sat Jan 31 10:59:42 2015
@@ -63,23 +63,24 @@ public class StatVisualizer extends Abst
private static final String USE_GROUP_NAME = "useGroupName"; //$NON-NLS-1$
- private static final String SAVE_HEADERS = "saveHeaders"; //$NON-NLS-1$
+ private static final String SAVE_HEADERS = "saveHeaders"; //$NON-NLS-1$
- private final String TOTAL_ROW_LABEL
- = JMeterUtils.getResString("aggregate_report_total_label");
//$NON-NLS-1$
+ private final String TOTAL_ROW_LABEL = JMeterUtils
+ .getResString("aggregate_report_total_label"); //$NON-NLS-1$
private JTable myJTable;
private JScrollPane myScrollPane;
- private final JButton saveTable =
- new JButton(JMeterUtils.getResString("aggregate_graph_save_table"));
//$NON-NLS-1$
+ private final JButton saveTable = new JButton(
+ JMeterUtils.getResString("aggregate_graph_save_table"));
//$NON-NLS-1$
- private final JCheckBox saveHeaders = // should header be saved with the
data?
- new
JCheckBox(JMeterUtils.getResString("aggregate_graph_save_table_header"),true);
//$NON-NLS-1$
+ // should header be saved with the data?
+ private final JCheckBox saveHeaders = new JCheckBox(
+ JMeterUtils.getResString("aggregate_graph_save_table_header"),
true); //$NON-NLS-1$
- private final JCheckBox useGroupName =
- new
JCheckBox(JMeterUtils.getResString("aggregate_graph_use_group_name"));
//$NON-NLS-1$
+ private final JCheckBox useGroupName = new JCheckBox(
+ JMeterUtils.getResString("aggregate_graph_use_group_name"));
//$NON-NLS-1$
private transient ObjectTableModel model;
@@ -138,7 +139,7 @@ public class StatVisualizer extends Abst
synchronized(tot) {
tot.addSample(res);
}
- model.fireTableDataChanged();
+ model.fireTableDataChanged();
}
});
}
Modified:
jmeter/trunk/src/core/org/apache/jmeter/config/gui/RowDetailDialog.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/config/gui/RowDetailDialog.java?rev=1656177&r1=1656176&r2=1656177&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/config/gui/RowDetailDialog.java
(original)
+++ jmeter/trunk/src/core/org/apache/jmeter/config/gui/RowDetailDialog.java Sat
Jan 31 10:59:42 2015
@@ -76,13 +76,13 @@ public class RowDetailDialog extends JDi
private JButton nextButton;
private JButton previousButton;
-
+
private JButton closeButton;
private ObjectTableModel tableModel;
private int selectedRow;
-
+
private boolean textChanged = true; // change to false after the first
insert
@@ -102,9 +102,7 @@ public class RowDetailDialog extends JDi
JRootPane rootPane = new JRootPane();
// Hide Window on ESC
Action escapeAction = new AbstractAction("ESCAPE") {
- /**
- *
- */
+
private static final long serialVersionUID = -8699034338969407625L;
@Override
@@ -114,9 +112,7 @@ public class RowDetailDialog extends JDi
};
// Do update on Enter
Action enterAction = new AbstractAction("ENTER") {
- /**
- *
- */
+
private static final long serialVersionUID = -1529005452976176873L;
@Override
@@ -198,22 +194,22 @@ public class RowDetailDialog extends JDi
@Override
public void actionPerformed(ActionEvent e) {
String action = e.getActionCommand();
- if(action.equals(CLOSE)) {
+ if (action.equals(CLOSE)) {
this.setVisible(false);
}
- else if(action.equals(NEXT)) {
+ else if (action.equals(NEXT)) {
selectedRow++;
previousButton.setEnabled(true);
nextButton.setEnabled(selectedRow < tableModel.getRowCount()-1);
setValues(selectedRow);
}
- else if(action.equals(PREVIOUS)) {
+ else if (action.equals(PREVIOUS)) {
selectedRow--;
nextButton.setEnabled(true);
previousButton.setEnabled(selectedRow > 0);
setValues(selectedRow);
}
- else if(action.equals(UPDATE)) {
+ else if (action.equals(UPDATE)) {
doUpdate(e);
}
}
@@ -265,5 +261,5 @@ public class RowDetailDialog extends JDi
public void changedUpdate(DocumentEvent e) {
changeLabelButton();
}
-
+
}
Modified: jmeter/trunk/src/core/org/apache/jmeter/control/gui/TestPlanGui.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/control/gui/TestPlanGui.java?rev=1656177&r1=1656176&r2=1656177&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/control/gui/TestPlanGui.java
(original)
+++ jmeter/trunk/src/core/org/apache/jmeter/control/gui/TestPlanGui.java Sat
Jan 31 10:59:42 2015
@@ -158,14 +158,14 @@ public class TestPlanGui extends Abstrac
super.configure(el);
if (el instanceof TestPlan) {
TestPlan tp = (TestPlan) el;
- functionalMode.setSelected(tp.isFunctionalMode());
- serializedMode.setSelected(tp.isSerialized());
- tearDownOnShutdown.setSelected(tp.isTearDownOnShutdown());
- final JMeterProperty udv = tp.getUserDefinedVariablesAsProperty();
- if (udv != null) {
- argsPanel.configure((Arguments) udv.getObjectValue());
- }
- browseJar.setFiles(tp.getTestPlanClasspathArray());
+ functionalMode.setSelected(tp.isFunctionalMode());
+ serializedMode.setSelected(tp.isSerialized());
+ tearDownOnShutdown.setSelected(tp.isTearDownOnShutdown());
+ final JMeterProperty udv = tp.getUserDefinedVariablesAsProperty();
+ if (udv != null) {
+ argsPanel.configure((Arguments) udv.getObjectValue());
+ }
+ browseJar.setFiles(tp.getTestPlanClasspathArray());
}
}
Modified:
jmeter/trunk/src/core/org/apache/jmeter/functions/gui/FunctionHelper.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/functions/gui/FunctionHelper.java?rev=1656177&r1=1656176&r2=1656177&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/functions/gui/FunctionHelper.java
(original)
+++ jmeter/trunk/src/core/org/apache/jmeter/functions/gui/FunctionHelper.java
Sat Jan 31 10:59:42 2015
@@ -69,7 +69,7 @@ public class FunctionHelper extends JDia
init();
JMeterUtils.addLocaleChangeListener(this);
}
-
+
/**
* Allow Dialog to be closed by ESC key
*/
@@ -78,13 +78,11 @@ public class FunctionHelper extends JDia
JRootPane rootPane = new JRootPane();
KeyStroke stroke = KeyStrokes.ESC;
javax.swing.Action escapeAction = new AbstractAction("ESCAPE") {
- /**
- *
- */
+
private static final long serialVersionUID = -4036804004190858925L;
@Override
- public void actionPerformed(ActionEvent actionEvent) {
+ public void actionPerformed(ActionEvent actionEvent) {
setVisible(false);
}
};
@@ -93,7 +91,7 @@ public class FunctionHelper extends JDia
inputMap.put(stroke, escapeAction.getValue(Action.NAME));
return rootPane;
}
-
+
private void init() {
parameterPanel = new
ArgumentsPanel(JMeterUtils.getResString("function_params"), false);
//$NON-NLS-1$
initializeFunctionList();
@@ -112,7 +110,7 @@ public class FunctionHelper extends JDia
generateButton.addActionListener(this);
resultsPanel.add(generateButton);
this.getContentPane().add(resultsPanel, BorderLayout.SOUTH);
-
+
this.pack();
ComponentUtil.centerComponentInWindow(this);
}
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=1656177&r1=1656176&r2=1656177&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/MainFrame.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/MainFrame.java Sat Jan 31
10:59:42 2015
@@ -196,6 +196,7 @@ public class MainFrame extends JFrame im
totalThreads = new JLabel("0"); // $NON-NLS-1$
totalThreads.setToolTipText(JMeterUtils.getResString("total_threads_tooltip"));
// $NON-NLS-1$
+
activeThreads = new JLabel("0"); // $NON-NLS-1$
activeThreads.setToolTipText(JMeterUtils.getResString("active_threads_tooltip"));
// $NON-NLS-1$
@@ -206,9 +207,9 @@ public class MainFrame extends JFrame im
warnIndicator.setContentAreaFilled(false);
warnIndicator.setBorderPainted(false);
warnIndicator.setCursor(new Cursor(Cursor.HAND_CURSOR));
-
warnIndicator.setToolTipText(JMeterUtils.getResString("error_indicator_tooltip"));
// $NON-NLS-1$
warnIndicator.addActionListener(this);
+
errorsOrFatalsLabel = new JLabel("0"); // $NON-NLS-1$
errorsOrFatalsLabel.setToolTipText(JMeterUtils.getResString("error_indicator_tooltip"));
// $NON-NLS-1$
@@ -345,7 +346,7 @@ public class MainFrame extends JFrame im
}
stoppingMessage = new EscapeDialog(this,
JMeterUtils.getResString("stopping_test_title"), true); //$NON-NLS-1$
String label = JMeterUtils.getResString("stopping_test"); //$NON-NLS-1
- if(!StringUtils.isEmpty(host)) {
+ if (!StringUtils.isEmpty(host)) {
label = label + JMeterUtils.getResString("stopping_test_host")+ ":
" + host;
}
JLabel stopLabel = new JLabel(label); //$NON-NLS-1$$NON-NLS-2$
@@ -356,7 +357,7 @@ public class MainFrame extends JFrame im
SwingUtilities.invokeLater(new Runnable() {
@Override
public void run() {
- if (stoppingMessage != null) {// TODO - how can this be null?
+ if (stoppingMessage != null) { // TODO - how can this be null?
stoppingMessage.setVisible(true);
}
}
@@ -409,7 +410,7 @@ public class MainFrame extends JFrame im
activeThreads.setText("0"); // $NON-NLS-1$
totalThreads.setText("0"); // $NON-NLS-1$
menuBar.setRunning(true, host);
- if(LOCAL.equals(host)) {
+ if (LOCAL.equals(host)) {
toolbar.setLocalTestStarted(true);
} else {
toolbar.setRemoteTestStarted(true);
@@ -442,7 +443,7 @@ public class MainFrame extends JFrame im
JMeterContextService.endTest();
}
menuBar.setRunning(false, host);
- if(LOCAL.equals(host)) {
+ if (LOCAL.equals(host)) {
toolbar.setLocalTestStarted(false);
} else {
toolbar.setRemoteTestStarted(false);
@@ -640,7 +641,7 @@ public class MainFrame extends JFrame im
treevar.addTreeSelectionListener(treeListener);
treevar.addMouseListener(treeListener);
treevar.addKeyListener(treeListener);
-
+
// enable drag&drop, install a custom transfer handler
treevar.setDragEnabled(true);
treevar.setDropMode(DropMode.ON_OR_INSERT);
@@ -725,18 +726,18 @@ public class MainFrame extends JFrame im
@SuppressWarnings("unchecked")
List<File> files = (List<File>)
tr.getTransferData(DataFlavor.javaFileListFlavor);
- if(files.isEmpty()) {
+ if (files.isEmpty()) {
return false;
}
File file = files.get(0);
- if(!file.getName().endsWith(".jmx")) {
+ if (!file.getName().endsWith(".jmx")) {
log.warn("Importing file:" + file.getName()+ "from DnD failed
because file extension does not end with .jmx");
return false;
}
ActionEvent fakeEvent = new ActionEvent(this,
ActionEvent.ACTION_PERFORMED, ActionNames.OPEN);
LoadDraggedFile.loadProject(fakeEvent, file);
-
+
return true;
}
@@ -781,7 +782,7 @@ public class MainFrame extends JFrame im
@Override
public void clearData() {
logPanel.clear();
- if(DISPLAY_ERROR_FATAL_COUNTER) {
+ if (DISPLAY_ERROR_FATAL_COUNTER) {
errorsAndFatalsCounterLogTarget.clearData();
}
}
@@ -791,7 +792,7 @@ public class MainFrame extends JFrame im
*/
@Override
public void actionPerformed(ActionEvent event) {
- if(event.getSource()==warnIndicator) {
+ if (event.getSource() == warnIndicator) {
ActionRouter.getInstance().doActionNow(new
ActionEvent(event.getSource(), event.getID(),
ActionNames.LOGGER_PANEL_ENABLE_DISABLE));
}
}
Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/action/AddToTree.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/action/AddToTree.java?rev=1656177&r1=1656176&r2=1656177&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/action/AddToTree.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/action/AddToTree.java Sat Jan
31 10:59:42 2015
@@ -45,7 +45,6 @@ public class AddToTree implements Comman
commandSet = Collections.unmodifiableSet(commands);
}
-
public AddToTree() {
}
@@ -76,7 +75,7 @@ public class AddToTree implements Comman
log.error("", err); // $NON-NLS-1$
String msg = err.getMessage();
if (msg == null) {
- msg=err.toString();
+ msg = err.toString();
}
JMeterUtils.reportErrorToUser(msg);
}
@@ -84,7 +83,7 @@ public class AddToTree implements Comman
log.error("", err); // $NON-NLS-1$
String msg = err.getMessage();
if (msg == null) {
- msg=err.toString();
+ msg = err.toString();
}
JMeterUtils.reportErrorToUser(msg);
}
Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/action/Load.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/action/Load.java?rev=1656177&r1=1656176&r2=1656177&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/action/Load.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/action/Load.java Sat Jan 31
10:59:42 2015
@@ -81,10 +81,10 @@ public class Load implements Command {
return;
}
final File selectedFile = chooser.getSelectedFile();
- if(selectedFile != null) {
+ if (selectedFile != null) {
final boolean merging =
e.getActionCommand().equals(ActionNames.MERGE);
// We must ask the user if it is ok to close current project
- if(!merging) { // i.e. it is OPEN
+ if (!merging) { // i.e. it is OPEN
if (!Close.performAction(e)) {
return;
}
@@ -121,25 +121,26 @@ public class Load implements Command {
if (f != null) {
InputStream reader = null;
try {
- if (merging) {
- log.info("Merging file: " + f);
- } else {
- log.info("Loading file: " + f);
- // TODO should this be done even if not a full test
plan?
- // and what if load fails?
- if(setDetails) {
- FileServer.getFileServer().setBaseForScript(f);
- }
- }
- reader = new FileInputStream(f);
- final HashTree tree = SaveService.loadTree(reader);
- final boolean isTestPlan = insertLoadedTree(e.getID(),
tree, merging);
-
- // don't change name if merging
- if (!merging && isTestPlan && setDetails) {
- // TODO should setBaseForScript be called here rather
than above?
- guiPackage.setTestPlanFile(f.getAbsolutePath());
+ if (merging) {
+ log.info("Merging file: " + f);
+ } else {
+ log.info("Loading file: " + f);
+ // TODO should this be done even if not a full test plan?
+ // and what if load fails?
+ if (setDetails) {
+ FileServer.getFileServer().setBaseForScript(f);
}
+ }
+ reader = new FileInputStream(f);
+ final HashTree tree = SaveService.loadTree(reader);
+ final boolean isTestPlan = insertLoadedTree(e.getID(), tree,
merging);
+
+ // don't change name if merging
+ if (!merging && isTestPlan && setDetails) {
+ // TODO should setBaseForScript be called here rather than
+ // above?
+ guiPackage.setTestPlanFile(f.getAbsolutePath());
+ }
} catch (NoClassDefFoundError ex) {// Allow for missing optional
jars
reportError("Missing jar file", ex, true);
} catch (ConversionException ex) {
@@ -204,7 +205,7 @@ public class Load implements Command {
// Send different event wether we are merging a test plan into another
test plan,
// or loading a testplan from scratch
ActionEvent actionEvent =
- new ActionEvent(subTree.get(subTree.getArray()[subTree.size() -
1]), id,
+ new ActionEvent(subTree.get(subTree.getArray()[subTree.size() -
1]), id,
merging ? ActionNames.SUB_TREE_MERGED :
ActionNames.SUB_TREE_LOADED);
ActionRouter.getInstance().actionPerformed(actionEvent);
Modified:
jmeter/trunk/src/core/org/apache/jmeter/gui/action/SearchTreeDialog.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/action/SearchTreeDialog.java?rev=1656177&r1=1656176&r2=1656177&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/action/SearchTreeDialog.java
(original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/action/SearchTreeDialog.java
Sat Jan 31 10:59:42 2015
@@ -59,9 +59,7 @@ import org.apache.log.Logger;
* FIXME Why is searchTF not getting focus correctly after having been
setVisible(false) once
*/
public class SearchTreeDialog extends JDialog implements ActionListener {
- /**
- *
- */
+
private static final long serialVersionUID = -4436834972710248247L;
private static final Logger logger = LoggingManager.getLoggerForClass();
@@ -93,9 +91,7 @@ public class SearchTreeDialog extends JD
JRootPane rootPane = new JRootPane();
// Hide Window on ESC
Action escapeAction = new AbstractAction("ESCAPE") {
- /**
- *
- */
+
private static final long serialVersionUID = -6543764044868772971L;
@Override
@@ -105,9 +101,7 @@ public class SearchTreeDialog extends JD
};
// Do search on Enter
Action enterAction = new AbstractAction("ENTER") {
- /**
- *
- */
+
private static final long serialVersionUID = -3661361497864527363L;
@Override
@@ -172,7 +166,7 @@ public class SearchTreeDialog extends JD
*/
@Override
public void actionPerformed(ActionEvent e) {
- if(e.getSource()==cancelButton) {
+ if (e.getSource()==cancelButton) {
searchTF.requestFocusInWindow();
this.setVisible(false);
return;
@@ -186,7 +180,7 @@ public class SearchTreeDialog extends JD
private void doSearch(ActionEvent e) {
boolean expand = e.getSource()==searchAndExpandButton;
String wordToSearch = searchTF.getText();
- if(StringUtils.isEmpty(wordToSearch)) {
+ if (StringUtils.isEmpty(wordToSearch)) {
return;
} else {
this.lastSearch = wordToSearch;
@@ -196,7 +190,7 @@ public class SearchTreeDialog extends JD
ActionRouter.getInstance().doActionNow(new ActionEvent(e.getSource(),
e.getID(), ActionNames.SEARCH_RESET));
// do search
Searcher searcher = null;
- if(isRegexpCB.isSelected()) {
+ if (isRegexpCB.isSelected()) {
searcher = new RegexpSearcher(isCaseSensitiveCB.isSelected(),
searchTF.getText());
} else {
searcher = new RawTextSearcher(isCaseSensitiveCB.isSelected(),
searchTF.getText());
@@ -211,7 +205,7 @@ public class SearchTreeDialog extends JD
List<JMeterTreeNode> matchingNodes =
jMeterTreeNode.getPathToThreadGroup();
List<String> searchableTokens =
searchable.getSearchableTokens();
boolean result = searcher.search(searchableTokens);
- if(result) {
+ if (result) {
nodes.addAll(matchingNodes);
}
}
Modified:
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/AccessLogSampler.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/AccessLogSampler.java?rev=1656177&r1=1656176&r2=1656177&view=diff
==============================================================================
---
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/AccessLogSampler.java
(original)
+++
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/AccessLogSampler.java
Sat Jan 31 10:59:42 2015
@@ -308,11 +308,11 @@ public class AccessLogSampler extends HT
initFilter();
s.filter = (Filter) ((TestCloneable) filter).clone();
}
-
if(TestCloneable.class.isAssignableFrom(Class.forName(parserClassName)))
+ if
(TestCloneable.class.isAssignableFrom(Class.forName(parserClassName)))
{
instantiateParser();
s.PARSER = (LogParser)((TestCloneable)PARSER).clone();
- if(filter != null)
+ if (filter != null)
{
s.PARSER.setFilter(s.filter);
}
Modified:
jmeter/trunk/test/src/org/apache/jmeter/visualizers/GenerateTreeGui.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/test/src/org/apache/jmeter/visualizers/GenerateTreeGui.java?rev=1656177&r1=1656176&r2=1656177&view=diff
==============================================================================
--- jmeter/trunk/test/src/org/apache/jmeter/visualizers/GenerateTreeGui.java
(original)
+++ jmeter/trunk/test/src/org/apache/jmeter/visualizers/GenerateTreeGui.java
Sat Jan 31 10:59:42 2015
@@ -59,8 +59,8 @@ import org.apache.jmeter.util.JMeterUtil
* Note: the code currently runs on all versions of JMeter back to 2.2.
* Beware of making changes that rely on more recent APIs.
*/
-public class GenerateTreeGui extends AbstractConfigGui
- implements ActionListener, UnsharedComponent {
+public class GenerateTreeGui extends AbstractConfigGui implements
+ ActionListener, UnsharedComponent {
private static final long serialVersionUID = 1L;
@@ -119,7 +119,7 @@ public class GenerateTreeGui extends Abs
JMeterTreeNode myTarget) {
myTarget = addSimpleController(treeModel, myTarget, title);
JPopupMenu jp = MenuFactory.makeMenu(menuKey, "").getPopupMenu();
- for(Component comp : jp.getComponents()) {
+ for (Component comp : jp.getComponents()) {
JMenuItem jmi = (JMenuItem) comp;
try {
TestElement testElement =
guiPackage.createTestElement(jmi.getName());
@@ -156,17 +156,16 @@ public class GenerateTreeGui extends Abs
return labelPanel;
}
-
/**
* Initialize the components and layout of this component.
*/
private void init() {
JPanel p = this;
- setLayout(new BorderLayout(0, 5));
- setBorder(makeBorder());
- add(makeTitlePanel(), BorderLayout.NORTH);
- p = new JPanel();
+ setLayout(new BorderLayout(0, 5));
+ setBorder(makeBorder());
+ add(makeTitlePanel(), BorderLayout.NORTH);
+ p = new JPanel();
p.setLayout(new BorderLayout());
@@ -208,14 +207,14 @@ public class GenerateTreeGui extends Abs
}
volatile JMeterTreeNode newNode;
-
+
@Override
public void run() {
try {
newNode = model.addComponent(testElement, node);
} catch (IllegalUserActionException e) {
throw new Error(e);
- }
+ }
}
}
