Author: pmouawad
Date: Sat Dec 31 15:08:51 2016
New Revision: 1776772
URL: http://svn.apache.org/viewvc?rev=1776772&view=rev
Log:
Sonar : fix fix false positive squid:CommentedOutCodeLine "This block of
commented-out lines of code should be removed. "
Modified:
jmeter/trunk/src/core/org/apache/jmeter/gui/action/Save.java
Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/action/Save.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/action/Save.java?rev=1776772&r1=1776771&r2=1776772&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/action/Save.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/action/Save.java Sat Dec 31
15:08:51 2016
@@ -324,9 +324,11 @@ public class Save extends AbstractAction
log.error("Could not backup file ! Backup directory does not
exist, is not a directory or could not be created ! <" +
backupDir.getAbsolutePath() + ">"); //$NON-NLS-1$ //$NON-NLS-2$
}
- // select files matching
- // {baseName}{versionSeparator}{version}{jmxExtension}
- // where {version} is a 6 digits number
+ /**
+ * select files matching
+ * {baseName}{versionSeparator}{version}{jmxExtension}
+ * where {version} is a 6 digits number
+ */
String backupPatternRegex = Pattern.quote(baseName + versionSeparator)
+ "([\\d]{6})" + Pattern.quote(JMX_FILE_EXTENSION); //$NON-NLS-1$
Pattern backupPattern = Pattern.compile(backupPatternRegex);
// create a file filter that select files matching a given regex
pattern
@@ -365,8 +367,10 @@ public class Save extends AbstractAction
return diff < 0 ? -1 : diff > 0 ? 1 : 0;
}
});
- // backup name is of the form
- // {baseName}{versionSeparator}{version}{jmxExtension}
+ /**
+ * backup name is of the form
+ * {baseName}{versionSeparator}{version}{jmxExtension}
+ */
String backupName = baseName + versionSeparator +
BACKUP_VERSION_FORMATER.format(lastVersionNumber + 1L) + JMX_FILE_EXTENSION;
File backupFile = new File(backupDir, backupName);
// create file backup
