You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jmeter.apache.org by pm...@apache.org on 2016/12/31 15:10:10 UTC
svn commit: r1776775 - in /jmeter/trunk/src/core/org/apache/jmeter/gui/util:
FileListPanel.java JMeterMenuBar.java JSyntaxTextArea.java
Author: pmouawad
Date: Sat Dec 31 15:10:10 2016
New Revision: 1776775
URL: http://svn.apache.org/viewvc?rev=1776775&view=rev
Log:
Sonar : fix squid:CommentedOutCodeLine "This block of commented-out lines of code should be removed. "
Modified:
jmeter/trunk/src/core/org/apache/jmeter/gui/util/FileListPanel.java
jmeter/trunk/src/core/org/apache/jmeter/gui/util/JMeterMenuBar.java
jmeter/trunk/src/core/org/apache/jmeter/gui/util/JSyntaxTextArea.java
Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/util/FileListPanel.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/util/FileListPanel.java?rev=1776775&r1=1776774&r2=1776775&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/util/FileListPanel.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/util/FileListPanel.java Sat Dec 31 15:10:10 2016
@@ -127,7 +127,6 @@ public class FileListPanel extends JPane
browse.addActionListener(this);
clear.addActionListener(this);
delete.addActionListener(this);
- //this.setPreferredSize(new Dimension(400,150));
}
/**
Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/util/JMeterMenuBar.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/util/JMeterMenuBar.java?rev=1776775&r1=1776774&r2=1776775&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/util/JMeterMenuBar.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/util/JMeterMenuBar.java Sat Dec 31 15:10:10 2016
@@ -517,10 +517,6 @@ public class JMeterMenuBar extends JMenu
fileExit = makeMenuItemRes("exit", 'X', ActionNames.EXIT, KeyStrokes.EXIT); //$NON-NLS-1$
fileMerge = makeMenuItemRes("menu_merge", 'M', ActionNames.MERGE); //$NON-NLS-1$
- // file_merge.setAccelerator(
- // KeyStroke.getKeyStroke(KeyEvent.VK_O, KeyEvent.CTRL_MASK));
- // Set default SAVE menu item to disabled since the default node that
- // is selected is ROOT, which does not allow items to be inserted.
fileMerge.setEnabled(false);
fileMenu.add(fileClose);
Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/util/JSyntaxTextArea.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/util/JSyntaxTextArea.java?rev=1776775&r1=1776774&r2=1776775&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/util/JSyntaxTextArea.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/util/JSyntaxTextArea.java Sat Dec 31 15:10:10 2016
@@ -38,7 +38,7 @@ public class JSyntaxTextArea extends RSy
private static final long serialVersionUID = 210L;
- private final Properties languageProperties = JMeterUtils.loadProperties("org/apache/jmeter/gui/util/textarea.properties"); //$NON-NLS-1$;
+ private final Properties languageProperties = JMeterUtils.loadProperties("org/apache/jmeter/gui/util/textarea.properties"); //$NON-NLS-1$
private final boolean disableUndo;
private static final boolean WRAP_STYLE_WORD = JMeterUtils.getPropDefault("jsyntaxtextarea.wrapstyleword", true);