Bug 547304 - [cleanup] Fix wrong space/tab indentation
This change fixes space or mixed tab/space indentations in all Java
files. This also includes two or three space indentations and even fix
most stray single spaces in indentations.
The change includes only whitespace formatting and no code changes.
Change-Id: Iab83ab866d88b2022f28625ed9ea6242091725f2
diff --git a/bundles/org.eclipse.releng.tests/src/org/eclipse/releng/tests/BuildTests.java b/bundles/org.eclipse.releng.tests/src/org/eclipse/releng/tests/BuildTests.java
index 0a9d02f..10d0548 100644
--- a/bundles/org.eclipse.releng.tests/src/org/eclipse/releng/tests/BuildTests.java
+++ b/bundles/org.eclipse.releng.tests/src/org/eclipse/releng/tests/BuildTests.java
@@ -42,289 +42,289 @@
public class BuildTests {
- private String logFileName;
- private static final int HTML = 0;
- private static final int PROPERTIES = 1;
- private static final int XML = 2;
+ private String logFileName;
+ private static final int HTML = 0;
+ private static final int PROPERTIES = 1;
+ private static final int XML = 2;
- private static FileTool.IZipFilter getTrueFilter() {
- return new FileTool.IZipFilter() {
+ private static FileTool.IZipFilter getTrueFilter() {
+ return new FileTool.IZipFilter() {
- @Override
+ @Override
public boolean shouldExtract(String fullEntryName, String entryName, int depth) {
- return true;
- }
+ return true;
+ }
- @Override
+ @Override
public boolean shouldUnzip(String fullEntryName, String entryName, int depth) {
- return true;
- }
- };
- }
+ return true;
+ }
+ };
+ }
- /**
- * Method hasErrors.
- *
- * @param string
- * @return boolean
- */
- private boolean hasErrors(String string) {
+ /**
+ * Method hasErrors.
+ *
+ * @param string
+ * @return boolean
+ */
+ private boolean hasErrors(String string) {
- boolean result = false;
+ boolean result = false;
- try (BufferedReader aReader = new BufferedReader(new InputStreamReader(new FileInputStream(string)))){
- String aLine = aReader.readLine();
- while (aLine != null) {
- int aNumber = parseLine(aLine);
- if (aNumber > 0) {
- result = true;
- }
- aLine = aReader.readLine();
- }
- }
- catch (FileNotFoundException e) {
- System.out.println("Could not open log file: " + string);
- result = true;
- }
- catch (IOException e) {
- System.out.println("Error reading log file: " + string);
- result = true;
- }
- return result;
- }
- @Test
- public void testChkpii() {
+ try (BufferedReader aReader = new BufferedReader(new InputStreamReader(new FileInputStream(string)))){
+ String aLine = aReader.readLine();
+ while (aLine != null) {
+ int aNumber = parseLine(aLine);
+ if (aNumber > 0) {
+ result = true;
+ }
+ aLine = aReader.readLine();
+ }
+ }
+ catch (FileNotFoundException e) {
+ System.out.println("Could not open log file: " + string);
+ result = true;
+ }
+ catch (IOException e) {
+ System.out.println("Error reading log file: " + string);
+ result = true;
+ }
+ return result;
+ }
+ @Test
+ public void testChkpii() {
- try {
- // test that chkpii is on path by printing chkpii help information
- Runtime aRuntime = Runtime.getRuntime();
- Process aProcess = aRuntime.exec(getExec() + " /?");
- BufferedReader aBufferedReader = new BufferedReader(new InputStreamReader(aProcess.getInputStream()));
- while (aBufferedReader.readLine() != null) {
- }
- aProcess.waitFor();
- } catch (IOException e) {
- // skip chkpii test if chkpii cannot be run.
- System.out.println("testChkpii-NotInstalled");
- System.out.println(e.getMessage());
- System.out.println("Skipping chkpii test.");
- assertTrue(true);
- return;
- } catch (InterruptedException e) {
- e.printStackTrace();
- }
+ try {
+ // test that chkpii is on path by printing chkpii help information
+ Runtime aRuntime = Runtime.getRuntime();
+ Process aProcess = aRuntime.exec(getExec() + " /?");
+ BufferedReader aBufferedReader = new BufferedReader(new InputStreamReader(aProcess.getInputStream()));
+ while (aBufferedReader.readLine() != null) {
+ }
+ aProcess.waitFor();
+ } catch (IOException e) {
+ // skip chkpii test if chkpii cannot be run.
+ System.out.println("testChkpii-NotInstalled");
+ System.out.println(e.getMessage());
+ System.out.println("Skipping chkpii test.");
+ assertTrue(true);
+ return;
+ } catch (InterruptedException e) {
+ e.printStackTrace();
+ }
- String zipFile = locateEclipseZip();
+ String zipFile = locateEclipseZip();
- // String sniffFolder = BootLoader.getInstallURL().getPath() +
- // "releng_sniff_folder";
- // String sniffFolder = "d:\\builds\\t";
- String sniffFolder = Platform.getLocation().toOSString();
+ // String sniffFolder = BootLoader.getInstallURL().getPath() +
+ // "releng_sniff_folder";
+ // String sniffFolder = "d:\\builds\\t";
+ String sniffFolder = Platform.getLocation().toOSString();
- try {
- if (zipFile.isEmpty()) {
- FileTool.unzip(getTrueFilter(), new File(sniffFolder));
- } else {
- FileTool.unzip(getTrueFilter(), new ZipFile(zipFile), new File(sniffFolder));
- }
- }
- catch (IOException e) {
- fail(zipFile + ": " + sniffFolder + ": " + "IOException unzipping Eclipse for chkpii");
- }
+ try {
+ if (zipFile.isEmpty()) {
+ FileTool.unzip(getTrueFilter(), new File(sniffFolder));
+ } else {
+ FileTool.unzip(getTrueFilter(), new ZipFile(zipFile), new File(sniffFolder));
+ }
+ }
+ catch (IOException e) {
+ fail(zipFile + ": " + sniffFolder + ": " + "IOException unzipping Eclipse for chkpii");
+ }
- boolean result1 = testChkpii(HTML);
- boolean result2 = testChkpii(XML);
- boolean result3 = testChkpii(PROPERTIES);
- assertTrue("Translation errors in files. See the chkpii logs linked from the test results page for details.",
- (result1 && result2 && result3));
- }
+ boolean result1 = testChkpii(HTML);
+ boolean result2 = testChkpii(XML);
+ boolean result3 = testChkpii(PROPERTIES);
+ assertTrue("Translation errors in files. See the chkpii logs linked from the test results page for details.",
+ (result1 && result2 && result3));
+ }
- private boolean testChkpii(int type) {
- Runtime aRuntime = Runtime.getRuntime();
- String chkpiiString = getChkpiiString(type);
- try {
- Process aProcess = aRuntime.exec(chkpiiString);
- BufferedReader aBufferedReader = new BufferedReader(new InputStreamReader(aProcess.getInputStream()));
- while (aBufferedReader.readLine() != null) {
- }
- aProcess.waitFor();
- } catch (IOException e) {
- e.printStackTrace();
- return false;
- } catch (InterruptedException e) {
- return false;
- }
- return !hasErrors(getOutputFile(type));
- }
+ private boolean testChkpii(int type) {
+ Runtime aRuntime = Runtime.getRuntime();
+ String chkpiiString = getChkpiiString(type);
+ try {
+ Process aProcess = aRuntime.exec(chkpiiString);
+ BufferedReader aBufferedReader = new BufferedReader(new InputStreamReader(aProcess.getInputStream()));
+ while (aBufferedReader.readLine() != null) {
+ }
+ aProcess.waitFor();
+ } catch (IOException e) {
+ e.printStackTrace();
+ return false;
+ } catch (InterruptedException e) {
+ return false;
+ }
+ return !hasErrors(getOutputFile(type));
+ }
- /**
- * Method getChkpiiString.
- *
- * @param type
- * @return String
- */
- private String getChkpiiString(int type) {
- return getExec() + " " + getFilesToTest(type) + " -E -O " + getOutputFile(type) + " -XM @" + getExcludeErrors() + " -X "
- + getExcludeFile() + " -S /jsq /tex";
- }
+ /**
+ * Method getChkpiiString.
+ *
+ * @param type
+ * @return String
+ */
+ private String getChkpiiString(int type) {
+ return getExec() + " " + getFilesToTest(type) + " -E -O " + getOutputFile(type) + " -XM @" + getExcludeErrors() + " -X "
+ + getExcludeFile() + " -S /jsq /tex";
+ }
- /**
- * Method locateEclipseZip.
- *
- * @return String
- */
- private String locateEclipseZip() {
+ /**
+ * Method locateEclipseZip.
+ *
+ * @return String
+ */
+ private String locateEclipseZip() {
- // String to use when running as an automated test.
- String installDir = Platform.getInstallLocation().getURL().getPath() + ".." + File.separator + "..";
+ // String to use when running as an automated test.
+ String installDir = Platform.getInstallLocation().getURL().getPath() + ".." + File.separator + "..";
- // String to use when running in Eclipse
- // String installDir = BootLoader.getInstallURL().getPath() + "..";
- File aFile = new File(installDir);
+ // String to use when running in Eclipse
+ // String installDir = BootLoader.getInstallURL().getPath() + "..";
+ File aFile = new File(installDir);
- for (File file : aFile.listFiles()) {
- String fileName = file.getName();
- if (fileName.startsWith("eclipse-SDK-") && fileName.endsWith(".zip")) {
- return file.getPath();
- }
- }
+ for (File file : aFile.listFiles()) {
+ String fileName = file.getName();
+ if (fileName.startsWith("eclipse-SDK-") && fileName.endsWith(".zip")) {
+ return file.getPath();
+ }
+ }
- return "";
- }
+ return "";
+ }
- /**
- * Method getExcludeFiles.
- *
- * @return String
- */
- private String getExcludeFile() {
- String aString = System.getProperty("PLUGIN_PATH");
- return aString + File.separator + "ignoreFiles.txt";
- }
+ /**
+ * Method getExcludeFiles.
+ *
+ * @return String
+ */
+ private String getExcludeFile() {
+ String aString = System.getProperty("PLUGIN_PATH");
+ return aString + File.separator + "ignoreFiles.txt";
+ }
- /**
- * Method getOutputFile.
- *
- * @param type
- * @return String
- */
+ /**
+ * Method getOutputFile.
+ *
+ * @param type
+ * @return String
+ */
- private String getOutputFile(int type) {
+ private String getOutputFile(int type) {
- new File(logFileName).mkdirs();
+ new File(logFileName).mkdirs();
- String aString = logFileName + File.separator + "org.eclipse.nls.";
- aString = new File(aString).getPath();
+ String aString = logFileName + File.separator + "org.eclipse.nls.";
+ aString = new File(aString).getPath();
- switch (type) {
- case HTML:
- return aString + "html.txt";
- case PROPERTIES:
- return aString + "properties.txt";
+ switch (type) {
+ case HTML:
+ return aString + "html.txt";
+ case PROPERTIES:
+ return aString + "properties.txt";
- case XML:
- return aString + "xml.txt";
+ case XML:
+ return aString + "xml.txt";
- default:
- return aString + "other.txt";
- }
- }
+ default:
+ return aString + "other.txt";
+ }
+ }
- /**
- * Method getFilesToTest.
- *
- * @param type
- * @return String
- */
+ /**
+ * Method getFilesToTest.
+ *
+ * @param type
+ * @return String
+ */
- private String getFilesToTest(int type) {
+ private String getFilesToTest(int type) {
- String sniffFolder = Platform.getLocation().toOSString();
+ String sniffFolder = Platform.getLocation().toOSString();
- String aString = new File(sniffFolder).getPath() + File.separator;
+ String aString = new File(sniffFolder).getPath() + File.separator;
- switch (type) {
- case HTML:
- return aString + "*.htm*";
- case PROPERTIES:
- return aString + "*.properties";
+ switch (type) {
+ case HTML:
+ return aString + "*.htm*";
+ case PROPERTIES:
+ return aString + "*.properties";
- case XML:
- return aString + "*.xml";
+ case XML:
+ return aString + "*.xml";
- default:
- return aString + "*.*";
- }
- }
+ default:
+ return aString + "*.*";
+ }
+ }
- /**
- * Method getExec.
- *
- * @return String
- */
+ /**
+ * Method getExec.
+ *
+ * @return String
+ */
- private String getExec() {
+ private String getExec() {
- return new File("chkpw1402.exe").getPath();
- }
+ return new File("chkpw1402.exe").getPath();
+ }
- /**
- * Method getExcludeErrors.
- */
- private String getExcludeErrors() {
+ /**
+ * Method getExcludeErrors.
+ */
+ private String getExcludeErrors() {
- String os = Platform.getOS();
- String fileName;
+ String os = Platform.getOS();
+ String fileName;
- if (os.equals("win32")) {
- fileName = "ignoreErrorsWindows.txt";
- } else {
- fileName = "ignoreErrorsUnix.txt";
- }
+ if (os.equals("win32")) {
+ fileName = "ignoreErrorsWindows.txt";
+ } else {
+ fileName = "ignoreErrorsUnix.txt";
+ }
- String aString = System.getProperty("PLUGIN_PATH");
- return aString + File.separator + fileName;
- }
+ String aString = System.getProperty("PLUGIN_PATH");
+ return aString + File.separator + fileName;
+ }
- /**
- * Method parseLine.
- *
- * @param aLine
- * @return -1 if not an error or warning line or the number of errors or warnings.
- */
- private int parseLine(String aLine) {
- int index = aLine.indexOf("Files Could Not Be Processed: ");
+ /**
+ * Method parseLine.
+ *
+ * @param aLine
+ * @return -1 if not an error or warning line or the number of errors or warnings.
+ */
+ private int parseLine(String aLine) {
+ int index = aLine.indexOf("Files Could Not Be Processed: ");
- if (index == -1) {
- index = aLine.indexOf("Files Contain Error");
- }
+ if (index == -1) {
+ index = aLine.indexOf("Files Contain Error");
+ }
- if (index == -1) {
- return -1;
- } else {
- String aString = aLine.substring(0, index).trim();
- return Integer.parseInt(aString);
- }
- }
+ if (index == -1) {
+ return -1;
+ } else {
+ String aString = aLine.substring(0, index).trim();
+ return Integer.parseInt(aString);
+ }
+ }
- public class FileSuffixFilter implements FilenameFilter {
+ public class FileSuffixFilter implements FilenameFilter {
- private String suffix;
+ private String suffix;
- public FileSuffixFilter(String suffix) {
- this.suffix = suffix;
- }
+ public FileSuffixFilter(String suffix) {
+ this.suffix = suffix;
+ }
- @Override
+ @Override
public boolean accept(File dir, String name) {
- int lastDot = name.lastIndexOf('.');
- if (lastDot == -1) {
- return false;
- }
- return name.substring(lastDot).equals(suffix);
- }
+ int lastDot = name.lastIndexOf('.');
+ if (lastDot == -1) {
+ return false;
+ }
+ return name.substring(lastDot).equals(suffix);
+ }
- }
+ }
public static final List<String> REQUIRED_FEATURE_FILES_EPL2 = Arrays
.asList(new String[] { "epl-2.0.html", "feature.properties", "feature.xml", "license.html" });
@@ -357,411 +357,411 @@
public static final List<String> SUFFIX_EXEMPT_LIST = Arrays
.asList(new String[] { "org.eclipse.swt", "org.apache.ant" });
- public static final int PLUGIN_COUNT = 84; // - 20; // Note this number
- // must include non-shipping
- // test plugins
- public static final int FEATURE_COUNT = 9; // - 1; // Note this number must
+ public static final int PLUGIN_COUNT = 84; // - 20; // Note this number
+ // must include non-shipping
+ // test plugins
+ public static final int FEATURE_COUNT = 9; // - 1; // Note this number must
- // include non-shipping test
- // feature
+ // include non-shipping test
+ // feature
- @Before
- public void setUp() {
- // Automated Test
- logFileName = Platform.getInstallLocation().getURL().getPath() + ".." + File.separator + ".." + File.separator + "results"
- + File.separator + "chkpii"; // A tad bogus but this is where
- // the build wants to copy the
- // results from!
+ @Before
+ public void setUp() {
+ // Automated Test
+ logFileName = Platform.getInstallLocation().getURL().getPath() + ".." + File.separator + ".." + File.separator + "results"
+ + File.separator + "chkpii"; // A tad bogus but this is where
+ // the build wants to copy the
+ // results from!
- // Runtime Workbench - TODO Put me back to Automated status
- // logFileName = "d:\\results";
- // sourceDirectoryName = "d:\\sourceFetch";
- }
- @Test
- public void testFeatureFiles() {
- List<String> result = new ArrayList<>();
- String installDir = Platform.getInstallLocation().getURL().getPath();
+ // Runtime Workbench - TODO Put me back to Automated status
+ // logFileName = "d:\\results";
+ // sourceDirectoryName = "d:\\sourceFetch";
+ }
+ @Test
+ public void testFeatureFiles() {
+ List<String> result = new ArrayList<>();
+ String installDir = Platform.getInstallLocation().getURL().getPath();
- File featureDir = new File(installDir, "features");
- for (File aFeature : featureDir.listFiles()) {
- List<String> testFiles = REQUIRED_FEATURE_FILES_EPL2;
+ File featureDir = new File(installDir, "features");
+ for (File aFeature : featureDir.listFiles()) {
+ List<String> testFiles = REQUIRED_FEATURE_FILES_EPL2;
// EMF and ECF features are still EPL 1.0
if (aFeature.getName().startsWith("org.eclipse.ecf")) {
testFiles = REQUIRED_FEATURE_FILES_EPL1;
}
if (!testDirectory(aFeature, testFiles, REQUIRED_FEATURE_SUFFIX)) {
- result.add(aFeature.getPath());
- }
- }
+ result.add(aFeature.getPath());
+ }
+ }
- String aString = "";
- if (!result.isEmpty()) {
- for (String element: result) {
- aString = aString + element + "; ";
- }
- }
- assertTrue("Feature directory missing required files: " + aString, result.isEmpty());
- }
- @Test
- public void testPluginFiles() {
- List<String> result = new ArrayList<>();
- String installDir = Platform.getInstallLocation().getURL().getPath();
- File pluginDir = new File(installDir, "plugins");
- for (File aPlugin : pluginDir.listFiles()) {
- if (aPlugin.getName().indexOf("test") == -1) {
- if (!testPluginFile(aPlugin)) {
- result.add(aPlugin.getPath());
- }
- }
- }
+ String aString = "";
+ if (!result.isEmpty()) {
+ for (String element: result) {
+ aString = aString + element + "; ";
+ }
+ }
+ assertTrue("Feature directory missing required files: " + aString, result.isEmpty());
+ }
+ @Test
+ public void testPluginFiles() {
+ List<String> result = new ArrayList<>();
+ String installDir = Platform.getInstallLocation().getURL().getPath();
+ File pluginDir = new File(installDir, "plugins");
+ for (File aPlugin : pluginDir.listFiles()) {
+ if (aPlugin.getName().indexOf("test") == -1) {
+ if (!testPluginFile(aPlugin)) {
+ result.add(aPlugin.getPath());
+ }
+ }
+ }
- String aString = "";
- if (!result.isEmpty()) {
- for (String element : result) {
- aString = aString + element + "; ";
- }
- }
- assertTrue("Plugin directory missing required files: " + aString, result.isEmpty());
- }
+ String aString = "";
+ if (!result.isEmpty()) {
+ for (String element : result) {
+ aString = aString + element + "; ";
+ }
+ }
+ assertTrue("Plugin directory missing required files: " + aString, result.isEmpty());
+ }
- private boolean testPluginFile(File aPlugin) {
+ private boolean testPluginFile(File aPlugin) {
- // Are we a doc plugin?
- if (testDirectory(aPlugin, REQUIRED_PLUGIN_FILES, ".zip")) {
- return true;
- }
+ // Are we a doc plugin?
+ if (testDirectory(aPlugin, REQUIRED_PLUGIN_FILES, ".zip")) {
+ return true;
+ }
- // Are we a feature plugin?
- if (testDirectory(aPlugin, REQUIRED_FEATURE_PLUGIN_FILES, REQUIRED_FEATURE_PLUGIN_SUFFIX)) {
- return true;
- }
+ // Are we a feature plugin?
+ if (testDirectory(aPlugin, REQUIRED_FEATURE_PLUGIN_FILES, REQUIRED_FEATURE_PLUGIN_SUFFIX)) {
+ return true;
+ }
- // Are we a regular plugin
- if (testDirectory(aPlugin, REQUIRED_PLUGIN_FILES, REQUIRED_PLUGIN_SUFFIX)) {
- return true;
- }
+ // Are we a regular plugin
+ if (testDirectory(aPlugin, REQUIRED_PLUGIN_FILES, REQUIRED_PLUGIN_SUFFIX)) {
+ return true;
+ }
- // Are we a source plugin
- if (testSourcePlugin(aPlugin)) {
- return true;
- }
+ // Are we a source plugin
+ if (testSourcePlugin(aPlugin)) {
+ return true;
+ }
- // Are we a fragment
- if ((testDirectory(aPlugin, REQUIRED_FRAGMENT_FILES, REQUIRED_FRAGMENT_SUFFIX))
- || (testBundleDirectory(aPlugin, REQUIRED_BUNDLE_FILES, REQUIRED_BUNDLE_MANIFEST, REQUIRED_FRAGMENT_SUFFIX))) {
- return true;
- }
+ // Are we a fragment
+ if ((testDirectory(aPlugin, REQUIRED_FRAGMENT_FILES, REQUIRED_FRAGMENT_SUFFIX))
+ || (testBundleDirectory(aPlugin, REQUIRED_BUNDLE_FILES, REQUIRED_BUNDLE_MANIFEST, REQUIRED_FRAGMENT_SUFFIX))) {
+ return true;
+ }
- // Are we an swt fragment
- if (testDirectory(aPlugin, REQUIRED_SWT_FRAGMENT_FILES, REQUIRED_SWT_FRAGMENT_SUFFIX)) {
- return true;
- }
+ // Are we an swt fragment
+ if (testDirectory(aPlugin, REQUIRED_SWT_FRAGMENT_FILES, REQUIRED_SWT_FRAGMENT_SUFFIX)) {
+ return true;
+ }
- // Are we a bundle?
- if (testBundleDirectory(aPlugin, REQUIRED_BUNDLE_FILES, REQUIRED_BUNDLE_MANIFEST, REQUIRED_BUNDLE_SUFFIX)) {
- return true;
- }
+ // Are we a bundle?
+ if (testBundleDirectory(aPlugin, REQUIRED_BUNDLE_FILES, REQUIRED_BUNDLE_MANIFEST, REQUIRED_BUNDLE_SUFFIX)) {
+ return true;
+ }
- // No then we are bad
- return false;
- }
+ // No then we are bad
+ return false;
+ }
- private boolean testPluginJar(File aDirectory, List<String> requiredFiles) {
- ArrayList<String> list = new ArrayList<>();
- try (ZipFile jarredPlugin = new ZipFile(aDirectory)) {
- Enumeration<? extends ZipEntry> _enum = jarredPlugin.entries();
- while (_enum.hasMoreElements()) {
- list.add(_enum.nextElement().toString());
- }
- } catch (IOException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
- if (!list.containsAll(requiredFiles)) {
- return false;
- }
- return true;
- }
+ private boolean testPluginJar(File aDirectory, List<String> requiredFiles) {
+ ArrayList<String> list = new ArrayList<>();
+ try (ZipFile jarredPlugin = new ZipFile(aDirectory)) {
+ Enumeration<? extends ZipEntry> _enum = jarredPlugin.entries();
+ while (_enum.hasMoreElements()) {
+ list.add(_enum.nextElement().toString());
+ }
+ } catch (IOException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+ if (!list.containsAll(requiredFiles)) {
+ return false;
+ }
+ return true;
+ }
- private boolean testDirectory(File aDirectory, List<String> requiredFiles, String requiredSuffix) {
- if (aDirectory.getName().endsWith(".jar")) {
- return testPluginJar(aDirectory, requiredFiles);
- } else {
- if (!Arrays.asList(aDirectory.list()).containsAll(requiredFiles)) {
- return false;
- }
+ private boolean testDirectory(File aDirectory, List<String> requiredFiles, String requiredSuffix) {
+ if (aDirectory.getName().endsWith(".jar")) {
+ return testPluginJar(aDirectory, requiredFiles);
+ } else {
+ if (!Arrays.asList(aDirectory.list()).containsAll(requiredFiles)) {
+ return false;
+ }
- int index = aDirectory.getName().indexOf('_');
- if (index == -1) {
- index = aDirectory.getName().length();
- }
+ int index = aDirectory.getName().indexOf('_');
+ if (index == -1) {
+ index = aDirectory.getName().length();
+ }
- String plainName = aDirectory.getName().substring(0, index);
+ String plainName = aDirectory.getName().substring(0, index);
- if (requiredSuffix.isEmpty() || SUFFIX_EXEMPT_LIST.contains(plainName)) {
- return true;
- } else if (aDirectory.listFiles(new FileSuffixFilter(requiredSuffix)).length == 0) {
- return false;
- }
- }
- return true;
- }
+ if (requiredSuffix.isEmpty() || SUFFIX_EXEMPT_LIST.contains(plainName)) {
+ return true;
+ } else if (aDirectory.listFiles(new FileSuffixFilter(requiredSuffix)).length == 0) {
+ return false;
+ }
+ }
+ return true;
+ }
- private boolean testBundleDirectory(File aDirectory, List<String> requiredFiles, String manifestFile, String requiredSuffix) {
- if (aDirectory.getName().endsWith(".jar")) {
- return testPluginJar(aDirectory, requiredFiles);
- } else {
- if (!Arrays.asList(aDirectory.list()).containsAll(requiredFiles)) {
- return false;
- }
+ private boolean testBundleDirectory(File aDirectory, List<String> requiredFiles, String manifestFile, String requiredSuffix) {
+ if (aDirectory.getName().endsWith(".jar")) {
+ return testPluginJar(aDirectory, requiredFiles);
+ } else {
+ if (!Arrays.asList(aDirectory.list()).containsAll(requiredFiles)) {
+ return false;
+ }
- int index = aDirectory.getName().indexOf('_');
- if (index == -1) {
- index = aDirectory.getName().length();
- }
+ int index = aDirectory.getName().indexOf('_');
+ if (index == -1) {
+ index = aDirectory.getName().length();
+ }
- String plainName = aDirectory.getName().substring(0, index);
+ String plainName = aDirectory.getName().substring(0, index);
- File metaDir = new File(aDirectory, "META-INF");
+ File metaDir = new File(aDirectory, "META-INF");
- String[] metaFiles = metaDir.list();
- if (metaFiles == null) {
- return (false);
- } else {
- for (String filename : metaFiles) {
- if (filename == manifestFile) {
- return true;
- }
- }
- }
+ String[] metaFiles = metaDir.list();
+ if (metaFiles == null) {
+ return (false);
+ } else {
+ for (String filename : metaFiles) {
+ if (filename == manifestFile) {
+ return true;
+ }
+ }
+ }
- if (!metaDir.exists()) {
- return false;
- }
+ if (!metaDir.exists()) {
+ return false;
+ }
- if (requiredSuffix.isEmpty() || SUFFIX_EXEMPT_LIST.contains(plainName)) {
- return true;
- } else if (aDirectory.listFiles(new FileSuffixFilter(requiredSuffix)).length == 0) {
- return false;
- }
- }
- return true;
- }
+ if (requiredSuffix.isEmpty() || SUFFIX_EXEMPT_LIST.contains(plainName)) {
+ return true;
+ } else if (aDirectory.listFiles(new FileSuffixFilter(requiredSuffix)).length == 0) {
+ return false;
+ }
+ }
+ return true;
+ }
- /**
- * Return true if the receiver is a source plugin, false otherwise A separate method because this is a little tricky.
- *
- * @param aPlugin
- * @return boolean
- */
- private boolean testSourcePlugin(File aPlugin) {
- if (!testDirectory(aPlugin, REQUIRED_PLUGIN_FILES, "")) {
- return false;
- }
+ /**
+ * Return true if the receiver is a source plugin, false otherwise A separate method because this is a little tricky.
+ *
+ * @param aPlugin
+ * @return boolean
+ */
+ private boolean testSourcePlugin(File aPlugin) {
+ if (!testDirectory(aPlugin, REQUIRED_PLUGIN_FILES, "")) {
+ return false;
+ }
- File sourceDir = new File(aPlugin, "src");
- File[] sourceDirs = sourceDir.listFiles();
- if (sourceDirs == null) {
- return false;
- }
+ File sourceDir = new File(aPlugin, "src");
+ File[] sourceDirs = sourceDir.listFiles();
+ if (sourceDirs == null) {
+ return false;
+ }
- for ( File aSourceDir : sourceDirs) {
- if (!testDirectory(aSourceDir, REQUIRED_SOURCE_FILES, REQUIRED_SOURCE_SUFFIX)) {
- return false;
- }
- }
- return true;
- }
- @Test
- public void testJavadocLogs() throws Exception {
- String javadocUrls = System.getProperty("RELENGTEST.JAVADOC.URLS");
- // Skip this test if there are no logs to check
- if (javadocUrls == null) {
- System.err.println("WARNING: no javadoc logs to test, since RELENGTEST.JAVADOC.URLS property was not set");
- return;
- } else {
- System.err.println("RELENGTEST.JAVADOC.URLS: " + javadocUrls);
- }
+ for ( File aSourceDir : sourceDirs) {
+ if (!testDirectory(aSourceDir, REQUIRED_SOURCE_FILES, REQUIRED_SOURCE_SUFFIX)) {
+ return false;
+ }
+ }
+ return true;
+ }
+ @Test
+ public void testJavadocLogs() throws Exception {
+ String javadocUrls = System.getProperty("RELENGTEST.JAVADOC.URLS");
+ // Skip this test if there are no logs to check
+ if (javadocUrls == null) {
+ System.err.println("WARNING: no javadoc logs to test, since RELENGTEST.JAVADOC.URLS property was not set");
+ return;
+ } else {
+ System.err.println("RELENGTEST.JAVADOC.URLS: " + javadocUrls);
+ }
- String[] urls = javadocUrls.split(",");
- URL[] javadocLogs = new URL[urls.length];
- for (int i = 0; i < urls.length; i++) {
- javadocLogs[i] = new URL(urls[i]);
- System.err.println("javadocLogs[" + i + "]: " + javadocLogs[i]);
- }
+ String[] urls = javadocUrls.split(",");
+ URL[] javadocLogs = new URL[urls.length];
+ for (int i = 0; i < urls.length; i++) {
+ javadocLogs[i] = new URL(urls[i]);
+ System.err.println("javadocLogs[" + i + "]: " + javadocLogs[i]);
+ }
- JavadocLog javadocLog = new JavadocLog(javadocLogs);
- String message = "javadoc errors and/or warnings in: \n";
- boolean problemLogsExist = javadocLog.logs.size() > 0;
- if (problemLogsExist) {
- for (int i = 0; i < javadocLog.logs.size(); i++)
- message = message.concat(javadocLog.logs.get(i).toString() + "\n");
- }
- message = message.concat("See the javadoc logs linked from the test results page for details");
- assertTrue(message, !problemLogsExist);
- }
- @Test
- public void testDirtyLogSize() throws Exception {
- final boolean DEBUG_DIRTY_TEST = true;
- // MAX_ALLOWED_BYTES will never be 'zero', even if "no dirt" because the
- // "dirReport" always contains some information
- // in response to the "git status" command. The goal, here, is to
- // "hard code" previously observed values, to make sure
- // there is no regressions, which would be implied by a report larger
- // than those that had been produced before.
- // The "size" should be expressed in exact bytes as "increases" in
- // size might be small ... if just a file or two.
- URL standardReportURL = this.getClass().getResource("standardDirtReport.txt");
- URLConnection standardReportURLConnection = standardReportURL.openConnection();
- // No need to get contents (yet, most of the time) unless getContentLenth doesn't work for plugin resources?
- long MAX_ALLOWED_BYTES = standardReportURLConnection.getContentLength();
- // long MAX_ALLOWED_BYTES = 37179;
- System.out.println("DEBUG: MAX_ALLOWED_BYTES: " + MAX_ALLOWED_BYTES);
- String buildId = System.getProperty("buildId");
- assertNotNull("buildId property must be specified for testDirtyLogSize test", buildId);
- String downloadHost = "build.eclipse.org/eclipse/builds/4" + buildId.charAt(0) + "/siteDir";
- String urlOfFile = "http://" + downloadHost + "/eclipse/downloads/drops4/" + buildId + "/buildlogs/dirtReport.txt";
- URL logURL = new URL(urlOfFile);
+ JavadocLog javadocLog = new JavadocLog(javadocLogs);
+ String message = "javadoc errors and/or warnings in: \n";
+ boolean problemLogsExist = javadocLog.logs.size() > 0;
+ if (problemLogsExist) {
+ for (int i = 0; i < javadocLog.logs.size(); i++)
+ message = message.concat(javadocLog.logs.get(i).toString() + "\n");
+ }
+ message = message.concat("See the javadoc logs linked from the test results page for details");
+ assertTrue(message, !problemLogsExist);
+ }
+ @Test
+ public void testDirtyLogSize() throws Exception {
+ final boolean DEBUG_DIRTY_TEST = true;
+ // MAX_ALLOWED_BYTES will never be 'zero', even if "no dirt" because the
+ // "dirReport" always contains some information
+ // in response to the "git status" command. The goal, here, is to
+ // "hard code" previously observed values, to make sure
+ // there is no regressions, which would be implied by a report larger
+ // than those that had been produced before.
+ // The "size" should be expressed in exact bytes as "increases" in
+ // size might be small ... if just a file or two.
+ URL standardReportURL = this.getClass().getResource("standardDirtReport.txt");
+ URLConnection standardReportURLConnection = standardReportURL.openConnection();
+ // No need to get contents (yet, most of the time) unless getContentLenth doesn't work for plugin resources?
+ long MAX_ALLOWED_BYTES = standardReportURLConnection.getContentLength();
+ // long MAX_ALLOWED_BYTES = 37179;
+ System.out.println("DEBUG: MAX_ALLOWED_BYTES: " + MAX_ALLOWED_BYTES);
+ String buildId = System.getProperty("buildId");
+ assertNotNull("buildId property must be specified for testDirtyLogSize test", buildId);
+ String downloadHost = "build.eclipse.org/eclipse/builds/4" + buildId.charAt(0) + "/siteDir";
+ String urlOfFile = "http://" + downloadHost + "/eclipse/downloads/drops4/" + buildId + "/buildlogs/dirtReport.txt";
+ URL logURL = new URL(urlOfFile);
- URLConnection urlConnection = logURL.openConnection();
- // getContentLength calls "connect" if needed.
- // urlConnection.connect();
- // Note, if expect more than "2 Gig", use getContentLengthLong (in Java 7).
- long nBytes = urlConnection.getContentLength();
- if (DEBUG_DIRTY_TEST) {
- System.out.println("Debug info for testDirtyLogSize");
- System.out.println("Debug: nBytes: " + nBytes);
- printHeaders(urlConnection);
- }
- // if find "response does not contain length, on a regular basis, for
- // some servers, will have to read contents.
- assertTrue(
- "Either file (url) does not exist (build may have been removed?), or HTTP response does not contain content length. urlOfFile: "
- + urlOfFile,
- (!(-1 == nBytes)));
- assertFalse("dirtReport file has increased in size, indicating a regression. See " + urlOfFile, nBytes > MAX_ALLOWED_BYTES);
- assertFalse(
- "Good news! dirtReport file has decreased in size, compared to standard, so the standardDirtReport.txt file should be replaced with the one at "
- + urlOfFile
- + ". But NOTE: results may not be accurate, if there are other errors in build, so diff is recommended.",
- nBytes < MAX_ALLOWED_BYTES);
+ URLConnection urlConnection = logURL.openConnection();
+ // getContentLength calls "connect" if needed.
+ // urlConnection.connect();
+ // Note, if expect more than "2 Gig", use getContentLengthLong (in Java 7).
+ long nBytes = urlConnection.getContentLength();
+ if (DEBUG_DIRTY_TEST) {
+ System.out.println("Debug info for testDirtyLogSize");
+ System.out.println("Debug: nBytes: " + nBytes);
+ printHeaders(urlConnection);
+ }
+ // if find "response does not contain length, on a regular basis, for
+ // some servers, will have to read contents.
+ assertTrue(
+ "Either file (url) does not exist (build may have been removed?), or HTTP response does not contain content length. urlOfFile: "
+ + urlOfFile,
+ (!(-1 == nBytes)));
+ assertFalse("dirtReport file has increased in size, indicating a regression. See " + urlOfFile, nBytes > MAX_ALLOWED_BYTES);
+ assertFalse(
+ "Good news! dirtReport file has decreased in size, compared to standard, so the standardDirtReport.txt file should be replaced with the one at "
+ + urlOfFile
+ + ". But NOTE: results may not be accurate, if there are other errors in build, so diff is recommended.",
+ nBytes < MAX_ALLOWED_BYTES);
- }
+ }
- @Test
- public void testJarSign() throws Exception {
+ @Test
+ public void testJarSign() throws Exception {
- String buildId = System.getProperty("buildId");
- assertNotNull("buildId property must be specified for testJarSign test", buildId);
- String downloadHost = "build.eclipse.org/eclipse/builds/4" + buildId.charAt(0) + "/siteDir";
- String urlOfFile = "http://" + downloadHost + "/eclipse/downloads/drops4/" + buildId + "/buildlogs/reporeports/reports/unsigned8.txt";
- URL logURL = new URL(urlOfFile);
+ String buildId = System.getProperty("buildId");
+ assertNotNull("buildId property must be specified for testJarSign test", buildId);
+ String downloadHost = "build.eclipse.org/eclipse/builds/4" + buildId.charAt(0) + "/siteDir";
+ String urlOfFile = "http://" + downloadHost + "/eclipse/downloads/drops4/" + buildId + "/buildlogs/reporeports/reports/unsigned8.txt";
+ URL logURL = new URL(urlOfFile);
- URLConnection urlConnection = logURL.openConnection();
- long nBytes = urlConnection.getContentLength();
- // nBytes will be -1 if the file doesn't exist
- // it will be more than 3 if there are unsigned jars. (atlear jar extention will be listed
+ URLConnection urlConnection = logURL.openConnection();
+ long nBytes = urlConnection.getContentLength();
+ // nBytes will be -1 if the file doesn't exist
+ // it will be more than 3 if there are unsigned jars. (atlear jar extention will be listed
assertTrue("Some bundles are unsigned please refer " + urlOfFile, ((2 > nBytes)));
- }
+ }
- private String getDownloadHost() {
- String downloadHost = System.getProperty("downloadHost");
- if (downloadHost == null) {
- downloadHost = "download.eclipse.org";
- }
- return downloadHost;
- }
+ private String getDownloadHost() {
+ String downloadHost = System.getProperty("downloadHost");
+ if (downloadHost == null) {
+ downloadHost = "download.eclipse.org";
+ }
+ return downloadHost;
+ }
- private void printHeaders(URLConnection urlConnection) {
- System.out.println("Debug: Headers for urlConnection to " + urlConnection.getURL());
- Map<String, List<String>> allFields = urlConnection.getHeaderFields();
- for (Entry<String, List<String>> entry : allFields.entrySet()) {
- for (String value : entry.getValue()) {
- System.out.printf("Debug: %-20s %-30s %n", "key: " + entry.getKey(), "value: " + value);
- }
- }
- }
- @Test
- public void testComparatorLogSize() throws Exception {
- final boolean DEBUG_TEST = true;
- // MAX_ALLOWED_BYTES will never be 'zero', even if no unexpected comparator warnings, because the
- // report always contains some information, such as identifying which build it was for.
- // The goal, here, is to
- // "hard code" nominal values, to make sure
- // there is no regressions, which would be implied by a report larger
- // than that nominal value.
- long MAX_ALLOWED_BYTES = 210;
- String buildId = System.getProperty("buildId");
- assertNotNull("buildId property must be specified for testComparatorLogSize test", buildId);
- String buildType = buildId.substring(0, 1);
- // Comparator logs are not generated for N builds
- if (!buildType.equals("N")) {
- String downloadHost = getDownloadHost();
- String urlOfFile = "http://" + downloadHost + "/eclipse/downloads/drops4/" + buildId
- + "/buildlogs/comparatorlogs/buildtimeComparatorUnanticipated.log.txt";
- URL logURL = new URL(urlOfFile);
+ private void printHeaders(URLConnection urlConnection) {
+ System.out.println("Debug: Headers for urlConnection to " + urlConnection.getURL());
+ Map<String, List<String>> allFields = urlConnection.getHeaderFields();
+ for (Entry<String, List<String>> entry : allFields.entrySet()) {
+ for (String value : entry.getValue()) {
+ System.out.printf("Debug: %-20s %-30s %n", "key: " + entry.getKey(), "value: " + value);
+ }
+ }
+ }
+ @Test
+ public void testComparatorLogSize() throws Exception {
+ final boolean DEBUG_TEST = true;
+ // MAX_ALLOWED_BYTES will never be 'zero', even if no unexpected comparator warnings, because the
+ // report always contains some information, such as identifying which build it was for.
+ // The goal, here, is to
+ // "hard code" nominal values, to make sure
+ // there is no regressions, which would be implied by a report larger
+ // than that nominal value.
+ long MAX_ALLOWED_BYTES = 210;
+ String buildId = System.getProperty("buildId");
+ assertNotNull("buildId property must be specified for testComparatorLogSize test", buildId);
+ String buildType = buildId.substring(0, 1);
+ // Comparator logs are not generated for N builds
+ if (!buildType.equals("N")) {
+ String downloadHost = getDownloadHost();
+ String urlOfFile = "http://" + downloadHost + "/eclipse/downloads/drops4/" + buildId
+ + "/buildlogs/comparatorlogs/buildtimeComparatorUnanticipated.log.txt";
+ URL logURL = new URL(urlOfFile);
- URLConnection urlConnection = logURL.openConnection();
- // urlConnection.connect();
- long nBytes = urlConnection.getContentLength();
- if (DEBUG_TEST) {
- System.out.println("Debug info for testComparatorLogSize");
- System.out.println("Debug: nBytes: " + nBytes);
- printHeaders(urlConnection);
- }
- // if find "response does not contain length, on a regular basis, for
- // some servers, will have to read contents.
- assertTrue(
- "Either file (url) does not exist, or HTTP response does not contain content length. urlOfFile: " + urlOfFile,
- (!(-1 == nBytes)));
- assertTrue("Unanticipated comparator log file has increased in size, indicating a regression. See " + urlOfFile,
- nBytes <= MAX_ALLOWED_BYTES);
- if (MAX_ALLOWED_BYTES > (nBytes + 20)) {
- System.out.println("WARNING: MAX_ALLOWED_BYTES was larger than bytes found, by " + (MAX_ALLOWED_BYTES - nBytes)
- + ", which may indicate MAX_ALLOWED_BYTES needs to be lowered, to catch regressions.");
- }
- } else {
- System.out.println("noComparatorTestsForNBuilds");
- }
- }
+ URLConnection urlConnection = logURL.openConnection();
+ // urlConnection.connect();
+ long nBytes = urlConnection.getContentLength();
+ if (DEBUG_TEST) {
+ System.out.println("Debug info for testComparatorLogSize");
+ System.out.println("Debug: nBytes: " + nBytes);
+ printHeaders(urlConnection);
+ }
+ // if find "response does not contain length, on a regular basis, for
+ // some servers, will have to read contents.
+ assertTrue(
+ "Either file (url) does not exist, or HTTP response does not contain content length. urlOfFile: " + urlOfFile,
+ (!(-1 == nBytes)));
+ assertTrue("Unanticipated comparator log file has increased in size, indicating a regression. See " + urlOfFile,
+ nBytes <= MAX_ALLOWED_BYTES);
+ if (MAX_ALLOWED_BYTES > (nBytes + 20)) {
+ System.out.println("WARNING: MAX_ALLOWED_BYTES was larger than bytes found, by " + (MAX_ALLOWED_BYTES - nBytes)
+ + ", which may indicate MAX_ALLOWED_BYTES needs to be lowered, to catch regressions.");
+ }
+ } else {
+ System.out.println("noComparatorTestsForNBuilds");
+ }
+ }
- private class JavadocLog {
+ private class JavadocLog {
- private ArrayList<String> logs = new ArrayList<>();
+ private ArrayList<String> logs = new ArrayList<>();
- private JavadocLog(URL[] logs) {
- findProblems(logs);
- }
+ private JavadocLog(URL[] logs) {
+ findProblems(logs);
+ }
- private void findProblems(URL[] javadocLogs) {
- String JAVADOC_WARNING = ": warning";
- String JAVADOC_ERROR = ": error";
- String JAVADOC_JAVA = ".java:";
+ private void findProblems(URL[] javadocLogs) {
+ String JAVADOC_WARNING = ": warning";
+ String JAVADOC_ERROR = ": error";
+ String JAVADOC_JAVA = ".java:";
- for (URL javadocLog : javadocLogs) {
- try (BufferedReader in = new BufferedReader(new InputStreamReader(javadocLog.openStream()))){
- String tmp;
- while ((tmp = in.readLine()) != null) {
- tmp = tmp.toLowerCase();
- if (tmp.indexOf(JAVADOC_ERROR) != -1 || tmp.indexOf(JAVADOC_WARNING) != -1
- || tmp.indexOf(JAVADOC_JAVA) != -1) {
- String fileName = new File(javadocLog.getFile()).getName();
- if (!logs.contains(fileName))
- logs.add(fileName);
- }
- }
- }
- catch (FileNotFoundException e) {
- logs.add("Unable to find " + new File(javadocLog.getFile()).getName() + " to read.");
- e.printStackTrace();
- }
- catch (IOException e) {
- logs.add("Unable to read " + new File(javadocLog.getFile()).getName());
- e.printStackTrace();
- }
- }
- }
- }
+ for (URL javadocLog : javadocLogs) {
+ try (BufferedReader in = new BufferedReader(new InputStreamReader(javadocLog.openStream()))){
+ String tmp;
+ while ((tmp = in.readLine()) != null) {
+ tmp = tmp.toLowerCase();
+ if (tmp.indexOf(JAVADOC_ERROR) != -1 || tmp.indexOf(JAVADOC_WARNING) != -1
+ || tmp.indexOf(JAVADOC_JAVA) != -1) {
+ String fileName = new File(javadocLog.getFile()).getName();
+ if (!logs.contains(fileName))
+ logs.add(fileName);
+ }
+ }
+ }
+ catch (FileNotFoundException e) {
+ logs.add("Unable to find " + new File(javadocLog.getFile()).getName() + " to read.");
+ e.printStackTrace();
+ }
+ catch (IOException e) {
+ logs.add("Unable to read " + new File(javadocLog.getFile()).getName());
+ e.printStackTrace();
+ }
+ }
+ }
+ }
}
diff --git a/bundles/org.eclipse.releng.tests/src/org/eclipse/releng/tests/CheckMacSignatures.java b/bundles/org.eclipse.releng.tests/src/org/eclipse/releng/tests/CheckMacSignatures.java
index a99cb61..ff76223 100644
--- a/bundles/org.eclipse.releng.tests/src/org/eclipse/releng/tests/CheckMacSignatures.java
+++ b/bundles/org.eclipse.releng.tests/src/org/eclipse/releng/tests/CheckMacSignatures.java
@@ -20,34 +20,34 @@
public class CheckMacSignatures {
- private boolean runningOnMac;
- private String eclipseInstall;
+ private boolean runningOnMac;
+ private String eclipseInstall;
- public CheckMacSignatures() {
+ public CheckMacSignatures() {
- }
+ }
- @Before
- public void checkIfOnMac() {
- String os = System.getProperty("osgi.os");
- if ("macosx".equals(os)) {
- runningOnMac = true;
- eclipseInstall = System.getProperty("eclipse.install.location");
- }
- // temp
- System.out.println("eclipse.home: " + System.getProperty("eclipse.home"));
- System.out.println("eclipse.home.location: " + System.getProperty("eclipse.home.location"));
- System.out.println("All properties");
- Properties allProperties = System.getProperties();
- allProperties.list(System.out);
- }
+ @Before
+ public void checkIfOnMac() {
+ String os = System.getProperty("osgi.os");
+ if ("macosx".equals(os)) {
+ runningOnMac = true;
+ eclipseInstall = System.getProperty("eclipse.install.location");
+ }
+ // temp
+ System.out.println("eclipse.home: " + System.getProperty("eclipse.home"));
+ System.out.println("eclipse.home.location: " + System.getProperty("eclipse.home.location"));
+ System.out.println("All properties");
+ Properties allProperties = System.getProperties();
+ allProperties.list(System.out);
+ }
- @Test
- public void checkSignature() {
- if (!runningOnMac) {
- System.out.println("Not running on Mac. No need to check Mac signature");
- } else {
- System.out.println("Eclipse Install location: " + eclipseInstall);
- }
- }
+ @Test
+ public void checkSignature() {
+ if (!runningOnMac) {
+ System.out.println("Not running on Mac. No need to check Mac signature");
+ } else {
+ System.out.println("Eclipse Install location: " + eclipseInstall);
+ }
+ }
}
diff --git a/bundles/org.eclipse.releng.tests/src/org/eclipse/releng/tests/tools/AdvancedCopyrightCommentTestsJunit4.java b/bundles/org.eclipse.releng.tests/src/org/eclipse/releng/tests/tools/AdvancedCopyrightCommentTestsJunit4.java
index bffe019..c8f5c36 100644
--- a/bundles/org.eclipse.releng.tests/src/org/eclipse/releng/tests/tools/AdvancedCopyrightCommentTestsJunit4.java
+++ b/bundles/org.eclipse.releng.tests/src/org/eclipse/releng/tests/tools/AdvancedCopyrightCommentTestsJunit4.java
@@ -31,372 +31,372 @@
*/
public class AdvancedCopyrightCommentTestsJunit4 {
- //to get name of test cases on the fly.
- @Rule public TestName name = new TestName();
+ //to get name of test cases on the fly.
+ @Rule public TestName name = new TestName();
- /**
- * verify that standard comment will have the new year appended to it
- */
- @Test
- public void singleYearComment() {
- String original = "<!--\n" +
- " Copyright (c) 2000 IBM Corporation and others. \n" +
- " All rights reserved. This program and the accompanying materials\n" +
- " are made available under the terms of the Eclipse Public License v1.0\n" +
- " which accompanies this distribution, and is available at\n" +
- " http://www.eclipse.org/legal/epl-v10.html\n" +
- " \n" +
- " Contributors:\n" +
- " IBM Corporation - initial API and implementation\n" +
- " -->";
+ /**
+ * verify that standard comment will have the new year appended to it
+ */
+ @Test
+ public void singleYearComment() {
+ String original = "<!--\n" +
+ " Copyright (c) 2000 IBM Corporation and others. \n" +
+ " All rights reserved. This program and the accompanying materials\n" +
+ " are made available under the terms of the Eclipse Public License v1.0\n" +
+ " which accompanies this distribution, and is available at\n" +
+ " http://www.eclipse.org/legal/epl-v10.html\n" +
+ " \n" +
+ " Contributors:\n" +
+ " IBM Corporation - initial API and implementation\n" +
+ " -->";
- //Last year updated to 2015
- String expectedOut = "<!--\n" +
- " Copyright (c) 2000, 2015 IBM Corporation and others. \n" + //<<<< Note appended 2015
- " All rights reserved. This program and the accompanying materials\n" +
- " are made available under the terms of the Eclipse Public License v1.0\n" +
- " which accompanies this distribution, and is available at\n" +
- " http://www.eclipse.org/legal/epl-v10.html\n" +
- " \n" +
- " Contributors:\n" +
- " IBM Corporation - initial API and implementation\n" +
- " -->";
+ //Last year updated to 2015
+ String expectedOut = "<!--\n" +
+ " Copyright (c) 2000, 2015 IBM Corporation and others. \n" + //<<<< Note appended 2015
+ " All rights reserved. This program and the accompanying materials\n" +
+ " are made available under the terms of the Eclipse Public License v1.0\n" +
+ " which accompanies this distribution, and is available at\n" +
+ " http://www.eclipse.org/legal/epl-v10.html\n" +
+ " \n" +
+ " Contributors:\n" +
+ " IBM Corporation - initial API and implementation\n" +
+ " -->";
- assertTrue(proccessAndCompare(original, 2015, expectedOut));
- }
+ assertTrue(proccessAndCompare(original, 2015, expectedOut));
+ }
- /**
- * verify standard two year comments work correctly 2000, 2014
- */
- @Test
- public void twoYearCommentCommaSeperated() {
- String original = "<!--\n" +
- " Copyright (c) 2000, 2014 IBM Corporation and others. \n" +
- " All rights reserved. This program and the accompanying materials\n" +
- " are made available under the terms of the Eclipse Public License v1.0\n" +
- " which accompanies this distribution, and is available at\n" +
- " http://www.eclipse.org/legal/epl-v10.html\n" +
- " \n" +
- " Contributors:\n" +
- " IBM Corporation - initial API and implementation\n" +
- " -->";
+ /**
+ * verify standard two year comments work correctly 2000, 2014
+ */
+ @Test
+ public void twoYearCommentCommaSeperated() {
+ String original = "<!--\n" +
+ " Copyright (c) 2000, 2014 IBM Corporation and others. \n" +
+ " All rights reserved. This program and the accompanying materials\n" +
+ " are made available under the terms of the Eclipse Public License v1.0\n" +
+ " which accompanies this distribution, and is available at\n" +
+ " http://www.eclipse.org/legal/epl-v10.html\n" +
+ " \n" +
+ " Contributors:\n" +
+ " IBM Corporation - initial API and implementation\n" +
+ " -->";
- //Last year updated to 2015
- String expectedOut = "<!--\n" +
- " Copyright (c) 2000, 2015 IBM Corporation and others. \n" +
- " All rights reserved. This program and the accompanying materials\n" +
- " are made available under the terms of the Eclipse Public License v1.0\n" +
- " which accompanies this distribution, and is available at\n" +
- " http://www.eclipse.org/legal/epl-v10.html\n" +
- " \n" +
- " Contributors:\n" +
- " IBM Corporation - initial API and implementation\n" +
- " -->";
+ //Last year updated to 2015
+ String expectedOut = "<!--\n" +
+ " Copyright (c) 2000, 2015 IBM Corporation and others. \n" +
+ " All rights reserved. This program and the accompanying materials\n" +
+ " are made available under the terms of the Eclipse Public License v1.0\n" +
+ " which accompanies this distribution, and is available at\n" +
+ " http://www.eclipse.org/legal/epl-v10.html\n" +
+ " \n" +
+ " Contributors:\n" +
+ " IBM Corporation - initial API and implementation\n" +
+ " -->";
- assertTrue(proccessAndCompare(original, 2015, expectedOut));
- }
+ assertTrue(proccessAndCompare(original, 2015, expectedOut));
+ }
- /**
- * verify standard two year comments work correctly 2000 - 2014 <br>
- * It should also handle dashes as well as commas.
- */
- @Test
- public void twoYearCommentDashSeperated() {
- String original = "<!--\n" +
- " Copyright (c) 2000 - 2014 IBM Corporation and others. \n" +
- " All rights reserved. This program and the accompanying materials\n" +
- " are made available under the terms of the Eclipse Public License v1.0\n" +
- " which accompanies this distribution, and is available at\n" +
- " http://www.eclipse.org/legal/epl-v10.html\n" +
- " \n" +
- " Contributors:\n" +
- " IBM Corporation - initial API and implementation\n" +
- " -->";
+ /**
+ * verify standard two year comments work correctly 2000 - 2014 <br>
+ * It should also handle dashes as well as commas.
+ */
+ @Test
+ public void twoYearCommentDashSeperated() {
+ String original = "<!--\n" +
+ " Copyright (c) 2000 - 2014 IBM Corporation and others. \n" +
+ " All rights reserved. This program and the accompanying materials\n" +
+ " are made available under the terms of the Eclipse Public License v1.0\n" +
+ " which accompanies this distribution, and is available at\n" +
+ " http://www.eclipse.org/legal/epl-v10.html\n" +
+ " \n" +
+ " Contributors:\n" +
+ " IBM Corporation - initial API and implementation\n" +
+ " -->";
- //Last year updated to 2015
- String expectedOut = "<!--\n" +
- " Copyright (c) 2000 - 2015 IBM Corporation and others. \n" +
- " All rights reserved. This program and the accompanying materials\n" +
- " are made available under the terms of the Eclipse Public License v1.0\n" +
- " which accompanies this distribution, and is available at\n" +
- " http://www.eclipse.org/legal/epl-v10.html\n" +
- " \n" +
- " Contributors:\n" +
- " IBM Corporation - initial API and implementation\n" +
- " -->";
+ //Last year updated to 2015
+ String expectedOut = "<!--\n" +
+ " Copyright (c) 2000 - 2015 IBM Corporation and others. \n" +
+ " All rights reserved. This program and the accompanying materials\n" +
+ " are made available under the terms of the Eclipse Public License v1.0\n" +
+ " which accompanies this distribution, and is available at\n" +
+ " http://www.eclipse.org/legal/epl-v10.html\n" +
+ " \n" +
+ " Contributors:\n" +
+ " IBM Corporation - initial API and implementation\n" +
+ " -->";
- assertTrue(proccessAndCompare(original, 2015, expectedOut));
- }
+ assertTrue(proccessAndCompare(original, 2015, expectedOut));
+ }
- /**
- * Verify that comments with multiple years are handled correctly.
- */
- @Test
- public void multiYearComment() {
- String original = "<!--\n" +
- " Copyright (c) 2000, 2011-2012, 2014 IBM Corporation and others. \n" +
- " All rights reserved. This program and the accompanying materials\n" +
- " are made available under the terms of the Eclipse Public License v1.0\n" +
- " which accompanies this distribution, and is available at\n" +
- " http://www.eclipse.org/legal/epl-v10.html\n" +
- " \n" +
- " Contributors:\n" +
- " IBM Corporation - initial API and implementation\n" +
- " -->";
+ /**
+ * Verify that comments with multiple years are handled correctly.
+ */
+ @Test
+ public void multiYearComment() {
+ String original = "<!--\n" +
+ " Copyright (c) 2000, 2011-2012, 2014 IBM Corporation and others. \n" +
+ " All rights reserved. This program and the accompanying materials\n" +
+ " are made available under the terms of the Eclipse Public License v1.0\n" +
+ " which accompanies this distribution, and is available at\n" +
+ " http://www.eclipse.org/legal/epl-v10.html\n" +
+ " \n" +
+ " Contributors:\n" +
+ " IBM Corporation - initial API and implementation\n" +
+ " -->";
- //Last year updated to 2015
- String expectedOut = "<!--\n" +
- " Copyright (c) 2000, 2011-2012, 2015 IBM Corporation and others. \n" +
- " All rights reserved. This program and the accompanying materials\n" +
- " are made available under the terms of the Eclipse Public License v1.0\n" +
- " which accompanies this distribution, and is available at\n" +
- " http://www.eclipse.org/legal/epl-v10.html\n" +
- " \n" +
- " Contributors:\n" +
- " IBM Corporation - initial API and implementation\n" +
- " -->";
+ //Last year updated to 2015
+ String expectedOut = "<!--\n" +
+ " Copyright (c) 2000, 2011-2012, 2015 IBM Corporation and others. \n" +
+ " All rights reserved. This program and the accompanying materials\n" +
+ " are made available under the terms of the Eclipse Public License v1.0\n" +
+ " which accompanies this distribution, and is available at\n" +
+ " http://www.eclipse.org/legal/epl-v10.html\n" +
+ " \n" +
+ " Contributors:\n" +
+ " IBM Corporation - initial API and implementation\n" +
+ " -->";
- assertTrue(proccessAndCompare(original, 2015, expectedOut));
- }
+ assertTrue(proccessAndCompare(original, 2015, expectedOut));
+ }
- /**
- * Verify that newline at the end is copied across to the new comment correctly.
- */
- @Test
- public void multiYearCommentNewlinePost() {
- String original = "<!--\n" +
- " Copyright (c) 2000, 2011-2012, 2014 IBM Corporation and others. \n" +
- " All rights reserved. This program and the accompanying materials\n" +
- " are made available under the terms of the Eclipse Public License v1.0\n" +
- " which accompanies this distribution, and is available at\n" +
- " http://www.eclipse.org/legal/epl-v10.html\n" +
- " \n" +
- " Contributors:\n" +
- " IBM Corporation - initial API and implementation\n" +
- " -->\n"; // NOTE new line char here.
+ /**
+ * Verify that newline at the end is copied across to the new comment correctly.
+ */
+ @Test
+ public void multiYearCommentNewlinePost() {
+ String original = "<!--\n" +
+ " Copyright (c) 2000, 2011-2012, 2014 IBM Corporation and others. \n" +
+ " All rights reserved. This program and the accompanying materials\n" +
+ " are made available under the terms of the Eclipse Public License v1.0\n" +
+ " which accompanies this distribution, and is available at\n" +
+ " http://www.eclipse.org/legal/epl-v10.html\n" +
+ " \n" +
+ " Contributors:\n" +
+ " IBM Corporation - initial API and implementation\n" +
+ " -->\n"; // NOTE new line char here.
- //
- String expectedOut = "<!--\n" +
- " Copyright (c) 2000, 2011-2012, 2015 IBM Corporation and others. \n" +
- " All rights reserved. This program and the accompanying materials\n" +
- " are made available under the terms of the Eclipse Public License v1.0\n" +
- " which accompanies this distribution, and is available at\n" +
- " http://www.eclipse.org/legal/epl-v10.html\n" +
- " \n" +
- " Contributors:\n" +
- " IBM Corporation - initial API and implementation\n" +
- " -->\n";
+ //
+ String expectedOut = "<!--\n" +
+ " Copyright (c) 2000, 2011-2012, 2015 IBM Corporation and others. \n" +
+ " All rights reserved. This program and the accompanying materials\n" +
+ " are made available under the terms of the Eclipse Public License v1.0\n" +
+ " which accompanies this distribution, and is available at\n" +
+ " http://www.eclipse.org/legal/epl-v10.html\n" +
+ " \n" +
+ " Contributors:\n" +
+ " IBM Corporation - initial API and implementation\n" +
+ " -->\n";
- assertTrue(proccessAndCompare(original, 2015,expectedOut));
- }
+ assertTrue(proccessAndCompare(original, 2015,expectedOut));
+ }
- /**
- * Verify that newline at the beginning is copied across to the new comment correctly.
- */
- @Test
- public void multiYearCommentNewlinePre() {
- String original = "\n<!--\n" + // NOTE new line char here.
- " Copyright (c) 2000, 2011-2012, 2014 IBM Corporation and others. \n" +
- " All rights reserved. This program and the accompanying materials\n" +
- " are made available under the terms of the Eclipse Public License v1.0\n" +
- " which accompanies this distribution, and is available at\n" +
- " http://www.eclipse.org/legal/epl-v10.html\n" +
- " \n" +
- " Contributors:\n" +
- " IBM Corporation - initial API and implementation\n" +
- " -->";
+ /**
+ * Verify that newline at the beginning is copied across to the new comment correctly.
+ */
+ @Test
+ public void multiYearCommentNewlinePre() {
+ String original = "\n<!--\n" + // NOTE new line char here.
+ " Copyright (c) 2000, 2011-2012, 2014 IBM Corporation and others. \n" +
+ " All rights reserved. This program and the accompanying materials\n" +
+ " are made available under the terms of the Eclipse Public License v1.0\n" +
+ " which accompanies this distribution, and is available at\n" +
+ " http://www.eclipse.org/legal/epl-v10.html\n" +
+ " \n" +
+ " Contributors:\n" +
+ " IBM Corporation - initial API and implementation\n" +
+ " -->";
- //
- String expectedOut = "\n<!--\n" +
- " Copyright (c) 2000, 2011-2012, 2015 IBM Corporation and others. \n" +
- " All rights reserved. This program and the accompanying materials\n" +
- " are made available under the terms of the Eclipse Public License v1.0\n" +
- " which accompanies this distribution, and is available at\n" +
- " http://www.eclipse.org/legal/epl-v10.html\n" +
- " \n" +
- " Contributors:\n" +
- " IBM Corporation - initial API and implementation\n" +
- " -->";
+ //
+ String expectedOut = "\n<!--\n" +
+ " Copyright (c) 2000, 2011-2012, 2015 IBM Corporation and others. \n" +
+ " All rights reserved. This program and the accompanying materials\n" +
+ " are made available under the terms of the Eclipse Public License v1.0\n" +
+ " which accompanies this distribution, and is available at\n" +
+ " http://www.eclipse.org/legal/epl-v10.html\n" +
+ " \n" +
+ " Contributors:\n" +
+ " IBM Corporation - initial API and implementation\n" +
+ " -->";
- assertTrue(proccessAndCompare(original, 2015,expectedOut));
- }
+ assertTrue(proccessAndCompare(original, 2015,expectedOut));
+ }
- /**
- * Check with Unix delimiters.
- */
- @Test
- public void unixDelimiters() {
- String original = "<!--\n" +
- " Copyright (c) 2000, 2014 IBM Corporation and others. \n" +
- " All rights reserved. This program and the accompanying materials\n" +
- " are made available under the terms of the Eclipse Public License v1.0\n" +
- " which accompanies this distribution, and is available at\n" +
- " http://www.eclipse.org/legal/epl-v10.html\n" +
- " \n" +
- " Contributors:\n" +
- " IBM Corporation - initial API and implementation\n" +
- " -->";
+ /**
+ * Check with Unix delimiters.
+ */
+ @Test
+ public void unixDelimiters() {
+ String original = "<!--\n" +
+ " Copyright (c) 2000, 2014 IBM Corporation and others. \n" +
+ " All rights reserved. This program and the accompanying materials\n" +
+ " are made available under the terms of the Eclipse Public License v1.0\n" +
+ " which accompanies this distribution, and is available at\n" +
+ " http://www.eclipse.org/legal/epl-v10.html\n" +
+ " \n" +
+ " Contributors:\n" +
+ " IBM Corporation - initial API and implementation\n" +
+ " -->";
- //Last year updated to 2015
- String expectedOut = "<!--\n" +
- " Copyright (c) 2000, 2015 IBM Corporation and others. \n" +
- " All rights reserved. This program and the accompanying materials\n" +
- " are made available under the terms of the Eclipse Public License v1.0\n" +
- " which accompanies this distribution, and is available at\n" +
- " http://www.eclipse.org/legal/epl-v10.html\n" +
- " \n" +
- " Contributors:\n" +
- " IBM Corporation - initial API and implementation\n" +
- " -->";
+ //Last year updated to 2015
+ String expectedOut = "<!--\n" +
+ " Copyright (c) 2000, 2015 IBM Corporation and others. \n" +
+ " All rights reserved. This program and the accompanying materials\n" +
+ " are made available under the terms of the Eclipse Public License v1.0\n" +
+ " which accompanies this distribution, and is available at\n" +
+ " http://www.eclipse.org/legal/epl-v10.html\n" +
+ " \n" +
+ " Contributors:\n" +
+ " IBM Corporation - initial API and implementation\n" +
+ " -->";
- assertTrue(proccessAndCompare(original, 2015,expectedOut));
- }
+ assertTrue(proccessAndCompare(original, 2015,expectedOut));
+ }
- /**
- * Check with windows delimiters. {@code \r\n}
- */
- @Test
- public void windowsDelimiters() {
- String original = "<!--\r\n" + // NOTE new line char here.
- " Copyright (c) 2000, 2014 IBM Corporation and others. \r\n" +
- " All rights reserved. This program and the accompanying materials \r\n" +
- " are made available under the terms of the Eclipse Public License v1.0\r\n" +
- " which accompanies this distribution, and is available at\r\n" +
- " http://www.eclipse.org/legal/epl-v10.html\r\n" +
- " \r\n" +
- " Contributors:\r\n" +
- " IBM Corporation - initial API and implementation\r\n" +
- " -->";
+ /**
+ * Check with windows delimiters. {@code \r\n}
+ */
+ @Test
+ public void windowsDelimiters() {
+ String original = "<!--\r\n" + // NOTE new line char here.
+ " Copyright (c) 2000, 2014 IBM Corporation and others. \r\n" +
+ " All rights reserved. This program and the accompanying materials \r\n" +
+ " are made available under the terms of the Eclipse Public License v1.0\r\n" +
+ " which accompanies this distribution, and is available at\r\n" +
+ " http://www.eclipse.org/legal/epl-v10.html\r\n" +
+ " \r\n" +
+ " Contributors:\r\n" +
+ " IBM Corporation - initial API and implementation\r\n" +
+ " -->";
- String expectedOut = "<!--\r\n" + // NOTE new line char here.
- " Copyright (c) 2000, 2015 IBM Corporation and others. \r\n" +
- " All rights reserved. This program and the accompanying materials \r\n" +
- " are made available under the terms of the Eclipse Public License v1.0\r\n" +
- " which accompanies this distribution, and is available at\r\n" +
- " http://www.eclipse.org/legal/epl-v10.html\r\n" +
- " \r\n" +
- " Contributors:\r\n" +
- " IBM Corporation - initial API and implementation\r\n" +
- " -->";
+ String expectedOut = "<!--\r\n" + // NOTE new line char here.
+ " Copyright (c) 2000, 2015 IBM Corporation and others. \r\n" +
+ " All rights reserved. This program and the accompanying materials \r\n" +
+ " are made available under the terms of the Eclipse Public License v1.0\r\n" +
+ " which accompanies this distribution, and is available at\r\n" +
+ " http://www.eclipse.org/legal/epl-v10.html\r\n" +
+ " \r\n" +
+ " Contributors:\r\n" +
+ " IBM Corporation - initial API and implementation\r\n" +
+ " -->";
- assertTrue(proccessAndCompare(original, 2015,expectedOut));
- }
+ assertTrue(proccessAndCompare(original, 2015,expectedOut));
+ }
- /**
- * the tool should work with the official header.
- * https://www.eclipse.org/legal/copyrightandlicensenotice.php
- */
- @Test
- public void eclipseCopyrightComment() {
- String original =
- " /*******************************************************************************\n" +
- " * Copyright (c) 2000 {INITIAL COPYRIGHT OWNER} {OTHER COPYRIGHT OWNERS}.\n" +
- " * All rights reserved. This program and the accompanying materials\n" +
- " * are made available under the terms of the Eclipse Public License v1.0\n" +
- " * which accompanies this distribution, and is available at\n" +
- " * http://www.eclipse.org/legal/epl-v10.html\n" +
- " *\n" +
- " * Contributors:\n" +
- " * {INITIAL AUTHOR} - initial API and implementation and/or initial documentation\n" +
- " *******************************************************************************/";
+ /**
+ * the tool should work with the official header.
+ * https://www.eclipse.org/legal/copyrightandlicensenotice.php
+ */
+ @Test
+ public void eclipseCopyrightComment() {
+ String original =
+ " /*******************************************************************************\n" +
+ " * Copyright (c) 2000 {INITIAL COPYRIGHT OWNER} {OTHER COPYRIGHT OWNERS}.\n" +
+ " * All rights reserved. This program and the accompanying materials\n" +
+ " * are made available under the terms of the Eclipse Public License v1.0\n" +
+ " * which accompanies this distribution, and is available at\n" +
+ " * http://www.eclipse.org/legal/epl-v10.html\n" +
+ " *\n" +
+ " * Contributors:\n" +
+ " * {INITIAL AUTHOR} - initial API and implementation and/or initial documentation\n" +
+ " *******************************************************************************/";
- String expectedOut =
- " /*******************************************************************************\n" +
- " * Copyright (c) 2000, 2015 {INITIAL COPYRIGHT OWNER} {OTHER COPYRIGHT OWNERS}.\n" +
- " * All rights reserved. This program and the accompanying materials\n" +
- " * are made available under the terms of the Eclipse Public License v1.0\n" +
- " * which accompanies this distribution, and is available at\n" +
- " * http://www.eclipse.org/legal/epl-v10.html\n" +
- " *\n" +
- " * Contributors:\n" +
- " * {INITIAL AUTHOR} - initial API and implementation and/or initial documentation\n" +
- " *******************************************************************************/";
+ String expectedOut =
+ " /*******************************************************************************\n" +
+ " * Copyright (c) 2000, 2015 {INITIAL COPYRIGHT OWNER} {OTHER COPYRIGHT OWNERS}.\n" +
+ " * All rights reserved. This program and the accompanying materials\n" +
+ " * are made available under the terms of the Eclipse Public License v1.0\n" +
+ " * which accompanies this distribution, and is available at\n" +
+ " * http://www.eclipse.org/legal/epl-v10.html\n" +
+ " *\n" +
+ " * Contributors:\n" +
+ " * {INITIAL AUTHOR} - initial API and implementation and/or initial documentation\n" +
+ " *******************************************************************************/";
- assertTrue(proccessAndCompare(original, 2015,expectedOut));
- }
+ assertTrue(proccessAndCompare(original, 2015,expectedOut));
+ }
- /**
- * the tool should work with IBM headers.
- * https://www.eclipse.org/legal/copyrightandlicensenotice.php
- */
- @Test
- public void ibmCopyrightComment() {
- String original =
- "Copyright (c) 2000, 2010 IBM Corporation. \n" +
- "All rights reserved. This program and the accompanying materials \n" +
- "are made available under the terms of the Eclipse Public License v1.0 \n" +
- "which accompanies this distribution, and is available at \n" +
- "http://www.eclipse.org/legal/epl-v10.html \n" +
- "\n" +
- "Contributors: \n" +
- " IBM Corporation - initial API and implementation";
+ /**
+ * the tool should work with IBM headers.
+ * https://www.eclipse.org/legal/copyrightandlicensenotice.php
+ */
+ @Test
+ public void ibmCopyrightComment() {
+ String original =
+ "Copyright (c) 2000, 2010 IBM Corporation. \n" +
+ "All rights reserved. This program and the accompanying materials \n" +
+ "are made available under the terms of the Eclipse Public License v1.0 \n" +
+ "which accompanies this distribution, and is available at \n" +
+ "http://www.eclipse.org/legal/epl-v10.html \n" +
+ "\n" +
+ "Contributors: \n" +
+ " IBM Corporation - initial API and implementation";
- String expectedOut =
- "Copyright (c) 2000, 2015 IBM Corporation. \n" +
- "All rights reserved. This program and the accompanying materials \n" +
- "are made available under the terms of the Eclipse Public License v1.0 \n" +
- "which accompanies this distribution, and is available at \n" +
- "http://www.eclipse.org/legal/epl-v10.html \n" +
- "\n" +
- "Contributors: \n" +
- " IBM Corporation - initial API and implementation";
+ String expectedOut =
+ "Copyright (c) 2000, 2015 IBM Corporation. \n" +
+ "All rights reserved. This program and the accompanying materials \n" +
+ "are made available under the terms of the Eclipse Public License v1.0 \n" +
+ "which accompanies this distribution, and is available at \n" +
+ "http://www.eclipse.org/legal/epl-v10.html \n" +
+ "\n" +
+ "Contributors: \n" +
+ " IBM Corporation - initial API and implementation";
- assertTrue(proccessAndCompare(original, 2015,expectedOut));
- }
+ assertTrue(proccessAndCompare(original, 2015,expectedOut));
+ }
- /**
- * the tool should work with non-IBM copy right comments as well. <br>.
- * for the purpose, a random realistic comment was extracted.
- */
- @Test
- public void redHatCopyrightComment() {
- String original =
- " /*******************************************************************************\n" +
- " * Copyright (c) 2004, 2008, 2009, 2012 Red Hat, Inc. and others\n" +
- " * All rights reserved. This program and the accompanying materials\n" +
- " * are made available under the terms of the Eclipse Public License v1.0\n" +
- " * which accompanies this distribution, and is available at\n" +
- " * http://www.eclipse.org/legal/epl-v10.html\n" +
- " *\n" +
- " * Contributors:\n" +
- " * Kent Sebastian <ksebasti@redhat.com> - initial API and implementation\n" +
- " * Keith Seitz <keiths@redhat.com> - setup code in launch the method, initially\n" +
- " * written in the now-defunct OprofileSession class\n" +
- " * QNX Software Systems and others - the section of code marked in the launch\n" +
- " * method, and the exec method\n" +
- " * Lev Ufimtsev <lufimtse@redhat.com> --Added automatical enablement of options\n" +
- " * if thery are not set.\n" +
- " * Red Hat Inc. - modification of OProfileLaunchConfigurationDelegate to here\n" +
- " *******************************************************************************/";
+ /**
+ * the tool should work with non-IBM copy right comments as well. <br>.
+ * for the purpose, a random realistic comment was extracted.
+ */
+ @Test
+ public void redHatCopyrightComment() {
+ String original =
+ " /*******************************************************************************\n" +
+ " * Copyright (c) 2004, 2008, 2009, 2012 Red Hat, Inc. and others\n" +
+ " * All rights reserved. This program and the accompanying materials\n" +
+ " * are made available under the terms of the Eclipse Public License v1.0\n" +
+ " * which accompanies this distribution, and is available at\n" +
+ " * http://www.eclipse.org/legal/epl-v10.html\n" +
+ " *\n" +
+ " * Contributors:\n" +
+ " * Kent Sebastian <ksebasti@redhat.com> - initial API and implementation\n" +
+ " * Keith Seitz <keiths@redhat.com> - setup code in launch the method, initially\n" +
+ " * written in the now-defunct OprofileSession class\n" +
+ " * QNX Software Systems and others - the section of code marked in the launch\n" +
+ " * method, and the exec method\n" +
+ " * Lev Ufimtsev <lufimtse@redhat.com> --Added automatical enablement of options\n" +
+ " * if thery are not set.\n" +
+ " * Red Hat Inc. - modification of OProfileLaunchConfigurationDelegate to here\n" +
+ " *******************************************************************************/";
- String expectedOut =
- " /*******************************************************************************\n" +
- " * Copyright (c) 2004, 2008, 2009, 2015 Red Hat, Inc. and others\n" +
- " * All rights reserved. This program and the accompanying materials\n" +
- " * are made available under the terms of the Eclipse Public License v1.0\n" +
- " * which accompanies this distribution, and is available at\n" +
- " * http://www.eclipse.org/legal/epl-v10.html\n" +
- " *\n" +
- " * Contributors:\n" +
- " * Kent Sebastian <ksebasti@redhat.com> - initial API and implementation\n" +
- " * Keith Seitz <keiths@redhat.com> - setup code in launch the method, initially\n" +
- " * written in the now-defunct OprofileSession class\n" +
- " * QNX Software Systems and others - the section of code marked in the launch\n" +
- " * method, and the exec method\n" +
- " * Lev Ufimtsev <lufimtse@redhat.com> --Added automatical enablement of options\n" +
- " * if thery are not set.\n" +
- " * Red Hat Inc. - modification of OProfileLaunchConfigurationDelegate to here\n" +
- " *******************************************************************************/";
+ String expectedOut =
+ " /*******************************************************************************\n" +
+ " * Copyright (c) 2004, 2008, 2009, 2015 Red Hat, Inc. and others\n" +
+ " * All rights reserved. This program and the accompanying materials\n" +
+ " * are made available under the terms of the Eclipse Public License v1.0\n" +
+ " * which accompanies this distribution, and is available at\n" +
+ " * http://www.eclipse.org/legal/epl-v10.html\n" +
+ " *\n" +
+ " * Contributors:\n" +
+ " * Kent Sebastian <ksebasti@redhat.com> - initial API and implementation\n" +
+ " * Keith Seitz <keiths@redhat.com> - setup code in launch the method, initially\n" +
+ " * written in the now-defunct OprofileSession class\n" +
+ " * QNX Software Systems and others - the section of code marked in the launch\n" +
+ " * method, and the exec method\n" +
+ " * Lev Ufimtsev <lufimtse@redhat.com> --Added automatical enablement of options\n" +
+ " * if thery are not set.\n" +
+ " * Red Hat Inc. - modification of OProfileLaunchConfigurationDelegate to here\n" +
+ " *******************************************************************************/";
- assertTrue(proccessAndCompare(original, 2015,expectedOut));
- }
+ assertTrue(proccessAndCompare(original, 2015,expectedOut));
+ }
@@ -404,51 +404,51 @@
- /**
- * We test the AdvancedCopyrightComment parse(..) function.
- *
- * @param original original comment
- * @param reviseTo year to which it should be updated to
- * @param expected expected updated comment.
- * @return true if modified original matches expected.
- */
- private boolean proccessAndCompare(String original, int reviseTo, String expected) {
+ /**
+ * We test the AdvancedCopyrightComment parse(..) function.
+ *
+ * @param original original comment
+ * @param reviseTo year to which it should be updated to
+ * @param expected expected updated comment.
+ * @return true if modified original matches expected.
+ */
+ private boolean proccessAndCompare(String original, int reviseTo, String expected) {
- //For our purposes, start/end line & start/end comment don't matter.
- BlockComment commentBlock = new BlockComment(0, 0, original, null, null);
+ //For our purposes, start/end line & start/end comment don't matter.
+ BlockComment commentBlock = new BlockComment(0, 0, original, null, null);
- //Proccess input string.
- AdvancedCopyrightComment advComment = AdvancedCopyrightComment.parse(commentBlock,CopyrightComment.XML_COMMENT);
+ //Proccess input string.
+ AdvancedCopyrightComment advComment = AdvancedCopyrightComment.parse(commentBlock,CopyrightComment.XML_COMMENT);
- advComment.setRevisionYear(reviseTo);
+ advComment.setRevisionYear(reviseTo);
- //get updated comment.
- String actual = advComment.getCopyrightComment();
+ //get updated comment.
+ String actual = advComment.getCopyrightComment();
- //see if they are the same.
- boolean areSame = expected.equals(actual);
+ //see if they are the same.
+ boolean areSame = expected.equals(actual);
- //if tests differ, print onto console for inspection.
- if (! areSame) {
- printBadTest(original, expected, actual);
- }
+ //if tests differ, print onto console for inspection.
+ if (! areSame) {
+ printBadTest(original, expected, actual);
+ }
- return areSame;
- }
+ return areSame;
+ }
- private void printBadTest(String original, String expected, String actual) {
- System.out.println("");
- System.out.println("----------------------------------------------");
- System.out.println("-------ERROR in test: " + name.getMethodName());
- System.out.println("----------------------------------------------");
- System.out.println("----- Original:");
- System.out.println(original);
- System.out.println("----- Expected:");
- System.out.println(expected);
- System.out.println("----- Actual: ");
- System.out.println(actual);
- System.out.println("##############################################");
- }
+ private void printBadTest(String original, String expected, String actual) {
+ System.out.println("");
+ System.out.println("----------------------------------------------");
+ System.out.println("-------ERROR in test: " + name.getMethodName());
+ System.out.println("----------------------------------------------");
+ System.out.println("----- Original:");
+ System.out.println(original);
+ System.out.println("----- Expected:");
+ System.out.println(expected);
+ System.out.println("----- Actual: ");
+ System.out.println(actual);
+ System.out.println("##############################################");
+ }
}
diff --git a/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/internal/tools/pomversion/PomVersionMarkerResolution.java b/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/internal/tools/pomversion/PomVersionMarkerResolution.java
index dafb703..8d50e1c 100644
--- a/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/internal/tools/pomversion/PomVersionMarkerResolution.java
+++ b/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/internal/tools/pomversion/PomVersionMarkerResolution.java
@@ -65,7 +65,7 @@
@Override
public void run(IMarker marker) {
- try {
+ try {
correctedVersion = (String) marker.getAttribute(IPomVersionConstants.POM_CORRECT_VERSION);
} catch (CoreException e1) {
RelEngPlugin.log(e1);
diff --git a/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/AdvancedCopyrightComment.java b/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/AdvancedCopyrightComment.java
index 5cd66b2..dd95220 100644
--- a/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/AdvancedCopyrightComment.java
+++ b/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/AdvancedCopyrightComment.java
@@ -39,370 +39,370 @@
*/
public class AdvancedCopyrightComment extends CopyrightComment {
- /** A regex mattern to match years in the range {@code 19** to 23** } */
- private static final String YEAR_REGEX = "(19|20|21|22|23)\\d{2}"; //$NON-NLS-1$
+ /** A regex mattern to match years in the range {@code 19** to 23** } */
+ private static final String YEAR_REGEX = "(19|20|21|22|23)\\d{2}"; //$NON-NLS-1$
- private static final String DATE_VAR = "${date}"; //$NON-NLS-1$
- private static final String NEW_LINE = "\n"; //$NON-NLS-1$
+ private static final String DATE_VAR = "${date}"; //$NON-NLS-1$
+ private static final String NEW_LINE = "\n"; //$NON-NLS-1$
- /** Everything before the line with the year(s) on it. */
- private String preYearLinesString = null;
+ /** Everything before the line with the year(s) on it. */
+ private String preYearLinesString = null;
- /** The line with the year(s) on it. */
- private String yearLineString = null; // this is updated when we return a comment.
+ /** The line with the year(s) on it. */
+ private String yearLineString = null; // this is updated when we return a comment.
- /** Everything after the line with the year(s) on it. */
- private String postYearLineString = null;
+ /** Everything after the line with the year(s) on it. */
+ private String postYearLineString = null;
- /** Number of year units matching {@link #YEAR_REGEX YEAR_REGEX} in the comment. e.g '2000, 2011-2014' has 3 */
- private int yearsCount;
+ /** Number of year units matching {@link #YEAR_REGEX YEAR_REGEX} in the comment. e.g '2000, 2011-2014' has 3 */
+ private int yearsCount;
- /**
- * Return the body of this copyright comment or null if it cannot be built.
- */
- @Override
+ /**
+ * Return the body of this copyright comment or null if it cannot be built.
+ */
+ @Override
public String getCopyrightComment() {
- if ((preYearLinesString != null || postYearLineString != null)) {
- StringBuilder copyrightComment = new StringBuilder();
+ if ((preYearLinesString != null || postYearLineString != null)) {
+ StringBuilder copyrightComment = new StringBuilder();
- // Pre-append everything before the years
- if (preYearLinesString != null) {
- copyrightComment.append(preYearLinesString);
- }
+ // Pre-append everything before the years
+ if (preYearLinesString != null) {
+ copyrightComment.append(preYearLinesString);
+ }
- // Check if the comment has a revised year. Fix the years on the line if so.
- if (hasRevisionYear() && (getRevisionYear() != getCreationYear())) {
+ // Check if the comment has a revised year. Fix the years on the line if so.
+ if (hasRevisionYear() && (getRevisionYear() != getCreationYear())) {
- String fixedYearLine;
- if (yearsCount == 1) {
- // Insert a 2nd year '2000' -> '2000-2010'.
- fixedYearLine = insertRevisedYear(yearLineString, getRevisionYear());
- } else {
- // update the last found year on line: '2000 ... 2005' -> '2000 ... 2015'
- fixedYearLine = updateLastYear(yearLineString, getRevisionYear());
- if (fixedYearLine == null) {
- return null; //failed to update last year.
- }
- }
+ String fixedYearLine;
+ if (yearsCount == 1) {
+ // Insert a 2nd year '2000' -> '2000-2010'.
+ fixedYearLine = insertRevisedYear(yearLineString, getRevisionYear());
+ } else {
+ // update the last found year on line: '2000 ... 2005' -> '2000 ... 2015'
+ fixedYearLine = updateLastYear(yearLineString, getRevisionYear());
+ if (fixedYearLine == null) {
+ return null; //failed to update last year.
+ }
+ }
- copyrightComment.append(fixedYearLine);
- } else {
- // Otherwise put back the original year line.
- copyrightComment.append(yearLineString);
- }
+ copyrightComment.append(fixedYearLine);
+ } else {
+ // Otherwise put back the original year line.
+ copyrightComment.append(yearLineString);
+ }
- // Post append everything after the year line
- copyrightComment.append(postYearLineString);
+ // Post append everything after the year line
+ copyrightComment.append(postYearLineString);
- return copyrightComment.toString();
- }
+ return copyrightComment.toString();
+ }
- String linePrefix = getCommentPrefix();
- if (linePrefix == null)
- return null;
+ String linePrefix = getCommentPrefix();
+ if (linePrefix == null)
+ return null;
- StringWriter out = new StringWriter();
-
- try (PrintWriter writer = new PrintWriter(out)) {
- writeCommentStart(writer);
- writeLegal(writer, linePrefix);
- writeCommentEnd(writer);
- return out.toString();
- }
- }
+ StringWriter out = new StringWriter();
+
+ try (PrintWriter writer = new PrintWriter(out)) {
+ writeCommentStart(writer);
+ writeLegal(writer, linePrefix);
+ writeCommentEnd(writer);
+ return out.toString();
+ }
+ }
- /**
- * <h1>Parse a raw comment.</h1>
- * <p>
- * Create an instance the same as the argument comment but with the revision year <br>
- * updated if needed. Return the default comment if the argument comment is null <br>
- * or an empty string.
- * </p>
- *
- * @param comment
- * the original comment from the file.
- * @param commentStyle
- * the comment style. {@link CopyrightComment}
- * @return {@link AdvancedCopyrightComment} an copyright comment with the year updated.
- *
- */
- public static AdvancedCopyrightComment parse(BlockComment commentBock, int commentStyle) {
- // If the given comment is empty, return the default comment.
- if (commentBock == null) {
- return defaultComment(commentStyle);
- }
+ /**
+ * <h1>Parse a raw comment.</h1>
+ * <p>
+ * Create an instance the same as the argument comment but with the revision year <br>
+ * updated if needed. Return the default comment if the argument comment is null <br>
+ * or an empty string.
+ * </p>
+ *
+ * @param comment
+ * the original comment from the file.
+ * @param commentStyle
+ * the comment style. {@link CopyrightComment}
+ * @return {@link AdvancedCopyrightComment} an copyright comment with the year updated.
+ *
+ */
+ public static AdvancedCopyrightComment parse(BlockComment commentBock, int commentStyle) {
+ // If the given comment is empty, return the default comment.
+ if (commentBock == null) {
+ return defaultComment(commentStyle);
+ }
- String comment = commentBock.getContents();
+ String comment = commentBock.getContents();
- // identify which line delimiter is used. (for writing back to file )
- String fileLineDelimiter = TextUtilities.determineLineDelimiter(comment, "\n"); //$NON-NLS-1$
+ // identify which line delimiter is used. (for writing back to file )
+ String fileLineDelimiter = TextUtilities.determineLineDelimiter(comment, "\n"); //$NON-NLS-1$
- // Split Comment into Seperate lines for easier proccessing:
- String commentLines[] = comment.split("\\r?\\n"); //$NON-NLS-1$
+ // Split Comment into Seperate lines for easier proccessing:
+ String commentLines[] = comment.split("\\r?\\n"); //$NON-NLS-1$
- // lines before the line with the year comment on it.
- StringBuilder preYearLines = new StringBuilder();
+ // lines before the line with the year comment on it.
+ StringBuilder preYearLines = new StringBuilder();
- // line with the year(s) on it. 'copyright 2002, 2010-2011 ... etc..
- String yearLine = null;
+ // line with the year(s) on it. 'copyright 2002, 2010-2011 ... etc..
+ String yearLine = null;
- // Lines after the line with the year comment on it.
- StringBuilder postYearLines = new StringBuilder();
+ // Lines after the line with the year comment on it.
+ StringBuilder postYearLines = new StringBuilder();
- // Break down the comment into the three sections.
- boolean yearFound = false;
- String line;
- for (int i = 0; i < commentLines.length; i++) {
+ // Break down the comment into the three sections.
+ boolean yearFound = false;
+ String line;
+ for (int i = 0; i < commentLines.length; i++) {
- line = commentLines[i]; // for clarity.
+ line = commentLines[i]; // for clarity.
- if (yearFound) {
- // We have already found the year line and are just appending the last lines.
+ if (yearFound) {
+ // We have already found the year line and are just appending the last lines.
- // Conditionally append a newline delimiter.
- if (i != (commentLines.length - 1)) {
- // normally, append a new line.
- postYearLines.append(line + fileLineDelimiter);
- } else {
- // for the last line, only append if the original comment had a newline delimiter.
- Character lastchar = comment.charAt(comment.length() - 1);
- if (Character.isWhitespace(lastchar)) {
- postYearLines.append(line + lastchar);
- } else {
- postYearLines.append(line);
- }
- }
+ // Conditionally append a newline delimiter.
+ if (i != (commentLines.length - 1)) {
+ // normally, append a new line.
+ postYearLines.append(line + fileLineDelimiter);
+ } else {
+ // for the last line, only append if the original comment had a newline delimiter.
+ Character lastchar = comment.charAt(comment.length() - 1);
+ if (Character.isWhitespace(lastchar)) {
+ postYearLines.append(line + lastchar);
+ } else {
+ postYearLines.append(line);
+ }
+ }
- } else if (line.matches(".*" + YEAR_REGEX + ".*")) { //$NON-NLS-1$ //$NON-NLS-2$
- // We found the line with the copy-right years on it.
- yearFound = true;
- yearLine = line + fileLineDelimiter;
- } else {
- // We are parsting the top part of the comment and have not reached the year-line yet.
- preYearLines.append(line + fileLineDelimiter);
- }
- }
+ } else if (line.matches(".*" + YEAR_REGEX + ".*")) { //$NON-NLS-1$ //$NON-NLS-2$
+ // We found the line with the copy-right years on it.
+ yearFound = true;
+ yearLine = line + fileLineDelimiter;
+ } else {
+ // We are parsting the top part of the comment and have not reached the year-line yet.
+ preYearLines.append(line + fileLineDelimiter);
+ }
+ }
- // The comment didn't contain any years that we can update.
- if (!yearFound) {
- return null;
- }
+ // The comment didn't contain any years that we can update.
+ if (!yearFound) {
+ return null;
+ }
- // Determine first year.
- int createdYear = getFirstYear(yearLine);
- if (createdYear == 0) {
- return null; //Failed to read a year.
- }
+ // Determine first year.
+ int createdYear = getFirstYear(yearLine);
+ if (createdYear == 0) {
+ return null; //Failed to read a year.
+ }
- int yearsOnLine = countYearsOnLine(yearLine);
- // Determine the last year
- int revisedYear;
- if (yearsOnLine == 1) {
- revisedYear = -1;
- } else {
- revisedYear = getLastYear(yearLine);
- }
+ int yearsOnLine = countYearsOnLine(yearLine);
+ // Determine the last year
+ int revisedYear;
+ if (yearsOnLine == 1) {
+ revisedYear = -1;
+ } else {
+ revisedYear = getLastYear(yearLine);
+ }
- return new AdvancedCopyrightComment(commentStyle, createdYear, revisedYear, yearsOnLine,
- preYearLines.toString(), yearLine, postYearLines.toString());
- }
+ return new AdvancedCopyrightComment(commentStyle, createdYear, revisedYear, yearsOnLine,
+ preYearLines.toString(), yearLine, postYearLines.toString());
+ }
- /**
- * <p> Construct a new default comment for the file.</p>
- *
- * @param commentStyle As defined in: CopyrightComment
- * @return a newly created comment.
- */
- public static AdvancedCopyrightComment defaultComment(int commentStyle) {
- return new AdvancedCopyrightComment(commentStyle, -1, -1, 1, null, null, null);
- }
+ /**
+ * <p> Construct a new default comment for the file.</p>
+ *
+ * @param commentStyle As defined in: CopyrightComment
+ * @return a newly created comment.
+ */
+ public static AdvancedCopyrightComment defaultComment(int commentStyle) {
+ return new AdvancedCopyrightComment(commentStyle, -1, -1, 1, null, null, null);
+ }
- private AdvancedCopyrightComment(int commentStyle, int creationYear, int revisionYear,
- int yearsCount, String preYearComment, String middleYearsComment, String postYearComment) {
- super(commentStyle, creationYear == -1 ? getPreferenceStore().getInt(
- RelEngCopyrightConstants.CREATION_YEAR_KEY) : creationYear, revisionYear);
- this.preYearLinesString = preYearComment;
- this.yearLineString = middleYearsComment;
- this.postYearLineString = postYearComment;
- this.yearsCount = yearsCount;
- }
+ private AdvancedCopyrightComment(int commentStyle, int creationYear, int revisionYear,
+ int yearsCount, String preYearComment, String middleYearsComment, String postYearComment) {
+ super(commentStyle, creationYear == -1 ? getPreferenceStore().getInt(
+ RelEngCopyrightConstants.CREATION_YEAR_KEY) : creationYear, revisionYear);
+ this.preYearLinesString = preYearComment;
+ this.yearLineString = middleYearsComment;
+ this.postYearLineString = postYearComment;
+ this.yearsCount = yearsCount;
+ }
- /**
- * Get the copyright tool preference store.
- *
- * @return preference store used the releng plugin.
- */
- private static IPreferenceStore getPreferenceStore() {
- return RelEngPlugin.getDefault().getPreferenceStore();
- }
+ /**
+ * Get the copyright tool preference store.
+ *
+ * @return preference store used the releng plugin.
+ */
+ private static IPreferenceStore getPreferenceStore() {
+ return RelEngPlugin.getDefault().getPreferenceStore();
+ }
- /**
- * Get the copyright statement in form of an array of Strings where
- * each item is a line of the copyright statement.
- *
- * @return String[] array of lines making up the comment. Containing $date template.
- */
- private static String[] getLegalLines() {
- StringTokenizer st = new StringTokenizer(getPreferenceStore().getString(
- RelEngCopyrightConstants.COPYRIGHT_TEMPLATE_KEY), NEW_LINE, true);
- ArrayList<String> lines = new ArrayList<>();
- String previous = NEW_LINE;
- while (st.hasMoreTokens()) {
- String current = st.nextToken();
- // add empty lines to array as well
- if (NEW_LINE.equals(previous)) {
- lines.add(current);
- }
- previous = current;
- }
- String[] stringLines = new String[lines.size()];
- stringLines = lines.toArray(stringLines);
- return stringLines;
- }
+ /**
+ * Get the copyright statement in form of an array of Strings where
+ * each item is a line of the copyright statement.
+ *
+ * @return String[] array of lines making up the comment. Containing $date template.
+ */
+ private static String[] getLegalLines() {
+ StringTokenizer st = new StringTokenizer(getPreferenceStore().getString(
+ RelEngCopyrightConstants.COPYRIGHT_TEMPLATE_KEY), NEW_LINE, true);
+ ArrayList<String> lines = new ArrayList<>();
+ String previous = NEW_LINE;
+ while (st.hasMoreTokens()) {
+ String current = st.nextToken();
+ // add empty lines to array as well
+ if (NEW_LINE.equals(previous)) {
+ lines.add(current);
+ }
+ previous = current;
+ }
+ String[] stringLines = new String[lines.size()];
+ stringLines = lines.toArray(stringLines);
+ return stringLines;
+ }
- /**
- * Write out the copyright statement, line by line, adding in the created/revision
- * year as well as comment line prefixes.
- *
- * @param writer
- * @param linePrefix
- */
- private void writeLegal(PrintWriter writer, String linePrefix) {
- String[] legalLines = getLegalLines();
- for (String currentLine : legalLines) {
- int offset = currentLine.indexOf(DATE_VAR);
- // if this is the line, containing the ${date}, add in the year
- if (offset > -1) {
- writer.print(linePrefix + ' ' + currentLine.substring(0, offset)
- + getCreationYear());
- if (hasRevisionYear() && getRevisionYear() != getCreationYear()) {
- writer.print(", " + getRevisionYear()); //$NON-NLS-1$
- }
- println(writer,
- currentLine.substring(offset + DATE_VAR.length(), currentLine.length()));
- } else {
- // just write out the line
- if (NEW_LINE.equals(currentLine)) {
- // handle empty lines
- println(writer, linePrefix);
- } else {
- println(writer, linePrefix + ' ' + currentLine);
- }
- }
- }
- }
+ /**
+ * Write out the copyright statement, line by line, adding in the created/revision
+ * year as well as comment line prefixes.
+ *
+ * @param writer
+ * @param linePrefix
+ */
+ private void writeLegal(PrintWriter writer, String linePrefix) {
+ String[] legalLines = getLegalLines();
+ for (String currentLine : legalLines) {
+ int offset = currentLine.indexOf(DATE_VAR);
+ // if this is the line, containing the ${date}, add in the year
+ if (offset > -1) {
+ writer.print(linePrefix + ' ' + currentLine.substring(0, offset)
+ + getCreationYear());
+ if (hasRevisionYear() && getRevisionYear() != getCreationYear()) {
+ writer.print(", " + getRevisionYear()); //$NON-NLS-1$
+ }
+ println(writer,
+ currentLine.substring(offset + DATE_VAR.length(), currentLine.length()));
+ } else {
+ // just write out the line
+ if (NEW_LINE.equals(currentLine)) {
+ // handle empty lines
+ println(writer, linePrefix);
+ } else {
+ println(writer, linePrefix + ' ' + currentLine);
+ }
+ }
+ }
+ }
- /**
- * Replace the last year in the provided string that matches {@link #YEAR_REGEX}.
- *
- * @param line
- * the line that contains the year that you want to update.
- * @param newYear
- * the new year that you want to update to.
- * @return the string with the last year updated or null if it fails to find a year.
- */
- private static String updateLastYear(String line, int newYear) {
+ /**
+ * Replace the last year in the provided string that matches {@link #YEAR_REGEX}.
+ *
+ * @param line
+ * the line that contains the year that you want to update.
+ * @param newYear
+ * the new year that you want to update to.
+ * @return the string with the last year updated or null if it fails to find a year.
+ */
+ private static String updateLastYear(String line, int newYear) {
- Matcher matcher = Pattern.compile(YEAR_REGEX).matcher(line);
+ Matcher matcher = Pattern.compile(YEAR_REGEX).matcher(line);
- // Find position of last year in the string.
- int lastStart = -1;
- while (matcher.find()) {
- lastStart = matcher.start();
- }
+ // Find position of last year in the string.
+ int lastStart = -1;
+ while (matcher.find()) {
+ lastStart = matcher.start();
+ }
- // Failed to find a year. Return the original line.
- if (lastStart == -1) {
- return null;
- }
+ // Failed to find a year. Return the original line.
+ if (lastStart == -1) {
+ return null;
+ }
- // Insert new year
- String before = line.substring(0, lastStart);
- String after = line.substring(lastStart + 4);
- String updatedLine = before + Integer.toString(newYear) + after;
+ // Insert new year
+ String before = line.substring(0, lastStart);
+ String after = line.substring(lastStart + 4);
+ String updatedLine = before + Integer.toString(newYear) + after;
- return updatedLine;
- }
+ return updatedLine;
+ }
- /**
- * In the situation that a line only has a single year 'Copyright 2000 IBM ... '. <br>
- * append the revision year to make it like: 'Copyright 2000-2010 IBM ... '. <br>
- *
- * <p>
- * This should <b>only</b> be used for lines that have a single year.
- * </p>
- *
- * @param line
- * @param year
- * @return
- */
- private static String insertRevisedYear(String line, int year) {
- Matcher matcher = Pattern.compile(YEAR_REGEX).matcher(line);
+ /**
+ * In the situation that a line only has a single year 'Copyright 2000 IBM ... '. <br>
+ * append the revision year to make it like: 'Copyright 2000-2010 IBM ... '. <br>
+ *
+ * <p>
+ * This should <b>only</b> be used for lines that have a single year.
+ * </p>
+ *
+ * @param line
+ * @param year
+ * @return
+ */
+ private static String insertRevisedYear(String line, int year) {
+ Matcher matcher = Pattern.compile(YEAR_REGEX).matcher(line);
- if (!matcher.find())
- return line; // no year found. Return original.
+ if (!matcher.find())
+ return line; // no year found. Return original.
- // Insert new year.
- String before = line.substring(0, matcher.end());
- String after = line.substring(matcher.end());
- String updatedLine = before + ", " + Integer.toString(year) + after; //$NON-NLS-1$
+ // Insert new year.
+ String before = line.substring(0, matcher.end());
+ String after = line.substring(matcher.end());
+ String updatedLine = before + ", " + Integer.toString(year) + after; //$NON-NLS-1$
- return updatedLine;
- }
+ return updatedLine;
+ }
- /**
- * Given a line with one or multiple years on it, count how many years occur on it.
- *
- * @param line
- * @return
- */
- private static int countYearsOnLine(String line) {
- Matcher yearMatcher = Pattern.compile(YEAR_REGEX).matcher(line);
- int count = 0;
- while (yearMatcher.find()) {
- count++;
- }
- return count;
- }
+ /**
+ * Given a line with one or multiple years on it, count how many years occur on it.
+ *
+ * @param line
+ * @return
+ */
+ private static int countYearsOnLine(String line) {
+ Matcher yearMatcher = Pattern.compile(YEAR_REGEX).matcher(line);
+ int count = 0;
+ while (yearMatcher.find()) {
+ count++;
+ }
+ return count;
+ }
- /**
- * <h1>Get first year in line. </h1>
- * <p> For example given a line like '2000, 2012, 2011, IMB..' it would return 2000. <br>
- *
- * Pre-condition: The line must contain a valid year in the range YEAR_REGEX
- *
- * @see #YEAR_REGEX
- * @param line Line containing a year.
- * @return the first found year. 0 if none found. (caller should check).
- */
- private static int getFirstYear(String line) {
- Matcher yearMatcher = Pattern.compile(YEAR_REGEX).matcher(line);
- if (yearMatcher.find()) {
- return Integer.parseInt(yearMatcher.group()); // exception never thrown since match only matches integer.
- }
- return 0; //No year was found on this line.
- }
+ /**
+ * <h1>Get first year in line. </h1>
+ * <p> For example given a line like '2000, 2012, 2011, IMB..' it would return 2000. <br>
+ *
+ * Pre-condition: The line must contain a valid year in the range YEAR_REGEX
+ *
+ * @see #YEAR_REGEX
+ * @param line Line containing a year.
+ * @return the first found year. 0 if none found. (caller should check).
+ */
+ private static int getFirstYear(String line) {
+ Matcher yearMatcher = Pattern.compile(YEAR_REGEX).matcher(line);
+ if (yearMatcher.find()) {
+ return Integer.parseInt(yearMatcher.group()); // exception never thrown since match only matches integer.
+ }
+ return 0; //No year was found on this line.
+ }
- /**
- * <h2>Get the last year in a line. '2000, 2012, 2011, IMB..'</h2> Pre-condition: The line must contain a valid year
- * in the range YEAR_REGEX
- *
- * @see #YEAR_REGEX
- * @param line
- * @return e.g 2011
- */
- private static int getLastYear(String line) {
- Matcher yearMatcher = Pattern.compile(YEAR_REGEX).matcher(line);
+ /**
+ * <h2>Get the last year in a line. '2000, 2012, 2011, IMB..'</h2> Pre-condition: The line must contain a valid year
+ * in the range YEAR_REGEX
+ *
+ * @see #YEAR_REGEX
+ * @param line
+ * @return e.g 2011
+ */
+ private static int getLastYear(String line) {
+ Matcher yearMatcher = Pattern.compile(YEAR_REGEX).matcher(line);
- int lastYear = -1;
- // loop till the last occurance.
- while (yearMatcher.find()) {
- lastYear = Integer.parseInt(yearMatcher.group()); // exception never thrown since match only matches
- // integer.
- }
- return lastYear;
- }
+ int lastYear = -1;
+ // loop till the last occurance.
+ while (yearMatcher.find()) {
+ lastYear = Integer.parseInt(yearMatcher.group()); // exception never thrown since match only matches
+ // integer.
+ }
+ return lastYear;
+ }
}
diff --git a/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/BlockComment.java b/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/BlockComment.java
index 14d9bc5..51a8692 100644
--- a/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/BlockComment.java
+++ b/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/BlockComment.java
@@ -47,7 +47,7 @@
}
public String getContents() {
- return contents;
+ return contents;
}
/**
diff --git a/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/CopyrightComment.java b/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/CopyrightComment.java
index 3305e7c..c65f46f 100644
--- a/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/CopyrightComment.java
+++ b/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/CopyrightComment.java
@@ -21,102 +21,102 @@
public abstract class CopyrightComment {
- public static final int UNKNOWN_COMMENT = -1;
- public static final int JAVA_COMMENT = 1;
- public static final int PROPERTIES_COMMENT = 2;
- public static final int C_COMMENT = 3;
- public static final int SHELL_MAKE_COMMENT = 4;
- public static final int BAT_COMMENT = 5;
+ public static final int UNKNOWN_COMMENT = -1;
+ public static final int JAVA_COMMENT = 1;
+ public static final int PROPERTIES_COMMENT = 2;
+ public static final int C_COMMENT = 3;
+ public static final int SHELL_MAKE_COMMENT = 4;
+ public static final int BAT_COMMENT = 5;
public static final int JAVASCRIPT_COMMENT = 6;
public static final int XML_COMMENT = 7;
-
- private int commentStyle;
- private int creationYear = -1;
- private int revisionYear = -1;
- private String lineDelimiter;
-
- protected CopyrightComment(int commentStyle, int creationYear, int revisionYear) {
- this.commentStyle = commentStyle;
- this.creationYear = creationYear == -1 ? (Calendar.getInstance().get(Calendar.YEAR)) : creationYear;
- this.revisionYear = revisionYear;
- }
- public static String getLinePrefix(int commentStyle) {
- switch(commentStyle) {
- case JAVA_COMMENT:
- case C_COMMENT:
- case JAVASCRIPT_COMMENT:
- return " *"; //$NON-NLS-1$
- case PROPERTIES_COMMENT:
- return "#"; //$NON-NLS-1$
- case SHELL_MAKE_COMMENT:
- return "#"; //$NON-NLS-1$
- case BAT_COMMENT:
- return "@rem"; //$NON-NLS-1$
- case XML_COMMENT:
- return " "; //$NON-NLS-1$
- default:
- return null;
- }
+ private int commentStyle;
+ private int creationYear = -1;
+ private int revisionYear = -1;
+ private String lineDelimiter;
+
+ protected CopyrightComment(int commentStyle, int creationYear, int revisionYear) {
+ this.commentStyle = commentStyle;
+ this.creationYear = creationYear == -1 ? (Calendar.getInstance().get(Calendar.YEAR)) : creationYear;
+ this.revisionYear = revisionYear;
}
-
+
+ public static String getLinePrefix(int commentStyle) {
+ switch(commentStyle) {
+ case JAVA_COMMENT:
+ case C_COMMENT:
+ case JAVASCRIPT_COMMENT:
+ return " *"; //$NON-NLS-1$
+ case PROPERTIES_COMMENT:
+ return "#"; //$NON-NLS-1$
+ case SHELL_MAKE_COMMENT:
+ return "#"; //$NON-NLS-1$
+ case BAT_COMMENT:
+ return "@rem"; //$NON-NLS-1$
+ case XML_COMMENT:
+ return " "; //$NON-NLS-1$
+ default:
+ return null;
+ }
+ }
+
protected void writeCommentStart(PrintWriter writer) {
- switch(commentStyle) {
- case JAVA_COMMENT:
- case C_COMMENT:
- case JAVASCRIPT_COMMENT:
+ switch(commentStyle) {
+ case JAVA_COMMENT:
+ case C_COMMENT:
+ case JAVASCRIPT_COMMENT:
println(writer, "/*******************************************************************************"); //$NON-NLS-1$
break;
- case PROPERTIES_COMMENT:
- println(writer, "###############################################################################"); //$NON-NLS-1$
- break;
- case SHELL_MAKE_COMMENT:
+ case PROPERTIES_COMMENT:
+ println(writer, "###############################################################################"); //$NON-NLS-1$
+ break;
+ case SHELL_MAKE_COMMENT:
println(writer, "#*******************************************************************************"); //$NON-NLS-1$
break;
- case BAT_COMMENT:
+ case BAT_COMMENT:
println(writer, "@rem ***************************************************************************"); //$NON-NLS-1$
break;
- case XML_COMMENT:
+ case XML_COMMENT:
println(writer, "<!--"); //$NON-NLS-1$
break;
- }
+ }
}
protected void writeCommentEnd(PrintWriter writer) {
- switch(commentStyle) {
- case JAVA_COMMENT:
- case C_COMMENT:
- case JAVASCRIPT_COMMENT:
+ switch(commentStyle) {
+ case JAVA_COMMENT:
+ case C_COMMENT:
+ case JAVASCRIPT_COMMENT:
println(writer, " *******************************************************************************/"); //$NON-NLS-1$
break;
- case PROPERTIES_COMMENT:
- println(writer, "###############################################################################"); //$NON-NLS-1$
- break;
- case SHELL_MAKE_COMMENT:
+ case PROPERTIES_COMMENT:
+ println(writer, "###############################################################################"); //$NON-NLS-1$
+ break;
+ case SHELL_MAKE_COMMENT:
println(writer, "#*******************************************************************************"); //$NON-NLS-1$
break;
- case BAT_COMMENT:
+ case BAT_COMMENT:
println(writer, "@rem ***************************************************************************"); //$NON-NLS-1$
break;
- case XML_COMMENT:
+ case XML_COMMENT:
println(writer, " -->"); //$NON-NLS-1$
break;
- }
+ }
+ }
+
+
+ public int getRevisionYear() {
+ return revisionYear == -1 ? creationYear : revisionYear;
}
-
- public int getRevisionYear() {
- return revisionYear == -1 ? creationYear : revisionYear;
- }
-
- public boolean hasRevisionYear() {
- return revisionYear != -1;
- }
-
- public void setRevisionYear(int year) {
- if (revisionYear != -1 || creationYear != year)
- revisionYear = year;
- }
+ public boolean hasRevisionYear() {
+ return revisionYear != -1;
+ }
+
+ public void setRevisionYear(int year) {
+ if (revisionYear != -1 || creationYear != year)
+ revisionYear = year;
+ }
/**
* @param lineDelimiter
diff --git a/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/IBMCopyrightComment.java b/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/IBMCopyrightComment.java
index 3f386c6..269f753 100644
--- a/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/IBMCopyrightComment.java
+++ b/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/IBMCopyrightComment.java
@@ -23,116 +23,116 @@
public class IBMCopyrightComment extends CopyrightComment {
- private static final int DEFAULT_CREATION_YEAR = 2005;
+ private static final int DEFAULT_CREATION_YEAR = 2005;
- private List<String> contributors;
- private int yearRangeStart, yearRangeEnd;
- private String originalText;
+ private List<String> contributors;
+ private int yearRangeStart, yearRangeEnd;
+ private String originalText;
- private IBMCopyrightComment(int commentStyle, int creationYear, int revisionYear, List<String> contributors, int yearRangeStart, int yearRangeEnd, String originalText) {
- super(commentStyle, creationYear == -1 ? DEFAULT_CREATION_YEAR : creationYear, revisionYear);
- this.contributors = contributors;
- this.yearRangeStart = yearRangeStart;
- this.yearRangeEnd = yearRangeEnd;
- this.originalText = originalText;
- }
+ private IBMCopyrightComment(int commentStyle, int creationYear, int revisionYear, List<String> contributors, int yearRangeStart, int yearRangeEnd, String originalText) {
+ super(commentStyle, creationYear == -1 ? DEFAULT_CREATION_YEAR : creationYear, revisionYear);
+ this.contributors = contributors;
+ this.yearRangeStart = yearRangeStart;
+ this.yearRangeEnd = yearRangeEnd;
+ this.originalText = originalText;
+ }
- public static IBMCopyrightComment defaultComment(int commentStyle) {
- return new IBMCopyrightComment(commentStyle, DEFAULT_CREATION_YEAR, -1, null, 0, 0, null);
- }
+ public static IBMCopyrightComment defaultComment(int commentStyle) {
+ return new IBMCopyrightComment(commentStyle, DEFAULT_CREATION_YEAR, -1, null, 0, 0, null);
+ }
- /**
- * Create an instance the same as the argument comment but with the revision year
- * updated if needed. Return the default comment if the argument comment is null
- * or an empty string. Return null if the argument comment is not recognized as
- * an IBM copyright comment.
- */
- public static IBMCopyrightComment parse(BlockComment comment, int commentStyle) {
- if (comment == null)
- return defaultComment(commentStyle);
-
- String body = comment.getContents();
+ /**
+ * Create an instance the same as the argument comment but with the revision year
+ * updated if needed. Return the default comment if the argument comment is null
+ * or an empty string. Return null if the argument comment is not recognized as
+ * an IBM copyright comment.
+ */
+ public static IBMCopyrightComment parse(BlockComment comment, int commentStyle) {
+ if (comment == null)
+ return defaultComment(commentStyle);
+
+ String body = comment.getContents();
- final String copyrightLabel = "Copyright (c) "; //$NON-NLS-1$
- int start = body.indexOf(copyrightLabel);
- if (start == -1) return null;
- int contrib = body.indexOf("Contributors:", start); //$NON-NLS-1$
- int rangeEnd = body.indexOf(" IBM Corp", start); //$NON-NLS-1$ // catch both IBM Corporation and IBM Corp.
+ final String copyrightLabel = "Copyright (c) "; //$NON-NLS-1$
+ int start = body.indexOf(copyrightLabel);
+ if (start == -1) return null;
+ int contrib = body.indexOf("Contributors:", start); //$NON-NLS-1$
+ int rangeEnd = body.indexOf(" IBM Corp", start); //$NON-NLS-1$ // catch both IBM Corporation and IBM Corp.
- if (rangeEnd == -1 || rangeEnd > contrib) // IBM must be on the copyright line, not the contributor line
- return null;
+ if (rangeEnd == -1 || rangeEnd > contrib) // IBM must be on the copyright line, not the contributor line
+ return null;
- int rangeStart = start + copyrightLabel.length();
- String yearRange = body.substring(rangeStart, rangeEnd);
+ int rangeStart = start + copyrightLabel.length();
+ String yearRange = body.substring(rangeStart, rangeEnd);
- int comma = yearRange.indexOf(","); //$NON-NLS-1$
- if (comma == -1) {
- comma = yearRange.indexOf("-"); //$NON-NLS-1$
- }
+ int comma = yearRange.indexOf(","); //$NON-NLS-1$
+ if (comma == -1) {
+ comma = yearRange.indexOf("-"); //$NON-NLS-1$
+ }
- String startStr = comma == -1 ? yearRange : yearRange.substring(0, comma);
- if (comma != -1 && Character.isWhitespace(yearRange.charAt(comma))) comma++;
- String endStr = comma == -1 ? null : yearRange.substring(comma + 1);
+ String startStr = comma == -1 ? yearRange : yearRange.substring(0, comma);
+ if (comma != -1 && Character.isWhitespace(yearRange.charAt(comma))) comma++;
+ String endStr = comma == -1 ? null : yearRange.substring(comma + 1);
- int startYear = -1;
- if (startStr != null) {
- try {
- startYear = Integer.parseInt(startStr.trim());
- } catch(NumberFormatException e) {
- // do nothing
- }
- }
+ int startYear = -1;
+ if (startStr != null) {
+ try {
+ startYear = Integer.parseInt(startStr.trim());
+ } catch(NumberFormatException e) {
+ // do nothing
+ }
+ }
- int endYear = -1;
- if (endStr != null) {
- try {
- endYear = Integer.parseInt(endStr.trim());
- } catch(NumberFormatException e) {
- // do nothing
- }
- }
+ int endYear = -1;
+ if (endStr != null) {
+ try {
+ endYear = Integer.parseInt(endStr.trim());
+ } catch(NumberFormatException e) {
+ // do nothing
+ }
+ }
- String contribComment = body.substring(contrib);
- StringTokenizer tokens = new StringTokenizer(contribComment, "\r\n"); //$NON-NLS-1$
- tokens.nextToken();
- ArrayList<String> contributors = new ArrayList<>();
- String linePrefix = getLinePrefix(commentStyle);
- while(tokens.hasMoreTokens()) {
- String contributor = tokens.nextToken();
- if (contributor.indexOf("***********************************") == -1 //$NON-NLS-1$
- && contributor.indexOf("###################################") == -1) { //$NON-NLS-1$
- int c = contributor.indexOf(linePrefix);
- if (c == -1 && linePrefix.equals(" *")) { //$NON-NLS-1$
- // special case: old prefix was "*" and new prefix is " *"
- c = contributor.indexOf("*"); //$NON-NLS-1$
- }
- if (c == 0) {
+ String contribComment = body.substring(contrib);
+ StringTokenizer tokens = new StringTokenizer(contribComment, "\r\n"); //$NON-NLS-1$
+ tokens.nextToken();
+ ArrayList<String> contributors = new ArrayList<>();
+ String linePrefix = getLinePrefix(commentStyle);
+ while(tokens.hasMoreTokens()) {
+ String contributor = tokens.nextToken();
+ if (contributor.indexOf("***********************************") == -1 //$NON-NLS-1$
+ && contributor.indexOf("###################################") == -1) { //$NON-NLS-1$
+ int c = contributor.indexOf(linePrefix);
+ if (c == -1 && linePrefix.equals(" *")) { //$NON-NLS-1$
+ // special case: old prefix was "*" and new prefix is " *"
+ c = contributor.indexOf("*"); //$NON-NLS-1$
+ }
+ if (c == 0) {
// prefix has to be at the beginning of the line
- contributor = contributor.substring(c + linePrefix.length());
- }
- contributors.add(contributor);
- }
- }
+ contributor = contributor.substring(c + linePrefix.length());
+ }
+ contributors.add(contributor);
+ }
+ }
- return new IBMCopyrightComment(commentStyle, startYear, endYear, contributors, rangeStart, rangeEnd, body);
- }
+ return new IBMCopyrightComment(commentStyle, startYear, endYear, contributors, rangeStart, rangeEnd, body);
+ }
/**
* Return the body of this copyright comment or null if it cannot be built.
*/
@Override
public String getCopyrightComment() {
- String linePrefix = getCommentPrefix();
- if (linePrefix == null)
- return null;
+ String linePrefix = getCommentPrefix();
+ if (linePrefix == null)
+ return null;
- StringWriter out = new StringWriter();
+ StringWriter out = new StringWriter();
try (PrintWriter writer = new PrintWriter(out)) {
- writeCommentStart(writer);
+ writeCommentStart(writer);
writeLegal(writer, linePrefix);
writeContributions(writer, linePrefix);
- writeCommentEnd(writer);
+ writeCommentEnd(writer);
return out.toString();
}
}
@@ -141,13 +141,13 @@
* Return the body of the original copyright comment with new dates.
*/
public String getOriginalCopyrightComment() {
- StringWriter out = new StringWriter();
+ StringWriter out = new StringWriter();
try (PrintWriter writer = new PrintWriter(out)) {
writer.print(originalText.substring(0, yearRangeStart));
writer.print(getCreationYear());
if (hasRevisionYear() && getRevisionYear() != getCreationYear())
- writer.print(", " + getRevisionYear()); //$NON-NLS-1$
+ writer.print(", " + getRevisionYear()); //$NON-NLS-1$
writer.print(originalText.substring(yearRangeEnd));
return out.toString();
}
@@ -156,7 +156,7 @@
private void writeLegal(PrintWriter writer, String linePrefix) {
writer.print(linePrefix + " Copyright (c) " + getCreationYear()); //$NON-NLS-1$
if (hasRevisionYear() && getRevisionYear() != getCreationYear())
- writer.print(", " + getRevisionYear()); //$NON-NLS-1$
+ writer.print(", " + getRevisionYear()); //$NON-NLS-1$
println(writer, " IBM Corporation and others."); //$NON-NLS-1$
println(writer, linePrefix + " All rights reserved. This program and the accompanying materials"); //$NON-NLS-1$
@@ -170,19 +170,19 @@
println(writer, linePrefix + " Contributors:"); //$NON-NLS-1$
if (contributors == null || contributors.size() <= 0)
- println(writer, linePrefix + " IBM Corporation - initial API and implementation"); //$NON-NLS-1$
+ println(writer, linePrefix + " IBM Corporation - initial API and implementation"); //$NON-NLS-1$
else {
Iterator<String> i = contributors.iterator();
while (i.hasNext()) {
String contributor = i.next();
if (contributor.length() > 0) {
if (Character.isWhitespace(contributor.charAt(0))) {
- println(writer, linePrefix + contributor);
+ println(writer, linePrefix + contributor);
} else {
- println(writer, linePrefix + " " + contributor); //$NON-NLS-1$
+ println(writer, linePrefix + " " + contributor); //$NON-NLS-1$
}
} else {
- println(writer, linePrefix);
+ println(writer, linePrefix);
}
}
}
diff --git a/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/ShellMakeFile.java b/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/ShellMakeFile.java
index c0f99e5..8d7d5a3 100644
--- a/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/ShellMakeFile.java
+++ b/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/ShellMakeFile.java
@@ -59,49 +59,49 @@
return CopyrightComment.SHELL_MAKE_COMMENT;
}
- @Override
- protected void doInsert(final String comment, IDocument document) throws BadLocationException, IOException {
- // find insert offset (we must skip instructions)
- int insertOffset = findInsertOffset(document);
+ @Override
+ protected void doInsert(final String comment, IDocument document) throws BadLocationException, IOException {
+ // find insert offset (we must skip instructions)
+ int insertOffset = findInsertOffset(document);
- // insert comment
- document.replace(insertOffset, 0, comment);
- }
+ // insert comment
+ document.replace(insertOffset, 0, comment);
+ }
- private int findInsertOffset(IDocument document) throws BadLocationException {
- boolean inInstruction = false;
- int insertOffset = 0;
+ private int findInsertOffset(IDocument document) throws BadLocationException {
+ boolean inInstruction = false;
+ int insertOffset = 0;
- for (int offset = 0; offset < document.getLength(); offset++) {
- char c = document.getChar(offset);
+ for (int offset = 0; offset < document.getLength(); offset++) {
+ char c = document.getChar(offset);
- // also look at next char
- char c2 = ((offset + 1) < document.getLength()) ? document.getChar(offset + 1) : 0;
+ // also look at next char
+ char c2 = ((offset + 1) < document.getLength()) ? document.getChar(offset + 1) : 0;
- // look for line ending
- if (inInstruction) {
- if (c == '\n' && c2 == '\r' || c == '\r' && c2 == '\n') {
- insertOffset = offset + 2;
- break; // done
- } else if (c == '\n') {
- insertOffset = offset + 1;
- break; // done
- } else {
- // continue looking for ending
- continue;
- }
- }
+ // look for line ending
+ if (inInstruction) {
+ if (c == '\n' && c2 == '\r' || c == '\r' && c2 == '\n') {
+ insertOffset = offset + 2;
+ break; // done
+ } else if (c == '\n') {
+ insertOffset = offset + 1;
+ break; // done
+ } else {
+ // continue looking for ending
+ continue;
+ }
+ }
- // next chars must start an instruction
- if (c == '#' && c2 == '!') {
- inInstruction = true;
- offset++; // don't need to analyse c2 again
- continue;
- } else {
- // if it's something else, we can stop seeking
- break;
- }
- }
- return insertOffset;
- }
+ // next chars must start an instruction
+ if (c == '#' && c2 == '!') {
+ inInstruction = true;
+ offset++; // don't need to analyse c2 again
+ continue;
+ } else {
+ // if it's something else, we can stop seeking
+ break;
+ }
+ }
+ return insertOffset;
+ }
}
diff --git a/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/SourceFile.java b/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/SourceFile.java
index 5700a2e..3f17236 100644
--- a/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/SourceFile.java
+++ b/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/SourceFile.java
@@ -49,26 +49,26 @@
private String lineDelimiter;
public static SourceFile createFor(IFile file) {
- String extension = file.getFileExtension();
- if (extension != null) {
- extension = extension.toLowerCase();
+ String extension = file.getFileExtension();
+ if (extension != null) {
+ extension = extension.toLowerCase();
if (extension.equals("java")) { //$NON-NLS-1$
return new JavaFile(file);
- } else if (extension.equals("c") || extension.equals("h") || extension.equals("rc") || extension.equals("cc") || extension.equals("cpp")) { //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
- return new CFile(file);
+ } else if (extension.equals("c") || extension.equals("h") || extension.equals("rc") || extension.equals("cc") || extension.equals("cpp")) { //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
+ return new CFile(file);
} else if (extension.equals("properties")) { //$NON-NLS-1$
return new PropertiesFile(file);
- } else if (extension.equals("sh") || extension.equals("csh") || extension.equals("mak") || extension.equals("pl") || extension.equals("tcl")) { //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
- return new ShellMakeFile(file);
- } else if (extension.equals("bat")) { //$NON-NLS-1$
- return new BatFile(file);
+ } else if (extension.equals("sh") || extension.equals("csh") || extension.equals("mak") || extension.equals("pl") || extension.equals("tcl")) { //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
+ return new ShellMakeFile(file);
+ } else if (extension.equals("bat")) { //$NON-NLS-1$
+ return new BatFile(file);
} else if (extension.equals("js")) { //$NON-NLS-1$
- return new JavaScriptFile(file);
+ return new JavaScriptFile(file);
} else if (extension.equals("xml")) { //$NON-NLS-1$
- //[276257] re-enable xml support.
- return new XmlFile(file);
+ //[276257] re-enable xml support.
+ return new XmlFile(file);
}
- }
+ }
return null;
}
@@ -109,15 +109,15 @@
IDocument document;
try {
- //connect file buffer.
- ITextFileBuffer fileBuffer = openFileBuffer();
- if (fileBuffer == null)
- return;
-
+ //connect file buffer.
+ ITextFileBuffer fileBuffer = openFileBuffer();
+ if (fileBuffer == null)
+ return;
+
document = fileBuffer.getDocument();
} finally {
//Close file buffer.
- closeFileBuffer();
+ closeFileBuffer();
}
lineDelimiter= TextUtilities.getDefaultLineDelimiter(document);
@@ -209,11 +209,11 @@
* Companion function to getFileBuffer();
*/
private void closeFileBuffer() {
- try {
- textFileBufferManager.disconnect(file.getFullPath(), LocationKind.IFILE, null);
- } catch (CoreException e) {
- e.printStackTrace();
- }
+ try {
+ textFileBufferManager.disconnect(file.getFullPath(), LocationKind.IFILE, null);
+ } catch (CoreException e) {
+ e.printStackTrace();
+ }
}
@@ -224,10 +224,10 @@
*/
public void insert(String copyRightComment) {
try {
- ITextFileBuffer fileBuffer= openFileBuffer();
- if (fileBuffer == null)
- return;
-
+ ITextFileBuffer fileBuffer= openFileBuffer();
+ if (fileBuffer == null)
+ return;
+
IDocument document= fileBuffer.getDocument();
doInsert(copyRightComment, document);
fileBuffer.commit(null, false);
@@ -238,7 +238,7 @@
} catch (IOException e) {
e.printStackTrace();
} finally {
- closeFileBuffer();
+ closeFileBuffer();
}
}
@@ -286,9 +286,9 @@
} catch (CoreException e) {
e.printStackTrace();
} finally {
- closeFileBuffer();
+ closeFileBuffer();
try {
- FileBuffers.getTextFileBufferManager().disconnect(file.getFullPath(), LocationKind.IFILE, null);
+ FileBuffers.getTextFileBufferManager().disconnect(file.getFullPath(), LocationKind.IFILE, null);
} catch (CoreException e) {
e.printStackTrace();
return;
diff --git a/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/XmlFile.java b/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/XmlFile.java
index b0dac0b..924cf27 100644
--- a/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/XmlFile.java
+++ b/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/XmlFile.java
@@ -65,41 +65,41 @@
super(file);
}
- /**
- * Deals with the fact that XML files can start with a header and the copy <br>
- * right comment can start at the end of the header. <br>
- *
- * <p> For example: {@code <?xml?> <!-- } </p>
- *
- * {@inheritDoc}
- */
- @Override
- public boolean isCommentStart(String aLine) {
- return aLine.trim().contains(getCommentStart());
+ /**
+ * Deals with the fact that XML files can start with a header and the copy <br>
+ * right comment can start at the end of the header. <br>
+ *
+ * <p> For example: {@code <?xml?> <!-- } </p>
+ *
+ * {@inheritDoc}
+ */
+ @Override
+ public boolean isCommentStart(String aLine) {
+ return aLine.trim().contains(getCommentStart());
- //Note, above is a bit different from parent, contains/startswithd:
- //Parent:
- //return aLine.trim().STARTSWITH(getCommentStart());
+ //Note, above is a bit different from parent, contains/startswithd:
+ //Parent:
+ //return aLine.trim().STARTSWITH(getCommentStart());
- }
+ }
- /**
- * Deals with the fact that XML files can end with a header and the copy <br>
- * right comment can start at the end of the header. <br>
- *
- * <p> For exaple: {@code <?xml?> <!-- } </p>
- *
- * {@inheritDoc}
- */
- @Override
- public boolean isCommentEnd(String aLine, String commentStartString) {
- return aLine.trim().contains(getCommentEnd());
- //Similarly, uses 'contains' instead of 'starts with'
- }
+ /**
+ * Deals with the fact that XML files can end with a header and the copy <br>
+ * right comment can start at the end of the header. <br>
+ *
+ * <p> For exaple: {@code <?xml?> <!-- } </p>
+ *
+ * {@inheritDoc}
+ */
+ @Override
+ public boolean isCommentEnd(String aLine, String commentStartString) {
+ return aLine.trim().contains(getCommentEnd());
+ //Similarly, uses 'contains' instead of 'starts with'
+ }
@Override
public String getCommentStart() {
- return "<!--"; //$NON-NLS-1$
+ return "<!--"; //$NON-NLS-1$
}
@Override
@@ -119,34 +119,34 @@
* If only updating the year, this method is not called. </p>
* @see org.eclipse.releng.tools.SourceFile#doInsert(java.lang.String, org.eclipse.jface.text.IDocument)
*/
- @Override
- protected void doInsert(final String comment, IDocument document) throws BadLocationException, IOException {
+ @Override
+ protected void doInsert(final String comment, IDocument document) throws BadLocationException, IOException {
- //----------------- XML COMMENT CLEAN UP
- // XML comments need extra-tidy up because we need to consider the existance of an XML header
- String tidyComment = comment.trim();
+ //----------------- XML COMMENT CLEAN UP
+ // XML comments need extra-tidy up because we need to consider the existance of an XML header
+ String tidyComment = comment.trim();
- //Append new-line at the end for cleaner look.
- tidyComment += "\n";
+ //Append new-line at the end for cleaner look.
+ tidyComment += "\n";
- // check for existance of an xml header (<?xml)
- // If so, put the comment 'below' it.
- // example:
- //<?xml .... ?>
- //<--
- // comment start....
- if (containsXmlEncoding(document)) {
- // If encoding is present, pre-append a new line.
- tidyComment = "\n" + tidyComment; //$NON-NLS-1$
- }
+ // check for existance of an xml header (<?xml)
+ // If so, put the comment 'below' it.
+ // example:
+ //<?xml .... ?>
+ //<--
+ // comment start....
+ if (containsXmlEncoding(document)) {
+ // If encoding is present, pre-append a new line.
+ tidyComment = "\n" + tidyComment; //$NON-NLS-1$
+ }
- //------------------ COMMENT INSERT
- // find insert offset (we must skip instructions)
- int insertOffset = findInsertOffset(document);
+ //------------------ COMMENT INSERT
+ // find insert offset (we must skip instructions)
+ int insertOffset = findInsertOffset(document);
- // insert comment
- document.replace(insertOffset, 0, tidyComment);
- }
+ // insert comment
+ document.replace(insertOffset, 0, tidyComment);
+ }
/**
* Given the document, find the place after the xml header to insert the comment.
@@ -176,7 +176,7 @@
if(inInstruction) {
if(c == '?' && c2 == '>') {
- //Offset is '+2' not '+1' because of '?' in '?>'
+ //Offset is '+2' not '+1' because of '?' in '?>'
insertOffset = offset + 2;
inInstruction = false;
offset++; // don't need to analyse c2 again
@@ -218,45 +218,45 @@
*/
public boolean containsXmlEncoding(IDocument xmlDoc) throws BadLocationException {
- //XML attribute headers *must* reside on the first line.
- //We identify if the xml document contains a header by checking the first tag and see if it starts with: <?xml
+ //XML attribute headers *must* reside on the first line.
+ //We identify if the xml document contains a header by checking the first tag and see if it starts with: <?xml
- //-- Check to see if the document is long enough to contain the minimum '<?xml?>' tag
- if (xmlDoc.getLength() < 7) {
- return false;
- }
+ //-- Check to see if the document is long enough to contain the minimum '<?xml?>' tag
+ if (xmlDoc.getLength() < 7) {
+ return false;
+ }
- for (int offset = 0; offset < xmlDoc.getLength(); offset++) {
+ for (int offset = 0; offset < xmlDoc.getLength(); offset++) {
- //Read Char.
- char c = xmlDoc.getChar(offset);
+ //Read Char.
+ char c = xmlDoc.getChar(offset);
- // ignore whitespace and new lines
- if(Character.isWhitespace(c)) {
- continue;
- }
+ // ignore whitespace and new lines
+ if(Character.isWhitespace(c)) {
+ continue;
+ }
- //Once we've found the first '<', check that it's a '<?xml'
- if (c == '<') {
+ //Once we've found the first '<', check that it's a '<?xml'
+ if (c == '<') {
- //check that document is long enough to close a header if we are to read it: '<?xml
- if ((offset + 4) < xmlDoc.getLength()) {
+ //check that document is long enough to close a header if we are to read it: '<?xml
+ if ((offset + 4) < xmlDoc.getLength()) {
- //Read "<?xml" equivalent.
- String xmlTag = "" + c + xmlDoc.getChar(offset+1) + xmlDoc.getChar(offset+2) + //$NON-NLS-1$
- xmlDoc.getChar(offset+3) + xmlDoc.getChar(offset+4);
+ //Read "<?xml" equivalent.
+ String xmlTag = "" + c + xmlDoc.getChar(offset+1) + xmlDoc.getChar(offset+2) + //$NON-NLS-1$
+ xmlDoc.getChar(offset+3) + xmlDoc.getChar(offset+4);
- if ( xmlTag.compareToIgnoreCase("<?xml") == 0) { //$NON-NLS-1$
- return true;
- } else {
- return false;
- }
- }
- }
- }
+ if ( xmlTag.compareToIgnoreCase("<?xml") == 0) { //$NON-NLS-1$
+ return true;
+ } else {
+ return false;
+ }
+ }
+ }
+ }
- //if parsing an empty xml document, return false.
- return false;
+ //if parsing an empty xml document, return false.
+ return false;
}
}
diff --git a/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/preferences/RelEngPreferenceInitializer.java b/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/preferences/RelEngPreferenceInitializer.java
index 0f7a1d6..47aa92e 100644
--- a/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/preferences/RelEngPreferenceInitializer.java
+++ b/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/preferences/RelEngPreferenceInitializer.java
@@ -29,19 +29,19 @@
@Override
public void initializeDefaultPreferences() {
- IPreferenceStore store = RelEngPlugin.getDefault().getPreferenceStore();
- int year = Calendar.getInstance().get(Calendar.YEAR);
- store.setDefault(RelEngCopyrightConstants.COPYRIGHT_TEMPLATE_KEY, LEGAL_LINE);
- store.setDefault(RelEngCopyrightConstants.CREATION_YEAR_KEY, year);
+ IPreferenceStore store = RelEngPlugin.getDefault().getPreferenceStore();
+ int year = Calendar.getInstance().get(Calendar.YEAR);
+ store.setDefault(RelEngCopyrightConstants.COPYRIGHT_TEMPLATE_KEY, LEGAL_LINE);
+ store.setDefault(RelEngCopyrightConstants.CREATION_YEAR_KEY, year);
store.setDefault(RelEngCopyrightConstants.REVISION_YEAR_KEY, year);
- store.setDefault(RelEngCopyrightConstants.USE_DEFAULT_REVISION_YEAR_KEY, false);
- // disable fix up existing copyright till it works better
+ store.setDefault(RelEngCopyrightConstants.USE_DEFAULT_REVISION_YEAR_KEY, false);
+ // disable fix up existing copyright till it works better
// store.setDefault(RelEngCopyrightConstants.FIX_UP_EXISTING_KEY, false);
- store.setDefault(RelEngCopyrightConstants.REPLACE_ALL_EXISTING_KEY, false);
- store.setDefault(RelEngCopyrightConstants.IGNORE_PROPERTIES_KEY, false);
- store.setDefault(RelEngCopyrightConstants.IGNORE_XML_KEY, false);
+ store.setDefault(RelEngCopyrightConstants.REPLACE_ALL_EXISTING_KEY, false);
+ store.setDefault(RelEngCopyrightConstants.IGNORE_PROPERTIES_KEY, false);
+ store.setDefault(RelEngCopyrightConstants.IGNORE_XML_KEY, false);
- store.setDefault(IPomVersionConstants.POM_VERSION_ERROR_LEVEL, IPomVersionConstants.VALUE_ERROR);
+ store.setDefault(IPomVersionConstants.POM_VERSION_ERROR_LEVEL, IPomVersionConstants.VALUE_ERROR);
}
}
diff --git a/bundles/org.eclipse.test.performance/META-INF/MANIFEST.MF b/bundles/org.eclipse.test.performance/META-INF/MANIFEST.MF
index f199528..80fcbf4 100644
--- a/bundles/org.eclipse.test.performance/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.test.performance/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %Plugin.name
Bundle-SymbolicName: org.eclipse.test.performance
-Bundle-Version: 3.13.400.qualifier
+Bundle-Version: 3.13.500.qualifier
Bundle-Activator: org.eclipse.test.internal.performance.PerformanceTestPlugin
Bundle-Vendor: %Plugin.providerName
Bundle-Localization: plugin
diff --git a/bundles/org.eclipse.test.performance/pom.xml b/bundles/org.eclipse.test.performance/pom.xml
index b83ba01..589787f 100644
--- a/bundles/org.eclipse.test.performance/pom.xml
+++ b/bundles/org.eclipse.test.performance/pom.xml
@@ -19,7 +19,7 @@
</parent>
<groupId>org.eclipse.test</groupId>
<artifactId>org.eclipse.test.performance</artifactId>
- <version>3.13.400-SNAPSHOT</version>
+ <version>3.13.500-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
<properties>
<code.ignoredWarnings>-warn:-deprecation,unavoidableGenericProblems,raw,unchecked</code.ignoredWarnings>
diff --git a/bundles/org.eclipse.test.performance/src/org/eclipse/test/TracingSuite.java b/bundles/org.eclipse.test.performance/src/org/eclipse/test/TracingSuite.java
index 084d48f..dcabb47 100644
--- a/bundles/org.eclipse.test.performance/src/org/eclipse/test/TracingSuite.java
+++ b/bundles/org.eclipse.test.performance/src/org/eclipse/test/TracingSuite.java
@@ -62,147 +62,147 @@
*/
public class TracingSuite extends Suite {
- /**
- * Configuration options for classes annotated with {@code @RunWith(TracingSuite.class)}.
- */
- @Retention(RetentionPolicy.RUNTIME)
- @Target(ElementType.TYPE)
- @Inherited
- public @interface TracingOptions {
+ /**
+ * Configuration options for classes annotated with {@code @RunWith(TracingSuite.class)}.
+ */
+ @Retention(RetentionPolicy.RUNTIME)
+ @Target(ElementType.TYPE)
+ @Inherited
+ public @interface TracingOptions {
- /**
- * @return true iff start times of atomic tests should be logged to {@code System.out}
- */
- public boolean logTestStart() default true;
+ /**
+ * @return true iff start times of atomic tests should be logged to {@code System.out}
+ */
+ public boolean logTestStart() default true;
- /**
- * @return the number of seconds after which a thread dump is initiated,
- * or 0 if no timer should be started
- */
- public long stackDumpTimeoutSeconds() default 10 * 60;
+ /**
+ * @return the number of seconds after which a thread dump is initiated,
+ * or 0 if no timer should be started
+ */
+ public long stackDumpTimeoutSeconds() default 10 * 60;
- /**
- * @return true iff the runner should try to throw an
- * {@link IllegalStateException} in the main thread after
- * writing a stack dump. This sometimes makes an program proceed
- * when the main thread was stuck in an endless loop.
- */
- public boolean throwExceptionInMainThread() default true;
+ /**
+ * @return true iff the runner should try to throw an
+ * {@link IllegalStateException} in the main thread after
+ * writing a stack dump. This sometimes makes an program proceed
+ * when the main thread was stuck in an endless loop.
+ */
+ public boolean throwExceptionInMainThread() default true;
- /**
- * @return the maximum number of screenshots that are taken
- */
- public int maxScreenshotCount() default 5;
- }
+ /**
+ * @return the maximum number of screenshots that are taken
+ */
+ public int maxScreenshotCount() default 5;
+ }
- private TracingOptions fTracingOptions;
+ private TracingOptions fTracingOptions;
- private class TracingRunNotifier extends RunNotifier {
- private RunNotifier fNotifier;
- private Timer fTimer = new Timer(true);
- private ConcurrentHashMap<Description, TimerTask> fRunningTests = new ConcurrentHashMap<>();
+ private class TracingRunNotifier extends RunNotifier {
+ private RunNotifier fNotifier;
+ private Timer fTimer = new Timer(true);
+ private ConcurrentHashMap<Description, TimerTask> fRunningTests = new ConcurrentHashMap<>();
- public TracingRunNotifier(RunNotifier notifier) {
- fNotifier = notifier;
- }
+ public TracingRunNotifier(RunNotifier notifier) {
+ fNotifier = notifier;
+ }
- @Override
- public void addListener(RunListener listener) {
- fNotifier.addListener(listener);
- }
+ @Override
+ public void addListener(RunListener listener) {
+ fNotifier.addListener(listener);
+ }
- @Override
- public void removeListener(RunListener listener) {
- fNotifier.removeListener(listener);
- }
+ @Override
+ public void removeListener(RunListener listener) {
+ fNotifier.removeListener(listener);
+ }
- @Override
- public void fireTestRunStarted(Description description) {
- fNotifier.fireTestRunStarted(description);
- }
+ @Override
+ public void fireTestRunStarted(Description description) {
+ fNotifier.fireTestRunStarted(description);
+ }
- @Override
- public void fireTestRunFinished(Result result) {
- fNotifier.fireTestRunFinished(result);
- }
+ @Override
+ public void fireTestRunFinished(Result result) {
+ fNotifier.fireTestRunFinished(result);
+ }
- @Override
- public void fireTestStarted(Description description) throws StoppedByUserException {
- Date start = new Date();
- if (fTracingOptions.logTestStart()) {
- String message = format(start, description);
- System.out.println(message);
- }
+ @Override
+ public void fireTestStarted(Description description) throws StoppedByUserException {
+ Date start = new Date();
+ if (fTracingOptions.logTestStart()) {
+ String message = format(start, description);
+ System.out.println(message);
+ }
- long seconds = fTracingOptions.stackDumpTimeoutSeconds();
- if (seconds != 0) {
- DumpTask task = new DumpTask(description);
- fRunningTests.put(description, task);
- fTimer.schedule(task, seconds * 1000);
- }
- fNotifier.fireTestStarted(description);
- }
+ long seconds = fTracingOptions.stackDumpTimeoutSeconds();
+ if (seconds != 0) {
+ DumpTask task = new DumpTask(description);
+ fRunningTests.put(description, task);
+ fTimer.schedule(task, seconds * 1000);
+ }
+ fNotifier.fireTestStarted(description);
+ }
- @Override
- public void fireTestFailure(Failure failure) {
- fNotifier.fireTestFailure(failure);
- }
+ @Override
+ public void fireTestFailure(Failure failure) {
+ fNotifier.fireTestFailure(failure);
+ }
- @Override
- public void fireTestAssumptionFailed(Failure failure) {
- fNotifier.fireTestAssumptionFailed(failure);
- }
+ @Override
+ public void fireTestAssumptionFailed(Failure failure) {
+ fNotifier.fireTestAssumptionFailed(failure);
+ }
- @Override
- public void fireTestIgnored(Description description) {
- fNotifier.fireTestIgnored(description);
- }
+ @Override
+ public void fireTestIgnored(Description description) {
+ fNotifier.fireTestIgnored(description);
+ }
- @Override
- public void fireTestFinished(Description description) {
- TimerTask task = fRunningTests.remove(description);
- if (task != null) {
- task.cancel();
- }
- fNotifier.fireTestFinished(description);
- }
+ @Override
+ public void fireTestFinished(Description description) {
+ TimerTask task = fRunningTests.remove(description);
+ if (task != null) {
+ task.cancel();
+ }
+ fNotifier.fireTestFinished(description);
+ }
- @Override
- public void pleaseStop() {
- fNotifier.pleaseStop();
- }
+ @Override
+ public void pleaseStop() {
+ fNotifier.pleaseStop();
+ }
- @Override
- public void addFirstListener(RunListener listener) {
- fNotifier.addFirstListener(listener);
- }
- }
+ @Override
+ public void addFirstListener(RunListener listener) {
+ fNotifier.addFirstListener(listener);
+ }
+ }
- private class DumpTask extends TimerTask {
- private volatile int fScreenshotCount;
- private Description fDescription;
+ private class DumpTask extends TimerTask {
+ private volatile int fScreenshotCount;
+ private Description fDescription;
- public DumpTask(Description description) {
- fDescription = description;
- }
+ public DumpTask(Description description) {
+ fDescription = description;
+ }
- @Override
- public void run() {
- // There are situation where a blocked main thread apparently also blocks output to
- // System.err. Try to dump to System.out first. If both dumps get through, the short
- // delay between the traces may even help identify threads that are still running.
- dumpStackTraces(System.out);
- try {
- Thread.sleep(100);
- } catch (InterruptedException e2) {
- // won't happen, continue
- }
- Thread main = dumpStackTraces(System.err);
+ @Override
+ public void run() {
+ // There are situation where a blocked main thread apparently also blocks output to
+ // System.err. Try to dump to System.out first. If both dumps get through, the short
+ // delay between the traces may even help identify threads that are still running.
+ dumpStackTraces(System.out);
+ try {
+ Thread.sleep(100);
+ } catch (InterruptedException e2) {
+ // won't happen, continue
+ }
+ Thread main = dumpStackTraces(System.err);
- if (fScreenshotCount < fTracingOptions.maxScreenshotCount()) {
- String screenshotFile = Screenshots.takeScreenshot(TracingSuite.class, Integer.toString(fScreenshotCount++));
- System.err.println("Timeout screenshot saved to " + screenshotFile);
- }
+ if (fScreenshotCount < fTracingOptions.maxScreenshotCount()) {
+ String screenshotFile = Screenshots.takeScreenshot(TracingSuite.class, Integer.toString(fScreenshotCount++));
+ System.err.println("Timeout screenshot saved to " + screenshotFile);
+ }
if (main != null && fTracingOptions.throwExceptionInMainThread()) {
Throwable toThrow = new IllegalStateException("main thread killed by " + TracingSuite.class.getSimpleName() + " timeout");
@@ -223,57 +223,57 @@
e1.printStackTrace();
}
}
- }
+ }
- private Thread dumpStackTraces(PrintStream stream) {
- String message = format(new Date(), fDescription) + " ran for more than " + (long) (10 * 60) + " seconds";
- stream.println(message);
+ private Thread dumpStackTraces(PrintStream stream) {
+ String message = format(new Date(), fDescription) + " ran for more than " + (long) (10 * 60) + " seconds";
+ stream.println(message);
- stream.format("totalMemory: %11d\n", Runtime.getRuntime().totalMemory());
- stream.format("freeMemory (before GC):%11d\n", Runtime.getRuntime().freeMemory());
- System.gc();
- stream.format("freeMemory (after GC): %11d\n", Runtime.getRuntime().freeMemory());
+ stream.format("totalMemory: %11d\n", Runtime.getRuntime().totalMemory());
+ stream.format("freeMemory (before GC):%11d\n", Runtime.getRuntime().freeMemory());
+ System.gc();
+ stream.format("freeMemory (after GC): %11d\n", Runtime.getRuntime().freeMemory());
- Thread main = null;
- Map<Thread, StackTraceElement[]> stackTraces = Thread.getAllStackTraces();
- for (Entry<Thread, StackTraceElement[]> entry : stackTraces.entrySet()) {
- String name = entry.getKey().getName();
- if ("main".equals(name)) {
- main = entry.getKey();
- }
- StackTraceElement[] stack = entry.getValue();
- ThreadDump exception = new ThreadDump("for thread \"" + name + "\"");
- exception.setStackTrace(stack);
- exception.printStackTrace(stream);
- }
- return main;
- }
- }
+ Thread main = null;
+ Map<Thread, StackTraceElement[]> stackTraces = Thread.getAllStackTraces();
+ for (Entry<Thread, StackTraceElement[]> entry : stackTraces.entrySet()) {
+ String name = entry.getKey().getName();
+ if ("main".equals(name)) {
+ main = entry.getKey();
+ }
+ StackTraceElement[] stack = entry.getValue();
+ ThreadDump exception = new ThreadDump("for thread \"" + name + "\"");
+ exception.setStackTrace(stack);
+ exception.printStackTrace(stream);
+ }
+ return main;
+ }
+ }
- static class ThreadDump extends Exception {
- private static final long serialVersionUID = 1L;
- ThreadDump(String message) {
- super(message);
- }
- }
+ static class ThreadDump extends Exception {
+ private static final long serialVersionUID = 1L;
+ ThreadDump(String message) {
+ super(message);
+ }
+ }
- private static String format(Date time, Description description) {
- String now = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss Z", Locale.US).format(time);
- String message = "[" + now + "] " + description.getClassName() + "#" + description.getMethodName() + "()";
- return message;
- }
+ private static String format(Date time, Description description) {
+ String now = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss Z", Locale.US).format(time);
+ String message = "[" + now + "] " + description.getClassName() + "#" + description.getMethodName() + "()";
+ return message;
+ }
- public TracingSuite(Class<?> klass, RunnerBuilder builder) throws InitializationError {
- super(klass, builder);
- fTracingOptions = klass.getAnnotation(TracingOptions.class);
- if (fTracingOptions == null) {
- @TracingOptions class DefaultTracingOptionsProvider { /* just an annotation holder */ }
- fTracingOptions = DefaultTracingOptionsProvider.class.getAnnotation(TracingOptions.class);
- }
- }
+ public TracingSuite(Class<?> klass, RunnerBuilder builder) throws InitializationError {
+ super(klass, builder);
+ fTracingOptions = klass.getAnnotation(TracingOptions.class);
+ if (fTracingOptions == null) {
+ @TracingOptions class DefaultTracingOptionsProvider { /* just an annotation holder */ }
+ fTracingOptions = DefaultTracingOptionsProvider.class.getAnnotation(TracingOptions.class);
+ }
+ }
- @Override
- protected void runChild(Runner runner, RunNotifier notifier) {
- super.runChild(runner, new TracingRunNotifier(notifier));
- }
+ @Override
+ protected void runChild(Runner runner, RunNotifier notifier) {
+ super.runChild(runner, new TracingRunNotifier(notifier));
+ }
}
\ No newline at end of file
diff --git a/bundles/org.eclipse.test.performance/src/org/eclipse/test/internal/performance/PerformanceMonitor.java b/bundles/org.eclipse.test.performance/src/org/eclipse/test/internal/performance/PerformanceMonitor.java
index a0d0f7b..08cd071 100644
--- a/bundles/org.eclipse.test.performance/src/org/eclipse/test/internal/performance/PerformanceMonitor.java
+++ b/bundles/org.eclipse.test.performance/src/org/eclipse/test/internal/performance/PerformanceMonitor.java
@@ -18,32 +18,32 @@
class PerformanceMonitor {
- private static PerformanceMonitor fgPerformanceMonitor;
+ private static PerformanceMonitor fgPerformanceMonitor;
- public static PerformanceMonitor getPerformanceMonitor() {
- if (fgPerformanceMonitor == null) {
- String os = System.getProperty("os.name"); //$NON-NLS-1$
- if (os.startsWith("Windows")) //$NON-NLS-1$
- fgPerformanceMonitor = new PerformanceMonitorWindows();
- else if (os.startsWith("Mac OS X")) //$NON-NLS-1$
- fgPerformanceMonitor = new PerformanceMonitorMac();
- else
- fgPerformanceMonitor = new PerformanceMonitorLinux();
+ public static PerformanceMonitor getPerformanceMonitor() {
+ if (fgPerformanceMonitor == null) {
+ String os = System.getProperty("os.name"); //$NON-NLS-1$
+ if (os.startsWith("Windows")) //$NON-NLS-1$
+ fgPerformanceMonitor = new PerformanceMonitorWindows();
+ else if (os.startsWith("Mac OS X")) //$NON-NLS-1$
+ fgPerformanceMonitor = new PerformanceMonitorMac();
+ else
+ fgPerformanceMonitor = new PerformanceMonitorLinux();
+ }
+ return fgPerformanceMonitor;
}
- return fgPerformanceMonitor;
- }
- protected void collectOperatingSystemCounters(Map scalars) {
- Runtime runtime = Runtime.getRuntime();
- // runtime.gc();
- addScalar(scalars, InternalDimensions.USED_JAVA_HEAP, runtime.totalMemory() - runtime.freeMemory());
- }
+ protected void collectOperatingSystemCounters(Map scalars) {
+ Runtime runtime = Runtime.getRuntime();
+ // runtime.gc();
+ addScalar(scalars, InternalDimensions.USED_JAVA_HEAP, runtime.totalMemory() - runtime.freeMemory());
+ }
- protected void collectGlobalPerformanceInfo(Map scalars) {
- // no default implementation
- }
+ protected void collectGlobalPerformanceInfo(Map scalars) {
+ // no default implementation
+ }
- void addScalar(Map scalars, Dim dimension, long value) {
- scalars.put(dimension, new Scalar(dimension, value));
- }
+ void addScalar(Map scalars, Dim dimension, long value) {
+ scalars.put(dimension, new Scalar(dimension, value));
+ }
}
diff --git a/bundles/org.eclipse.test.performance/src/org/eclipse/test/internal/performance/PerformanceMonitorLinux.java b/bundles/org.eclipse.test.performance/src/org/eclipse/test/internal/performance/PerformanceMonitorLinux.java
index d44ec65..5aabc18 100644
--- a/bundles/org.eclipse.test.performance/src/org/eclipse/test/internal/performance/PerformanceMonitorLinux.java
+++ b/bundles/org.eclipse.test.performance/src/org/eclipse/test/internal/performance/PerformanceMonitorLinux.java
@@ -21,156 +21,156 @@
class PerformanceMonitorLinux extends PerformanceMonitor {
- private static long PAGESIZE = 4096;
- private static long JIFFIES = 10L;
- private static boolean fgHasElapsedTime = true;
- private static long fgStartupTime;
+ private static long PAGESIZE = 4096;
+ private static long JIFFIES = 10L;
+ private static boolean fgHasElapsedTime = true;
+ private static long fgStartupTime;
- /**
- * Write out operating system counters for Linux.
- *
- * @param scalars
- */
- @Override
- protected void collectOperatingSystemCounters(Map scalars) {
- synchronized (this) {
- /**
- * The status values for a Linux process, that is the values that come from /proc/self/stat. The names of the variables match
- * the man proc page.
- */
- StringTokenizer st = readTokens("/proc/self/stat", false); //$NON-NLS-1$
- if (st != null) {
- st.nextToken(); // int pid; // Process id.
- st.nextToken(); // String comm; // The command name.
- st.nextToken(); // String state;
- st.nextToken(); // int ppid; // Parent process id. */
- st.nextToken(); // int pgrp; // Process group. */
- st.nextToken(); // int session;
- st.nextToken(); // int ttry_nr;
- st.nextToken(); // int tpgid;
- st.nextToken(); // long flags;
- long minflt = Long.parseLong(st.nextToken()); // Minor page faults (didn't need to load a page from disk). */
- st.nextToken(); // long cminflt; // Minor page faults for the process and it's children. */
- long majflt = Long.parseLong(st.nextToken()); // Major page faults. */
- st.nextToken(); // long cmajflt; // Major page faults for the process and it's children. */
- long utime = Long.parseLong(st.nextToken()); // User time in jiffies. */
- long stime = Long.parseLong(st.nextToken()); // System time in jiffies. */
- st.nextToken(); // long cutime; // User time for the process and it's children. */
- st.nextToken(); // long cstime; // System time for the process and it's children. */
+ /**
+ * Write out operating system counters for Linux.
+ *
+ * @param scalars
+ */
+ @Override
+ protected void collectOperatingSystemCounters(Map scalars) {
+ synchronized (this) {
+ /**
+ * The status values for a Linux process, that is the values that come from /proc/self/stat. The names of the variables match
+ * the man proc page.
+ */
+ StringTokenizer st = readTokens("/proc/self/stat", false); //$NON-NLS-1$
+ if (st != null) {
+ st.nextToken(); // int pid; // Process id.
+ st.nextToken(); // String comm; // The command name.
+ st.nextToken(); // String state;
+ st.nextToken(); // int ppid; // Parent process id. */
+ st.nextToken(); // int pgrp; // Process group. */
+ st.nextToken(); // int session;
+ st.nextToken(); // int ttry_nr;
+ st.nextToken(); // int tpgid;
+ st.nextToken(); // long flags;
+ long minflt = Long.parseLong(st.nextToken()); // Minor page faults (didn't need to load a page from disk). */
+ st.nextToken(); // long cminflt; // Minor page faults for the process and it's children. */
+ long majflt = Long.parseLong(st.nextToken()); // Major page faults. */
+ st.nextToken(); // long cmajflt; // Major page faults for the process and it's children. */
+ long utime = Long.parseLong(st.nextToken()); // User time in jiffies. */
+ long stime = Long.parseLong(st.nextToken()); // System time in jiffies. */
+ st.nextToken(); // long cutime; // User time for the process and it's children. */
+ st.nextToken(); // long cstime; // System time for the process and it's children. */
- // addScalar(scalars, InternalDimensions.USER_TIME, utime*JIFFIES);
- addScalar(scalars, InternalDimensions.KERNEL_TIME, stime * JIFFIES);
- addScalar(scalars, InternalDimensions.CPU_TIME, (utime + stime) * JIFFIES);
- addScalar(scalars, InternalDimensions.SOFT_PAGE_FAULTS, minflt);
- addScalar(scalars, InternalDimensions.HARD_PAGE_FAULTS, majflt);
- }
-
- /**
- * The status memory values values for a Linux process, that is the values that come from /proc/self/statm. The names of the
- * variables match the man proc page.
- */
- st = readTokens("/proc/self/statm", false); //$NON-NLS-1$
- if (st != null) {
- st.nextToken(); // int size; // Size of the process in pages
- int resident = Integer.parseInt(st.nextToken()); // Resident size in pages.
- st.nextToken(); // int shared; // Shared size in pages.
- int trs = Integer.parseInt(st.nextToken()); // Text (code) size in pages.
- int drs = Integer.parseInt(st.nextToken()); // Data/Stack size in pages.
- int lrs = Integer.parseInt(st.nextToken()); // Library size in pages.
- // st.nextToken(); // int dt; // Dirty pages.
-
- addScalar(scalars, InternalDimensions.WORKING_SET, resident * PAGESIZE);
- addScalar(scalars, InternalDimensions.TRS, trs * PAGESIZE);
- addScalar(scalars, InternalDimensions.DRS, drs * PAGESIZE);
- addScalar(scalars, InternalDimensions.LRS, lrs * PAGESIZE);
- }
-
- long currentTime = System.currentTimeMillis();
-
- addScalar(scalars, InternalDimensions.SYSTEM_TIME, currentTime);
-
- if (fgHasElapsedTime) {
- if (fgStartupTime == 0) {
- String t = System.getProperty("eclipse.startTime"); //$NON-NLS-1$
- if (t != null) {
- try {
- fgStartupTime = Long.parseLong(t);
- } catch (NumberFormatException e) {
- fgHasElapsedTime = false;
+ // addScalar(scalars, InternalDimensions.USER_TIME, utime*JIFFIES);
+ addScalar(scalars, InternalDimensions.KERNEL_TIME, stime * JIFFIES);
+ addScalar(scalars, InternalDimensions.CPU_TIME, (utime + stime) * JIFFIES);
+ addScalar(scalars, InternalDimensions.SOFT_PAGE_FAULTS, minflt);
+ addScalar(scalars, InternalDimensions.HARD_PAGE_FAULTS, majflt);
}
- } else
- fgHasElapsedTime = false;
+
+ /**
+ * The status memory values values for a Linux process, that is the values that come from /proc/self/statm. The names of the
+ * variables match the man proc page.
+ */
+ st = readTokens("/proc/self/statm", false); //$NON-NLS-1$
+ if (st != null) {
+ st.nextToken(); // int size; // Size of the process in pages
+ int resident = Integer.parseInt(st.nextToken()); // Resident size in pages.
+ st.nextToken(); // int shared; // Shared size in pages.
+ int trs = Integer.parseInt(st.nextToken()); // Text (code) size in pages.
+ int drs = Integer.parseInt(st.nextToken()); // Data/Stack size in pages.
+ int lrs = Integer.parseInt(st.nextToken()); // Library size in pages.
+ // st.nextToken(); // int dt; // Dirty pages.
+
+ addScalar(scalars, InternalDimensions.WORKING_SET, resident * PAGESIZE);
+ addScalar(scalars, InternalDimensions.TRS, trs * PAGESIZE);
+ addScalar(scalars, InternalDimensions.DRS, drs * PAGESIZE);
+ addScalar(scalars, InternalDimensions.LRS, lrs * PAGESIZE);
+ }
+
+ long currentTime = System.currentTimeMillis();
+
+ addScalar(scalars, InternalDimensions.SYSTEM_TIME, currentTime);
+
+ if (fgHasElapsedTime) {
+ if (fgStartupTime == 0) {
+ String t = System.getProperty("eclipse.startTime"); //$NON-NLS-1$
+ if (t != null) {
+ try {
+ fgStartupTime = Long.parseLong(t);
+ } catch (NumberFormatException e) {
+ fgHasElapsedTime = false;
+ }
+ } else
+ fgHasElapsedTime = false;
+ }
+ if (fgHasElapsedTime)
+ addScalar(scalars, InternalDimensions.ELAPSED_PROCESS, currentTime - fgStartupTime);
+ }
+
+ super.collectOperatingSystemCounters(scalars);
}
- if (fgHasElapsedTime)
- addScalar(scalars, InternalDimensions.ELAPSED_PROCESS, currentTime - fgStartupTime);
- }
-
- super.collectOperatingSystemCounters(scalars);
}
- }
- /**
- * Write out the global machine counters for Linux.
- *
- * @param scalars
- */
- @Override
- protected void collectGlobalPerformanceInfo(Map scalars) {
- synchronized (this) {
- /**
- * The meminfo values for a Linux machine, that is the values that come from /proc/meminfo.
- */
- // /proc/meminfo is formatted on linux - use byte-counted output from free
- StringTokenizer st = readOutput("free -b", true); //$NON-NLS-1$
- if (st != null) {
- st.nextToken(); // throw away label
- long total = Long.parseLong(st.nextToken());
- long used = Long.parseLong(st.nextToken());
- long free = Long.parseLong(st.nextToken());
- st.nextToken(); // long shared;
- long buffers = Long.parseLong(st.nextToken());
- long cache = Long.parseLong(st.nextToken());
+ /**
+ * Write out the global machine counters for Linux.
+ *
+ * @param scalars
+ */
+ @Override
+ protected void collectGlobalPerformanceInfo(Map scalars) {
+ synchronized (this) {
+ /**
+ * The meminfo values for a Linux machine, that is the values that come from /proc/meminfo.
+ */
+ // /proc/meminfo is formatted on linux - use byte-counted output from free
+ StringTokenizer st = readOutput("free -b", true); //$NON-NLS-1$
+ if (st != null) {
+ st.nextToken(); // throw away label
+ long total = Long.parseLong(st.nextToken());
+ long used = Long.parseLong(st.nextToken());
+ long free = Long.parseLong(st.nextToken());
+ st.nextToken(); // long shared;
+ long buffers = Long.parseLong(st.nextToken());
+ long cache = Long.parseLong(st.nextToken());
- addScalar(scalars, InternalDimensions.PHYSICAL_TOTAL, total);
- addScalar(scalars, InternalDimensions.USED_LINUX_MEM, used);
- addScalar(scalars, InternalDimensions.FREE_LINUX_MEM, free);
- addScalar(scalars, InternalDimensions.BUFFERS_LINUX, buffers);
- addScalar(scalars, InternalDimensions.SYSTEM_CACHE, cache);
- }
- super.collectGlobalPerformanceInfo(scalars);
+ addScalar(scalars, InternalDimensions.PHYSICAL_TOTAL, total);
+ addScalar(scalars, InternalDimensions.USED_LINUX_MEM, used);
+ addScalar(scalars, InternalDimensions.FREE_LINUX_MEM, free);
+ addScalar(scalars, InternalDimensions.BUFFERS_LINUX, buffers);
+ addScalar(scalars, InternalDimensions.SYSTEM_CACHE, cache);
+ }
+ super.collectGlobalPerformanceInfo(scalars);
+ }
}
- }
- private StringTokenizer readTokens(String procPath, boolean skipFirst) {
- try (BufferedReader rdr = new BufferedReader(new FileReader(procPath));){
- if (skipFirst)
- rdr.readLine(); // throw away the heading line
- return new StringTokenizer(rdr.readLine());
- } catch (IOException e) {
- PerformanceTestPlugin.log(e);
+ private StringTokenizer readTokens(String procPath, boolean skipFirst) {
+ try (BufferedReader rdr = new BufferedReader(new FileReader(procPath));){
+ if (skipFirst)
+ rdr.readLine(); // throw away the heading line
+ return new StringTokenizer(rdr.readLine());
+ } catch (IOException e) {
+ PerformanceTestPlugin.log(e);
+ }
+ return null;
}
- return null;
- }
- private StringTokenizer readOutput(String cmd, boolean skipFirst) {
- BufferedReader rdr = null;
- try {
- Process process = Runtime.getRuntime().exec(cmd);
- rdr = new BufferedReader(new InputStreamReader(process.getInputStream()));
- if (skipFirst)
- rdr.readLine(); // throw away the heading line
- return new StringTokenizer(rdr.readLine());
- } catch (IOException e) {
- PerformanceTestPlugin.log(e);
+ private StringTokenizer readOutput(String cmd, boolean skipFirst) {
+ BufferedReader rdr = null;
+ try {
+ Process process = Runtime.getRuntime().exec(cmd);
+ rdr = new BufferedReader(new InputStreamReader(process.getInputStream()));
+ if (skipFirst)
+ rdr.readLine(); // throw away the heading line
+ return new StringTokenizer(rdr.readLine());
+ } catch (IOException e) {
+ PerformanceTestPlugin.log(e);
+ }
+ finally {
+ try {
+ if (rdr != null)
+ rdr.close();
+ } catch (IOException e) {
+ // silently ignored
+ }
+ }
+ return null;
}
- finally {
- try {
- if (rdr != null)
- rdr.close();
- } catch (IOException e) {
- // silently ignored
- }
- }
- return null;
- }
}
diff --git a/bundles/org.eclipse.test.performance/src/org/eclipse/test/internal/performance/PerformanceMonitorMac.java b/bundles/org.eclipse.test.performance/src/org/eclipse/test/internal/performance/PerformanceMonitorMac.java
index 486c62b..1130df6 100644
--- a/bundles/org.eclipse.test.performance/src/org/eclipse/test/internal/performance/PerformanceMonitorMac.java
+++ b/bundles/org.eclipse.test.performance/src/org/eclipse/test/internal/performance/PerformanceMonitorMac.java
@@ -18,101 +18,101 @@
*/
class PerformanceMonitorMac extends PerformanceMonitor {
- private static boolean fgHasElapsedTime = true;
- private static long fgStartupTime;
+ private static boolean fgHasElapsedTime = true;
+ private static long fgStartupTime;
- /**
- * name of the library that implements the native methods.
- */
- private static final String NATIVE_LIBRARY_NAME = "perf_3_1_0"; //$NON-NLS-1$
+ /**
+ * name of the library that implements the native methods.
+ */
+ private static final String NATIVE_LIBRARY_NAME = "perf_3_1_0"; //$NON-NLS-1$
- /**
- * Is the native library loaded? 0-don't know, 1-no, 2-yes
- */
- private static int fgIsLoaded = 0;
+ /**
+ * Is the native library loaded? 0-don't know, 1-no, 2-yes
+ */
+ private static int fgIsLoaded = 0;
- /**
- * Answer true if the native library for this class has been successfully loaded. If the load has not been attempted yet, try to
- * load it.
- *
- * @return returns true if native library has been successfullz loaded
- */
- public static boolean isLoaded() {
- if (fgIsLoaded == 0) {
- try {
- System.loadLibrary(NATIVE_LIBRARY_NAME);
- fgIsLoaded = 2;
- } catch (Throwable e) {
- // e.printStackTrace();
- // PerformanceTestPlugin.log(e);
- fgIsLoaded = 1;
- }
- }
- return fgIsLoaded == 2;
- }
-
- /**
- * Write out operating system counters for Mac OS X.
- *
- * @param scalars
- * where to collect the data
- */
- @Override
- protected void collectOperatingSystemCounters(Map scalars) {
- synchronized (this) {
- if (isLoaded()) {
- int[] counters = new int[18];
- if (getrusage(0, counters) == 0) {
-
- int user_time = counters[0] * 1000 + counters[1] / 1000;
- int kernel_time = counters[2] * 1000 + counters[3] / 1000;
-
- addScalar(scalars, InternalDimensions.KERNEL_TIME, kernel_time);
- addScalar(scalars, InternalDimensions.CPU_TIME, user_time + kernel_time);
- }
- }
-
- long currentTime = System.currentTimeMillis();
-
- addScalar(scalars, InternalDimensions.SYSTEM_TIME, currentTime);
-
- if (fgHasElapsedTime) {
- if (fgStartupTime == 0) {
- String t = System.getProperty("eclipse.startTime"); //$NON-NLS-1$
- if (t != null) {
+ /**
+ * Answer true if the native library for this class has been successfully loaded. If the load has not been attempted yet, try to
+ * load it.
+ *
+ * @return returns true if native library has been successfullz loaded
+ */
+ public static boolean isLoaded() {
+ if (fgIsLoaded == 0) {
try {
- fgStartupTime = Long.parseLong(t);
- } catch (NumberFormatException e) {
- fgHasElapsedTime = false;
+ System.loadLibrary(NATIVE_LIBRARY_NAME);
+ fgIsLoaded = 2;
+ } catch (Throwable e) {
+ // e.printStackTrace();
+ // PerformanceTestPlugin.log(e);
+ fgIsLoaded = 1;
}
- } else
- fgHasElapsedTime = false;
}
- if (fgHasElapsedTime)
- addScalar(scalars, InternalDimensions.ELAPSED_PROCESS, currentTime - fgStartupTime);
- }
-
- super.collectOperatingSystemCounters(scalars);
+ return fgIsLoaded == 2;
}
- }
- // struct rusage {
- // 0,1 struct timeval ru_utime; /* user time used */
- // 2,3 struct timeval ru_stime; /* system time used */
- // 4 long ru_maxrss; /* integral max resident set size */
- // 5 long ru_ixrss; /* integral shared text memory size */
- // 6 long ru_idrss; /* integral unshared data size */
- // 7 long ru_isrss; /* integral unshared stack size */
- // 8 long ru_minflt; /* page reclaims */
- // 9 long ru_majflt; /* page faults */
- // 10 long ru_nswap; /* swaps */
- // 11 long ru_inblock; /* block input operations */
- // 12 long ru_oublock; /* block output operations */
- // 13 long ru_msgsnd; /* messages sent */
- // 14 long ru_msgrcv; /* messages received */
- // 15 long ru_nsignals; /* signals received */
- // 16 long ru_nvcsw; /* voluntary context switches */
- // 17 long ru_nivcsw; /* involuntary context switches */
- // };
- private static native int getrusage(int who, int[] counters);
+ /**
+ * Write out operating system counters for Mac OS X.
+ *
+ * @param scalars
+ * where to collect the data
+ */
+ @Override
+ protected void collectOperatingSystemCounters(Map scalars) {
+ synchronized (this) {
+ if (isLoaded()) {
+ int[] counters = new int[18];
+ if (getrusage(0, counters) == 0) {
+
+ int user_time = counters[0] * 1000 + counters[1] / 1000;
+ int kernel_time = counters[2] * 1000 + counters[3] / 1000;
+
+ addScalar(scalars, InternalDimensions.KERNEL_TIME, kernel_time);
+ addScalar(scalars, InternalDimensions.CPU_TIME, user_time + kernel_time);
+ }
+ }
+
+ long currentTime = System.currentTimeMillis();
+
+ addScalar(scalars, InternalDimensions.SYSTEM_TIME, currentTime);
+
+ if (fgHasElapsedTime) {
+ if (fgStartupTime == 0) {
+ String t = System.getProperty("eclipse.startTime"); //$NON-NLS-1$
+ if (t != null) {
+ try {
+ fgStartupTime = Long.parseLong(t);
+ } catch (NumberFormatException e) {
+ fgHasElapsedTime = false;
+ }
+ } else
+ fgHasElapsedTime = false;
+ }
+ if (fgHasElapsedTime)
+ addScalar(scalars, InternalDimensions.ELAPSED_PROCESS, currentTime - fgStartupTime);
+ }
+
+ super.collectOperatingSystemCounters(scalars);
+ }
+ }
+
+ // struct rusage {
+ // 0,1 struct timeval ru_utime; /* user time used */
+ // 2,3 struct timeval ru_stime; /* system time used */
+ // 4 long ru_maxrss; /* integral max resident set size */
+ // 5 long ru_ixrss; /* integral shared text memory size */
+ // 6 long ru_idrss; /* integral unshared data size */
+ // 7 long ru_isrss; /* integral unshared stack size */
+ // 8 long ru_minflt; /* page reclaims */
+ // 9 long ru_majflt; /* page faults */
+ // 10 long ru_nswap; /* swaps */
+ // 11 long ru_inblock; /* block input operations */
+ // 12 long ru_oublock; /* block output operations */
+ // 13 long ru_msgsnd; /* messages sent */
+ // 14 long ru_msgrcv; /* messages received */
+ // 15 long ru_nsignals; /* signals received */
+ // 16 long ru_nvcsw; /* voluntary context switches */
+ // 17 long ru_nivcsw; /* involuntary context switches */
+ // };
+ private static native int getrusage(int who, int[] counters);
}
diff --git a/bundles/org.eclipse.test.performance/src/org/eclipse/test/internal/performance/PerformanceTestPlugin.java b/bundles/org.eclipse.test.performance/src/org/eclipse/test/internal/performance/PerformanceTestPlugin.java
index 5f4b942..c7b6fd3 100644
--- a/bundles/org.eclipse.test.performance/src/org/eclipse/test/internal/performance/PerformanceTestPlugin.java
+++ b/bundles/org.eclipse.test.performance/src/org/eclipse/test/internal/performance/PerformanceTestPlugin.java
@@ -30,338 +30,338 @@
*/
public class PerformanceTestPlugin extends Plugin {
- public static final String CONFIG = "config"; //$NON-NLS-1$
- public static final String BUILD = "build"; //$NON-NLS-1$
+ public static final String CONFIG = "config"; //$NON-NLS-1$
+ public static final String BUILD = "build"; //$NON-NLS-1$
- private static final String DEFAULT_DB_NAME = "perfDB"; //$NON-NLS-1$
- private static final String DEFAULT_DB_USER = "guest"; //$NON-NLS-1$
- private static final String DEFAULT_DB_PASSWORD = "guest"; //$NON-NLS-1$
+ private static final String DEFAULT_DB_NAME = "perfDB"; //$NON-NLS-1$
+ private static final String DEFAULT_DB_USER = "guest"; //$NON-NLS-1$
+ private static final String DEFAULT_DB_PASSWORD = "guest"; //$NON-NLS-1$
- private static final String DB_NAME = "dbname"; //$NON-NLS-1$
- private static final String DB_USER = "dbuser"; //$NON-NLS-1$
- private static final String DB_PASSWD = "dbpasswd"; //$NON-NLS-1$
+ private static final String DB_NAME = "dbname"; //$NON-NLS-1$
+ private static final String DB_USER = "dbuser"; //$NON-NLS-1$
+ private static final String DB_PASSWD = "dbpasswd"; //$NON-NLS-1$
- /*
- * New properties
- */
- private static final String ECLIPSE_PERF_DBLOC = "eclipse.perf.dbloc"; //$NON-NLS-1$
- public static final String ECLIPSE_PERF_ASSERTAGAINST = "eclipse.perf.assertAgainst"; //$NON-NLS-1$
- private static final String ECLIPSE_PERF_CONFIG = "eclipse.perf.config"; //$NON-NLS-1$
- private static final String ECLIPSE_PERF_DEFAULT_DIM = "eclipse.perf.default.dim"; //$NON-NLS-1$
- private static final String ECLIPSE_PERF_RESULTS_DIMENSIONS = "eclipse.perf.results.dimensions"; //$NON-NLS-1$
- private static final String ECLIPSE_PERF_CONFIGS_DESCRIPTOR = "eclipse.perf.configs.descriptor"; //$NON-NLS-1$
+ /*
+ * New properties
+ */
+ private static final String ECLIPSE_PERF_DBLOC = "eclipse.perf.dbloc"; //$NON-NLS-1$
+ public static final String ECLIPSE_PERF_ASSERTAGAINST = "eclipse.perf.assertAgainst"; //$NON-NLS-1$
+ private static final String ECLIPSE_PERF_CONFIG = "eclipse.perf.config"; //$NON-NLS-1$
+ private static final String ECLIPSE_PERF_DEFAULT_DIM = "eclipse.perf.default.dim"; //$NON-NLS-1$
+ private static final String ECLIPSE_PERF_RESULTS_DIMENSIONS = "eclipse.perf.results.dimensions"; //$NON-NLS-1$
+ private static final String ECLIPSE_PERF_CONFIGS_DESCRIPTOR = "eclipse.perf.configs.descriptor"; //$NON-NLS-1$
- /**
- * Supported dimensions.
- * <p>
- * Currently all the dimensions accessible through this interface:
- * <ul>
- * <li>{@link Dimension#KERNEL_TIME}</li>
- * <li>{@link Dimension#CPU_TIME}</li>
- * <li>{@link Dimension#WORKING_SET}</li>
- * <li>{@link Dimension#ELAPSED_PROCESS}</li>
- * <li>{@link Dimension#USED_JAVA_HEAP}</li>
- * <li>{@link Dimension#WORKING_SET_PEAK}</li>
- * <li>{@link Dimension#KERNEL_TIME}</li>
- * </ul>
- * </p>
- */
- private static final Dim[] SUPPORTED_DIMENSIONS = { InternalDimensions.KERNEL_TIME, InternalDimensions.CPU_TIME, InternalDimensions.WORKING_SET, InternalDimensions.ELAPSED_PROCESS, InternalDimensions.USED_JAVA_HEAP,
- InternalDimensions.WORKING_SET_PEAK, InternalDimensions.COMITTED, };
+ /**
+ * Supported dimensions.
+ * <p>
+ * Currently all the dimensions accessible through this interface:
+ * <ul>
+ * <li>{@link Dimension#KERNEL_TIME}</li>
+ * <li>{@link Dimension#CPU_TIME}</li>
+ * <li>{@link Dimension#WORKING_SET}</li>
+ * <li>{@link Dimension#ELAPSED_PROCESS}</li>
+ * <li>{@link Dimension#USED_JAVA_HEAP}</li>
+ * <li>{@link Dimension#WORKING_SET_PEAK}</li>
+ * <li>{@link Dimension#KERNEL_TIME}</li>
+ * </ul>
+ * </p>
+ */
+ private static final Dim[] SUPPORTED_DIMENSIONS = { InternalDimensions.KERNEL_TIME, InternalDimensions.CPU_TIME, InternalDimensions.WORKING_SET, InternalDimensions.ELAPSED_PROCESS, InternalDimensions.USED_JAVA_HEAP,
+ InternalDimensions.WORKING_SET_PEAK, InternalDimensions.COMITTED, };
- /**
- * Identifiers of the supported dimensions.
- */
- private static final int[] SUPPORTED_DIMENSIONS_ID = new int[SUPPORTED_DIMENSIONS.length];
- static {
- int length = SUPPORTED_DIMENSIONS.length;
- for (int i = 0; i < length; i++) {
- SUPPORTED_DIMENSIONS_ID[i] = SUPPORTED_DIMENSIONS[i].getId();
- }
- }
-
- /**
- * Default machines names.
- */
- private static final String DEFAULT_CONFIG_DESCRIPTORS = ""; //$NON-NLS-1$
-
- /**
- * Default dimension use for performance results.
- */
- private static final Dim DEFAULT_DIMENSION = InternalDimensions.ELAPSED_PROCESS;
-
- /**
- * The dimensions which are put in the generated performance results pages.
- */
- private static final Dim[] DEFAULT_RESULTS_DIMENSIONS = { InternalDimensions.ELAPSED_PROCESS, InternalDimensions.CPU_TIME, };
-
- /**
- * The plug-in ID
- */
- public static final String PLUGIN_ID = "org.eclipse.test.performance"; //$NON-NLS-1$
-
- /** Status code describing an internal error */
- public static final int INTERNAL_ERROR = 1;
-
- /**
- * The shared instance.
- */
- private static PerformanceTestPlugin fgPlugin;
-
- /**
- * The constructor.
- */
- public PerformanceTestPlugin() {
- super();
- fgPlugin = this;
- }
-
- @Override
- public void stop(BundleContext context) throws Exception {
- DB.shutdown();
- super.stop(context);
- }
-
- /*
- * Returns the shared instance.
- */
- public static PerformanceTestPlugin getDefault() {
- return fgPlugin;
- }
-
- /*
- * -Declipse.perf.dbloc=net://localhost
- */
- public static String getDBLocation() {
- String dbloc = System.getProperty(ECLIPSE_PERF_DBLOC);
- if (dbloc != null) {
- logInfo("System property " + ECLIPSE_PERF_DBLOC + " found to equal " + dbloc + " in getDBLocation"); //$NON-NLS-1$ //$NON-NLS-2$
- Variations keys = new Variations();
- keys.parsePairs(ECLIPSE_PERF_DBLOC + '=' + dbloc);
- return keys.getProperty(ECLIPSE_PERF_DBLOC);
- }
- return null;
- }
-
- public static String getDBName() {
- String dbloc = System.getProperty(ECLIPSE_PERF_DBLOC);
- if (dbloc != null) {
- logInfo("System property " + ECLIPSE_PERF_DBLOC + " found to equal " + dbloc + " in getDBName"); //$NON-NLS-1$ //$NON-NLS-2$
- Variations keys = new Variations();
- keys.parsePairs(ECLIPSE_PERF_DBLOC + '=' + dbloc);
- return keys.getProperty(DB_NAME, DEFAULT_DB_NAME);
- }
- return DEFAULT_DB_NAME;
- }
-
- public static String getDBUser() {
- String dbloc = System.getProperty(ECLIPSE_PERF_DBLOC);
- if (dbloc != null) {
- logInfo("System property " + ECLIPSE_PERF_DBLOC + " found to equal " + dbloc + " in getDBUser"); //$NON-NLS-1$ //$NON-NLS-2$
- Variations keys = new Variations();
- keys.parsePairs(ECLIPSE_PERF_DBLOC + '=' + dbloc);
- return keys.getProperty(DB_USER, DEFAULT_DB_USER);
- }
- return DEFAULT_DB_USER;
- }
-
- /**
- * Returns the default dimension used for performance results.
- *
- * @return The default {@link Dimension} or <code>null</code> if the specified default dimension does not match any known
- * dimensions name.
- */
- public static Dimension getDefaultDimension() {
- String defaultDim = System.getProperty(ECLIPSE_PERF_DEFAULT_DIM);
- if (defaultDim == null)
- return DEFAULT_DIMENSION;
- Dimension dimension = getDimension(defaultDim);
- Assert.isNotNull(dimension, "Invalid default dimension found in system property '" + ECLIPSE_PERF_DEFAULT_DIM + "': " + defaultDim); //$NON-NLS-1$ //$NON-NLS-2$
- return dimension;
- }
-
- /**
- * Returns the dimensions displayed in the performance results.
- *
- * @return The list of {@link Dimension} which will be displayed in the generated results data pages.
- */
- public static Dimension[] getResultsDimensions() {
- String resultsDimension = System.getProperty(ECLIPSE_PERF_RESULTS_DIMENSIONS);
- if (resultsDimension == null)
- return DEFAULT_RESULTS_DIMENSIONS;
- StringTokenizer tokenizer = new StringTokenizer(resultsDimension, ","); //$NON-NLS-1$
- List<Dimension> list = new ArrayList<>();
- while (tokenizer.hasMoreTokens()) {
- String token = tokenizer.nextToken().trim();
- Dimension dimension = getDimension(token);
- if (dimension == null) {
- try {
- dimension = getDimension(Integer.parseInt(token));
- } catch (NumberFormatException e) {
- // skip
+ /**
+ * Identifiers of the supported dimensions.
+ */
+ private static final int[] SUPPORTED_DIMENSIONS_ID = new int[SUPPORTED_DIMENSIONS.length];
+ static {
+ int length = SUPPORTED_DIMENSIONS.length;
+ for (int i = 0; i < length; i++) {
+ SUPPORTED_DIMENSIONS_ID[i] = SUPPORTED_DIMENSIONS[i].getId();
}
- if (dimension == null) {
- System.err.println("Skip invalid results dimension found in system property '" + ECLIPSE_PERF_RESULTS_DIMENSIONS + "': " + resultsDimension); //$NON-NLS-1$ //$NON-NLS-2$
- continue;
+ }
+
+ /**
+ * Default machines names.
+ */
+ private static final String DEFAULT_CONFIG_DESCRIPTORS = ""; //$NON-NLS-1$
+
+ /**
+ * Default dimension use for performance results.
+ */
+ private static final Dim DEFAULT_DIMENSION = InternalDimensions.ELAPSED_PROCESS;
+
+ /**
+ * The dimensions which are put in the generated performance results pages.
+ */
+ private static final Dim[] DEFAULT_RESULTS_DIMENSIONS = { InternalDimensions.ELAPSED_PROCESS, InternalDimensions.CPU_TIME, };
+
+ /**
+ * The plug-in ID
+ */
+ public static final String PLUGIN_ID = "org.eclipse.test.performance"; //$NON-NLS-1$
+
+ /** Status code describing an internal error */
+ public static final int INTERNAL_ERROR = 1;
+
+ /**
+ * The shared instance.
+ */
+ private static PerformanceTestPlugin fgPlugin;
+
+ /**
+ * The constructor.
+ */
+ public PerformanceTestPlugin() {
+ super();
+ fgPlugin = this;
+ }
+
+ @Override
+ public void stop(BundleContext context) throws Exception {
+ DB.shutdown();
+ super.stop(context);
+ }
+
+ /*
+ * Returns the shared instance.
+ */
+ public static PerformanceTestPlugin getDefault() {
+ return fgPlugin;
+ }
+
+ /*
+ * -Declipse.perf.dbloc=net://localhost
+ */
+ public static String getDBLocation() {
+ String dbloc = System.getProperty(ECLIPSE_PERF_DBLOC);
+ if (dbloc != null) {
+ logInfo("System property " + ECLIPSE_PERF_DBLOC + " found to equal " + dbloc + " in getDBLocation"); //$NON-NLS-1$ //$NON-NLS-2$
+ Variations keys = new Variations();
+ keys.parsePairs(ECLIPSE_PERF_DBLOC + '=' + dbloc);
+ return keys.getProperty(ECLIPSE_PERF_DBLOC);
}
- }
- list.add(dimension);
+ return null;
}
- int size = list.size();
- if (size == 0) {
- System.err.println("No valid dimension was found in system property '" + ECLIPSE_PERF_RESULTS_DIMENSIONS + "'!"); //$NON-NLS-1$ //$NON-NLS-2$
- System.err.println("=> default results dimensions will be used instead!"); //$NON-NLS-1$
- return DEFAULT_RESULTS_DIMENSIONS;
+
+ public static String getDBName() {
+ String dbloc = System.getProperty(ECLIPSE_PERF_DBLOC);
+ if (dbloc != null) {
+ logInfo("System property " + ECLIPSE_PERF_DBLOC + " found to equal " + dbloc + " in getDBName"); //$NON-NLS-1$ //$NON-NLS-2$
+ Variations keys = new Variations();
+ keys.parsePairs(ECLIPSE_PERF_DBLOC + '=' + dbloc);
+ return keys.getProperty(DB_NAME, DEFAULT_DB_NAME);
+ }
+ return DEFAULT_DB_NAME;
}
- Dimension[] dimensions = new Dimension[size];
- list.toArray(dimensions);
- return dimensions;
- }
- /**
- * Returns the names of the dimensions which may be used in the performance results.
- *
- * @return The list of the dimension names
- */
- public static List<String> getDimensions() {
- List<String> dimensions = new ArrayList<>();
- for (int i = 0; i < SUPPORTED_DIMENSIONS.length; i++) {
- dimensions.add(SUPPORTED_DIMENSIONS[i].getName());
+ public static String getDBUser() {
+ String dbloc = System.getProperty(ECLIPSE_PERF_DBLOC);
+ if (dbloc != null) {
+ logInfo("System property " + ECLIPSE_PERF_DBLOC + " found to equal " + dbloc + " in getDBUser"); //$NON-NLS-1$ //$NON-NLS-2$
+ Variations keys = new Variations();
+ keys.parsePairs(ECLIPSE_PERF_DBLOC + '=' + dbloc);
+ return keys.getProperty(DB_USER, DEFAULT_DB_USER);
+ }
+ return DEFAULT_DB_USER;
}
- return dimensions;
- }
- /**
- * Return the dimension corresponding to the given id.
- *
- * @param id
- * The id of the searched dimension.
- * @return The {@link Dimension} or <code>null</code> if none is found.
- */
- public static Dimension getDimension(int id) {
- int length = SUPPORTED_DIMENSIONS.length;
- for (int i = 0; i < length; i++) {
- if (SUPPORTED_DIMENSIONS[i].getId() == id) {
- return SUPPORTED_DIMENSIONS[i];
- }
+ /**
+ * Returns the default dimension used for performance results.
+ *
+ * @return The default {@link Dimension} or <code>null</code> if the specified default dimension does not match any known
+ * dimensions name.
+ */
+ public static Dimension getDefaultDimension() {
+ String defaultDim = System.getProperty(ECLIPSE_PERF_DEFAULT_DIM);
+ if (defaultDim == null)
+ return DEFAULT_DIMENSION;
+ Dimension dimension = getDimension(defaultDim);
+ Assert.isNotNull(dimension, "Invalid default dimension found in system property '" + ECLIPSE_PERF_DEFAULT_DIM + "': " + defaultDim); //$NON-NLS-1$ //$NON-NLS-2$
+ return dimension;
}
- return null;
- }
- /**
- * Return the dimension corresponding to the given id.
- *
- * @param name
- * The name of the searched dimension.
- * @return The {@link Dimension} or <code>null</code> if none is found.
- */
- public static Dimension getDimension(String name) {
- int length = SUPPORTED_DIMENSIONS.length;
- for (int i = 0; i < length; i++) {
- if (SUPPORTED_DIMENSIONS[i].getName().equals(name)) {
- return SUPPORTED_DIMENSIONS[i];
- }
+ /**
+ * Returns the dimensions displayed in the performance results.
+ *
+ * @return The list of {@link Dimension} which will be displayed in the generated results data pages.
+ */
+ public static Dimension[] getResultsDimensions() {
+ String resultsDimension = System.getProperty(ECLIPSE_PERF_RESULTS_DIMENSIONS);
+ if (resultsDimension == null)
+ return DEFAULT_RESULTS_DIMENSIONS;
+ StringTokenizer tokenizer = new StringTokenizer(resultsDimension, ","); //$NON-NLS-1$
+ List<Dimension> list = new ArrayList<>();
+ while (tokenizer.hasMoreTokens()) {
+ String token = tokenizer.nextToken().trim();
+ Dimension dimension = getDimension(token);
+ if (dimension == null) {
+ try {
+ dimension = getDimension(Integer.parseInt(token));
+ } catch (NumberFormatException e) {
+ // skip
+ }
+ if (dimension == null) {
+ System.err.println("Skip invalid results dimension found in system property '" + ECLIPSE_PERF_RESULTS_DIMENSIONS + "': " + resultsDimension); //$NON-NLS-1$ //$NON-NLS-2$
+ continue;
+ }
+ }
+ list.add(dimension);
+ }
+ int size = list.size();
+ if (size == 0) {
+ System.err.println("No valid dimension was found in system property '" + ECLIPSE_PERF_RESULTS_DIMENSIONS + "'!"); //$NON-NLS-1$ //$NON-NLS-2$
+ System.err.println("=> default results dimensions will be used instead!"); //$NON-NLS-1$
+ return DEFAULT_RESULTS_DIMENSIONS;
+ }
+ Dimension[] dimensions = new Dimension[size];
+ list.toArray(dimensions);
+ return dimensions;
}
- return null;
- }
- /**
- * Return the descriptors of the configurations used for the performances.
- *
- * @return An array of 2 strings, the former is the name of the configuration and the latter its description.
- */
- public static String[][] getConfigDescriptors() {
- String descriptors = System.getProperty(ECLIPSE_PERF_CONFIGS_DESCRIPTOR, DEFAULT_CONFIG_DESCRIPTORS);
- StringTokenizer tokenizer = new StringTokenizer(descriptors, ",;"); //$NON-NLS-1$
- List<String[]> list = new ArrayList<>();
- while (tokenizer.hasMoreTokens()) {
- String[] config = new String[2];
- config[0] = tokenizer.nextToken().trim(); // config name
- config[1] = tokenizer.nextToken().trim(); // config description
- list.add(config);
+ /**
+ * Returns the names of the dimensions which may be used in the performance results.
+ *
+ * @return The list of the dimension names
+ */
+ public static List<String> getDimensions() {
+ List<String> dimensions = new ArrayList<>();
+ for (int i = 0; i < SUPPORTED_DIMENSIONS.length; i++) {
+ dimensions.add(SUPPORTED_DIMENSIONS[i].getName());
+ }
+ return dimensions;
}
- String[][] configDescriptors = new String[list.size()][];
- list.toArray(configDescriptors);
- return configDescriptors;
- }
- public static String getDBPassword() {
- String dbloc = System.getProperty(ECLIPSE_PERF_DBLOC);
- if (dbloc != null) {
- logInfo("System property " + ECLIPSE_PERF_DBLOC + " found to equal " + dbloc + " in getDBPassword"); //$NON-NLS-1$ //$NON-NLS-2$
- Variations keys = new Variations();
- keys.parsePairs(ECLIPSE_PERF_DBLOC + '=' + dbloc);
- return keys.getProperty(DB_PASSWD, DEFAULT_DB_PASSWORD);
+ /**
+ * Return the dimension corresponding to the given id.
+ *
+ * @param id
+ * The id of the searched dimension.
+ * @return The {@link Dimension} or <code>null</code> if none is found.
+ */
+ public static Dimension getDimension(int id) {
+ int length = SUPPORTED_DIMENSIONS.length;
+ for (int i = 0; i < length; i++) {
+ if (SUPPORTED_DIMENSIONS[i].getId() == id) {
+ return SUPPORTED_DIMENSIONS[i];
+ }
+ }
+ return null;
}
- return DEFAULT_DB_PASSWORD;
- }
- /*
- * -Declipse.perf.config=<varname1>=<varval1>;<varname2>=<varval2>;...;<varnameN>=<varvalN>
- */
- public static Variations getVariations() {
- Variations keys = new Variations();
- String configKey = System.getProperty(ECLIPSE_PERF_CONFIG);
- if (configKey != null)
- keys.parsePairs(configKey);
- return keys;
- }
-
- /*
- * -Declipse.perf.assertAgainst=<varname1>=<varval1>;<varname2>=<varval2>;...;<varnameN>=<varvalN> Returns null if assertAgainst
- * property isn't defined.
- */
- public static Variations getAssertAgainst() {
- String assertKey = System.getProperty(ECLIPSE_PERF_ASSERTAGAINST);
- if (assertKey != null) {
- Variations keys = getVariations();
- if (keys == null)
- keys = new Variations();
- keys.parsePairs(assertKey);
- return keys;
+ /**
+ * Return the dimension corresponding to the given id.
+ *
+ * @param name
+ * The name of the searched dimension.
+ * @return The {@link Dimension} or <code>null</code> if none is found.
+ */
+ public static Dimension getDimension(String name) {
+ int length = SUPPORTED_DIMENSIONS.length;
+ for (int i = 0; i < length; i++) {
+ if (SUPPORTED_DIMENSIONS[i].getName().equals(name)) {
+ return SUPPORTED_DIMENSIONS[i];
+ }
+ }
+ return null;
}
- return null;
- }
- // logging
-
- public static void logError(String message) {
- if (message == null)
- message = ""; //$NON-NLS-1$
- log(new Status(IStatus.ERROR, PLUGIN_ID, INTERNAL_ERROR, message, null));
- }
-
- public static void logWarning(String message) {
- if (message == null)
- message = ""; //$NON-NLS-1$
- log(new Status(IStatus.WARNING, PLUGIN_ID, IStatus.OK, message, null));
- }
- public static void logInfo(String message) {
- if (message == null)
- message = ""; //$NON-NLS-1$
- log(new Status(IStatus.INFO, PLUGIN_ID, IStatus.OK, message, null));
- }
- public static void log(Throwable e) {
- log(new Status(IStatus.ERROR, PLUGIN_ID, INTERNAL_ERROR, "Internal Error", e)); //$NON-NLS-1$
- }
-
- public static void log(IStatus status) {
- if (fgPlugin != null) {
- fgPlugin.getLog().log(status);
- } else {
- switch (status.getSeverity()) {
- case IStatus.ERROR:
- System.err.println("Error: " + status.getMessage()); //$NON-NLS-1$
- break;
- case IStatus.WARNING:
- System.err.println("Warning: " + status.getMessage()); //$NON-NLS-1$
- break;
- default:
- break;
- }
- Throwable exception = status.getException();
- if (exception != null)
- exception.printStackTrace(System.err);
+ /**
+ * Return the descriptors of the configurations used for the performances.
+ *
+ * @return An array of 2 strings, the former is the name of the configuration and the latter its description.
+ */
+ public static String[][] getConfigDescriptors() {
+ String descriptors = System.getProperty(ECLIPSE_PERF_CONFIGS_DESCRIPTOR, DEFAULT_CONFIG_DESCRIPTORS);
+ StringTokenizer tokenizer = new StringTokenizer(descriptors, ",;"); //$NON-NLS-1$
+ List<String[]> list = new ArrayList<>();
+ while (tokenizer.hasMoreTokens()) {
+ String[] config = new String[2];
+ config[0] = tokenizer.nextToken().trim(); // config name
+ config[1] = tokenizer.nextToken().trim(); // config description
+ list.add(config);
+ }
+ String[][] configDescriptors = new String[list.size()][];
+ list.toArray(configDescriptors);
+ return configDescriptors;
}
- }
+
+ public static String getDBPassword() {
+ String dbloc = System.getProperty(ECLIPSE_PERF_DBLOC);
+ if (dbloc != null) {
+ logInfo("System property " + ECLIPSE_PERF_DBLOC + " found to equal " + dbloc + " in getDBPassword"); //$NON-NLS-1$ //$NON-NLS-2$
+ Variations keys = new Variations();
+ keys.parsePairs(ECLIPSE_PERF_DBLOC + '=' + dbloc);
+ return keys.getProperty(DB_PASSWD, DEFAULT_DB_PASSWORD);
+ }
+ return DEFAULT_DB_PASSWORD;
+ }
+
+ /*
+ * -Declipse.perf.config=<varname1>=<varval1>;<varname2>=<varval2>;...;<varnameN>=<varvalN>
+ */
+ public static Variations getVariations() {
+ Variations keys = new Variations();
+ String configKey = System.getProperty(ECLIPSE_PERF_CONFIG);
+ if (configKey != null)
+ keys.parsePairs(configKey);
+ return keys;
+ }
+
+ /*
+ * -Declipse.perf.assertAgainst=<varname1>=<varval1>;<varname2>=<varval2>;...;<varnameN>=<varvalN> Returns null if assertAgainst
+ * property isn't defined.
+ */
+ public static Variations getAssertAgainst() {
+ String assertKey = System.getProperty(ECLIPSE_PERF_ASSERTAGAINST);
+ if (assertKey != null) {
+ Variations keys = getVariations();
+ if (keys == null)
+ keys = new Variations();
+ keys.parsePairs(assertKey);
+ return keys;
+ }
+ return null;
+ }
+
+ // logging
+
+ public static void logError(String message) {
+ if (message == null)
+ message = ""; //$NON-NLS-1$
+ log(new Status(IStatus.ERROR, PLUGIN_ID, INTERNAL_ERROR, message, null));
+ }
+
+ public static void logWarning(String message) {
+ if (message == null)
+ message = ""; //$NON-NLS-1$
+ log(new Status(IStatus.WARNING, PLUGIN_ID, IStatus.OK, message, null));
+ }
+ public static void logInfo(String message) {
+ if (message == null)
+ message = ""; //$NON-NLS-1$
+ log(new Status(IStatus.INFO, PLUGIN_ID, IStatus.OK, message, null));
+ }
+ public static void log(Throwable e) {
+ log(new Status(IStatus.ERROR, PLUGIN_ID, INTERNAL_ERROR, "Internal Error", e)); //$NON-NLS-1$
+ }
+
+ public static void log(IStatus status) {
+ if (fgPlugin != null) {
+ fgPlugin.getLog().log(status);
+ } else {
+ switch (status.getSeverity()) {
+ case IStatus.ERROR:
+ System.err.println("Error: " + status.getMessage()); //$NON-NLS-1$
+ break;
+ case IStatus.WARNING:
+ System.err.println("Warning: " + status.getMessage()); //$NON-NLS-1$
+ break;
+ default:
+ break;
+ }
+ Throwable exception = status.getException();
+ if (exception != null)
+ exception.printStackTrace(System.err);
+ }
+ }
}
