diff --git a/changelog/org.eclipse.linuxtools.changelog-feature/feature.xml b/changelog/org.eclipse.linuxtools.changelog-feature/feature.xml
index a5440a0e6dc512b4f15be45c2aa32f47443bb9fc..d01021f5ae4870e65d3a2c57c32c8eb696443010 100644
--- a/changelog/org.eclipse.linuxtools.changelog-feature/feature.xml
+++ b/changelog/org.eclipse.linuxtools.changelog-feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.linuxtools.changelog"
label="%featureName"
- version="7.4.0.qualifier"
+ version="8.1.0.qualifier"
provider-name="%featureProvider"
license-feature="org.eclipse.license"
license-feature-version="0.0.0">
diff --git a/changelog/org.eclipse.linuxtools.changelog-feature/pom.xml b/changelog/org.eclipse.linuxtools.changelog-feature/pom.xml
index 5ff90e3783e7eac8608fbf5b7e8fd2e250c78246..dd1845bbcaff2e198435453c4342758917a4a9b8 100644
--- a/changelog/org.eclipse.linuxtools.changelog-feature/pom.xml
+++ b/changelog/org.eclipse.linuxtools.changelog-feature/pom.xml
@@ -15,12 +15,12 @@
<parent>
<artifactId>linuxtools-changelog-parent</artifactId>
<groupId>org.eclipse.linuxtools.changelog</groupId>
- <version>7.4.0</version>
+ <version>8.1.0</version>
</parent>
<artifactId>org.eclipse.linuxtools.changelog</artifactId>
<packaging>eclipse-feature</packaging>
- <version>7.4.0-SNAPSHOT</version>
+ <version>8.1.0-SNAPSHOT</version>
<name>Linux Tools ChangeLog Feature</name>
diff --git a/changelog/org.eclipse.linuxtools.changelog.c-feature/feature.xml b/changelog/org.eclipse.linuxtools.changelog.c-feature/feature.xml
index 471037aabc75b69d63d3ad3e03b53bf5fae84f15..43deccf705e4303b09b974981d1dd4788e3753c5 100644
--- a/changelog/org.eclipse.linuxtools.changelog.c-feature/feature.xml
+++ b/changelog/org.eclipse.linuxtools.changelog.c-feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.linuxtools.changelog.c"
label="%featureName"
- version="7.4.0.qualifier"
+ version="8.1.0.qualifier"
provider-name="%featureProvider"
license-feature="org.eclipse.license"
license-feature-version="0.0.0">
diff --git a/changelog/org.eclipse.linuxtools.changelog.c-feature/pom.xml b/changelog/org.eclipse.linuxtools.changelog.c-feature/pom.xml
index 39aa731cf98ff9f5ccbf6547a0083f1ff560a0e5..5a183650b690aec300f6bf9aff7cc5319ab1e345 100644
--- a/changelog/org.eclipse.linuxtools.changelog.c-feature/pom.xml
+++ b/changelog/org.eclipse.linuxtools.changelog.c-feature/pom.xml
@@ -15,12 +15,12 @@
<parent>
<artifactId>linuxtools-changelog-parent</artifactId>
<groupId>org.eclipse.linuxtools.changelog</groupId>
- <version>7.4.0</version>
+ <version>8.1.0</version>
</parent>
<artifactId>org.eclipse.linuxtools.changelog.c</artifactId>
<packaging>eclipse-feature</packaging>
- <version>7.4.0-SNAPSHOT</version>
+ <version>8.1.0-SNAPSHOT</version>
<name>Linux Tools ChangeLog Feature for C/C++</name>
diff --git a/changelog/org.eclipse.linuxtools.changelog.core/.classpath b/changelog/org.eclipse.linuxtools.changelog.core/.classpath
index 43b986286a9e5fd1828793fa4b2353d02ab8625f..1db08c6b4ce2fb50395b2f9c9a50c140a0bab199 100644
--- a/changelog/org.eclipse.linuxtools.changelog.core/.classpath
+++ b/changelog/org.eclipse.linuxtools.changelog.core/.classpath
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="target/classes"/>
diff --git a/changelog/org.eclipse.linuxtools.changelog.core/.settings/org.eclipse.jdt.core.prefs b/changelog/org.eclipse.linuxtools.changelog.core/.settings/org.eclipse.jdt.core.prefs
index adbfd21c95c73dcfb522237c7f96b13693fbc014..19f2f53c0c4d660336146e9c8a1179a4e3df9fc6 100644
--- a/changelog/org.eclipse.linuxtools.changelog.core/.settings/org.eclipse.jdt.core.prefs
+++ b/changelog/org.eclipse.linuxtools.changelog.core/.settings/org.eclipse.jdt.core.prefs
@@ -7,9 +7,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nul
org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.compliance=11
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -24,6 +24,7 @@ org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=warning
org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
@@ -80,6 +81,7 @@ org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=warn
org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
@@ -112,4 +114,5 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11
diff --git a/changelog/org.eclipse.linuxtools.changelog.core/META-INF/MANIFEST.MF b/changelog/org.eclipse.linuxtools.changelog.core/META-INF/MANIFEST.MF
index 276c50a20243fb359209f4557db28f873a2b3c90..05636d895e68c34c195e2891a9c5c776fc5abbd2 100644
--- a/changelog/org.eclipse.linuxtools.changelog.core/META-INF/MANIFEST.MF
+++ b/changelog/org.eclipse.linuxtools.changelog.core/META-INF/MANIFEST.MF
@@ -19,7 +19,7 @@ Require-Bundle: org.eclipse.team.ui,
org.eclipse.core.resources,
org.eclipse.ui.genericeditor;bundle-version="1.0.0"
Export-Package: org.eclipse.linuxtools.changelog.core
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
Bundle-ActivationPolicy: lazy
Eclipse-ExtensibleAPI: true
Automatic-Module-Name: org.eclipse.linuxtools.changelog.core
diff --git a/changelog/org.eclipse.linuxtools.changelog.core/pom.xml b/changelog/org.eclipse.linuxtools.changelog.core/pom.xml
index ea704402caecf69343455f2cdc889ae29b42ab94..438a9ca9019a6e78541c4ad2ee838b800cbe4dd3 100644
--- a/changelog/org.eclipse.linuxtools.changelog.core/pom.xml
+++ b/changelog/org.eclipse.linuxtools.changelog.core/pom.xml
@@ -15,7 +15,7 @@
<parent>
<artifactId>linuxtools-changelog-parent</artifactId>
<groupId>org.eclipse.linuxtools.changelog</groupId>
- <version>7.4.0</version>
+ <version>8.1.0</version>
</parent>
<artifactId>org.eclipse.linuxtools.changelog.core</artifactId>
diff --git a/changelog/org.eclipse.linuxtools.changelog.cparser/.classpath b/changelog/org.eclipse.linuxtools.changelog.cparser/.classpath
index 43b986286a9e5fd1828793fa4b2353d02ab8625f..1db08c6b4ce2fb50395b2f9c9a50c140a0bab199 100644
--- a/changelog/org.eclipse.linuxtools.changelog.cparser/.classpath
+++ b/changelog/org.eclipse.linuxtools.changelog.cparser/.classpath
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="target/classes"/>
diff --git a/changelog/org.eclipse.linuxtools.changelog.cparser/.settings/org.eclipse.jdt.core.prefs b/changelog/org.eclipse.linuxtools.changelog.cparser/.settings/org.eclipse.jdt.core.prefs
index 84f4e5be6933a8a2482a419349b99082b12ee08f..95b44766836b9c7f566fb0d0c35dbf2e432afd9d 100644
--- a/changelog/org.eclipse.linuxtools.changelog.cparser/.settings/org.eclipse.jdt.core.prefs
+++ b/changelog/org.eclipse.linuxtools.changelog.cparser/.settings/org.eclipse.jdt.core.prefs
@@ -6,9 +6,9 @@ org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annota
org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.compliance=11
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -23,6 +23,7 @@ org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=warning
org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
@@ -78,6 +79,7 @@ org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=warn
org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
@@ -109,4 +111,5 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11
diff --git a/changelog/org.eclipse.linuxtools.changelog.cparser/META-INF/MANIFEST.MF b/changelog/org.eclipse.linuxtools.changelog.cparser/META-INF/MANIFEST.MF
index 2794f8fcb955d733c6fb31a0cfdc8bf2d52de080..e394f855af98940ebc8f7af9deb9e29d2b302a2c 100644
--- a/changelog/org.eclipse.linuxtools.changelog.cparser/META-INF/MANIFEST.MF
+++ b/changelog/org.eclipse.linuxtools.changelog.cparser/META-INF/MANIFEST.MF
@@ -6,7 +6,7 @@ Bundle-Version: 2.7.0.qualifier
Bundle-Vendor: %Bundle-Vendor
Require-Bundle: org.eclipse.cdt.core;bundle-version="5.2.0",
org.eclipse.cdt.ui;bundle-version="5.2.0"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
Fragment-Host: org.eclipse.linuxtools.changelog.core;bundle-version="2.6.3"
Import-Package: org.eclipse.core.resources
Automatic-Module-Name: org.eclipse.linuxtools.changelog.cparser
diff --git a/changelog/org.eclipse.linuxtools.changelog.cparser/pom.xml b/changelog/org.eclipse.linuxtools.changelog.cparser/pom.xml
index f37715bd0638aec12417afcce3e9213b29a1e225..a0fc7227446a12cb3b6bc9fd68a04b85652b5700 100644
--- a/changelog/org.eclipse.linuxtools.changelog.cparser/pom.xml
+++ b/changelog/org.eclipse.linuxtools.changelog.cparser/pom.xml
@@ -15,7 +15,7 @@
<parent>
<artifactId>linuxtools-changelog-parent</artifactId>
<groupId>org.eclipse.linuxtools.changelog</groupId>
- <version>7.4.0</version>
+ <version>8.1.0</version>
</parent>
<artifactId>org.eclipse.linuxtools.changelog.cparser</artifactId>
diff --git a/changelog/org.eclipse.linuxtools.changelog.doc/pom.xml b/changelog/org.eclipse.linuxtools.changelog.doc/pom.xml
index 58d64c46510378ffddceb8c8d08386555ee6dc68..c5a848e9de019c777a48d8ef4d69bacca9c27df5 100644
--- a/changelog/org.eclipse.linuxtools.changelog.doc/pom.xml
+++ b/changelog/org.eclipse.linuxtools.changelog.doc/pom.xml
@@ -15,7 +15,7 @@
<parent>
<artifactId>linuxtools-changelog-parent</artifactId>
<groupId>org.eclipse.linuxtools.changelog</groupId>
- <version>7.4.0</version>
+ <version>8.1.0</version>
</parent>
<artifactId>org.eclipse.linuxtools.changelog.doc</artifactId>
diff --git a/changelog/org.eclipse.linuxtools.changelog.java-feature/feature.xml b/changelog/org.eclipse.linuxtools.changelog.java-feature/feature.xml
index 53f18e6d95f6446180c5c26ee514d52c9a605795..064b7b5b64d2872ee9678fd109dc06427364db66 100644
--- a/changelog/org.eclipse.linuxtools.changelog.java-feature/feature.xml
+++ b/changelog/org.eclipse.linuxtools.changelog.java-feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.linuxtools.changelog.java"
label="%featureName"
- version="7.4.0.qualifier"
+ version="8.1.0.qualifier"
provider-name="%featureProvider"
license-feature="org.eclipse.license"
license-feature-version="0.0.0">
diff --git a/changelog/org.eclipse.linuxtools.changelog.java-feature/pom.xml b/changelog/org.eclipse.linuxtools.changelog.java-feature/pom.xml
index 497811130685be1c22de8209a3aef25244cddd2d..efa667fba8c2d0530bf304db2509f0cdafbf07e7 100644
--- a/changelog/org.eclipse.linuxtools.changelog.java-feature/pom.xml
+++ b/changelog/org.eclipse.linuxtools.changelog.java-feature/pom.xml
@@ -15,12 +15,12 @@
<parent>
<artifactId>linuxtools-changelog-parent</artifactId>
<groupId>org.eclipse.linuxtools.changelog</groupId>
- <version>7.4.0</version>
+ <version>8.1.0</version>
</parent>
<artifactId>org.eclipse.linuxtools.changelog.java</artifactId>
<packaging>eclipse-feature</packaging>
- <version>7.4.0-SNAPSHOT</version>
+ <version>8.1.0-SNAPSHOT</version>
<name>Linux Tools ChangeLog Feature for Java</name>
diff --git a/changelog/org.eclipse.linuxtools.changelog.javaparser/.classpath b/changelog/org.eclipse.linuxtools.changelog.javaparser/.classpath
index 43b986286a9e5fd1828793fa4b2353d02ab8625f..1db08c6b4ce2fb50395b2f9c9a50c140a0bab199 100644
--- a/changelog/org.eclipse.linuxtools.changelog.javaparser/.classpath
+++ b/changelog/org.eclipse.linuxtools.changelog.javaparser/.classpath
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="target/classes"/>
diff --git a/changelog/org.eclipse.linuxtools.changelog.javaparser/.settings/org.eclipse.jdt.core.prefs b/changelog/org.eclipse.linuxtools.changelog.javaparser/.settings/org.eclipse.jdt.core.prefs
index b693e57d0901e5af02a81ce745b93c87b11ee58a..74720a961e4aac755612aec6c06496f3e085e071 100644
--- a/changelog/org.eclipse.linuxtools.changelog.javaparser/.settings/org.eclipse.jdt.core.prefs
+++ b/changelog/org.eclipse.linuxtools.changelog.javaparser/.settings/org.eclipse.jdt.core.prefs
@@ -6,9 +6,9 @@ org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annota
org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.compliance=11
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -23,6 +23,7 @@ org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=warning
org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
@@ -78,6 +79,7 @@ org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=warn
org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=warning
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
@@ -109,4 +111,5 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11
diff --git a/changelog/org.eclipse.linuxtools.changelog.javaparser/META-INF/MANIFEST.MF b/changelog/org.eclipse.linuxtools.changelog.javaparser/META-INF/MANIFEST.MF
index b9161a17816d2e15a12a84fbb1b485cb26711e19..b666d71c0a021bc6834fc9fa4745395755eb2196 100644
--- a/changelog/org.eclipse.linuxtools.changelog.javaparser/META-INF/MANIFEST.MF
+++ b/changelog/org.eclipse.linuxtools.changelog.javaparser/META-INF/MANIFEST.MF
@@ -6,7 +6,7 @@ Bundle-Version: 2.7.0.qualifier
Require-Bundle: org.eclipse.jdt.core;bundle-version="3.3.0",
org.eclipse.jdt.ui;bundle-version="3.3.0"
Bundle-Vendor: %Bundle-Vendor
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
Fragment-Host: org.eclipse.linuxtools.changelog.core;bundle-version="2.6.3"
Automatic-Module-Name: org.eclipse.linuxtools.changelog.parsers.java
diff --git a/changelog/org.eclipse.linuxtools.changelog.javaparser/pom.xml b/changelog/org.eclipse.linuxtools.changelog.javaparser/pom.xml
index b5df7d89aa199978b7a6d1fcd084702d843d7688..f9f688c5c0a6170c53203e27de7029424d89ed20 100644
--- a/changelog/org.eclipse.linuxtools.changelog.javaparser/pom.xml
+++ b/changelog/org.eclipse.linuxtools.changelog.javaparser/pom.xml
@@ -15,7 +15,7 @@
<parent>
<artifactId>linuxtools-changelog-parent</artifactId>
<groupId>org.eclipse.linuxtools.changelog</groupId>
- <version>7.4.0</version>
+ <version>8.1.0</version>
</parent>
<artifactId>org.eclipse.linuxtools.changelog.parsers.java</artifactId>
diff --git a/changelog/org.eclipse.linuxtools.changelog.tests/.classpath b/changelog/org.eclipse.linuxtools.changelog.tests/.classpath
index 43b986286a9e5fd1828793fa4b2353d02ab8625f..1db08c6b4ce2fb50395b2f9c9a50c140a0bab199 100644
--- a/changelog/org.eclipse.linuxtools.changelog.tests/.classpath
+++ b/changelog/org.eclipse.linuxtools.changelog.tests/.classpath
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="target/classes"/>
diff --git a/changelog/org.eclipse.linuxtools.changelog.tests/.settings/org.eclipse.jdt.core.prefs b/changelog/org.eclipse.linuxtools.changelog.tests/.settings/org.eclipse.jdt.core.prefs
index 89403a77994b785316070de748ba8557617d10d2..649554d9b3307e8870e94c442906bcfe4a4e8e83 100644
--- a/changelog/org.eclipse.linuxtools.changelog.tests/.settings/org.eclipse.jdt.core.prefs
+++ b/changelog/org.eclipse.linuxtools.changelog.tests/.settings/org.eclipse.jdt.core.prefs
@@ -6,8 +6,8 @@ org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annota
org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
+org.eclipse.jdt.core.compiler.compliance=11
org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
@@ -18,6 +18,7 @@ org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=warning
org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
@@ -61,6 +62,7 @@ org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=warn
org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
@@ -92,4 +94,5 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11
diff --git a/changelog/org.eclipse.linuxtools.changelog.tests/META-INF/MANIFEST.MF b/changelog/org.eclipse.linuxtools.changelog.tests/META-INF/MANIFEST.MF
index 42174e87b407a12ee3c2516caf2756da7fee06af..0b8f2271cabbe050593cba6ca5a67a93ee0cd6d6 100644
--- a/changelog/org.eclipse.linuxtools.changelog.tests/META-INF/MANIFEST.MF
+++ b/changelog/org.eclipse.linuxtools.changelog.tests/META-INF/MANIFEST.MF
@@ -9,7 +9,7 @@ Require-Bundle:
org.eclipse.jdt.ui,
org.junit;bundle-version="4.8.1"
Fragment-Host: org.eclipse.linuxtools.changelog.core
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
Bundle-ActivationPolicy: lazy
Import-Package: org.eclipse.cdt.core,
org.eclipse.cdt.core.model,
diff --git a/changelog/org.eclipse.linuxtools.changelog.tests/pom.xml b/changelog/org.eclipse.linuxtools.changelog.tests/pom.xml
index e417303eacc406d7d003f11a743a4540fff17d92..6ad37c1e224ccd32004a4ab33c5c7b0edf43f957 100644
--- a/changelog/org.eclipse.linuxtools.changelog.tests/pom.xml
+++ b/changelog/org.eclipse.linuxtools.changelog.tests/pom.xml
@@ -15,7 +15,7 @@
<parent>
<artifactId>linuxtools-changelog-parent</artifactId>
<groupId>org.eclipse.linuxtools.changelog</groupId>
- <version>7.4.0</version>
+ <version>8.1.0</version>
</parent>
<artifactId>org.eclipse.linuxtools.changelog.tests</artifactId>
diff --git a/changelog/org.eclipse.linuxtools.changelog.ui.tests/.classpath b/changelog/org.eclipse.linuxtools.changelog.ui.tests/.classpath
index 43b986286a9e5fd1828793fa4b2353d02ab8625f..1db08c6b4ce2fb50395b2f9c9a50c140a0bab199 100644
--- a/changelog/org.eclipse.linuxtools.changelog.ui.tests/.classpath
+++ b/changelog/org.eclipse.linuxtools.changelog.ui.tests/.classpath
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="target/classes"/>
diff --git a/changelog/org.eclipse.linuxtools.changelog.ui.tests/.settings/org.eclipse.jdt.core.prefs b/changelog/org.eclipse.linuxtools.changelog.ui.tests/.settings/org.eclipse.jdt.core.prefs
index f08a6e7a05eec34664f92a5736a542080c8d8914..d885a09e58b340584d56aadd56a0cd2f0bd863ed 100644
--- a/changelog/org.eclipse.linuxtools.changelog.ui.tests/.settings/org.eclipse.jdt.core.prefs
+++ b/changelog/org.eclipse.linuxtools.changelog.ui.tests/.settings/org.eclipse.jdt.core.prefs
@@ -6,9 +6,9 @@ org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annota
org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.compliance=11
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -22,6 +22,7 @@ org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=warning
org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
@@ -65,6 +66,7 @@ org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=warn
org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
@@ -96,4 +98,5 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11
diff --git a/changelog/org.eclipse.linuxtools.changelog.ui.tests/META-INF/MANIFEST.MF b/changelog/org.eclipse.linuxtools.changelog.ui.tests/META-INF/MANIFEST.MF
index 84565c82f080698337e11885f676baeb10ee5530..d5a5b2706e80da677949bc3844cbd8a9aebc8c99 100644
--- a/changelog/org.eclipse.linuxtools.changelog.ui.tests/META-INF/MANIFEST.MF
+++ b/changelog/org.eclipse.linuxtools.changelog.ui.tests/META-INF/MANIFEST.MF
@@ -9,5 +9,5 @@ Require-Bundle: org.eclipse.swtbot.go,
Fragment-Host: org.eclipse.linuxtools.changelog.core
Import-Package: org.eclipse.core.resources,
org.eclipse.jdt.core
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
Automatic-Module-Name: org.eclipse.linuxtools.changelog.ui.tests
diff --git a/changelog/org.eclipse.linuxtools.changelog.ui.tests/pom.xml b/changelog/org.eclipse.linuxtools.changelog.ui.tests/pom.xml
index 976a1ebbf180c05d98fff8ab7c740f4dfb159fe1..e1a1f305771432d39c4e82b93d7ae6268ac38b07 100644
--- a/changelog/org.eclipse.linuxtools.changelog.ui.tests/pom.xml
+++ b/changelog/org.eclipse.linuxtools.changelog.ui.tests/pom.xml
@@ -15,7 +15,7 @@
<parent>
<artifactId>linuxtools-changelog-parent</artifactId>
<groupId>org.eclipse.linuxtools.changelog</groupId>
- <version>7.4.0</version>
+ <version>8.1.0</version>
</parent>
<artifactId>org.eclipse.linuxtools.changelog.ui.tests</artifactId>
diff --git a/changelog/pom.xml b/changelog/pom.xml
index f6fae0e883b322e837f45b71bafb603e471f9736..0979807eded56eb561bca45a0eb602e6b56a0fa0 100644
--- a/changelog/pom.xml
+++ b/changelog/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.eclipse.linuxtools</groupId>
<artifactId>linuxtools-parent</artifactId>
- <version>7.4.0</version>
+ <version>8.1.0</version>
</parent>
<groupId>org.eclipse.linuxtools.changelog</groupId>
diff --git a/containers/org.eclipse.linuxtools.docker-feature/build.properties b/containers/org.eclipse.linuxtools.docker-feature/build.properties
index 155886c3eb07dbbac2b496e9d5590585c49296e9..ad437bffaea243f6524f890c6f3a4d22909b00aa 100644
--- a/containers/org.eclipse.linuxtools.docker-feature/build.properties
+++ b/containers/org.eclipse.linuxtools.docker-feature/build.properties
@@ -4,5 +4,4 @@ bin.includes = feature.xml,\
src.includes = feature.xml,\
feature.properties,\
build.properties,\
- .classpath,\
.project
diff --git a/containers/org.eclipse.linuxtools.docker-feature/feature.xml b/containers/org.eclipse.linuxtools.docker-feature/feature.xml
index d65a5874f0fec29186a5616f5fcafb685d53fbbd..b7ef3fac496dac25d944fe328ca9767a6052748a 100644
--- a/containers/org.eclipse.linuxtools.docker-feature/feature.xml
+++ b/containers/org.eclipse.linuxtools.docker-feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.linuxtools.docker.feature"
label="%featureName"
- version="4.4.0.qualifier"
+ version="5.1.0.qualifier"
provider-name="%featureProvider"
license-feature="org.eclipse.license"
license-feature-version="0.0.0">
@@ -23,6 +23,10 @@
<update label="Linux Tools Docker Update Site" url="http://download.eclipse.org/linuxtools/update-docker"/>
</url>
+ <includes
+ id="org.eclipse.linuxtools.docker.editor.ls.feature"
+ version="0.0.0"/>
+
<plugin
id="org.eclipse.linuxtools.docker.core"
download-size="0"
@@ -44,11 +48,4 @@
version="0.0.0"
unpack="false"/>
- <plugin
- id="org.eclipse.linuxtools.docker.editor"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
</feature>
diff --git a/containers/org.eclipse.linuxtools.docker-feature/pom.xml b/containers/org.eclipse.linuxtools.docker-feature/pom.xml
index 08b4c3976ed08e1b22f8192eae747300db4eb566..3eefe5c20c37945439bec897ff58e50d8c6b96ae 100644
--- a/containers/org.eclipse.linuxtools.docker-feature/pom.xml
+++ b/containers/org.eclipse.linuxtools.docker-feature/pom.xml
@@ -14,12 +14,12 @@
<parent>
<groupId>org.eclipse.linuxtools</groupId>
<artifactId>org.eclipse.linuxtools.docker</artifactId>
- <version>4.4.0</version>
+ <version>5.1.0</version>
</parent>
<artifactId>org.eclipse.linuxtools.docker.feature</artifactId>
<packaging>eclipse-feature</packaging>
- <version>4.4.0-SNAPSHOT</version>
+ <version>5.1.0-SNAPSHOT</version>
<name>Linux Tools Docker Tooling Feature</name>
diff --git a/containers/org.eclipse.linuxtools.docker.core/.classpath b/containers/org.eclipse.linuxtools.docker.core/.classpath
index cf36b561195a3e4e3849ff022040558ccc6c3074..bc57d2383d545884b89334a8dd1293afd4316f5d 100644
--- a/containers/org.eclipse.linuxtools.docker.core/.classpath
+++ b/containers/org.eclipse.linuxtools.docker.core/.classpath
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src/"/>
<classpathentry kind="output" path="target/classes"/>
diff --git a/containers/org.eclipse.linuxtools.docker.core/.settings/org.eclipse.jdt.core.prefs b/containers/org.eclipse.linuxtools.docker.core/.settings/org.eclipse.jdt.core.prefs
index e6aabf54ea677641b2367317800f367eda6a5e44..fb282c74ede02769de9c1d72a5217c210b04fa75 100644
--- a/containers/org.eclipse.linuxtools.docker.core/.settings/org.eclipse.jdt.core.prefs
+++ b/containers/org.eclipse.linuxtools.docker.core/.settings/org.eclipse.jdt.core.prefs
@@ -7,9 +7,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nul
org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.compliance=11
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -24,6 +24,7 @@ org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore
org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
@@ -80,6 +81,7 @@ org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=warn
org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
@@ -112,7 +114,8 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11
org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
diff --git a/containers/org.eclipse.linuxtools.docker.core/.settings/org.eclipse.jdt.ui.prefs b/containers/org.eclipse.linuxtools.docker.core/.settings/org.eclipse.jdt.ui.prefs
index 446b847248fe18b33c39bc69cb039342f8d63727..51b731035da2f7969efe45a45e47e2eff46c1231 100644
--- a/containers/org.eclipse.linuxtools.docker.core/.settings/org.eclipse.jdt.ui.prefs
+++ b/containers/org.eclipse.linuxtools.docker.core/.settings/org.eclipse.jdt.ui.prefs
@@ -15,31 +15,40 @@ sp_cleanup.always_use_blocks=true
sp_cleanup.always_use_parentheses_in_expressions=false
sp_cleanup.always_use_this_for_non_static_field_access=false
sp_cleanup.always_use_this_for_non_static_method_access=false
-sp_cleanup.convert_functional_interfaces=false
+sp_cleanup.convert_functional_interfaces=true
sp_cleanup.convert_to_enhanced_for_loop=false
+sp_cleanup.convert_to_enhanced_for_loop_if_loop_var_used=false
sp_cleanup.correct_indentation=false
sp_cleanup.format_source_code=true
sp_cleanup.format_source_code_changes_only=true
sp_cleanup.insert_inferred_type_arguments=false
+sp_cleanup.lazy_logical_operator=false
sp_cleanup.make_local_variable_final=true
sp_cleanup.make_parameters_final=false
sp_cleanup.make_private_fields_final=true
sp_cleanup.make_type_abstract_if_missing_method=false
sp_cleanup.make_variable_declarations_final=false
+sp_cleanup.merge_conditional_blocks=false
sp_cleanup.never_use_blocks=false
sp_cleanup.never_use_parentheses_in_expressions=true
+sp_cleanup.number_suffix=false
+sp_cleanup.objects_equals=false
sp_cleanup.on_save_use_additional_actions=true
sp_cleanup.organize_imports=true
+sp_cleanup.push_down_negation=false
sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
sp_cleanup.qualify_static_member_accesses_with_declaring_class=false
sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
sp_cleanup.remove_private_constructors=true
+sp_cleanup.remove_redundant_modifiers=true
+sp_cleanup.remove_redundant_semicolons=true
sp_cleanup.remove_redundant_type_arguments=true
-sp_cleanup.remove_trailing_whitespaces=false
+sp_cleanup.remove_trailing_whitespaces=true
sp_cleanup.remove_trailing_whitespaces_all=true
sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
+sp_cleanup.remove_unnecessary_array_creation=true
sp_cleanup.remove_unnecessary_casts=true
sp_cleanup.remove_unnecessary_nls_tags=false
sp_cleanup.remove_unused_imports=false
@@ -48,11 +57,14 @@ sp_cleanup.remove_unused_private_fields=true
sp_cleanup.remove_unused_private_members=false
sp_cleanup.remove_unused_private_methods=true
sp_cleanup.remove_unused_private_types=true
+sp_cleanup.simplify_lambda_expression_and_method_ref=true
sp_cleanup.sort_members=false
sp_cleanup.sort_members_all=false
sp_cleanup.use_anonymous_class_creation=false
+sp_cleanup.use_autoboxing=false
sp_cleanup.use_blocks=false
sp_cleanup.use_blocks_only_for_return_and_throw=false
+sp_cleanup.use_directly_map_method=true
sp_cleanup.use_lambda=true
sp_cleanup.use_parentheses_in_expressions=false
sp_cleanup.use_this_for_non_static_field_access=false
@@ -60,3 +72,5 @@ sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
sp_cleanup.use_this_for_non_static_method_access=false
sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
sp_cleanup.use_type_arguments=false
+sp_cleanup.use_unboxing=false
+sp_cleanup.use_var=false
diff --git a/containers/org.eclipse.linuxtools.docker.core/META-INF/MANIFEST.MF b/containers/org.eclipse.linuxtools.docker.core/META-INF/MANIFEST.MF
index 4c06d09e5062256acbb562ca964f0f4b02b52888..d7221c920c3f5690ce433b23844fd3ee85df83c8 100644
--- a/containers/org.eclipse.linuxtools.docker.core/META-INF/MANIFEST.MF
+++ b/containers/org.eclipse.linuxtools.docker.core/META-INF/MANIFEST.MF
@@ -2,31 +2,35 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Docker Core Plugin
Bundle-SymbolicName: org.eclipse.linuxtools.docker.core;singleton:=true
-Bundle-Version: 4.4.0.qualifier
+Bundle-Version: 5.1.0.qualifier
Bundle-Activator: org.eclipse.linuxtools.docker.core.Activator
Bundle-Vendor: Eclipse Linux Tools
Require-Bundle: org.eclipse.core.runtime;bundle-version="3.12.0",
org.eclipse.core.resources;bundle-version="3.9.0",
- com.google.guava;bundle-version="21.0.0",
+ com.google.guava;bundle-version="27.1.0",
org.eclipse.equinox.registry;bundle-version="0.0.0",
org.eclipse.equinox.security,
org.eclipse.osgi,
- com.spotify.docker.client;bundle-version="[8.9.2,9.0.0)",
- com.github.jnr.unixsocket;bundle-version="0.4.0",
- com.github.jnr.enxio;bundle-version="0.5.0",
- org.glassfish.jersey.core.jersey-client;bundle-version="2.14.0",
- org.glassfish.jersey.media.jersey-media-json-jackson;bundle-version="2.14.0",
- org.glassfish.jersey.core.jersey-common;bundle-version="2.14.0",
+ org.mandas.docker-client;bundle-version="3.2.1",
+ com.github.jnr.unixsocket;bundle-version="0.28.0",
+ com.github.jnr.enxio;bundle-version="0.25.0",
+ org.glassfish.jersey.core.jersey-client;bundle-version="2.30.1",
+ org.glassfish.jersey.media.jersey-media-json-jackson;bundle-version="2.30.1",
+ org.glassfish.jersey.core.jersey-common;bundle-version="2.30.1",
+ org.glassfish.jersey.containers.servlet;bundle-version="2.3.0.1",
+ org.glassfish.jersey.inject.jersey-hk2;bundle-version="2.3.0.1",
org.eclipse.tm.terminal.view.core;bundle-version="4.0.0",
org.eclipse.debug.core;bundle-version="3.10.100",
- javax.xml.bind;bundle-version="2.2.0",
- javax.xml.stream;bundle-version="1.0.1"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+ javax.annotation;bundle-version="1.3.5",
+ org.apache.httpcomponents.httpcore;bundle-version="4.4.12",
+ org.apache.httpcomponents.httpclient;bundle-version="4.5.10"
+Bundle-RequiredExecutionEnvironment: JavaSE-11
Bundle-ActivationPolicy: lazy
Export-Package: org.eclipse.linuxtools.docker.core,
org.eclipse.linuxtools.internal.docker.core;x-friends:="org.eclipse.linuxtools.docker.ui,org.eclipse.linuxtools.docker.ui.tests,org.eclipse.linuxtools.docker.integration.tests"
-Import-Package: com.fasterxml.jackson.annotation;version="2.5.0",
+Import-Package: com.fasterxml.jackson.annotation;version="2.10.3",
javax.ws.rs;version="2.0.1",
javax.ws.rs.core;version="2.0.1",
+ javax.xml.bind;version="2.3.3",
javax.ws.rs.client;version="2.0.1"
Automatic-Module-Name: org.eclipse.linuxtools.docker.core
diff --git a/containers/org.eclipse.linuxtools.docker.core/pom.xml b/containers/org.eclipse.linuxtools.docker.core/pom.xml
index 76968663849851df1c1ac0bb192a5c672136f768..698d4524d4d460a7bcb10bdc0c58e8b3d556b47a 100644
--- a/containers/org.eclipse.linuxtools.docker.core/pom.xml
+++ b/containers/org.eclipse.linuxtools.docker.core/pom.xml
@@ -4,10 +4,10 @@
<parent>
<groupId>org.eclipse.linuxtools</groupId>
<artifactId>org.eclipse.linuxtools.docker</artifactId>
- <version>4.4.0</version>
+ <version>5.1.0</version>
</parent>
<artifactId>org.eclipse.linuxtools.docker.core</artifactId>
<packaging>eclipse-plugin</packaging>
- <version>4.4.0-SNAPSHOT</version>
+ <version>5.1.0-SNAPSHOT</version>
</project>
diff --git a/containers/org.eclipse.linuxtools.docker.core/resources/script-macosx.sh b/containers/org.eclipse.linuxtools.docker.core/resources/script-macosx.sh
index 049a0d59313cfca7f000b5d9207b38942f8070c6..c60d0df0ee89bc403fe2eae50e3fa75a05f8c0d7 100755
--- a/containers/org.eclipse.linuxtools.docker.core/resources/script-macosx.sh
+++ b/containers/org.eclipse.linuxtools.docker.core/resources/script-macosx.sh
@@ -1,2 +1,2 @@
#!/usr/bin/env sh
-$SHELL -i -l -c "env | grep DOCKER"
+$SHELL -l -c "env | grep DOCKER"
diff --git a/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/docker/core/AbstractRegistry.java b/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/docker/core/AbstractRegistry.java
index 8509f1788e850a7dabee24c78f61a5558488d300..7655a97a76fb535402e2ad78a22d15754852482b 100644
--- a/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/docker/core/AbstractRegistry.java
+++ b/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/docker/core/AbstractRegistry.java
@@ -1,6 +1,6 @@
/*******************************************************************************
- * Copyright (c) 2016, 2018 Red Hat.
- *
+ * Copyright (c) 2016, 2020 Red Hat.
+ *
* This program and the accompanying materials are made
* available under the terms of the Eclipse Public License 2.0
* which is available at https://www.eclipse.org/legal/epl-2.0/
@@ -41,9 +41,8 @@ import org.eclipse.linuxtools.internal.docker.core.RepositoryTagV2;
import org.eclipse.osgi.util.NLS;
import org.glassfish.jersey.client.ClientConfig;
import org.glassfish.jersey.jackson.JacksonFeature;
-
-import com.spotify.docker.client.ObjectMapperProvider;
-import com.spotify.docker.client.messages.ImageSearchResult;
+import org.mandas.docker.client.ObjectMapperProvider;
+import org.mandas.docker.client.messages.ImageSearchResult;
/**
* @since 2.0
@@ -69,7 +68,7 @@ public abstract class AbstractRegistry implements IRegistry {
public abstract String getServerAddress();
/**
- *
+ *
* @return the server host (and optional port) to prepend to an image name
* when pushing or pulling
*/
@@ -139,7 +138,7 @@ public abstract class AbstractRegistry implements IRegistry {
WebTarget queryImagesResource;
if (isVersion2()) {
- final GenericType<ImageSearchResultV2> IMAGE_SEARCH_RESULT_LIST = new GenericType<ImageSearchResultV2>() {
+ final GenericType<ImageSearchResultV2> IMAGE_SEARCH_RESULT_LIST = new GenericType<>() {
};
ImageSearchResultV2 cisr = null;
queryImagesResource = client.target(getHTTPServerAddress())
@@ -161,7 +160,7 @@ public abstract class AbstractRegistry implements IRegistry {
.collect(Collectors.toList()));
} else {
ImageSearchResultV1 pisr = null;
- final GenericType<ImageSearchResultV1> IMAGE_SEARCH_RESULT_LIST = new GenericType<ImageSearchResultV1>() {
+ final GenericType<ImageSearchResultV1> IMAGE_SEARCH_RESULT_LIST = new GenericType<>() {
};
int page = 0;
try {
@@ -211,7 +210,7 @@ public abstract class AbstractRegistry implements IRegistry {
/**
* Retrieves the list of tags for a given repository, assuming that the
* target registry is Docker Hub.
- *
+ *
* @param client
* the client to use
* @param repository
@@ -300,7 +299,7 @@ public abstract class AbstractRegistry implements IRegistry {
/**
* Retrieves the list of tags for a given repository, assuming that the
* target registry is a registry v2 instance.
- *
+ *
* @param client
* the client to use
* @param repository
@@ -316,7 +315,7 @@ public abstract class AbstractRegistry implements IRegistry {
private List<IRepositoryTag> retrieveTagsFromRegistryV1(final Client client,
final String repository)
throws InterruptedException, ExecutionException {
- final GenericType<Map<String, String>> REPOSITORY_TAGS_RESULT_LIST = new GenericType<Map<String, String>>() {
+ final GenericType<Map<String, String>> REPOSITORY_TAGS_RESULT_LIST = new GenericType<>() {
};
final WebTarget queryTagsResource = client
.target(getHTTPServerAddress()).path("v1") //$NON-NLS-1$
@@ -330,7 +329,7 @@ public abstract class AbstractRegistry implements IRegistry {
/**
* Retrieves the list of tags for a given repository, assuming that the
* target registry is a registry v1 instance.
- *
+ *
* @param client
* the client to use
* @param repository
@@ -346,7 +345,7 @@ public abstract class AbstractRegistry implements IRegistry {
private List<IRepositoryTag> retrieveTagsFromRegistryV2(final Client client,
final String repository)
throws InterruptedException, ExecutionException {
- final GenericType<RepositoryTagV2> REPOSITORY_TAGS_RESULT_LIST = new GenericType<RepositoryTagV2>() {
+ final GenericType<RepositoryTagV2> REPOSITORY_TAGS_RESULT_LIST = new GenericType<>() {
};
final WebTarget queryTagsResource = client
.target(getHTTPServerAddress()).path("v2") //$NON-NLS-1$
diff --git a/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/docker/core/DockerException.java b/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/docker/core/DockerException.java
index 57f7ded010c2fd465f10adc598e0d1cef2da393d..12fad3b963ed3dde31fad6dc7bc5f2a8e54ea882 100644
--- a/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/docker/core/DockerException.java
+++ b/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/docker/core/DockerException.java
@@ -1,6 +1,6 @@
/*******************************************************************************
- * Copyright (c) 2014, 2018 Red Hat.
- *
+ * Copyright (c) 2014, 2020 Red Hat and others.
+ *
* This program and the accompanying materials are made
* available under the terms of the Eclipse Public License 2.0
* which is available at https://www.eclipse.org/legal/epl-2.0/
@@ -12,38 +12,65 @@
*******************************************************************************/
package org.eclipse.linuxtools.docker.core;
+import org.mandas.docker.client.exceptions.DockerRequestException;
+
public class DockerException extends Exception {
private static final long serialVersionUID = 1L;
- private String JSON_MESSAGE_PREFIX = "{\"message\":\""; //$NON-NLS-1$
- private String JSON_MESSAGE_SUFFIX = "\"}"; //$NON-NLS-1$
+ private static String JSON_MESSAGE_PREFIX = "{\"message\":\""; //$NON-NLS-1$
+ private static String JSON_MESSAGE_SUFFIX = "\"}"; //$NON-NLS-1$
public DockerException(final String message) {
super(message);
}
public DockerException(final String message, final Throwable cause) {
- super(message, cause);
+ super(calculateMessage(message, cause), cause);
}
public DockerException(final Throwable cause) {
- super(cause);
+ super(calculateMessage(null, cause), cause);
}
@Override
public String getMessage() {
- String s = super.getMessage();
- // Bug 499917 - temporarily massage any message we get back from docker
- // client if it is in JSON format. This code can be removed once docker
- // client has fixed itself to work with error messages from docker
- // 1.12.0 and beyond.
- if (s.startsWith(JSON_MESSAGE_PREFIX)) {
- s = s.substring(JSON_MESSAGE_PREFIX.length());
- s = s.replaceAll(JSON_MESSAGE_SUFFIX, ""); //$NON-NLS-1$
- return s;
- }
return super.getMessage();
}
+ static private String calculateMessage(final String message, final Throwable cause) {
+ Throwable dre = cause;
+ // Search for DockerRequestException
+ while (dre != null && !(dre instanceof DockerRequestException)) {
+ dre = dre.getCause();
+ }
+
+ // Handle DockerRequestException
+ if (dre != null) {
+ // Bug 499917 - temporarily massage any message we get back from
+ // docker client if it is in JSON format. This code can be removed
+ // once docker client has fixed itself to work with error messages
+ // from docker 1.12.0 and beyond.
+ DockerRequestException re = (DockerRequestException) dre;
+ String s = re.getResponseBody();
+ if (s.startsWith(JSON_MESSAGE_PREFIX)) {
+ s = s.substring(JSON_MESSAGE_PREFIX.length());
+ s = s.replaceAll(JSON_MESSAGE_SUFFIX, ""); //$NON-NLS-1$
+ if (message != null) {
+ return message + "; " + s;
+ } else {
+ return s;
+ }
+ }
+ }
+
+ // As it's not possible to select the super-constructor Throwable's
+ // behavior must be simulated
+ if ((message == null) && (cause != null)) {
+ return cause.toString();
+ } else {
+ return message;
+ }
+ }
+
}
diff --git a/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/docker/core/IDockerConnection.java b/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/docker/core/IDockerConnection.java
index fcc164911e47007358422f92417480d32e37271c..364e0e86cdecaa8bd79b7d476f9fc0997224116a 100644
--- a/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/docker/core/IDockerConnection.java
+++ b/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/docker/core/IDockerConnection.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2014, 2018 Red Hat.
+ * Copyright (c) 2014, 2020 Red Hat.
*
* This program and the accompanying materials are made
* available under the terms of the Eclipse Public License 2.0
@@ -23,7 +23,7 @@ import org.eclipse.linuxtools.internal.docker.core.DockerContainerRefreshManager
import org.eclipse.linuxtools.internal.docker.core.TCPConnectionSettings;
import org.eclipse.linuxtools.internal.docker.core.UnixSocketConnectionSettings;
-import com.spotify.docker.client.exceptions.DockerCertificateException;
+import org.mandas.docker.client.exceptions.DockerCertificateException;
public interface IDockerConnection {
diff --git a/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/docker/core/IDockerConnectionInfo.java b/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/docker/core/IDockerConnectionInfo.java
index 88c975dcb60143e8dd698ab87fc04e00b29cb65a..c5ef0bac1f7edf2188d953b9886a38ab2db273a9 100644
--- a/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/docker/core/IDockerConnectionInfo.java
+++ b/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/docker/core/IDockerConnectionInfo.java
@@ -1,6 +1,6 @@
/*******************************************************************************
- * Copyright (c) 2016, 2018 Red Hat.
- *
+ * Copyright (c) 2016, 2020 Red Hat.
+ *
* This program and the accompanying materials are made
* available under the terms of the Eclipse Public License 2.0
* which is available at https://www.eclipse.org/legal/epl-2.0/
@@ -40,12 +40,14 @@ public interface IDockerConnectionInfo {
* @return the DockerRootDir
*/
String getDockerRootDir();
-
+
/**
* @return the executionDriver
+ * @deprecated this will be removed in Docker Tooling 5.0.0
*/
+ @Deprecated
String getExecutionDriver();
-
+
/**
* @return the fileDescriptors
*/
@@ -70,17 +72,17 @@ public interface IDockerConnectionInfo {
* @return the initSha1
*/
String getInitSha1();
-
+
/**
* @return the IndexServerAddress
*/
String getIndexServerAddress();
-
+
/**
* @return the IPv4Forwarding flag
*/
boolean isIPv4Forwarding();
-
+
/**
* @return the kernelVersion
*/
@@ -90,7 +92,7 @@ public interface IDockerConnectionInfo {
* @return the Labels
*/
List<String> getLabels();
-
+
/**
* @return number of CPUs
*/
@@ -100,17 +102,17 @@ public interface IDockerConnectionInfo {
* @return total memory
*/
long getTotalMemory();
-
+
/**
* @return VM name
*/
String getName();
-
+
/**
* @return VM ID
*/
String getId();
-
+
/**
* @return the storageDriver
*/
diff --git a/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/docker/core/IDockerContainerExit.java b/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/docker/core/IDockerContainerExit.java
index b895258090d59a52aab117ccbc72b62e3c5f3255..93d11619ee69f65934c308a5777296d4ee79fa2b 100644
--- a/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/docker/core/IDockerContainerExit.java
+++ b/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/docker/core/IDockerContainerExit.java
@@ -1,6 +1,6 @@
/*******************************************************************************
- * Copyright (c) 2014, 2018 Red Hat.
- *
+ * Copyright (c) 2014, 2020 Red Hat.
+ *
* This program and the accompanying materials are made
* available under the terms of the Eclipse Public License 2.0
* which is available at https://www.eclipse.org/legal/epl-2.0/
diff --git a/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/docker/core/IDockerContainerInfo.java b/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/docker/core/IDockerContainerInfo.java
index ff05b7d345e112fc083a67a9475f4ecfa8909d69..65aa178c6d816e1953a74349081ecdc6b66bed85 100644
--- a/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/docker/core/IDockerContainerInfo.java
+++ b/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/docker/core/IDockerContainerInfo.java
@@ -1,6 +1,6 @@
/*******************************************************************************
- * Copyright (c) 2015, 2018 Red Hat.
- *
+ * Copyright (c) 2015, 2020 Red Hat.
+ *
* This program and the accompanying materials are made
* available under the terms of the Eclipse Public License 2.0
* which is available at https://www.eclipse.org/legal/epl-2.0/
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.launch.tests/src/org/eclipse/linuxtools/oprofile/launch/tests/AllLaunchTests.java b/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/docker/core/IDockerContainerInfo2.java
similarity index 50%
rename from oprofile/org.eclipse.linuxtools.oprofile.launch.tests/src/org/eclipse/linuxtools/oprofile/launch/tests/AllLaunchTests.java
rename to containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/docker/core/IDockerContainerInfo2.java
index ade92644e07f3f650534e8e4e7c7bdf67ad2047d..3ec2898214dea5b84046af8c93c33dd3a2ddc390 100644
--- a/oprofile/org.eclipse.linuxtools.oprofile.launch.tests/src/org/eclipse/linuxtools/oprofile/launch/tests/AllLaunchTests.java
+++ b/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/docker/core/IDockerContainerInfo2.java
@@ -1,6 +1,6 @@
/*******************************************************************************
- * Copyright (c) 2009, 2018 Red Hat, Inc.
- *
+ * Copyright (c) 2020 Red Hat.
+ *
* This program and the accompanying materials are made
* available under the terms of the Eclipse Public License 2.0
* which is available at https://www.eclipse.org/legal/epl-2.0/
@@ -8,15 +8,19 @@
* SPDX-License-Identifier: EPL-2.0
*
* Contributors:
- * Kent Sebastian <ksebasti@redhat.com> - initial API and implementation
+ * Red Hat - Initial Contribution
*******************************************************************************/
-package org.eclipse.linuxtools.oprofile.launch.tests;
+package org.eclipse.linuxtools.docker.core;
+
+import java.util.List;
+
+/**
+ * @since 4.7
+ * @author jjohnstn
+ *
+ */
+public interface IDockerContainerInfo2 {
+
+ List<IDockerContainerMount> mounts();
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
-@RunWith(Suite.class)
-@Suite.SuiteClasses({
- TestLaunching.class, TestSetup.class, TestLaunchingExternalProject.class
-})
-public class AllLaunchTests {
}
diff --git a/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/docker/core/IDockerContainerMount.java b/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/docker/core/IDockerContainerMount.java
new file mode 100644
index 0000000000000000000000000000000000000000..28fa894eb709da34f75352b6f94c861d607f4eab
--- /dev/null
+++ b/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/docker/core/IDockerContainerMount.java
@@ -0,0 +1,37 @@
+/*******************************************************************************
+ * Copyright (c) 2020 Red Hat.
+ *
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ * Red Hat - Initial Contribution
+ *******************************************************************************/
+package org.eclipse.linuxtools.docker.core;
+
+/**
+ * @since 4.7
+ *
+ */
+public interface IDockerContainerMount {
+
+ String type();
+
+ String name();
+
+ String source();
+
+ String destination();
+
+ String driver();
+
+ String mode();
+
+ Boolean rw();
+
+ String propagation();
+
+}
diff --git a/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/docker/core/IDockerContainerState.java b/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/docker/core/IDockerContainerState.java
index 571aef1261213505046d69107c7ef2c844c39f63..c33182f5fd6b95bdddacf137dbf121b59e29339d 100644
--- a/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/docker/core/IDockerContainerState.java
+++ b/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/docker/core/IDockerContainerState.java
@@ -1,6 +1,6 @@
/*******************************************************************************
- * Copyright (c) 2014, 2018 Red Hat.
- *
+ * Copyright (c) 2014, 2020 Red Hat.
+ *
* This program and the accompanying materials are made
* available under the terms of the Eclipse Public License 2.0
* which is available at https://www.eclipse.org/legal/epl-2.0/
diff --git a/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/ContainerFileProxy.java b/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/ContainerFileProxy.java
index 207625f141691f67889011ac72642b7aefad0198..95d1246e40e622570ae0a182587c7f62129234e4 100644
--- a/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/ContainerFileProxy.java
+++ b/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/ContainerFileProxy.java
@@ -1,6 +1,6 @@
/*******************************************************************************
- * Copyright (c) 2016, 2018 Red Hat.
- *
+ * Copyright (c) 2016, 2020 Red Hat.
+ *
* This program and the accompanying materials are made
* available under the terms of the Eclipse Public License 2.0
* which is available at https://www.eclipse.org/legal/epl-2.0/
@@ -12,11 +12,14 @@
*******************************************************************************/
package org.eclipse.linuxtools.internal.docker.core;
+import org.eclipse.core.runtime.Path;
+
public class ContainerFileProxy {
private final String path;
private final String name;
private final String link;
+ private final String target;
private final boolean isFolder;
private final boolean isLink;
@@ -26,7 +29,8 @@ public class ContainerFileProxy {
this.name = name;
this.isFolder = isFolder;
this.isLink = false;
- this.link = this.path;
+ this.link = null;
+ this.target = this.path;
}
public ContainerFileProxy(String directory, String name, boolean isFolder,
@@ -35,7 +39,10 @@ public class ContainerFileProxy {
this.name = name;
this.isFolder = isFolder;
this.isLink = isLink;
- this.link = (link == null ? this.path : link);
+ this.link = link;
+ this.target = (link.startsWith("/") ? link
+ : new Path(this.path).removeLastSegments(1).append(link)
+ .toPortableString());
}
public String getFullPath() {
@@ -60,6 +67,10 @@ public class ContainerFileProxy {
return link;
}
+ public String getTarget() {
+ return target;
+ }
+
public String getName() {
return name;
}
diff --git a/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/DefaultDockerConnectionSettingsFinder.java b/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/DefaultDockerConnectionSettingsFinder.java
index 63192cfc9b992d13c12c11d54de0fc00ef509372..61fbc15c08bcb2797a88c0ecd3a01e1abddd2d06 100644
--- a/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/DefaultDockerConnectionSettingsFinder.java
+++ b/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/DefaultDockerConnectionSettingsFinder.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2015, 2018 Red Hat.
+ * Copyright (c) 2015, 2020 Red Hat.
*
* This program and the accompanying materials are made
* available under the terms of the Eclipse Public License 2.0
@@ -35,8 +35,8 @@ import org.eclipse.linuxtools.docker.core.IDockerConnectionSettings;
import org.eclipse.linuxtools.docker.core.IDockerConnectionSettingsFinder;
import org.eclipse.linuxtools.docker.core.IDockerConnectionSettingsProvider;
-import com.spotify.docker.client.DockerClient;
-import com.spotify.docker.client.exceptions.DockerCertificateException;
+import org.mandas.docker.client.DockerClient;
+import org.mandas.docker.client.exceptions.DockerCertificateException;
/**
* A utility class that looks for candidate {@link IDockerConnection}s on the
@@ -80,7 +80,7 @@ public class DefaultDockerConnectionSettingsFinder
return client.info().name();
}
} catch (DockerCertificateException
- | com.spotify.docker.client.exceptions.DockerException
+ | org.mandas.docker.client.exceptions.DockerException
| InterruptedException e) {
// ignore and return null
}
diff --git a/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/DockerBlkioDeviceRate.java b/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/DockerBlkioDeviceRate.java
index 5699f1f48e5fdaeeb6fa7e3d03ba781417d66cd1..7652f49a0dbaad7fc401ca4e165a497f7678b606 100644
--- a/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/DockerBlkioDeviceRate.java
+++ b/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/DockerBlkioDeviceRate.java
@@ -1,8 +1,20 @@
+/*******************************************************************************
+ * Copyright (c) 2020 Red Hat.
+ *
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ * Red Hat - Initial Contribution
+ *******************************************************************************/
package org.eclipse.linuxtools.internal.docker.core;
import org.eclipse.linuxtools.docker.core.IDockerBlkioDeviceRate;
-import com.spotify.docker.client.messages.HostConfig.BlkioDeviceRate;
+import org.mandas.docker.client.messages.HostConfig.BlkioDeviceRate;
public class DockerBlkioDeviceRate implements IDockerBlkioDeviceRate {
diff --git a/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/DockerBlkioWeightDevice.java b/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/DockerBlkioWeightDevice.java
index b9306aff53f6820b12122bd8062611b1a3ffc8d4..7663375d1d50ef44e95abf651dd2961fe9e04065 100644
--- a/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/DockerBlkioWeightDevice.java
+++ b/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/DockerBlkioWeightDevice.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2019 Red Hat.
+ * Copyright (c) 2020 Red Hat.
*
* This program and the accompanying materials are made
* available under the terms of the Eclipse Public License 2.0
@@ -14,7 +14,7 @@ package org.eclipse.linuxtools.internal.docker.core;
import org.eclipse.linuxtools.docker.core.IDockerBlkioWeightDevice;
-import com.spotify.docker.client.messages.HostConfig.BlkioWeightDevice;
+import org.mandas.docker.client.messages.HostConfig.BlkioWeightDevice;
public class DockerBlkioWeightDevice implements IDockerBlkioWeightDevice {
diff --git a/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/DockerClientFactory.java b/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/DockerClientFactory.java
index e79f40060a69f9531a51617f9226179e8f92f5d3..dd53622dfacb78f43b331fa0c6a43f480555ee8f 100644
--- a/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/DockerClientFactory.java
+++ b/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/DockerClientFactory.java
@@ -1,6 +1,6 @@
/*******************************************************************************
- * Copyright (c) 2015, 2018 Red Hat.
- *
+ * Copyright (c) 2015, 2020 Red Hat.
+ *
* This program and the accompanying materials are made
* available under the terms of the Eclipse Public License 2.0
* which is available at https://www.eclipse.org/legal/epl-2.0/
@@ -13,19 +13,24 @@
package org.eclipse.linuxtools.internal.docker.core;
+import static java.util.Collections.singletonMap;
+
import java.io.File;
import java.net.URI;
import org.eclipse.linuxtools.docker.core.IDockerConnectionSettings;
import org.eclipse.linuxtools.docker.core.IDockerConnectionSettings.BindingType;
import org.eclipse.linuxtools.docker.core.IRegistryAccount;
+import org.mandas.docker.client.DefaultDockerClient;
+import org.mandas.docker.client.DefaultDockerClient.Builder;
+import org.mandas.docker.client.DockerCertificates;
+import org.mandas.docker.client.DockerClient;
+import org.mandas.docker.client.auth.FixedRegistryAuthSupplier;
+import org.mandas.docker.client.exceptions.DockerCertificateException;
+import org.mandas.docker.client.messages.RegistryAuth;
+import org.mandas.docker.client.messages.RegistryConfigs;
-import com.spotify.docker.client.DefaultDockerClient;
-import com.spotify.docker.client.DefaultDockerClient.Builder;
-import com.spotify.docker.client.DockerCertificates;
-import com.spotify.docker.client.DockerClient;
-import com.spotify.docker.client.exceptions.DockerCertificateException;
-import com.spotify.docker.client.messages.RegistryAuth;
+import com.google.common.base.MoreObjects;
/**
* Factory for {@link DockerClient}. Decoupling from {@link DockerConnection}
@@ -36,7 +41,7 @@ public class DockerClientFactory {
/**
* Creates a new {@link DockerClient} from the given
* {@link IDockerConnectionSettings}.
- *
+ *
* @param connectionSettings
* the connection settings
* @return the {@link DockerClient}
@@ -52,7 +57,7 @@ public class DockerClientFactory {
/**
* Creates a new {@link DockerClient} from the given
* {@link IDockerConnectionSettings}.
- *
+ *
* @param connectionSettings
* the connection settings
* @return the {@link DockerClient} or <code>null</code> if the connection
@@ -92,7 +97,14 @@ public class DockerClientFactory {
}
if (registryAccount != null) {
- builder.registryAuth(buildAuthentication(registryAccount));
+ // mimic spotify:
+ // https://github.com/spotify/docker-client/blob/master/src/main/java/com/spotify/docker/client/DefaultDockerClient.java#L3140
+ RegistryAuth registryAuth = buildAuthentication(registryAccount);
+ final RegistryConfigs configs = RegistryConfigs.create(singletonMap(
+ MoreObjects.firstNonNull(registryAuth.serverAddress(), ""),
+ registryAuth));
+ builder.registryAuthSupplier(
+ new FixedRegistryAuthSupplier(registryAuth, configs));
}
return builder.build();
}
diff --git a/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/DockerConfParameter.java b/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/DockerConfParameter.java
index e0a9cacbcaaababefa876df7d0778a08fd43c8e3..5f8f3a67fdec9c9c1e1bcd2c1864960e630e562f 100644
--- a/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/DockerConfParameter.java
+++ b/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/DockerConfParameter.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2014, 2018 Red Hat.
+ * Copyright (c) 2014, 2020 Red Hat.
*
* This program and the accompanying materials are made
* available under the terms of the Eclipse Public License 2.0
@@ -14,7 +14,7 @@ package org.eclipse.linuxtools.internal.docker.core;
import org.eclipse.linuxtools.docker.core.IDockerConfParameter;
-import com.spotify.docker.client.messages.HostConfig.LxcConfParameter;
+import org.mandas.docker.client.messages.HostConfig.LxcConfParameter;
public class DockerConfParameter implements IDockerConfParameter {
diff --git a/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/DockerConnection.java b/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/DockerConnection.java
index 07bef1e64af138afcd9caaa5ce3c46440cd9db49..7d8862a63ad0f330876a06b81e75d54b119e3d7a 100644
--- a/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/DockerConnection.java
+++ b/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/DockerConnection.java
@@ -1,6 +1,6 @@
/*******************************************************************************
- * Copyright (c) 2014, 2018 Red Hat Inc. and others.
- *
+ * Copyright (c) 2014, 2020 Red Hat Inc. and others.
+ *
* This program and the accompanying materials are made
* available under the terms of the Eclipse Public License 2.0
* which is available at https://www.eclipse.org/legal/epl-2.0/
@@ -35,6 +35,8 @@ import java.util.Map;
import java.util.Map.Entry;
import java.util.Set;
import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
import javax.ws.rs.ProcessingException;
@@ -42,7 +44,7 @@ import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.ListenerList;
-import org.eclipse.core.runtime.Path;
+import org.eclipse.core.runtime.Platform;
import org.eclipse.core.runtime.Status;
import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.core.runtime.preferences.IEclipsePreferences;
@@ -97,43 +99,44 @@ import org.eclipse.tm.terminal.view.core.TerminalServiceFactory;
import org.eclipse.tm.terminal.view.core.interfaces.ITerminalService;
import org.eclipse.tm.terminal.view.core.interfaces.ITerminalServiceOutputStreamMonitorListener;
import org.eclipse.tm.terminal.view.core.interfaces.constants.ITerminalsConnectorConstants;
+import org.mandas.docker.client.DockerClient;
+import org.mandas.docker.client.DockerClient.AttachParameter;
+import org.mandas.docker.client.DockerClient.BuildParam;
+import org.mandas.docker.client.DockerClient.ExecCreateParam;
+import org.mandas.docker.client.DockerClient.LogsParam;
+import org.mandas.docker.client.LogStream;
+import org.mandas.docker.client.exceptions.ContainerNotFoundException;
+import org.mandas.docker.client.exceptions.DockerCertificateException;
+import org.mandas.docker.client.exceptions.DockerTimeoutException;
+import org.mandas.docker.client.messages.Container;
+import org.mandas.docker.client.messages.ContainerChange;
+import org.mandas.docker.client.messages.ContainerConfig;
+import org.mandas.docker.client.messages.ContainerCreation;
+import org.mandas.docker.client.messages.ContainerExit;
+import org.mandas.docker.client.messages.ContainerInfo;
+import org.mandas.docker.client.messages.ExecCreation;
+import org.mandas.docker.client.messages.HostConfig;
+import org.mandas.docker.client.messages.HostConfig.LxcConfParameter;
+import org.mandas.docker.client.messages.Image;
+import org.mandas.docker.client.messages.ImageInfo;
+import org.mandas.docker.client.messages.ImageSearchResult;
+import org.mandas.docker.client.messages.Info;
+import org.mandas.docker.client.messages.Ipam;
+import org.mandas.docker.client.messages.IpamConfig;
+import org.mandas.docker.client.messages.Network;
+import org.mandas.docker.client.messages.NetworkConfig;
+import org.mandas.docker.client.messages.PortBinding;
+import org.mandas.docker.client.messages.RegistryAuth;
+import org.mandas.docker.client.messages.Version;
+import org.mandas.docker.client.messages.Volume;
+import org.mandas.docker.client.messages.VolumeList;
import com.google.common.collect.ImmutableMap;
-import com.spotify.docker.client.DockerClient;
-import com.spotify.docker.client.DockerClient.AttachParameter;
-import com.spotify.docker.client.DockerClient.BuildParam;
-import com.spotify.docker.client.DockerClient.ExecCreateParam;
-import com.spotify.docker.client.DockerClient.LogsParam;
-import com.spotify.docker.client.LogStream;
-import com.spotify.docker.client.exceptions.ContainerNotFoundException;
-import com.spotify.docker.client.exceptions.DockerCertificateException;
-import com.spotify.docker.client.exceptions.DockerTimeoutException;
-import com.spotify.docker.client.messages.Container;
-import com.spotify.docker.client.messages.ContainerChange;
-import com.spotify.docker.client.messages.ContainerConfig;
-import com.spotify.docker.client.messages.ContainerCreation;
-import com.spotify.docker.client.messages.ContainerExit;
-import com.spotify.docker.client.messages.ContainerInfo;
-import com.spotify.docker.client.messages.ExecCreation;
-import com.spotify.docker.client.messages.HostConfig;
-import com.spotify.docker.client.messages.HostConfig.LxcConfParameter;
-import com.spotify.docker.client.messages.Image;
-import com.spotify.docker.client.messages.ImageInfo;
-import com.spotify.docker.client.messages.ImageSearchResult;
-import com.spotify.docker.client.messages.Info;
-import com.spotify.docker.client.messages.Ipam;
-import com.spotify.docker.client.messages.Network;
-import com.spotify.docker.client.messages.NetworkConfig;
-import com.spotify.docker.client.messages.PortBinding;
-import com.spotify.docker.client.messages.RegistryAuth;
-import com.spotify.docker.client.messages.Version;
-import com.spotify.docker.client.messages.Volume;
-import com.spotify.docker.client.messages.VolumeList;
/**
- * A connection to a Docker daemon. The connection may rely on Unix Socket or TCP connection (using the REST API).
+ * A connection to a Docker daemon. The connection may rely on Unix Socket or TCP connection (using the REST API).
* All low-level communication is delegated to a wrapped {@link DockerClient}.
- *
+ *
*
*/
public class DockerConnection
@@ -152,7 +155,7 @@ public class DockerConnection
/**
* Creates a new {@link DockerConnection} using a Unix socket.
- *
+ *
* @param unixSocketConnectionSettings
* the connection settings.
* @return a new {@link DockerConnection}
@@ -165,7 +168,7 @@ public class DockerConnection
/**
* Creates a {@link DockerConnection} using a TCP connection.
- *
+ *
* @param tcpConnectionSettings
* the {@link TCPConnectionSettings}
* @return a new {@link DockerConnection}
@@ -308,7 +311,7 @@ public class DockerConnection
}
/**
* Change the default {@link DockerClientFactory}
- *
+ *
* @param dockerClientFactory
* the new {@link DockerClientFactory} to use when opening a
* connection.
@@ -373,7 +376,7 @@ public class DockerConnection
String socket = path.replaceAll("unix://", ""); //$NON-NLS-1$ //$NON-NLS-2$
java.io.File f = new java.io.File(socket);
if (!f.exists()) {
- throw new com.spotify.docker.client.exceptions.DockerException(
+ throw new org.mandas.docker.client.exceptions.DockerException(
NLS.bind(Messages.Docker_Daemon_No_Unix_Socket,
socket));
}
@@ -386,7 +389,7 @@ public class DockerConnection
Messages.Docker_Daemon_Ping_Failure, this.getName()));
}
setState(EnumDockerConnectionState.ESTABLISHED);
- } catch (com.spotify.docker.client.exceptions.DockerException
+ } catch (org.mandas.docker.client.exceptions.DockerException
| InterruptedException | IllegalArgumentException e) {
setState(EnumDockerConnectionState.CLOSED);
throw new DockerPingConnectionException(NLS.bind(
@@ -395,10 +398,9 @@ public class DockerConnection
}
@Override
- protected void finalize() throws Throwable {
+ protected void finalize() {
this.finalizing = true;
close();
- super.finalize();
}
@Override
@@ -434,14 +436,14 @@ public class DockerConnection
final Info info = this.client.info();
final Version version = this.client.version();
return new DockerConnectionInfo(info, version);
- } catch (com.spotify.docker.client.exceptions.DockerRequestException e) {
+ } catch (org.mandas.docker.client.exceptions.DockerRequestException e) {
throw new DockerException(e.getResponseBody());
- } catch (com.spotify.docker.client.exceptions.DockerException
+ } catch (org.mandas.docker.client.exceptions.DockerException
| InterruptedException e) {
throw new DockerException(Messages.Docker_General_Info_Failure, e);
}
}
-
+
@Override
public String getName() {
if (name != null && !name.isEmpty()) {
@@ -524,7 +526,7 @@ public class DockerConnection
try {
Version version = client.version();
return new DockerVersion(this, version);
- } catch (com.spotify.docker.client.exceptions.DockerException
+ } catch (org.mandas.docker.client.exceptions.DockerException
| InterruptedException e) {
throw new DockerException(Messages.Docker_General_Info_Failure, e);
}
@@ -542,7 +544,7 @@ public class DockerConnection
volumeList.add(v);
}
}
- } catch (com.spotify.docker.client.exceptions.DockerException e) {
+ } catch (org.mandas.docker.client.exceptions.DockerException e) {
throw new DockerException(e.getMessage());
} catch (InterruptedException e) {
return Collections.emptyList();
@@ -568,7 +570,7 @@ public class DockerConnection
* Get a copy of the client to use in parallel threads for long-standing
* operations such as logging or waiting until finished. The user of the
* copy should close it when the operation is complete.
- *
+ *
* @return copy of client
* @throws DockerException
* - general Docker client exception
@@ -742,11 +744,11 @@ public class DockerConnection
}
} while (follow && !stop);
listContainers();
- } catch (com.spotify.docker.client.exceptions.DockerRequestException e) {
+ } catch (org.mandas.docker.client.exceptions.DockerRequestException e) {
Activator.logErrorMessage(
ProcessMessages.getString("Monitor_Logs_Exception"), e); //$NON-NLS-1$
throw new InterruptedException();
- } catch (com.spotify.docker.client.exceptions.DockerException
+ } catch (org.mandas.docker.client.exceptions.DockerException
| IOException e) {
Activator.logErrorMessage(
ProcessMessages.getString("Monitor_Logs_Exception"), e); //$NON-NLS-1$
@@ -831,7 +833,7 @@ public class DockerConnection
new Status(IStatus.WARNING, Activator.PLUGIN_ID,
Messages.Docker_Connection_Timeout, e));
}
- } catch (com.spotify.docker.client.exceptions.DockerException
+ } catch (org.mandas.docker.client.exceptions.DockerException
| InterruptedException e) {
if (isOpen() && e.getCause() != null
&& e.getCause().getCause() != null && e.getCause()
@@ -908,7 +910,7 @@ public class DockerConnection
Messages.Docker_Connection_Timeout, e));
close();
}
- } catch (com.spotify.docker.client.exceptions.DockerException
+ } catch (org.mandas.docker.client.exceptions.DockerException
| InterruptedException e) {
if (isOpen() && e.getCause() != null
&& e.getCause().getCause() != null
@@ -924,7 +926,7 @@ public class DockerConnection
/**
* Sorts the given values using the given comparator and returns the result
* in a {@link List}
- *
+ *
* @param values
* the values to sort
* @param comparator
@@ -954,11 +956,11 @@ public class DockerConnection
try {
final ContainerInfo info = client.inspectContainer(id);
return new DockerContainerInfo(info);
- } catch (com.spotify.docker.client.exceptions.DockerRequestException e) {
+ } catch (org.mandas.docker.client.exceptions.DockerRequestException e) {
Activator.logErrorMessage(
ProcessMessages.getString("Container_Info_Exception"), e); //$NON-NLS-1$
return null;
- } catch (com.spotify.docker.client.exceptions.DockerException
+ } catch (org.mandas.docker.client.exceptions.DockerException
| InterruptedException e) {
Activator.log(new Status(IStatus.ERROR, Activator.PLUGIN_ID,
ProcessMessages.getFormattedString(
@@ -976,13 +978,20 @@ public class DockerConnection
try {
final ImageInfo info = this.client.inspectImage(id);
return new DockerImageInfo(info);
- } catch (com.spotify.docker.client.exceptions.DockerRequestException e) {
+ } catch (org.mandas.docker.client.exceptions.DockerRequestException e) {
Activator.logErrorMessage(
ProcessMessages.getString("Image_Info_Exception"), e); //$NON-NLS-1$
return null;
- } catch (com.spotify.docker.client.exceptions.ImageNotFoundException e) {
+ } catch (org.mandas.docker.client.exceptions.ImageNotFoundException e) {
+ // we might have an id which contains a registry which is invalid
+ // for inspectImage() so
+ // see if we can find a local image with matching tag
+ IDockerImage image = getImageByTag(id);
+ if (image != null) {
+ return getImageInfo(image.id());
+ }
return null;
- } catch (com.spotify.docker.client.exceptions.DockerException
+ } catch (org.mandas.docker.client.exceptions.DockerException
| InterruptedException e) {
Activator.log(new Status(IStatus.ERROR, Activator.PLUGIN_ID,
ProcessMessages.getFormattedString(
@@ -1131,15 +1140,15 @@ public class DockerConnection
nativeImage.created(), nativeImage.size(),
nativeImage.virtualSize(), imageQualifier));
}
- } catch (com.spotify.docker.client.exceptions.DockerTimeoutException e) {
+ } catch (org.mandas.docker.client.exceptions.DockerTimeoutException e) {
if (isOpen()) {
Activator.log(
new Status(IStatus.WARNING, Activator.PLUGIN_ID,
Messages.Docker_Connection_Timeout, e));
}
- } catch (com.spotify.docker.client.exceptions.DockerRequestException e) {
+ } catch (org.mandas.docker.client.exceptions.DockerRequestException e) {
throw new DockerException(e.getResponseBody());
- } catch (com.spotify.docker.client.exceptions.DockerException
+ } catch (org.mandas.docker.client.exceptions.DockerException
| InterruptedException e) {
if (isOpen() && e.getCause() != null
&& e.getCause().getCause() != null && e.getCause()
@@ -1166,7 +1175,7 @@ public class DockerConnection
/**
* Resolves the {@link DockerImageQualifier} for the given
* {@code nativeImage} in the context of all {@code nativeImages}
- *
+ *
* @param nativeImage
* the image to analyze
* @param nativeImages
@@ -1241,9 +1250,9 @@ public class DockerConnection
DockerProgressHandler d = new DockerProgressHandler(handler);
client.pull(id, d);
listImages();
- } catch (com.spotify.docker.client.exceptions.DockerRequestException e) {
+ } catch (org.mandas.docker.client.exceptions.DockerRequestException e) {
throw new DockerException(e.getResponseBody());
- } catch (com.spotify.docker.client.exceptions.DockerException e) {
+ } catch (org.mandas.docker.client.exceptions.DockerException e) {
DockerException f = new DockerException(e);
throw f;
}
@@ -1258,9 +1267,9 @@ public class DockerConnection
final DockerProgressHandler d = new DockerProgressHandler(handler);
client.pull(imageId, d);
listImages();
- } catch (com.spotify.docker.client.exceptions.DockerRequestException e) {
+ } catch (org.mandas.docker.client.exceptions.DockerRequestException e) {
throw new DockerException(e.getResponseBody());
- } catch (com.spotify.docker.client.exceptions.DockerException e) {
+ } catch (org.mandas.docker.client.exceptions.DockerException e) {
DockerException f = new DockerException(e);
throw f;
}
@@ -1279,7 +1288,7 @@ public class DockerConnection
}
}
return results;
- } catch (com.spotify.docker.client.exceptions.DockerException
+ } catch (org.mandas.docker.client.exceptions.DockerException
| InterruptedException e) {
throw new DockerException(e);
}
@@ -1291,9 +1300,9 @@ public class DockerConnection
try {
DockerProgressHandler d = new DockerProgressHandler(handler);
client.push(name, d);
- } catch (com.spotify.docker.client.exceptions.DockerRequestException e) {
+ } catch (org.mandas.docker.client.exceptions.DockerRequestException e) {
throw new DockerException(e.getResponseBody());
- } catch (com.spotify.docker.client.exceptions.DockerException e) {
+ } catch (org.mandas.docker.client.exceptions.DockerException e) {
DockerException f = new DockerException(e);
throw f;
}
@@ -1307,9 +1316,9 @@ public class DockerConnection
.getClient(this.connectionSettings, info);
final DockerProgressHandler d = new DockerProgressHandler(handler);
client.push(name, d);
- } catch (com.spotify.docker.client.exceptions.DockerRequestException e) {
+ } catch (org.mandas.docker.client.exceptions.DockerRequestException e) {
throw new DockerException(e.getResponseBody());
- } catch (com.spotify.docker.client.exceptions.DockerException
+ } catch (org.mandas.docker.client.exceptions.DockerException
| DockerCertificateException e) {
DockerException f = new DockerException(e);
throw f;
@@ -1321,9 +1330,9 @@ public class DockerConnection
InterruptedException {
try {
client.removeImage(name, true, false);
- } catch (com.spotify.docker.client.exceptions.DockerRequestException e) {
+ } catch (org.mandas.docker.client.exceptions.DockerRequestException e) {
throw new DockerException(e.getResponseBody());
- } catch (com.spotify.docker.client.exceptions.DockerException e) {
+ } catch (org.mandas.docker.client.exceptions.DockerException e) {
DockerException f = new DockerException(e);
throw f;
}
@@ -1334,9 +1343,9 @@ public class DockerConnection
InterruptedException {
try {
client.removeImage(tag, false, false);
- } catch (com.spotify.docker.client.exceptions.DockerRequestException e) {
+ } catch (org.mandas.docker.client.exceptions.DockerRequestException e) {
throw new DockerException(e.getResponseBody());
- } catch (com.spotify.docker.client.exceptions.DockerException e) {
+ } catch (org.mandas.docker.client.exceptions.DockerException e) {
DockerException f = new DockerException(e);
throw f;
}
@@ -1351,7 +1360,7 @@ public class DockerConnection
/**
* Adds a tag to an existing image while specifying the <code>force</code>
* flag.
- *
+ *
* @param name
* the image id
* @param newTag
@@ -1369,9 +1378,9 @@ public class DockerConnection
final boolean force) throws DockerException, InterruptedException {
try {
client.tag(name, newTag, force);
- } catch (com.spotify.docker.client.exceptions.DockerRequestException e) {
+ } catch (org.mandas.docker.client.exceptions.DockerRequestException e) {
throw new DockerException(e.getResponseBody());
- } catch (com.spotify.docker.client.exceptions.DockerException e) {
+ } catch (org.mandas.docker.client.exceptions.DockerException e) {
DockerException f = new DockerException(e);
throw f;
}
@@ -1388,9 +1397,9 @@ public class DockerConnection
String res = getClientCopy().build(p, d,
BuildParam.create("forcerm", "true")); //$NON-NLS-1$ //$NON-NLS-2$
return res;
- } catch (com.spotify.docker.client.exceptions.DockerRequestException e) {
+ } catch (org.mandas.docker.client.exceptions.DockerRequestException e) {
throw new DockerException(e.getResponseBody());
- } catch (com.spotify.docker.client.exceptions.DockerException
+ } catch (org.mandas.docker.client.exceptions.DockerException
| IOException e) {
DockerException f = new DockerException(e);
throw f;
@@ -1408,9 +1417,9 @@ public class DockerConnection
String res = getClientCopy().build(p, name, d,
BuildParam.create("forcerm", "true")); //$NON-NLS-1$ $NON-NLS-2$
return res;
- } catch (com.spotify.docker.client.exceptions.DockerRequestException e) {
+ } catch (org.mandas.docker.client.exceptions.DockerRequestException e) {
throw new DockerException(e.getResponseBody());
- } catch (com.spotify.docker.client.exceptions.DockerException
+ } catch (org.mandas.docker.client.exceptions.DockerException
| IOException e) {
DockerException f = new DockerException(e);
throw f;
@@ -1419,7 +1428,7 @@ public class DockerConnection
/**
* Builds an {@link IDockerImage}
- *
+ *
* @param path
* path to the build context
* @param name
@@ -1446,9 +1455,9 @@ public class DockerConnection
String res = getClientCopy().build(p, name, d,
getBuildParameters(buildOptions));
return res;
- } catch (com.spotify.docker.client.exceptions.DockerRequestException e) {
+ } catch (org.mandas.docker.client.exceptions.DockerRequestException e) {
throw new DockerException(e.getResponseBody());
- } catch (com.spotify.docker.client.exceptions.DockerException
+ } catch (org.mandas.docker.client.exceptions.DockerException
| IOException e) {
DockerException f = new DockerException(e);
throw f;
@@ -1457,7 +1466,7 @@ public class DockerConnection
/**
* Builds an {@link IDockerImage}
- *
+ *
* @param path
* path to the build context
* @param name
@@ -1486,9 +1495,9 @@ public class DockerConnection
String res = getClientCopy().build(p, name, dockerFileName, d,
getBuildParameters(buildOptions));
return res;
- } catch (com.spotify.docker.client.exceptions.DockerRequestException e) {
+ } catch (org.mandas.docker.client.exceptions.DockerRequestException e) {
throw new DockerException(e.getResponseBody());
- } catch (com.spotify.docker.client.exceptions.DockerException
+ } catch (org.mandas.docker.client.exceptions.DockerException
| IOException e) {
DockerException f = new DockerException(e);
throw f;
@@ -1499,7 +1508,7 @@ public class DockerConnection
* Converts the given {@link Map} of build options into an array of
* {@link BuildParameter} when the build options are set a value different
* from the default value.
- *
+ *
* @param buildOptions
* the build options
* @return an array of relevant {@link BuildParameter}, an empty array if
@@ -1538,7 +1547,7 @@ public class DockerConnection
// Currently we have to save all clouds instead of just this one
DockerConnectionManager.getInstance().saveConnections();
}
-
+
@Override
public String createContainer(final IDockerContainerConfig c,
final IDockerHostConfig hc) throws DockerException,
@@ -1645,7 +1654,7 @@ public class DockerConnection
builder = builder.env(c.env());
}
if (c.volumes() != null) {
- builder = builder.volumes(c.volumes());
+ builder = builder.volumes(c.volumes().keySet());
}
if (c.entrypoint() != null) {
builder = builder.entrypoint(c.entrypoint());
@@ -1666,9 +1675,9 @@ public class DockerConnection
return id;
} catch (ContainerNotFoundException e) {
throw new DockerContainerNotFoundException(e);
- } catch (com.spotify.docker.client.exceptions.DockerRequestException e) {
+ } catch (org.mandas.docker.client.exceptions.DockerRequestException e) {
throw new DockerException(e.getResponseBody());
- } catch (com.spotify.docker.client.exceptions.DockerException e) {
+ } catch (org.mandas.docker.client.exceptions.DockerException e) {
throw new DockerException(e);
}
}
@@ -1689,9 +1698,9 @@ public class DockerConnection
listContainers();
} catch (ContainerNotFoundException e) {
throw new DockerContainerNotFoundException(e);
- } catch (com.spotify.docker.client.exceptions.DockerRequestException e) {
+ } catch (org.mandas.docker.client.exceptions.DockerRequestException e) {
throw new DockerException(e.getResponseBody());
- } catch (com.spotify.docker.client.exceptions.DockerException e) {
+ } catch (org.mandas.docker.client.exceptions.DockerException e) {
throw new DockerException(e.getMessage(), e.getCause());
}
}
@@ -1711,9 +1720,9 @@ public class DockerConnection
listContainers(); // update container list
} catch (ContainerNotFoundException e) {
throw new DockerContainerNotFoundException(e);
- } catch (com.spotify.docker.client.exceptions.DockerRequestException e) {
+ } catch (org.mandas.docker.client.exceptions.DockerRequestException e) {
// Permit kill to fail silently even on non-running containers
- } catch (com.spotify.docker.client.exceptions.DockerException e) {
+ } catch (org.mandas.docker.client.exceptions.DockerException e) {
throw new DockerException(e.getMessage(), e.getCause());
}
}
@@ -1727,9 +1736,9 @@ public class DockerConnection
listContainers(); // update container list
} catch (ContainerNotFoundException e) {
throw new DockerContainerNotFoundException(e);
- } catch (com.spotify.docker.client.exceptions.DockerRequestException e) {
+ } catch (org.mandas.docker.client.exceptions.DockerRequestException e) {
throw new DockerException(e.getResponseBody());
- } catch (com.spotify.docker.client.exceptions.DockerException e) {
+ } catch (org.mandas.docker.client.exceptions.DockerException e) {
throw new DockerException(e.getMessage(), e.getCause());
}
}
@@ -1761,9 +1770,9 @@ public class DockerConnection
listContainers(); // update container list
} catch (ContainerNotFoundException e) {
throw new DockerContainerNotFoundException(e);
- } catch (com.spotify.docker.client.exceptions.DockerRequestException e) {
+ } catch (org.mandas.docker.client.exceptions.DockerRequestException e) {
throw new DockerException(e.getResponseBody());
- } catch (com.spotify.docker.client.exceptions.DockerException e) {
+ } catch (org.mandas.docker.client.exceptions.DockerException e) {
throw new DockerException(e.getMessage(), e.getCause());
}
}
@@ -1777,9 +1786,9 @@ public class DockerConnection
listContainers(); // update container list
} catch (ContainerNotFoundException e) {
throw new DockerContainerNotFoundException(e);
- } catch (com.spotify.docker.client.exceptions.DockerRequestException e) {
+ } catch (org.mandas.docker.client.exceptions.DockerRequestException e) {
throw new DockerException(e.getResponseBody());
- } catch (com.spotify.docker.client.exceptions.DockerException e) {
+ } catch (org.mandas.docker.client.exceptions.DockerException e) {
throw new DockerException(e.getMessage(), e.getCause());
}
}
@@ -1828,18 +1837,18 @@ public class DockerConnection
}
}
// list of containers needs to be refreshed once the container started, to reflect it new state.
- listContainers();
+ listContainers();
} catch (ContainerNotFoundException e) {
// if we get here, it means that the command failed...the actual
// message is buried in the throwable cause and isn't actually
// clearly stated so report there was a problem starting the command
throw new DockerException(DockerMessages.getFormattedString(
"DockerStartContainer.error", getCmdString(containerInfo))); //$NON-NLS-1$
- } catch (com.spotify.docker.client.exceptions.DockerRequestException e) {
+ } catch (org.mandas.docker.client.exceptions.DockerRequestException e) {
if (e.status() != 304) {
throw new DockerException(e.getMessage());
}
- } catch (com.spotify.docker.client.exceptions.DockerException e) {
+ } catch (org.mandas.docker.client.exceptions.DockerException e) {
throw new DockerException(e.getMessage(), e.getCause());
}
}
@@ -1882,11 +1891,11 @@ public class DockerConnection
// clearly stated so report there was a problem starting the command
throw new DockerException(DockerMessages.getFormattedString(
"DockerStartContainer.error", getCmdString(containerInfo))); //$NON-NLS-1$
- } catch (com.spotify.docker.client.exceptions.DockerRequestException e) {
+ } catch (org.mandas.docker.client.exceptions.DockerRequestException e) {
if (e.status() != 304) {
throw new DockerException(e.getMessage());
}
- } catch (com.spotify.docker.client.exceptions.DockerException e) {
+ } catch (org.mandas.docker.client.exceptions.DockerException e) {
throw new DockerException(e);
}
}
@@ -1924,9 +1933,9 @@ public class DockerConnection
listContainers();
} catch (ContainerNotFoundException e) {
throw new DockerContainerNotFoundException(e);
- } catch (com.spotify.docker.client.exceptions.DockerRequestException e) {
+ } catch (org.mandas.docker.client.exceptions.DockerRequestException e) {
throw new DockerException(e.getResponseBody());
- } catch (com.spotify.docker.client.exceptions.DockerException e) {
+ } catch (org.mandas.docker.client.exceptions.DockerException e) {
throw new DockerException(e.getMessage(), e.getCause());
}
}
@@ -1944,9 +1953,9 @@ public class DockerConnection
// FIXME: are we refreshing the list of images twice ?
listImages();
getImages(true);
- } catch (com.spotify.docker.client.exceptions.DockerRequestException e) {
+ } catch (org.mandas.docker.client.exceptions.DockerRequestException e) {
throw new DockerException(e.getResponseBody());
- } catch (com.spotify.docker.client.exceptions.DockerException
+ } catch (org.mandas.docker.client.exceptions.DockerException
| InterruptedException e) {
throw new DockerException(e.getMessage(), e.getCause());
}
@@ -1959,7 +1968,7 @@ public class DockerConnection
try {
DockerClient copy = getClientCopy();
stream = copy.archiveContainer(id, path);
- } catch (com.spotify.docker.client.exceptions.DockerException e) {
+ } catch (org.mandas.docker.client.exceptions.DockerException e) {
throw new DockerException(e.getMessage(), e.getCause());
}
return stream;
@@ -1972,7 +1981,7 @@ public class DockerConnection
DockerClient clientCopy = (DockerClient) token;
try {
stream = clientCopy.archiveContainer(id, path);
- } catch (com.spotify.docker.client.exceptions.DockerException e) {
+ } catch (org.mandas.docker.client.exceptions.DockerException e) {
throw new DockerException(e.getMessage(), e.getCause());
}
return stream;
@@ -1989,7 +1998,7 @@ public class DockerConnection
containerChanges.add(new DockerContainerChange(change.path(),
change.kind()));
}
- } catch (com.spotify.docker.client.exceptions.DockerException e) {
+ } catch (org.mandas.docker.client.exceptions.DockerException e) {
throw new DockerException(e.getMessage(), e.getCause());
}
return containerChanges;
@@ -2035,7 +2044,7 @@ public class DockerConnection
.getPath(directory);
copy.copyToContainer(dirPath, id, path);
copy.close(); /* dispose of client copy now that we are done */
- } catch (com.spotify.docker.client.exceptions.DockerException e) {
+ } catch (org.mandas.docker.client.exceptions.DockerException e) {
throw new DockerException(e.getMessage(), e.getCause());
}
}
@@ -2047,9 +2056,11 @@ public class DockerConnection
DockerClient copy = (DockerClient) token;
java.nio.file.Path dirPath = FileSystems.getDefault()
.getPath(directory);
- copy.copyToContainer(dirPath, id, path);
+ boolean isWin = Platform.getOS().equals(Platform.OS_WIN32);
+ copy.copyToContainer(dirPath, id,
+ isWin ? path.replace('\\', '/') : path);
copy.close(); /* dispose of client copy now that we are done */
- } catch (com.spotify.docker.client.exceptions.DockerException e) {
+ } catch (org.mandas.docker.client.exceptions.DockerException e) {
throw new DockerException(e.getMessage(), e.getCause());
}
}
@@ -2065,7 +2076,7 @@ public class DockerConnection
.email(new String(cfg.getEmail()))
.serverAddress(new String(cfg.getServerAddress())).build();
return client.auth(authConfig);
- } catch (com.spotify.docker.client.exceptions.DockerException e) {
+ } catch (org.mandas.docker.client.exceptions.DockerException e) {
throw new DockerException(e.getMessage(), e.getCause());
}
}
@@ -2124,9 +2135,9 @@ public class DockerConnection
}
} catch (ContainerNotFoundException e) {
throw new DockerContainerNotFoundException(e);
- } catch (com.spotify.docker.client.exceptions.DockerRequestException e) {
+ } catch (org.mandas.docker.client.exceptions.DockerRequestException e) {
throw new DockerException(e.getResponseBody());
- } catch (com.spotify.docker.client.exceptions.DockerException e) {
+ } catch (org.mandas.docker.client.exceptions.DockerException e) {
throw new DockerException(e.getMessage(), e.getCause());
}
}
@@ -2142,7 +2153,7 @@ public class DockerConnection
LogsParam.stdout(), LogsParam.stderr());
stream.attach(out, err);
stream.close();
- } catch (com.spotify.docker.client.exceptions.DockerException e) {
+ } catch (org.mandas.docker.client.exceptions.DockerException e) {
throw new DockerException(e.getMessage(), e.getCause());
}
}
@@ -2155,7 +2166,7 @@ public class DockerConnection
LogsParam.follow(), LogsParam.stdout(), LogsParam.stderr());
stream.attach(out, err);
stream.close();
- } catch (com.spotify.docker.client.exceptions.DockerException e) {
+ } catch (org.mandas.docker.client.exceptions.DockerException e) {
throw new DockerException(e.getMessage(), e.getCause());
}
}
@@ -2173,9 +2184,9 @@ public class DockerConnection
return exit;
} catch (ContainerNotFoundException e) {
throw new DockerContainerNotFoundException(e);
- } catch (com.spotify.docker.client.exceptions.DockerRequestException e) {
+ } catch (org.mandas.docker.client.exceptions.DockerRequestException e) {
throw new DockerException(e.getResponseBody());
- } catch (com.spotify.docker.client.exceptions.DockerException e) {
+ } catch (org.mandas.docker.client.exceptions.DockerException e) {
throw new DockerException(e.getMessage(), e.getCause());
}
}
@@ -2255,49 +2266,31 @@ public class DockerConnection
try {
DockerClient copyClient = getClientCopy();
final ExecCreation execCreation = copyClient.execCreate(id,
- new String[] { "/bin/sh", "-c", "ls -l -F -L -Q " + path }, //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ new String[] { "/bin/sh", "-c", "ls -l -F -Q " + path }, //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
ExecCreateParam.attachStdout(),
ExecCreateParam.attachStderr());
final String execId = execCreation.id();
final LogStream pty_stream = copyClient.execStart(execId);
+ String lastLine = ""; //$NON-NLS-1$
try {
while (pty_stream.hasNext()) {
ByteBuffer b = pty_stream.next().content();
byte[] buffer = new byte[b.remaining()];
b.get(buffer);
- String s = new String(buffer);
+ String s = lastLine + new String(buffer);
String[] lines = s.split("\\r?\\n"); //$NON-NLS-1$
- for (String line : lines) {
- if (line.trim().startsWith("total")) //$NON-NLS-1$
- continue; // ignore the total line
- String[] token = line.split("\\s+"); //$NON-NLS-1$
- boolean isDirectory = token[0].startsWith("d"); //$NON-NLS-1$
- boolean isLink = token[0].startsWith("l"); //$NON-NLS-1$
- if (token.length > 8) {
- // last token depends on whether we have a link or not
- String link = null;
- if (isLink) {
- String linkname = token[token.length - 1];
- if (linkname.endsWith("/")) { //$NON-NLS-1$
- linkname = linkname.substring(0, linkname.length() - 1);
- isDirectory = true;
- }
- IPath linkPath = new Path(path);
- linkPath = linkPath.append(linkname);
- link = linkPath.toString();
- String name = token[token.length - 3];
- childList.add(new ContainerFileProxy(path, name,
- isDirectory, isLink, link));
- } else {
- String name = token[token.length - 1];
- // remove quotes and any indicator char
- name = name.substring(1, name.length()
- - (name.endsWith("\"") ? 1 : 2));
- childList.add(new ContainerFileProxy(path, name,
- isDirectory));
- }
- }
+ if (lines.length > 0) {
+ lastLine = lines[lines.length - 1];
+ } else {
+ lastLine = ""; //$NON-NLS-1$
}
+ for (int i = 0; i < lines.length - 1; ++i) {
+ String line = lines[i];
+ processDirectoryLine(line, path, childList);
+ }
+ }
+ if (!lastLine.isEmpty()) {
+ processDirectoryLine(lastLine, path, childList);
}
} finally {
if (pty_stream != null)
@@ -2306,11 +2299,62 @@ public class DockerConnection
copyClient.close();
}
} catch (Exception e) {
+ if (e.getCause() instanceof IOException) {
+ // ugly hack as we often get Connection reset by peer exceptions
+ // so retry
+ return readContainerDirectory(id, path);
+ }
// e.printStackTrace();
}
return childList;
}
+ private String[] tokenize(String line) {
+ String regex = "(\"[^\"]*\"/?)|(\\S+)";
+ List<String> result = new ArrayList<>();
+
+ Matcher m = Pattern.compile(regex).matcher(line);
+ while (m.find()) {
+ if (m.group(1) != null) {
+ result.add(m.group(1));
+ } else {
+ result.add(m.group(2));
+ }
+ }
+ return result.toArray(new String[0]);
+ }
+
+ private void processDirectoryLine(String line, String path,
+ List<ContainerFileProxy> childList) {
+ if (line.trim().startsWith("total")) //$NON-NLS-1$
+ return; // ignore the total line
+ String[] token = tokenize(line);
+ boolean isDirectory = token[0].startsWith("d"); //$NON-NLS-1$
+ boolean isLink = token[0].startsWith("l"); //$NON-NLS-1$
+ if (token.length > 8) {
+ // Non-Link ends with "filename"
+ // Link ends with "filename" -> "Target"
+ String name = token[token.length - (isLink ? 3 : 1)];
+ // remove quotes and any indicator char
+ name = name.substring(1,
+ name.length() - (name.endsWith("\"") ? 1 : 2));
+
+ if (isLink) {
+ String linkname = token[token.length - 1];
+ if (linkname.endsWith("/")) { //$NON-NLS-1$
+ isDirectory = true;
+ }
+ linkname = linkname.substring(1,
+ linkname.length() - (linkname.endsWith("\"") ? 1 : 2));
+
+ childList.add(new ContainerFileProxy(path, name, isDirectory,
+ isLink, linkname));
+ } else {
+ childList.add(new ContainerFileProxy(path, name, isDirectory));
+ }
+ }
+ }
+
public void execShell(final String id) throws DockerException {
try {
final ExecCreation execCreation = client.execCreate(id,
@@ -2358,9 +2402,9 @@ public class DockerConnection
OutputStream tout = noBlockingOutputStream(
HttpHijackWorkaround.getOutputStream(pty_stream, getUri()));
InputStream tin = HttpHijackWorkaround.getInputStream(pty_stream);
-
+
TerminalOutputMonitorListener monitor = new TerminalOutputMonitorListener(out);
-
+
// org.eclipse.tm.terminal.connector.ssh.controls.SshWizardConfigurationPanel
Map<String, Object> properties = new HashMap<>();
properties.put(ITerminalsConnectorConstants.PROP_DELEGATE_ID,
@@ -2446,21 +2490,23 @@ public class DockerConnection
try {
Ipam.Builder ipamBuilder = Ipam.builder()
.driver(cfg.ipam().driver());
- List<IDockerIpamConfig> ipamCfgs = cfg.ipam().config();
- for (IDockerIpamConfig ipamCfg : ipamCfgs) {
- ipamBuilder = ipamBuilder.config(ipamCfg.subnet(),
- ipamCfg.ipRange(), ipamCfg.gateway());
+ List<IDockerIpamConfig> idockerIpamCfgs = cfg.ipam().config();
+ List<IpamConfig> ipamCfgs = new ArrayList<>();
+ for (IDockerIpamConfig ipamCfg : idockerIpamCfgs) {
+ ipamCfgs.add(IpamConfig.create(ipamCfg.subnet(),
+ ipamCfg.ipRange(), ipamCfg.gateway()));
}
+ ipamBuilder = ipamBuilder.config(ipamCfgs);
Ipam ipam = ipamBuilder.build();
NetworkConfig.Builder networkConfigBuilder = NetworkConfig.builder()
.name(cfg.name()).driver(cfg.driver()).ipam(ipam);
networkConfigBuilder.options(cfg.options());
NetworkConfig networkConfig = networkConfigBuilder.build();
- com.spotify.docker.client.messages.NetworkCreation creation = client
+ org.mandas.docker.client.messages.NetworkCreation creation = client
.createNetwork(networkConfig);
return new DockerNetworkCreation(creation);
- } catch (com.spotify.docker.client.exceptions.DockerException e) {
+ } catch (org.mandas.docker.client.exceptions.DockerException e) {
throw new DockerException(e.getMessage(), e.getCause());
}
}
@@ -2471,7 +2517,7 @@ public class DockerConnection
try {
Network n = client.inspectNetwork(networkId);
return new DockerNetwork(n);
- } catch (com.spotify.docker.client.exceptions.DockerException e) {
+ } catch (org.mandas.docker.client.exceptions.DockerException e) {
throw new DockerException(e.getMessage(), e.getCause());
}
}
@@ -2486,7 +2532,7 @@ public class DockerConnection
networks.add(new DockerNetwork(n));
}
return networks;
- } catch (com.spotify.docker.client.exceptions.DockerException e) {
+ } catch (org.mandas.docker.client.exceptions.DockerException e) {
throw new DockerException(e.getMessage(), e.getCause());
}
}
@@ -2496,7 +2542,7 @@ public class DockerConnection
throws DockerException, InterruptedException {
try {
client.removeNetwork(networkId);
- } catch (com.spotify.docker.client.exceptions.DockerException e) {
+ } catch (org.mandas.docker.client.exceptions.DockerException e) {
throw new DockerException(e.getMessage(), e.getCause());
}
}
@@ -2506,7 +2552,7 @@ public class DockerConnection
throws DockerException, InterruptedException {
try {
client.connectToNetwork(id, networkId);
- } catch (com.spotify.docker.client.exceptions.DockerException e) {
+ } catch (org.mandas.docker.client.exceptions.DockerException e) {
throw new DockerException(e.getMessage(), e.getCause());
}
}
@@ -2516,7 +2562,7 @@ public class DockerConnection
throws DockerException, InterruptedException {
try {
client.disconnectFromNetwork(id, networkId);
- } catch (com.spotify.docker.client.exceptions.DockerException e) {
+ } catch (org.mandas.docker.client.exceptions.DockerException e) {
throw new DockerException(e.getMessage(), e.getCause());
}
}
diff --git a/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/DockerConnectionInfo.java b/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/DockerConnectionInfo.java
index 43dde8ab8226c92eacd474c29e129fa9c194d7c9..b65ad04b0d8e87f65291beb1c6c6a9793262b526 100644
--- a/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/DockerConnectionInfo.java
+++ b/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/DockerConnectionInfo.java
@@ -1,6 +1,6 @@
/*******************************************************************************
- * Copyright (c) 2014, 2018 Red Hat.
- *
+ * Copyright (c) 2014, 2020 Red Hat.
+ *
* This program and the accompanying materials are made
* available under the terms of the Eclipse Public License 2.0
* which is available at https://www.eclipse.org/legal/epl-2.0/
@@ -18,9 +18,8 @@ import java.util.List;
import org.eclipse.linuxtools.docker.core.IDockerConnection;
import org.eclipse.linuxtools.docker.core.IDockerConnectionInfo;
-
-import com.spotify.docker.client.messages.Info;
-import com.spotify.docker.client.messages.Version;
+import org.mandas.docker.client.messages.Info;
+import org.mandas.docker.client.messages.Version;
/**
* Info about a given {@link IDockerConnection}
@@ -29,7 +28,6 @@ public class DockerConnectionInfo implements IDockerConnectionInfo {
private final int containers;
private final boolean debug;
- private final String executionDriver;
private final int fileDescriptors;
private final int goroutines;
private final int images;
@@ -52,11 +50,10 @@ public class DockerConnectionInfo implements IDockerConnectionInfo {
private final boolean ipv4Forwarding;
private final List<String> labels;
private final String dockerRootDir;
-
+
public DockerConnectionInfo(final Info info, final Version version) {
this.containers = info != null ? info.containers() : -1;
this.debug = info != null ? info.debug() : false;
- this.executionDriver = info != null ? info.executionDriver() : null;
this.fileDescriptors = info != null ? info.fileDescriptors() : -1;
this.goroutines = info != null ? info.goroutines() : -1;
this.images = info != null ? info.images() : -1;
@@ -86,7 +83,7 @@ public class DockerConnectionInfo implements IDockerConnectionInfo {
: null;
this.labels = info != null ? info.labels() : null;
this.dockerRootDir = info != null ? info.dockerRootDir() : null;
-
+
}
@Override
@@ -104,11 +101,6 @@ public class DockerConnectionInfo implements IDockerConnectionInfo {
return debug;
}
- @Override
- public String getExecutionDriver() {
- return executionDriver;
- }
-
@Override
public int getFileDescriptors() {
return fileDescriptors;
@@ -217,4 +209,10 @@ public class DockerConnectionInfo implements IDockerConnectionInfo {
return dockerRootDir;
}
+ @Override
+ @Deprecated
+ public String getExecutionDriver() {
+ return null;
+ }
+
}
diff --git a/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/DockerContainer.java b/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/DockerContainer.java
index 7bf3910cd3fd5c041ef503eb50e33a09d44e86e0..58ed1505ad724a5fe66d39f9c4a10777ae1bde6c 100644
--- a/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/DockerContainer.java
+++ b/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/DockerContainer.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2014, 2018 Red Hat.
+ * Copyright (c) 2014, 2020 Red Hat.
*
* This program and the accompanying materials are made
* available under the terms of the Eclipse Public License 2.0
@@ -21,8 +21,8 @@ import org.eclipse.linuxtools.docker.core.IDockerContainer;
import org.eclipse.linuxtools.docker.core.IDockerContainerInfo;
import org.eclipse.linuxtools.docker.core.IDockerPortMapping;
-import com.spotify.docker.client.DockerClient;
-import com.spotify.docker.client.messages.Container;
+import org.mandas.docker.client.DockerClient;
+import org.mandas.docker.client.messages.Container;
public class DockerContainer implements IDockerContainer, IAdaptable {
diff --git a/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/DockerContainerConfig.java b/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/DockerContainerConfig.java
index 6030a9c3d966ffa1b385368ba918c64113c154c7..1c182bd751bfa788bfeb3acd23735b62aaf5a6f6 100644
--- a/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/DockerContainerConfig.java
+++ b/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/DockerContainerConfig.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2014, 2018 Red Hat.
+ * Copyright (c) 2014, 2020 Red Hat.
*
* This program and the accompanying materials are made
* available under the terms of the Eclipse Public License 2.0
@@ -23,8 +23,8 @@ import java.util.TreeSet;
import org.eclipse.linuxtools.docker.core.IDockerContainerConfig;
-import com.spotify.docker.client.messages.ContainerConfig;
-import com.spotify.docker.client.messages.HostConfig;
+import org.mandas.docker.client.messages.ContainerConfig;
+import org.mandas.docker.client.messages.HostConfig;
public class DockerContainerConfig implements IDockerContainerConfig {
diff --git a/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/DockerContainerExit.java b/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/DockerContainerExit.java
index 84bec82ac0d6c9dbff61c664d46c4cbb0280d0ef..82b40d810d3b4c517607ecd204b316b057933894 100644
--- a/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/DockerContainerExit.java
+++ b/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/DockerContainerExit.java
@@ -1,6 +1,6 @@
/*******************************************************************************
- * Copyright (c) 2014, 2018 Red Hat.
- *
+ * Copyright (c) 2014, 2020 Red Hat.
+ *
* This program and the accompanying materials are made
* available under the terms of the Eclipse Public License 2.0
* which is available at https://www.eclipse.org/legal/epl-2.0/
@@ -16,15 +16,15 @@ import org.eclipse.linuxtools.docker.core.IDockerContainerExit;
public class DockerContainerExit implements IDockerContainerExit {
- private Integer statusCode;
+ private Long statusCode;
- public DockerContainerExit(Integer statusCode) {
- this.statusCode = statusCode;
+ public DockerContainerExit(Long long1) {
+ this.statusCode = long1;
}
@Override
public Integer statusCode() {
- return statusCode;
+ return Integer.valueOf(statusCode.intValue());
}
}
diff --git a/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/DockerContainerInfo.java b/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/DockerContainerInfo.java
index 1a18502443aecaa3a067017af4172f0a656ac231..3357561901114fcfe9b9ab8812df2d837d42573e 100644
--- a/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/DockerContainerInfo.java
+++ b/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/DockerContainerInfo.java
@@ -1,6 +1,6 @@
/*******************************************************************************
- * Copyright (c) 2015, 2018 Red Hat.
- *
+ * Copyright (c) 2015, 2020 Red Hat.
+ *
* This program and the accompanying materials are made
* available under the terms of the Eclipse Public License 2.0
* which is available at https://www.eclipse.org/legal/epl-2.0/
@@ -12,19 +12,23 @@
*******************************************************************************/
package org.eclipse.linuxtools.internal.docker.core;
+import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Map;
import org.eclipse.linuxtools.docker.core.IDockerContainerConfig;
import org.eclipse.linuxtools.docker.core.IDockerContainerInfo;
+import org.eclipse.linuxtools.docker.core.IDockerContainerInfo2;
+import org.eclipse.linuxtools.docker.core.IDockerContainerMount;
import org.eclipse.linuxtools.docker.core.IDockerContainerState;
import org.eclipse.linuxtools.docker.core.IDockerHostConfig;
import org.eclipse.linuxtools.docker.core.IDockerNetworkSettings;
+import org.mandas.docker.client.messages.ContainerInfo;
+import org.mandas.docker.client.messages.ContainerMount;
-import com.spotify.docker.client.messages.ContainerInfo;
-
-public class DockerContainerInfo implements IDockerContainerInfo {
+public class DockerContainerInfo
+ implements IDockerContainerInfo, IDockerContainerInfo2 {
private String id;
private Date created;
@@ -43,8 +47,7 @@ public class DockerContainerInfo implements IDockerContainerInfo {
private String execDriver;
private String processLabel;
private String mountLabel;
- private Map<String, String> volumes;
- private Map<String, Boolean> volumesRW;
+ private List<IDockerContainerMount> mounts;
public DockerContainerInfo (final ContainerInfo info) {
this.id = info != null ? info.id() : null;
@@ -68,8 +71,14 @@ public class DockerContainerInfo implements IDockerContainerInfo {
this.execDriver = info != null ? info.execDriver() : null;
this.processLabel = info != null ? info.processLabel() : null;
this.mountLabel = info != null ? info.mountLabel() : null;
- this.volumes = info != null ? info.volumes() : null;
- this.volumesRW = info != null ? info.volumesRw() : null;
+ if (info.mounts() != null) {
+ this.mounts = new ArrayList<>();
+ for (ContainerMount mount : info.mounts()) {
+ this.mounts.add(new DockerContainerMount(mount));
+ }
+ } else {
+ this.mounts = null;
+ }
}
@Override
@@ -158,13 +167,20 @@ public class DockerContainerInfo implements IDockerContainerInfo {
}
@Override
+ public List<IDockerContainerMount> mounts() {
+ return mounts;
+ }
+
+ @Override
+ @Deprecated
public Map<String, String> volumes() {
- return volumes;
+ return null;
}
@Override
+ @Deprecated
public Map<String, Boolean> volumesRW() {
- return volumesRW;
+ return null;
}
}
diff --git a/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/DockerContainerMount.java b/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/DockerContainerMount.java
new file mode 100644
index 0000000000000000000000000000000000000000..11deeb675cdf05bd90333fc735cf614321562ef9
--- /dev/null
+++ b/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/DockerContainerMount.java
@@ -0,0 +1,80 @@
+/*******************************************************************************
+ * Copyright (c) 2020 Red Hat.
+ *
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ * Red Hat - Initial Contribution
+ *******************************************************************************/
+package org.eclipse.linuxtools.internal.docker.core;
+
+import org.eclipse.linuxtools.docker.core.IDockerContainerMount;
+import org.mandas.docker.client.messages.ContainerMount;
+
+public class DockerContainerMount implements IDockerContainerMount {
+
+ private String name;
+ private String source;
+ private String destination;
+ private String type;
+ private String driver;
+ private String mode;
+ private Boolean rw;
+ private String propagation;
+
+ public DockerContainerMount(final ContainerMount mount) {
+ this.name = mount.name();
+ this.source = mount.source();
+ this.destination = mount.destination();
+ this.type = mount.type();
+ this.driver = mount.driver();
+ this.mode = mount.mode();
+ this.rw = mount.rw();
+ this.propagation = mount.propagation();
+ }
+
+ @Override
+ public String type() {
+ return type;
+ }
+
+ @Override
+ public String name() {
+ return name;
+ }
+
+ @Override
+ public String source() {
+ return source;
+ }
+
+ @Override
+ public String destination() {
+ return destination;
+ }
+
+ @Override
+ public String driver() {
+ return driver;
+ }
+
+ @Override
+ public String mode() {
+ return mode;
+ }
+
+ @Override
+ public Boolean rw() {
+ return rw;
+ }
+
+ @Override
+ public String propagation() {
+ return propagation;
+ }
+
+}
diff --git a/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/DockerContainerRefreshManager.java b/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/DockerContainerRefreshManager.java
index da79291c18be60e4978d1359e150d0b5240c64a1..19399f6eeab6efd6a7d885e04ce890a9a357fdef 100644
--- a/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/DockerContainerRefreshManager.java
+++ b/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/DockerContainerRefreshManager.java
@@ -1,6 +1,6 @@
/*******************************************************************************
- * Copyright (c) 2014, 2018 Red Hat.
- *
+ * Copyright (c) 2014, 2019 Red Hat.
+ *
* This program and the accompanying materials are made
* available under the terms of the Eclipse Public License 2.0
* which is available at https://www.eclipse.org/legal/epl-2.0/
@@ -58,7 +58,7 @@ public class DockerContainerRefreshManager implements IDockerContainerListener {
final List<IDockerContainer> dclist) {
if (!this.refreshThreadMap.containsKey(connection)) {
long refreshRateInSeconds = Platform.getPreferencesService()
- .getLong("org.eclipse.linuxtools.docker.ui", //$NON-NLS-1$
+ .getLong("org.eclipse.linuxtools.docker.ui", //$NON-NLS-1$
"containerRefreshTime", DEFAULT_REFRESH_TIME, null); //$NON-NLS-1$
final ContainerRefreshThread rt = new ContainerRefreshThread(
connection,
@@ -71,7 +71,7 @@ public class DockerContainerRefreshManager implements IDockerContainerListener {
/**
* Stops and remove the {@link ContainerRefreshThread} associated with the
* given {@link IDockerConnection}.
- *
+ *
* @param connection
* the connection that was monitored
*/
@@ -80,13 +80,13 @@ public class DockerContainerRefreshManager implements IDockerContainerListener {
if (this.refreshThreadMap.containsKey(connection)) {
final ContainerRefreshThread containerRefreshThread = refreshThreadMap.get(connection);
containerRefreshThread.stopMonitoring();
- final ContainerRefreshThread removed = this.refreshThreadMap.remove(connection);
+ this.refreshThreadMap.remove(connection);
}
}
/**
* Method to reset the refresh rate for updating container lists
- *
+ *
* @param seconds
* - time to wait between refreshes
*/
diff --git a/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/DockerContainerState.java b/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/DockerContainerState.java
index 5e4fc43a43a9d4bcdd7b96b9642891529280b0c9..8975a0e3eb7a947e92b917b1437e2b064d478064 100644
--- a/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/DockerContainerState.java
+++ b/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/DockerContainerState.java
@@ -1,6 +1,6 @@
/*******************************************************************************
- * Copyright (c) 2014, 2018 Red Hat.
- *
+ * Copyright (c) 2014, 2020 Red Hat.
+ *
* This program and the accompanying materials are made
* available under the terms of the Eclipse Public License 2.0
* which is available at https://www.eclipse.org/legal/epl-2.0/
@@ -15,8 +15,7 @@ package org.eclipse.linuxtools.internal.docker.core;
import java.util.Date;
import org.eclipse.linuxtools.docker.core.IDockerContainerState;
-
-import com.spotify.docker.client.messages.ContainerState;
+import org.mandas.docker.client.messages.ContainerState;
public class DockerContainerState implements IDockerContainerState {
@@ -24,7 +23,7 @@ public class DockerContainerState implements IDockerContainerState {
private final Boolean running;
private final Boolean paused;
private final Boolean restarting;
- private final Integer exitCode;
+ private final Long exitCode;
private final Date startDate;
private final Date finishDate;
@@ -47,12 +46,12 @@ public class DockerContainerState implements IDockerContainerState {
public Boolean restarting() {
return restarting;
}
-
+
@Override
public Boolean paused() {
return paused;
}
-
+
@Override
public Integer pid() {
return pid;
@@ -60,7 +59,7 @@ public class DockerContainerState implements IDockerContainerState {
@Override
public Integer exitCode() {
- return exitCode;
+ return Integer.valueOf(exitCode.intValue());
}
@Override
diff --git a/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/DockerDevice.java b/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/DockerDevice.java
index 52aecc34cc458ea788bb3fbb67dd29052becc9e2..119bd15603a00190efbf7f917f260b1cf5c3f12d 100644
--- a/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/DockerDevice.java
+++ b/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/DockerDevice.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2019 Red Hat.
+ * Copyright (c) 2019, 2020 Red Hat.
*
* This program and the accompanying materials are made
* available under the terms of the Eclipse Public License 2.0
@@ -14,7 +14,7 @@ package org.eclipse.linuxtools.internal.docker.core;
import org.eclipse.linuxtools.docker.core.IDockerDevice;
-import com.spotify.docker.client.messages.Device;
+import org.mandas.docker.client.messages.Device;
public class DockerDevice implements IDockerDevice {
diff --git a/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/DockerHostConfig.java b/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/DockerHostConfig.java
index 9f43fe1be52fbabdd98ac85bcbcd368ee2436cb3..c95f8587e1192ed72f60983c9e271e59098b3962 100644
--- a/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/DockerHostConfig.java
+++ b/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/DockerHostConfig.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2014, 2018 Red Hat.
+ * Copyright (c) 2014, 2020 Red Hat.
*
* This program and the accompanying materials are made
* available under the terms of the Eclipse Public License 2.0
@@ -29,13 +29,13 @@ import org.eclipse.linuxtools.docker.core.IDockerPortBinding;
import org.eclipse.linuxtools.docker.core.IDockerRestartPolicy;
import org.eclipse.linuxtools.docker.core.IDockerUlimit;
-import com.spotify.docker.client.messages.Device;
-import com.spotify.docker.client.messages.HostConfig;
-import com.spotify.docker.client.messages.HostConfig.BlkioDeviceRate;
-import com.spotify.docker.client.messages.HostConfig.BlkioWeightDevice;
-import com.spotify.docker.client.messages.HostConfig.LxcConfParameter;
-import com.spotify.docker.client.messages.HostConfig.Ulimit;
-import com.spotify.docker.client.messages.PortBinding;
+import org.mandas.docker.client.messages.Device;
+import org.mandas.docker.client.messages.HostConfig;
+import org.mandas.docker.client.messages.HostConfig.BlkioDeviceRate;
+import org.mandas.docker.client.messages.HostConfig.BlkioWeightDevice;
+import org.mandas.docker.client.messages.HostConfig.LxcConfParameter;
+import org.mandas.docker.client.messages.HostConfig.Ulimit;
+import org.mandas.docker.client.messages.PortBinding;
public class DockerHostConfig implements IDockerHostConfig {
diff --git a/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/DockerImage.java b/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/DockerImage.java
index 6192fdf8918b6d559a87da0a175c46d0ea054a90..7670fac098f4474b731298b7ce188e6ae88bbedb 100644
--- a/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/DockerImage.java
+++ b/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/DockerImage.java
@@ -1,6 +1,6 @@
/*******************************************************************************
* Copyright (c) 2014, 2018 Red Hat.
- *
+ *
* This program and the accompanying materials are made
* available under the terms of the Eclipse Public License 2.0
* which is available at https://www.eclipse.org/legal/epl-2.0/
@@ -50,7 +50,7 @@ public class DockerImage implements IDockerImage, IAdaptable {
+ "(\\:(?<tag>" + TAG + "))?"); //$NON-NLS-1$ //$NON-NLS-2$
// SimpleDateFormat is not thread-safe, so give one to each thread
- private static final ThreadLocal<SimpleDateFormat> formatter = new ThreadLocal<SimpleDateFormat>() {
+ private static final ThreadLocal<SimpleDateFormat> formatter = new ThreadLocal<>() {
@Override
protected SimpleDateFormat initialValue() {
return new SimpleDateFormat("yyyy-MM-dd"); //$NON-NLS-1$
@@ -141,7 +141,7 @@ public class DockerImage implements IDockerImage, IAdaptable {
* {@code repoTags}, assuming that the given repoTags elements have the
* following format: {@code [org/]repo[:tag]}. Tags are sorted by their
* natural order.
- *
+ *
* @param repoTags
* the list of repo/tags to analyze
* @return the tags indexed by org/repo
@@ -170,7 +170,7 @@ public class DockerImage implements IDockerImage, IAdaptable {
/**
* Extracts the list of tags in the given repo/tags, assuming that the given
* repoTags elements have the following format: {@code [org/]repo[:tag]}.
- *
+ *
* @param repoTags
* the repo/tags list to analyze
* @return the list of tags or empty list if none was found.
@@ -194,7 +194,7 @@ public class DockerImage implements IDockerImage, IAdaptable {
/**
* Extracts the tag in the given repo/tag, assuming that the given repoTag
* element has the following format: {@code [org/]repo[:tag]}.
- *
+ *
* @param repoTag
* the repo/tag to analyze
* @return the tag or null if none was found.
@@ -213,7 +213,7 @@ public class DockerImage implements IDockerImage, IAdaptable {
/**
* Extracts the tag in the given repo/tag, assuming that the given repoTag
* element has the following format: {@code [org/]repo[:tag]}
- *
+ *
* @param repoTag
* the repo/tag to analyze
* @return the tag or <code>null</code> if none was found.
@@ -232,7 +232,7 @@ public class DockerImage implements IDockerImage, IAdaptable {
/**
* Duplicates the given {@code image} into as many {@link IDockerImage} has
* it has distinct repoTags entries
- *
+ *
* @param image
* the source image
* @return a {@link Stream} of duplicate {@link IDockerImage}
@@ -373,7 +373,7 @@ public class DockerImage implements IDockerImage, IAdaptable {
/**
* Appends the <code>latest</code> tag to the given {@code imageName}
- *
+ *
* @param imageName
* the image name to check
* @return the image name with the <code>latest</code> tag if none was set
diff --git a/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/DockerImageInfo.java b/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/DockerImageInfo.java
index facebbc25a97b8d57f9caa2b19717447a09205b8..6719f54c27c4a14a4f7fd463936d97eb6f997e84 100644
--- a/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/DockerImageInfo.java
+++ b/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/DockerImageInfo.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2014, 2018 Red Hat.
+ * Copyright (c) 2014, 2020 Red Hat.
*
* This program and the accompanying materials are made
* available under the terms of the Eclipse Public License 2.0
@@ -17,7 +17,7 @@ import java.util.Date;
import org.eclipse.linuxtools.docker.core.IDockerContainerConfig;
import org.eclipse.linuxtools.docker.core.IDockerImageInfo;
-import com.spotify.docker.client.messages.ImageInfo;
+import org.mandas.docker.client.messages.ImageInfo;
public class DockerImageInfo implements IDockerImageInfo {
diff --git a/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/DockerIpam.java b/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/DockerIpam.java
index 9f53872bd70e2675da8062ef4d2905dd5354ec9c..8470f3c55fc61cf71931c3a8a701412c1458e474 100644
--- a/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/DockerIpam.java
+++ b/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/DockerIpam.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2016, 2018 Red Hat.
+ * Copyright (c) 2016, 2020 Red Hat.
*
* This program and the accompanying materials are made
* available under the terms of the Eclipse Public License 2.0
@@ -18,8 +18,8 @@ import java.util.List;
import org.eclipse.linuxtools.docker.core.IDockerIpam;
import org.eclipse.linuxtools.docker.core.IDockerIpamConfig;
-import com.spotify.docker.client.messages.Ipam;
-import com.spotify.docker.client.messages.IpamConfig;
+import org.mandas.docker.client.messages.Ipam;
+import org.mandas.docker.client.messages.IpamConfig;
public class DockerIpam implements IDockerIpam {
diff --git a/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/DockerIpamConfig.java b/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/DockerIpamConfig.java
index 880995b943ce915a709555ff46f4a81eb50ce703..c56e01178540388de4ae0ff079c94f5c3523dd60 100644
--- a/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/DockerIpamConfig.java
+++ b/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/DockerIpamConfig.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2016, 2018 Red Hat.
+ * Copyright (c) 2016, 2020 Red Hat.
*
* This program and the accompanying materials are made
* available under the terms of the Eclipse Public License 2.0
@@ -14,7 +14,7 @@ package org.eclipse.linuxtools.internal.docker.core;
import org.eclipse.linuxtools.docker.core.IDockerIpamConfig;
-import com.spotify.docker.client.messages.IpamConfig;
+import org.mandas.docker.client.messages.IpamConfig;
public class DockerIpamConfig implements IDockerIpamConfig {
diff --git a/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/DockerLogConfig.java b/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/DockerLogConfig.java
index 6c6bedf30bc9f1fe866c4e82ef29bde48b51c86a..c218955edaba22076f714a96d54b30a2f98ceba4 100644
--- a/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/DockerLogConfig.java
+++ b/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/DockerLogConfig.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2019 Red Hat.
+ * Copyright (c) 2019, 2020 Red Hat.
*
* This program and the accompanying materials are made
* available under the terms of the Eclipse Public License 2.0
@@ -16,7 +16,7 @@ import java.util.Map;
import org.eclipse.linuxtools.docker.core.IDockerLogConfig;
-import com.spotify.docker.client.messages.LogConfig;
+import org.mandas.docker.client.messages.LogConfig;
public class DockerLogConfig implements IDockerLogConfig {
diff --git a/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/DockerNetwork.java b/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/DockerNetwork.java
index 6e5946fc656b44cabd9d81990e881cb8767615d5..04afc2b051a2325c1c326af05b685504f634afe9 100644
--- a/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/DockerNetwork.java
+++ b/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/DockerNetwork.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2016, 2018 Red Hat.
+ * Copyright (c) 2016, 2020 Red Hat.
*
* This program and the accompanying materials are made
* available under the terms of the Eclipse Public License 2.0
@@ -19,7 +19,7 @@ import org.eclipse.linuxtools.docker.core.IDockerIpam;
import org.eclipse.linuxtools.docker.core.IDockerNetwork;
import org.eclipse.linuxtools.docker.core.IDockerNetworkContainer;
-import com.spotify.docker.client.messages.Network;
+import org.mandas.docker.client.messages.Network;
public class DockerNetwork implements IDockerNetwork {
diff --git a/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/DockerNetworkConfig.java b/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/DockerNetworkConfig.java
index 91f9a276cabb6511e99cfbecc9c007e9214a72cb..2c68461973f68d3b843868d3dd6a5da263b00610 100644
--- a/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/DockerNetworkConfig.java
+++ b/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/DockerNetworkConfig.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2016, 2018 Red Hat.
+ * Copyright (c) 2016, 2020 Red Hat.
*
* This program and the accompanying materials are made
* available under the terms of the Eclipse Public License 2.0
@@ -17,7 +17,7 @@ import java.util.Map;
import org.eclipse.linuxtools.docker.core.IDockerIpam;
import org.eclipse.linuxtools.docker.core.IDockerNetworkConfig;
-import com.spotify.docker.client.messages.NetworkConfig;
+import org.mandas.docker.client.messages.NetworkConfig;
public class DockerNetworkConfig implements IDockerNetworkConfig {
diff --git a/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/DockerNetworkContainer.java b/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/DockerNetworkContainer.java
index fc5ec315fe47758a960b7fefed842e7ee276bb2c..aa1461fbb8349e48fa7cd5385e846652ee153fcd 100644
--- a/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/DockerNetworkContainer.java
+++ b/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/DockerNetworkContainer.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2016, 2018 Red Hat.
+ * Copyright (c) 2016, 2020 Red Hat.
*
* This program and the accompanying materials are made
* available under the terms of the Eclipse Public License 2.0
@@ -14,7 +14,7 @@ package org.eclipse.linuxtools.internal.docker.core;
import org.eclipse.linuxtools.docker.core.IDockerNetworkContainer;
-import com.spotify.docker.client.messages.Network;
+import org.mandas.docker.client.messages.Network;
public class DockerNetworkContainer implements IDockerNetworkContainer {
diff --git a/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/DockerNetworkCreation.java b/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/DockerNetworkCreation.java
index d675cbe71909ae263be44e839117b50f67757f4e..4a923af2061039367cc4cc1261a6fbe7ce30c9ed 100644
--- a/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/DockerNetworkCreation.java
+++ b/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/DockerNetworkCreation.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2016, 2018 Red Hat.
+ * Copyright (c) 2016, 2020 Red Hat.
*
* This program and the accompanying materials are made
* available under the terms of the Eclipse Public License 2.0
@@ -14,7 +14,7 @@ package org.eclipse.linuxtools.internal.docker.core;
import org.eclipse.linuxtools.docker.core.IDockerNetworkCreation;
-import com.spotify.docker.client.messages.NetworkCreation;
+import org.mandas.docker.client.messages.NetworkCreation;
public class DockerNetworkCreation implements IDockerNetworkCreation {
diff --git a/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/DockerNetworkSettings.java b/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/DockerNetworkSettings.java
index a0a9215520b8898709dc85a990e03d78c011e076..45b8d9cae666f9f5a231497de5e023de3cf9f69f 100644
--- a/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/DockerNetworkSettings.java
+++ b/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/DockerNetworkSettings.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2014, 2018 Red Hat.
+ * Copyright (c) 2014, 2020 Red Hat.
*
* This program and the accompanying materials are made
* available under the terms of the Eclipse Public License 2.0
@@ -22,8 +22,8 @@ import java.util.Map.Entry;
import org.eclipse.linuxtools.docker.core.IDockerNetworkSettings;
import org.eclipse.linuxtools.docker.core.IDockerPortBinding;
-import com.spotify.docker.client.messages.NetworkSettings;
-import com.spotify.docker.client.messages.PortBinding;
+import org.mandas.docker.client.messages.NetworkSettings;
+import org.mandas.docker.client.messages.PortBinding;
public class DockerNetworkSettings implements IDockerNetworkSettings {
diff --git a/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/DockerPortBinding.java b/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/DockerPortBinding.java
index efd76a566ccd35832a57bf4fa24cc242f4afb8dc..1f6997b08a683bb9abf802a16868a933564226e5 100644
--- a/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/DockerPortBinding.java
+++ b/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/DockerPortBinding.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2014, 2018 Red Hat.
+ * Copyright (c) 2014, 2020 Red Hat.
*
* This program and the accompanying materials are made
* available under the terms of the Eclipse Public License 2.0
@@ -14,7 +14,7 @@ package org.eclipse.linuxtools.internal.docker.core;
import org.eclipse.linuxtools.docker.core.IDockerPortBinding;
-import com.spotify.docker.client.messages.PortBinding;
+import org.mandas.docker.client.messages.PortBinding;
public class DockerPortBinding implements IDockerPortBinding {
diff --git a/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/DockerProgressHandler.java b/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/DockerProgressHandler.java
index de47d2a39cf710f624fd4ef60ed4eb5d442345df..25129bc3d8631f20485c7b5d6e27f6cba61a0416 100644
--- a/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/DockerProgressHandler.java
+++ b/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/DockerProgressHandler.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2014, 2018 Red Hat.
+ * Copyright (c) 2014, 2020 Red Hat.
*
* This program and the accompanying materials are made
* available under the terms of the Eclipse Public License 2.0
@@ -14,10 +14,10 @@ package org.eclipse.linuxtools.internal.docker.core;
import org.eclipse.linuxtools.docker.core.IDockerProgressHandler;
-import com.spotify.docker.client.ProgressHandler;
-import com.spotify.docker.client.exceptions.DockerException;
-import com.spotify.docker.client.messages.ProgressDetail;
-import com.spotify.docker.client.messages.ProgressMessage;
+import org.mandas.docker.client.ProgressHandler;
+import org.mandas.docker.client.exceptions.DockerException;
+import org.mandas.docker.client.messages.ProgressDetail;
+import org.mandas.docker.client.messages.ProgressMessage;
public class DockerProgressHandler implements ProgressHandler {
diff --git a/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/DockerRestartPolicy.java b/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/DockerRestartPolicy.java
index a591e759fab576ab4b59e3d52a68847d35805e1b..5e61664641a21811e1ca6a58aacb0c3d97354878 100644
--- a/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/DockerRestartPolicy.java
+++ b/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/DockerRestartPolicy.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2019 Red Hat.
+ * Copyright (c) 2019, 2020 Red Hat.
*
* This program and the accompanying materials are made
* available under the terms of the Eclipse Public License 2.0
@@ -14,7 +14,7 @@ package org.eclipse.linuxtools.internal.docker.core;
import org.eclipse.linuxtools.docker.core.IDockerRestartPolicy;
-import com.spotify.docker.client.messages.HostConfig.RestartPolicy;
+import org.mandas.docker.client.messages.HostConfig.RestartPolicy;
public class DockerRestartPolicy implements IDockerRestartPolicy {
diff --git a/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/DockerUlimit.java b/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/DockerUlimit.java
index 75b4d49368d6cbee6f226198dd6ef725ab94601c..96b42db030b0d3520117a9e9db264f9a78527def 100644
--- a/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/DockerUlimit.java
+++ b/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/DockerUlimit.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2019 Red Hat.
+ * Copyright (c) 2019, 2020 Red Hat.
*
* This program and the accompanying materials are made
* available under the terms of the Eclipse Public License 2.0
@@ -14,7 +14,7 @@ package org.eclipse.linuxtools.internal.docker.core;
import org.eclipse.linuxtools.docker.core.IDockerUlimit;
-import com.spotify.docker.client.messages.HostConfig.Ulimit;
+import org.mandas.docker.client.messages.HostConfig.Ulimit;
public class DockerUlimit implements IDockerUlimit {
diff --git a/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/DockerVersion.java b/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/DockerVersion.java
index 5623557dbf23252f76f41259361e64f598dfc73e..c930bd888fd97b380e56c09995a3e889306540c1 100644
--- a/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/DockerVersion.java
+++ b/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/DockerVersion.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2016, 2018 Red Hat.
+ * Copyright (c) 2016, 2020 Red Hat.
*
* This program and the accompanying materials are made
* available under the terms of the Eclipse Public License 2.0
@@ -15,8 +15,8 @@ package org.eclipse.linuxtools.internal.docker.core;
import org.eclipse.linuxtools.docker.core.IDockerConnection;
import org.eclipse.linuxtools.docker.core.IDockerVersion;
-import com.spotify.docker.client.DockerClient;
-import com.spotify.docker.client.messages.Version;
+import org.mandas.docker.client.DockerClient;
+import org.mandas.docker.client.messages.Version;
public class DockerVersion implements IDockerVersion {
diff --git a/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/DockerVolume.java b/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/DockerVolume.java
index 34d41443ac3c42ace1c050056f41083fb62db8e1..7d4547af75cfc49a8c11ec784fa4b10de7ddc706 100644
--- a/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/DockerVolume.java
+++ b/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/DockerVolume.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2019 Red Hat.
+ * Copyright (c) 2019, 2020 Red Hat.
*
* This program and the accompanying materials are made
* available under the terms of the Eclipse Public License 2.0
@@ -16,7 +16,7 @@ import java.util.Map;
import org.eclipse.linuxtools.docker.core.IDockerVolume;
-import com.spotify.docker.client.messages.Volume;
+import org.mandas.docker.client.messages.Volume;
public class DockerVolume implements IDockerVolume {
diff --git a/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/HttpHijackWorkaround.java b/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/HttpHijackWorkaround.java
index e163ca86c47168e4b7447f44a73f9b5489aaef42..b71b124134153c7bfd5af3b190977145772c7519 100644
--- a/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/HttpHijackWorkaround.java
+++ b/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/HttpHijackWorkaround.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2015, 2018 Red Hat.
+ * Copyright (c) 2015, 2020 Red Hat.
*
* This program and the accompanying materials are made
* available under the terms of the Eclipse Public License 2.0
@@ -26,8 +26,8 @@ import org.eclipse.core.runtime.Platform;
import org.eclipse.linuxtools.docker.core.Activator;
import org.osgi.framework.Bundle;
-import com.spotify.docker.client.LogReader;
-import com.spotify.docker.client.LogStream;
+import org.mandas.docker.client.LogReader;
+import org.mandas.docker.client.LogStream;
/**
* This is a workaround for lack of HTTP Hijacking support in Apache
@@ -51,10 +51,10 @@ public class HttpHijackWorkaround {
"in", //$NON-NLS-1$
"wrappedStream", //$NON-NLS-1$
"in", //$NON-NLS-1$
- "instream" //$NON-NLS-1$
+ "inStream" //$NON-NLS-1$
};
final String[] declared = new String[] {
- "com.spotify.docker.client.DefaultLogStream",
+ "org.mandas.docker.client.DefaultLogStream",
LogReader.class.getName(),
"org.glassfish.jersey.message.internal.ReaderInterceptorExecutor$UnCloseableInputStream", //$NON-NLS-1$
"org.glassfish.jersey.message.internal.EntityInputStream", //$NON-NLS-1$
@@ -121,13 +121,13 @@ public class HttpHijackWorkaround {
}
/*
- * We could add API for this in com.spotify.docker.client since there is
+ * We could add API for this in org.mandas.docker.client since there is
* access to the underlying InputStream but better wait and see what
* happens with the HTTP Hijacking situation.
*/
public static InputStream getInputStream(LogStream stream) {
final String[] fields = new String[] { "reader", "stream" }; //$NON-NLS-1$ //$NON-NLS-2$
- final String[] declared = new String[] { "com.spotify.docker.client.DefaultLogStream", LogReader.class.getName()};
+ final String[] declared = new String[] { "org.mandas.docker.client.DefaultLogStream", LogReader.class.getName()};
List<String[]> list = new LinkedList<>();
for (int i = 0; i < fields.length; i++) {
@@ -155,7 +155,7 @@ public class HttpHijackWorkaround {
/*
* Avoid explicitly depending on certain classes that are requirements
- * of the docker-client library (com.spotify.docker.client).
+ * of the docker-client library (org.mandas.docker.client).
*/
private static Class<?> loadClass(String key, String [] bundles) {
try {
diff --git a/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/ImageSearchResultV1.java b/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/ImageSearchResultV1.java
index 66f9f2cc39ead5e8a02625b6a58777b27b6ab146..88341db56d15aa949dd9aabf367eea33d71c38a2 100644
--- a/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/ImageSearchResultV1.java
+++ b/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/ImageSearchResultV1.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2016, 2018 Red Hat.
+ * Copyright (c) 2016, 2020 Red Hat.
*
* This program and the accompanying materials are made
* available under the terms of the Eclipse Public License 2.0
@@ -21,7 +21,7 @@ import java.util.List;
import com.fasterxml.jackson.annotation.JsonAutoDetect;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.google.common.base.MoreObjects;
-import com.spotify.docker.client.messages.ImageSearchResult;
+import org.mandas.docker.client.messages.ImageSearchResult;
/**
* Binding for Image Search Results from a Registry V1.
diff --git a/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/ImageSearchResultV2.java b/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/ImageSearchResultV2.java
index 00cb5f4264e7c76b6f5ca9998ab0e86e1073dda8..951e8678659f5945c3574edfa6aca86c8486011b 100644
--- a/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/ImageSearchResultV2.java
+++ b/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/ImageSearchResultV2.java
@@ -1,6 +1,6 @@
/*******************************************************************************
- * Copyright (c) 2016, 2018 Red Hat.
- *
+ * Copyright (c) 2016, 2020 Red Hat.
+ *
* This program and the accompanying materials are made
* available under the terms of the Eclipse Public License 2.0
* which is available at https://www.eclipse.org/legal/epl-2.0/
@@ -18,14 +18,15 @@ import static com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility.NONE;
import java.util.ArrayList;
import java.util.List;
+import org.mandas.docker.client.messages.ImageSearchResult;
+
import com.fasterxml.jackson.annotation.JsonAutoDetect;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.google.common.base.MoreObjects;
-import com.spotify.docker.client.messages.ImageSearchResult;
/**
* Binding for Image Search Results from a Registry V2.
- *
+ *
* Currently the returned image search results lack the same degree of
* information returned from the V1 registries.
*/
@@ -49,7 +50,7 @@ public class ImageSearchResultV2 {
.add("results", getRepositories()).toString(); //$NON-NLS-1$
}
- private class ImageResultV2 extends ImageSearchResult {
+ private class ImageResultV2 implements ImageSearchResult {
private String name;
diff --git a/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/ProcessMessages.properties b/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/ProcessMessages.properties
index fd66ff1c817f37abe1a602a36a951a4500f1a1df..0641cebea98ad4822011a39c22f091794531b07f 100644
--- a/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/ProcessMessages.properties
+++ b/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/ProcessMessages.properties
@@ -17,7 +17,7 @@ Process_Monitor_Exception=Failed to monitor process
Monitor_Logs_Exception=Failed to monitor container logs
Settings_Detection_Exception=Failed to retrieve connection settings
Container_Info_Exception=Failed to retrieve container info
-Image_Info_exception=Failed to retrieve image info
+Image_Info_Exception=Failed to retrieve image info
Container_Inspect_Exception=Failed to inspect container: ''{0}''
Image_Inspect_Exception=Failed to inspect image: ''{0}''
diff --git a/containers/org.eclipse.linuxtools.docker.docs/META-INF/MANIFEST.MF b/containers/org.eclipse.linuxtools.docker.docs/META-INF/MANIFEST.MF
index 324c998ea4bfd3afc9f931c3004c607182fd4d1d..09d128620f4303dcaee388d9ab76e7a883fb3690 100644
--- a/containers/org.eclipse.linuxtools.docker.docs/META-INF/MANIFEST.MF
+++ b/containers/org.eclipse.linuxtools.docker.docs/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.linuxtools.docker.docs;singleton:=true
-Bundle-Version: 4.4.0.qualifier
+Bundle-Version: 5.1.0.qualifier
Bundle-Vendor: %providerName
Require-Bundle: org.eclipse.help
Bundle-Localization: plugin
diff --git a/containers/org.eclipse.linuxtools.docker.docs/pom.xml b/containers/org.eclipse.linuxtools.docker.docs/pom.xml
index e6b53feb34168b21b6a452d63ee9519e636d88bf..32f6bab570a91d827297317f22c9ef9a84c5d148 100644
--- a/containers/org.eclipse.linuxtools.docker.docs/pom.xml
+++ b/containers/org.eclipse.linuxtools.docker.docs/pom.xml
@@ -15,11 +15,11 @@
<parent>
<artifactId>org.eclipse.linuxtools.docker</artifactId>
<groupId>org.eclipse.linuxtools</groupId>
- <version>4.4.0</version>
+ <version>5.1.0</version>
</parent>
<artifactId>org.eclipse.linuxtools.docker.docs</artifactId>
- <version>4.4.0-SNAPSHOT</version>
+ <version>5.1.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
<name>Linux Tools Docker Tooling Documentation Plug-in</name>
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.remote-feature/.project b/containers/org.eclipse.linuxtools.docker.editor.ls-feature/.project
similarity index 84%
rename from oprofile/org.eclipse.linuxtools.oprofile.remote-feature/.project
rename to containers/org.eclipse.linuxtools.docker.editor.ls-feature/.project
index a19ed707832276fca632433ab8c4a184d724191a..f77d163e36685d338c77996af72cc2d47c80dcb2 100644
--- a/oprofile/org.eclipse.linuxtools.oprofile.remote-feature/.project
+++ b/containers/org.eclipse.linuxtools.docker.editor.ls-feature/.project
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.eclipse.linuxtools.oprofile.remote-feature</name>
+ <name>org.eclipse.linuxtools.docker.editor.ls-feature</name>
<comment></comment>
<projects>
</projects>
diff --git a/oprofile/org.eclipse.linuxtools.oprofile-feature/build.properties b/containers/org.eclipse.linuxtools.docker.editor.ls-feature/build.properties
similarity index 50%
rename from oprofile/org.eclipse.linuxtools.oprofile-feature/build.properties
rename to containers/org.eclipse.linuxtools.docker.editor.ls-feature/build.properties
index e2782da3e00d2a6d228dae82eddca29479d648f1..c8e4e44fc6a29dbf956c01a0d268d7ed96021162 100644
--- a/oprofile/org.eclipse.linuxtools.oprofile-feature/build.properties
+++ b/containers/org.eclipse.linuxtools.docker.editor.ls-feature/build.properties
@@ -1,6 +1,6 @@
bin.includes = feature.xml,\
+ feature.properties
+src.includes = build.properties,\
feature.properties,\
- p2.inf
-src.includes = feature.properties,\
feature.xml,\
- ChangeLog
+ .project
diff --git a/containers/org.eclipse.linuxtools.docker.editor.ls-feature/feature.properties b/containers/org.eclipse.linuxtools.docker.editor.ls-feature/feature.properties
new file mode 100644
index 0000000000000000000000000000000000000000..be42090150877713b666278574d947c022ccf202
--- /dev/null
+++ b/containers/org.eclipse.linuxtools.docker.editor.ls-feature/feature.properties
@@ -0,0 +1,10 @@
+# features.properties
+# contains externalized strings for feature.xml
+# "%foo" in feature.xml corresponds to the key "foo" in this file
+# java.io.Properties file (ISO 8859-1 with "\" escapes)
+# This file should be translated.
+
+featureProvider=Eclipse Linux Tools
+featureName=Docker Tooling Editor
+featureDescription=The Docker Tooling Editor feature provides content assist and syntax highlighting when editing Dockerfiles.
+copyright=Copyright 2019, 2020 Red Hat, Inc.
diff --git a/containers/org.eclipse.linuxtools.docker.editor.ls-feature/feature.xml b/containers/org.eclipse.linuxtools.docker.editor.ls-feature/feature.xml
new file mode 100644
index 0000000000000000000000000000000000000000..904ad6bd8f365ef1c1cf3c7e530f519fefb4f3d6
--- /dev/null
+++ b/containers/org.eclipse.linuxtools.docker.editor.ls-feature/feature.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+ id="org.eclipse.linuxtools.docker.editor.ls.feature"
+ label="%featureName"
+ version="5.1.0.qualifier"
+ provider-name="%featureProvider"
+ license-feature="org.eclipse.license"
+ license-feature-version="0.0.0">
+
+ <description url="http://www.eclipse.org/linuxtools">
+ %featureDescription
+ </description>
+
+ <copyright url="http://www.redhat.com">
+ %copyright
+ </copyright>
+
+ <license url="%licenseURL">
+ %license
+ </license>
+
+ <url>
+ <update label="Linux Tools Docker Update Site" url="http://download.eclipse.org/linuxtools/update-docker"/>
+ </url>
+
+ <plugin
+ id="org.eclipse.linuxtools.docker.editor.ls"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"/>
+
+</feature>
diff --git a/oprofile/org.eclipse.linuxtools.oprofile-feature/pom.xml b/containers/org.eclipse.linuxtools.docker.editor.ls-feature/pom.xml
similarity index 73%
rename from oprofile/org.eclipse.linuxtools.oprofile-feature/pom.xml
rename to containers/org.eclipse.linuxtools.docker.editor.ls-feature/pom.xml
index efb06bb026f9ce1d093607cb3df22d051c78ad33..d63a5f498d7863793eab283fff6f12cbfa161bf2 100644
--- a/oprofile/org.eclipse.linuxtools.oprofile-feature/pom.xml
+++ b/containers/org.eclipse.linuxtools.docker.editor.ls-feature/pom.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (C) 2011, 2018 Red Hat, Inc.
+ Copyright (C) 2019, 2020 Red Hat, Inc.
This program and the accompanying materials are made
available under the terms of the Eclipse Public License 2.0
@@ -11,18 +11,17 @@
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
-
<parent>
- <artifactId>linuxtools-oprofile-parent</artifactId>
- <groupId>org.eclipse.linuxtools.oprofile</groupId>
- <version>7.4.0</version>
+ <groupId>org.eclipse.linuxtools</groupId>
+ <artifactId>org.eclipse.linuxtools.docker</artifactId>
+ <version>5.1.0</version>
</parent>
- <artifactId>org.eclipse.linuxtools.oprofile.feature</artifactId>
+ <artifactId>org.eclipse.linuxtools.docker.editor.ls.feature</artifactId>
<packaging>eclipse-feature</packaging>
- <version>7.4.0-SNAPSHOT</version>
+ <version>5.1.0-SNAPSHOT</version>
- <name>Linux Tools OProfile Integration Feature</name>
+ <name>Linux Tools Docker Tooling Editor Feature</name>
<build>
<plugins>
@@ -36,11 +35,6 @@
<goals>
<goal>source-feature</goal>
</goals>
- <configuration>
- <excludes>
- <plugin id="org.eclipse.linuxtools.oprofile.doc"/>
- </excludes>
- </configuration>
</execution>
</executions>
</plugin>
diff --git a/containers/org.eclipse.linuxtools.docker.editor/.classpath b/containers/org.eclipse.linuxtools.docker.editor.ls.tests/.classpath
similarity index 67%
rename from containers/org.eclipse.linuxtools.docker.editor/.classpath
rename to containers/org.eclipse.linuxtools.docker.editor.ls.tests/.classpath
index eca7bdba8f03f22510b7980a94dbfe10c16c0901..a42a828e04a56494db334010723fbea280ad90dd 100644
--- a/containers/org.eclipse.linuxtools.docker.editor/.classpath
+++ b/containers/org.eclipse.linuxtools.docker.editor.ls.tests/.classpath
@@ -1,7 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="src" path="src"/>
+ <classpathentry kind="src" path="src">
+ <attributes>
+ <attribute name="test" value="true"/>
+ </attributes>
+ </classpathentry>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core.tests/.project b/containers/org.eclipse.linuxtools.docker.editor.ls.tests/.project
similarity index 91%
rename from oprofile/org.eclipse.linuxtools.oprofile.core.tests/.project
rename to containers/org.eclipse.linuxtools.docker.editor.ls.tests/.project
index 775970bedcb20143c92370c817435f0c94e192aa..6831558a42e9e614588d7ac125c732bee5d403af 100644
--- a/oprofile/org.eclipse.linuxtools.oprofile.core.tests/.project
+++ b/containers/org.eclipse.linuxtools.docker.editor.ls.tests/.project
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.eclipse.linuxtools.oprofile.core.tests</name>
+ <name>org.eclipse.linuxtools.docker.editor.ls.tests</name>
<comment></comment>
<projects>
</projects>
@@ -22,7 +22,7 @@
</buildCommand>
</buildSpec>
<natures>
- <nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.eclipse.pde.PluginNature</nature>
</natures>
</projectDescription>
diff --git a/containers/org.eclipse.linuxtools.docker.editor.ls.tests/.settings/org.eclipse.jdt.core.prefs b/containers/org.eclipse.linuxtools.docker.editor.ls.tests/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000000000000000000000000000000000000..f2525a8b92227620edba3ac50006e8c33c8ff2c6
--- /dev/null
+++ b/containers/org.eclipse.linuxtools.docker.editor.ls.tests/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,14 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=11
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11
diff --git a/containers/org.eclipse.linuxtools.docker.editor.ls.tests/.settings/org.eclipse.pde.prefs b/containers/org.eclipse.linuxtools.docker.editor.ls.tests/.settings/org.eclipse.pde.prefs
new file mode 100644
index 0000000000000000000000000000000000000000..2174e4fd5b04151e73b5664971f3d64521d4e6e4
--- /dev/null
+++ b/containers/org.eclipse.linuxtools.docker.editor.ls.tests/.settings/org.eclipse.pde.prefs
@@ -0,0 +1,34 @@
+compilers.f.unresolved-features=1
+compilers.f.unresolved-plugins=1
+compilers.incompatible-environment=1
+compilers.p.build=1
+compilers.p.build.bin.includes=1
+compilers.p.build.encodings=2
+compilers.p.build.java.compiler=2
+compilers.p.build.java.compliance=1
+compilers.p.build.missing.output=2
+compilers.p.build.output.library=1
+compilers.p.build.source.library=1
+compilers.p.build.src.includes=1
+compilers.p.deprecated=1
+compilers.p.discouraged-class=1
+compilers.p.internal=1
+compilers.p.missing-packages=2
+compilers.p.missing-version-export-package=2
+compilers.p.missing-version-import-package=2
+compilers.p.missing-version-require-bundle=2
+compilers.p.no-required-att=0
+compilers.p.no.automatic.module=1
+compilers.p.not-externalized-att=2
+compilers.p.service.component.without.lazyactivation=1
+compilers.p.unknown-attribute=1
+compilers.p.unknown-class=1
+compilers.p.unknown-element=1
+compilers.p.unknown-identifier=1
+compilers.p.unknown-resource=1
+compilers.p.unresolved-ex-points=0
+compilers.p.unresolved-import=0
+compilers.s.create-docs=false
+compilers.s.doc-folder=doc
+compilers.s.open-tags=1
+eclipse.preferences.version=1
diff --git a/containers/org.eclipse.linuxtools.docker.editor.ls.tests/META-INF/MANIFEST.MF b/containers/org.eclipse.linuxtools.docker.editor.ls.tests/META-INF/MANIFEST.MF
new file mode 100644
index 0000000000000000000000000000000000000000..e3d3a5be4f5e521a2238b94c0270494f072ebcab
--- /dev/null
+++ b/containers/org.eclipse.linuxtools.docker.editor.ls.tests/META-INF/MANIFEST.MF
@@ -0,0 +1,18 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Tests
+Bundle-SymbolicName: org.eclipse.linuxtools.docker.editor.ls.tests
+Bundle-Version: 1.0.0.qualifier
+Fragment-Host: org.eclipse.linuxtools.docker.editor.ls
+Automatic-Module-Name: org.eclipse.linuxtools.docker.editor.ls.tests
+Bundle-RequiredExecutionEnvironment: JavaSE-11
+Require-Bundle: org.eclipse.core.resources,
+ org.junit,
+ org.eclipse.ui.workbench,
+ org.eclipse.equinox.preferences,
+ org.eclipse.ui.workbench.texteditor,
+ org.eclipse.equinox.common,
+ org.eclipse.ui.ide,
+ org.eclipse.jface.text,
+ org.eclipse.ui.tests.harness,
+ org.eclipse.swt
diff --git a/containers/org.eclipse.linuxtools.docker.editor.ls.tests/build.properties b/containers/org.eclipse.linuxtools.docker.editor.ls.tests/build.properties
new file mode 100644
index 0000000000000000000000000000000000000000..b107977f4ed7c4ae7bc2725947b2e16e5b30f4b1
--- /dev/null
+++ b/containers/org.eclipse.linuxtools.docker.editor.ls.tests/build.properties
@@ -0,0 +1,3 @@
+source.. = src/
+bin.includes = META-INF/,\
+ .
diff --git a/containers/org.eclipse.linuxtools.docker.editor.ls.tests/pom.xml b/containers/org.eclipse.linuxtools.docker.editor.ls.tests/pom.xml
new file mode 100644
index 0000000000000000000000000000000000000000..3b6c93ba58d7b8ed5d7937d265eec97508f877a8
--- /dev/null
+++ b/containers/org.eclipse.linuxtools.docker.editor.ls.tests/pom.xml
@@ -0,0 +1,25 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.eclipse.linuxtools</groupId>
+ <artifactId>org.eclipse.linuxtools.docker</artifactId>
+ <version>5.1.0</version>
+ </parent>
+ <artifactId>org.eclipse.linuxtools.docker.editor.ls.tests</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <packaging>eclipse-test-plugin</packaging>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-surefire-plugin</artifactId>
+ <version>${tycho-version}</version>
+ <configuration>
+ <useUIThread>true</useUIThread>
+ <useUIHarness>true</useUIHarness>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
diff --git a/containers/org.eclipse.linuxtools.docker.editor.ls.tests/src/org/eclipse/linuxtools/docker/editor/ls/tests/TestLanguageServers.java b/containers/org.eclipse.linuxtools.docker.editor.ls.tests/src/org/eclipse/linuxtools/docker/editor/ls/tests/TestLanguageServers.java
new file mode 100644
index 0000000000000000000000000000000000000000..e872feff8ff15b946cd8bb49b7846c0caf81ee22
--- /dev/null
+++ b/containers/org.eclipse.linuxtools.docker.editor.ls.tests/src/org/eclipse/linuxtools/docker/editor/ls/tests/TestLanguageServers.java
@@ -0,0 +1,90 @@
+/*******************************************************************************
+ * Copyright (c) 2019 Red Hat Inc. and others.
+ *
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ * Red Hat Inc. - initial implementation
+ *******************************************************************************/
+package org.eclipse.linuxtools.docker.editor.ls.tests;
+
+import static org.junit.Assert.assertTrue;
+
+import java.io.ByteArrayInputStream;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.preferences.InstanceScope;
+import org.eclipse.ui.IViewReference;
+import org.eclipse.ui.IWorkbenchPage;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.ide.IDE;
+import org.eclipse.ui.preferences.ScopedPreferenceStore;
+import org.eclipse.ui.tests.harness.util.DisplayHelper;
+import org.eclipse.ui.texteditor.ITextEditor;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameter;
+import org.junit.runners.Parameterized.Parameters;
+
+@RunWith(Parameterized.class)
+public class TestLanguageServers {
+
+ private IProject project;
+
+ @Parameter
+ public String fileName;
+
+ @Before
+ public void setUpProject() throws Exception {
+ ScopedPreferenceStore prefs = new ScopedPreferenceStore(InstanceScope.INSTANCE, "org.eclipse.lsp4e");
+ prefs.putValue("org.eclipse.linuxtools.docker.editor.ls.server.logging.enabled", Boolean.toString(true));
+ this.project = ResourcesPlugin.getWorkspace().getRoot().getProject(getClass().getName() + System.nanoTime());
+ project.create(null);
+ project.open(null);
+ IWorkbenchPage activePage = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
+ for (IViewReference ref : activePage.getViewReferences()) {
+ activePage.hideView(ref);
+ }
+ }
+
+ @After
+ public void deleteProjectAndCloseEditors() throws Exception {
+ PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().closeAllEditors(false);
+ this.project.delete(true, null);
+ }
+
+ @Parameters
+ public static Object[] data() {
+ return new Object[] { "test.dockerfile", "Dockerfile" };
+ }
+
+ @Test
+ public void testDiagnostics() throws Exception {
+ final IFile file = project.getFile(fileName);
+ file.create(new ByteArrayInputStream("".getBytes()), true, null);
+ ITextEditor editor = (ITextEditor) IDE
+ .openEditor(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage(), file, "org.eclipse.ui.genericeditor.GenericEditor");
+ editor.getDocumentProvider().getDocument(editor.getEditorInput()).set("MAINTAINER alex");
+ assertTrue("Diagnostic not published", new DisplayHelper() {
+ @Override
+ protected boolean condition() {
+ try {
+ return file.findMarkers("org.eclipse.lsp4e.diagnostic", true, IResource.DEPTH_ZERO).length != 0;
+ } catch (CoreException e) {
+ return false;
+ }
+ }
+ }.waitForCondition(PlatformUI.getWorkbench().getDisplay(), 5000));
+ }
+}
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.launch/.classpath b/containers/org.eclipse.linuxtools.docker.editor.ls/.classpath
similarity index 95%
rename from oprofile/org.eclipse.linuxtools.oprofile.launch/.classpath
rename to containers/org.eclipse.linuxtools.docker.editor.ls/.classpath
index 43b986286a9e5fd1828793fa4b2353d02ab8625f..1db08c6b4ce2fb50395b2f9c9a50c140a0bab199 100644
--- a/oprofile/org.eclipse.linuxtools.oprofile.launch/.classpath
+++ b/containers/org.eclipse.linuxtools.docker.editor.ls/.classpath
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="target/classes"/>
diff --git a/containers/org.eclipse.linuxtools.docker.editor.ls/.gitignore b/containers/org.eclipse.linuxtools.docker.editor.ls/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..d1a09283b6a1ee3663fcd7c80687d116b3cd2a74
--- /dev/null
+++ b/containers/org.eclipse.linuxtools.docker.editor.ls/.gitignore
@@ -0,0 +1 @@
+language-server
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.tests/.project b/containers/org.eclipse.linuxtools.docker.editor.ls/.project
similarity index 91%
rename from oprofile/org.eclipse.linuxtools.oprofile.tests/.project
rename to containers/org.eclipse.linuxtools.docker.editor.ls/.project
index c8e31b70bf966a9e7999941ebc316ada95f62929..8a2f7d9ebb0555f4f8b734dde861edefb0cc173c 100644
--- a/oprofile/org.eclipse.linuxtools.oprofile.tests/.project
+++ b/containers/org.eclipse.linuxtools.docker.editor.ls/.project
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.eclipse.linuxtools.oprofile.tests</name>
+ <name>org.eclipse.linuxtools.docker.editor.ls</name>
<comment></comment>
<projects>
</projects>
diff --git a/containers/org.eclipse.linuxtools.docker.editor.ls/.settings/org.eclipse.jdt.core.prefs b/containers/org.eclipse.linuxtools.docker.editor.ls/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000000000000000000000000000000000000..7adc0fb9a0d32bd6b4e3ce6f305ab7165208865c
--- /dev/null
+++ b/containers/org.eclipse.linuxtools.docker.editor.ls/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,10 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
+org.eclipse.jdt.core.compiler.compliance=11
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11
diff --git a/containers/org.eclipse.linuxtools.docker.editor.ls/.settings/org.eclipse.jdt.ui.prefs b/containers/org.eclipse.linuxtools.docker.editor.ls/.settings/org.eclipse.jdt.ui.prefs
new file mode 100644
index 0000000000000000000000000000000000000000..4d0957f024fc298eae03af350d5c8b90976b1d47
--- /dev/null
+++ b/containers/org.eclipse.linuxtools.docker.editor.ls/.settings/org.eclipse.jdt.ui.prefs
@@ -0,0 +1,72 @@
+eclipse.preferences.version=1
+editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
+sp_cleanup.add_default_serial_version_id=true
+sp_cleanup.add_generated_serial_version_id=false
+sp_cleanup.add_missing_annotations=true
+sp_cleanup.add_missing_deprecated_annotations=true
+sp_cleanup.add_missing_methods=false
+sp_cleanup.add_missing_nls_tags=false
+sp_cleanup.add_missing_override_annotations=true
+sp_cleanup.add_missing_override_annotations_interface_methods=true
+sp_cleanup.add_serial_version_id=false
+sp_cleanup.always_use_blocks=true
+sp_cleanup.always_use_parentheses_in_expressions=false
+sp_cleanup.always_use_this_for_non_static_field_access=false
+sp_cleanup.always_use_this_for_non_static_method_access=false
+sp_cleanup.convert_functional_interfaces=true
+sp_cleanup.convert_to_enhanced_for_loop=true
+sp_cleanup.convert_to_enhanced_for_loop_if_loop_var_used=false
+sp_cleanup.correct_indentation=false
+sp_cleanup.format_source_code=true
+sp_cleanup.format_source_code_changes_only=false
+sp_cleanup.insert_inferred_type_arguments=false
+sp_cleanup.lazy_logical_operator=false
+sp_cleanup.make_local_variable_final=true
+sp_cleanup.make_parameters_final=false
+sp_cleanup.make_private_fields_final=true
+sp_cleanup.make_type_abstract_if_missing_method=false
+sp_cleanup.make_variable_declarations_final=false
+sp_cleanup.merge_conditional_blocks=false
+sp_cleanup.never_use_blocks=false
+sp_cleanup.never_use_parentheses_in_expressions=true
+sp_cleanup.number_suffix=false
+sp_cleanup.on_save_use_additional_actions=true
+sp_cleanup.organize_imports=true
+sp_cleanup.push_down_negation=false
+sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
+sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
+sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
+sp_cleanup.qualify_static_member_accesses_with_declaring_class=false
+sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
+sp_cleanup.remove_private_constructors=true
+sp_cleanup.remove_redundant_modifiers=true
+sp_cleanup.remove_redundant_semicolons=true
+sp_cleanup.remove_redundant_type_arguments=true
+sp_cleanup.remove_trailing_whitespaces=true
+sp_cleanup.remove_trailing_whitespaces_all=true
+sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
+sp_cleanup.remove_unnecessary_array_creation=true
+sp_cleanup.remove_unnecessary_casts=true
+sp_cleanup.remove_unnecessary_nls_tags=false
+sp_cleanup.remove_unused_imports=false
+sp_cleanup.remove_unused_local_variables=false
+sp_cleanup.remove_unused_private_fields=true
+sp_cleanup.remove_unused_private_members=false
+sp_cleanup.remove_unused_private_methods=true
+sp_cleanup.remove_unused_private_types=true
+sp_cleanup.simplify_lambda_expression_and_method_ref=true
+sp_cleanup.sort_members=false
+sp_cleanup.sort_members_all=false
+sp_cleanup.use_anonymous_class_creation=false
+sp_cleanup.use_autoboxing=false
+sp_cleanup.use_blocks=false
+sp_cleanup.use_blocks_only_for_return_and_throw=false
+sp_cleanup.use_directly_map_method=true
+sp_cleanup.use_lambda=true
+sp_cleanup.use_parentheses_in_expressions=false
+sp_cleanup.use_this_for_non_static_field_access=false
+sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
+sp_cleanup.use_this_for_non_static_method_access=false
+sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+sp_cleanup.use_unboxing=false
+sp_cleanup.use_var=false
diff --git a/containers/org.eclipse.linuxtools.docker.editor.ls/.settings/org.eclipse.pde.prefs b/containers/org.eclipse.linuxtools.docker.editor.ls/.settings/org.eclipse.pde.prefs
new file mode 100644
index 0000000000000000000000000000000000000000..2174e4fd5b04151e73b5664971f3d64521d4e6e4
--- /dev/null
+++ b/containers/org.eclipse.linuxtools.docker.editor.ls/.settings/org.eclipse.pde.prefs
@@ -0,0 +1,34 @@
+compilers.f.unresolved-features=1
+compilers.f.unresolved-plugins=1
+compilers.incompatible-environment=1
+compilers.p.build=1
+compilers.p.build.bin.includes=1
+compilers.p.build.encodings=2
+compilers.p.build.java.compiler=2
+compilers.p.build.java.compliance=1
+compilers.p.build.missing.output=2
+compilers.p.build.output.library=1
+compilers.p.build.source.library=1
+compilers.p.build.src.includes=1
+compilers.p.deprecated=1
+compilers.p.discouraged-class=1
+compilers.p.internal=1
+compilers.p.missing-packages=2
+compilers.p.missing-version-export-package=2
+compilers.p.missing-version-import-package=2
+compilers.p.missing-version-require-bundle=2
+compilers.p.no-required-att=0
+compilers.p.no.automatic.module=1
+compilers.p.not-externalized-att=2
+compilers.p.service.component.without.lazyactivation=1
+compilers.p.unknown-attribute=1
+compilers.p.unknown-class=1
+compilers.p.unknown-element=1
+compilers.p.unknown-identifier=1
+compilers.p.unknown-resource=1
+compilers.p.unresolved-ex-points=0
+compilers.p.unresolved-import=0
+compilers.s.create-docs=false
+compilers.s.doc-folder=doc
+compilers.s.open-tags=1
+eclipse.preferences.version=1
diff --git a/containers/org.eclipse.linuxtools.docker.editor.ls/META-INF/MANIFEST.MF b/containers/org.eclipse.linuxtools.docker.editor.ls/META-INF/MANIFEST.MF
new file mode 100644
index 0000000000000000000000000000000000000000..d6bd146091cdb225c76bf426c90d3bc009ea36d1
--- /dev/null
+++ b/containers/org.eclipse.linuxtools.docker.editor.ls/META-INF/MANIFEST.MF
@@ -0,0 +1,18 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Dockerfile Language Server Client
+Bundle-SymbolicName: org.eclipse.linuxtools.docker.editor.ls;singleton:=true
+Bundle-Version: 1.0.0.qualifier
+Bundle-Vendor: Eclipse
+Bundle-RequiredExecutionEnvironment: JavaSE-11
+Bundle-ActivationPolicy: lazy
+Require-Bundle: org.eclipse.lsp4e;bundle-version="0.11.0",
+ org.eclipse.ui.genericeditor;bundle-version="1.0.0",
+ org.eclipse.ui,
+ org.eclipse.core.contenttype,
+ org.eclipse.tm4e.registry;bundle-version="0.1.0",
+ org.eclipse.tm4e.ui;bundle-version="0.1.0",
+ org.eclipse.core.runtime;bundle-version="3.13.0",
+ org.eclipse.wildwebdeveloper.embedder.node
+Eclipse-BundleShape: dir
+Automatic-Module-Name: org.eclipse.linuxtools.docker.editor.ls
diff --git a/containers/org.eclipse.linuxtools.docker.editor.ls/build.properties b/containers/org.eclipse.linuxtools.docker.editor.ls/build.properties
new file mode 100644
index 0000000000000000000000000000000000000000..a76c9aa2249f6c6279e4306092e017a1fdfece2b
--- /dev/null
+++ b/containers/org.eclipse.linuxtools.docker.editor.ls/build.properties
@@ -0,0 +1,8 @@
+source.. = src/
+output.. = target/classes/
+bin.includes = META-INF/,\
+ .,\
+ plugin.xml,\
+ grammars/,\
+ language-server/,\
+ icons/
diff --git a/containers/org.eclipse.linuxtools.docker.editor.ls/grammars/Dockerfile.tmLanguage b/containers/org.eclipse.linuxtools.docker.editor.ls/grammars/Dockerfile.tmLanguage
new file mode 100644
index 0000000000000000000000000000000000000000..a4a7b7ae8d1517aeb92b0e68e47603d9ef175b72
--- /dev/null
+++ b/containers/org.eclipse.linuxtools.docker.editor.ls/grammars/Dockerfile.tmLanguage
@@ -0,0 +1,160 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+ <key>fileTypes</key>
+ <array>
+ <string>Dockerfile</string>
+ </array>
+ <key>name</key>
+ <string>Dockerfile</string>
+ <key>patterns</key>
+ <array>
+ <dict>
+ <key>captures</key>
+ <dict>
+ <key>1</key>
+ <dict>
+ <key>name</key>
+ <string>keyword.other.special-method.dockerfile</string>
+ </dict>
+ <key>2</key>
+ <dict>
+ <key>name</key>
+ <string>keyword.other.special-method.dockerfile</string>
+ </dict>
+ </dict>
+ <key>match</key>
+ <string>^\s*\b(?i:(FROM))\b.*?\b(?i:(AS))\b</string>
+ </dict>
+ <dict>
+ <key>captures</key>
+ <dict>
+ <key>1</key>
+ <dict>
+ <key>name</key>
+ <string>keyword.control.dockerfile</string>
+ </dict>
+ <key>2</key>
+ <dict>
+ <key>name</key>
+ <string>keyword.other.special-method.dockerfile</string>
+ </dict>
+ </dict>
+ <key>match</key>
+ <string>^\s*(?i:(ONBUILD)\s+)?(?i:(ADD|ARG|CMD|COPY|ENTRYPOINT|ENV|EXPOSE|FROM|HEALTHCHECK|LABEL|MAINTAINER|RUN|SHELL|STOPSIGNAL|USER|VOLUME|WORKDIR))\s</string>
+ </dict>
+ <dict>
+ <key>captures</key>
+ <dict>
+ <key>1</key>
+ <dict>
+ <key>name</key>
+ <string>keyword.operator.dockerfile</string>
+ </dict>
+ <key>2</key>
+ <dict>
+ <key>name</key>
+ <string>keyword.other.special-method.dockerfile</string>
+ </dict>
+ </dict>
+ <key>match</key>
+ <string>^\s*(?i:(ONBUILD)\s+)?(?i:(CMD|ENTRYPOINT))\s</string>
+ </dict>
+ <dict>
+ <key>begin</key>
+ <string>"</string>
+ <key>beginCaptures</key>
+ <dict>
+ <key>1</key>
+ <dict>
+ <key>name</key>
+ <string>punctuation.definition.string.begin.dockerfile</string>
+ </dict>
+ </dict>
+ <key>end</key>
+ <string>"</string>
+ <key>endCaptures</key>
+ <dict>
+ <key>1</key>
+ <dict>
+ <key>name</key>
+ <string>punctuation.definition.string.end.dockerfile</string>
+ </dict>
+ </dict>
+ <key>name</key>
+ <string>string.quoted.double.dockerfile</string>
+ <key>patterns</key>
+ <array>
+ <dict>
+ <key>match</key>
+ <string>\\.</string>
+ <key>name</key>
+ <string>constant.character.escaped.dockerfile</string>
+ </dict>
+ </array>
+ </dict>
+ <dict>
+ <key>begin</key>
+ <string>'</string>
+ <key>beginCaptures</key>
+ <dict>
+ <key>1</key>
+ <dict>
+ <key>name</key>
+ <string>punctuation.definition.string.begin.dockerfile</string>
+ </dict>
+ </dict>
+ <key>end</key>
+ <string>'</string>
+ <key>endCaptures</key>
+ <dict>
+ <key>1</key>
+ <dict>
+ <key>name</key>
+ <string>punctuation.definition.string.end.dockerfile</string>
+ </dict>
+ </dict>
+ <key>name</key>
+ <string>string.quoted.single.dockerfile</string>
+ <key>patterns</key>
+ <array>
+ <dict>
+ <key>match</key>
+ <string>\\.</string>
+ <key>name</key>
+ <string>constant.character.escaped.dockerfile</string>
+ </dict>
+ </array>
+ </dict>
+ <dict>
+ <key>captures</key>
+ <dict>
+ <key>1</key>
+ <dict>
+ <key>name</key>
+ <string>punctuation.whitespace.comment.leading.dockerfile</string>
+ </dict>
+ <key>2</key>
+ <dict>
+ <key>name</key>
+ <string>comment.line.number-sign.dockerfile</string>
+ </dict>
+ <key>3</key>
+ <dict>
+ <key>name</key>
+ <string>punctuation.definition.comment.dockerfile</string>
+ </dict>
+ </dict>
+ <key>comment</key>
+ <string>comment.line</string>
+ <key>match</key>
+ <string>^(\s*)((#).*$\n?)</string>
+ </dict>
+ </array>
+ <key>scopeName</key>
+ <string>source.dockerfile</string>
+ <key>uuid</key>
+ <string>a39d8795-59d2-49af-aa00-fe74ee29576e</string>
+</dict>
+</plist>
diff --git a/containers/org.eclipse.linuxtools.docker.editor/icons/dockerfile.png b/containers/org.eclipse.linuxtools.docker.editor.ls/icons/dockerfile.png
similarity index 100%
rename from containers/org.eclipse.linuxtools.docker.editor/icons/dockerfile.png
rename to containers/org.eclipse.linuxtools.docker.editor.ls/icons/dockerfile.png
diff --git a/containers/org.eclipse.linuxtools.docker.editor.ls/plugin.xml b/containers/org.eclipse.linuxtools.docker.editor.ls/plugin.xml
new file mode 100644
index 0000000000000000000000000000000000000000..fef0e113ddec3faaf56f6e482c2934404e99f5ae
--- /dev/null
+++ b/containers/org.eclipse.linuxtools.docker.editor.ls/plugin.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.4"?>
+<plugin>
+ <extension
+ point="org.eclipse.lsp4e.languageServer">
+ <server
+ class="org.eclipse.linuxtools.docker.editor.ls.DockerfileLanguageServer"
+ id="org.eclipse.linuxtools.docker.editor.ls.server"
+ label="Dockerfile Language Server">
+ </server>
+ <contentTypeMapping
+ contentType="org.eclipse.linuxtools.docker.editor.ls"
+ languageId="Dockerfile"
+ id="org.eclipse.linuxtools.docker.editor.ls.server">
+ </contentTypeMapping>
+ </extension>
+ <extension
+ point="org.eclipse.ui.editors">
+ <editorContentTypeBinding
+ contentTypeId="org.eclipse.linuxtools.docker.editor.ls"
+ editorId="org.eclipse.ui.genericeditor.GenericEditor">
+ </editorContentTypeBinding>
+ </extension>
+ <extension
+ point="org.eclipse.core.contenttype.contentTypes">
+ <content-type
+ base-type="org.eclipse.core.runtime.text"
+ file-extensions="Dockerfile,dockerfile"
+ file-names="Dockerfile"
+ id="org.eclipse.linuxtools.docker.editor.ls"
+ name="Dockerfile"
+ priority="normal">
+ </content-type>
+ </extension>
+ <extension
+ point="org.eclipse.tm4e.registry.grammars">
+ <grammar
+ path="grammars/Dockerfile.tmLanguage"
+ scopeName="source.dockerfile">
+ </grammar>
+ <scopeNameContentTypeBinding
+ contentTypeId="org.eclipse.linuxtools.docker.editor.ls"
+ scopeName="source.dockerfile">
+ </scopeNameContentTypeBinding>
+ </extension>
+ <extension
+ point="org.eclipse.ui.genericeditor.presentationReconcilers">
+ <presentationReconciler
+ class="org.eclipse.tm4e.ui.text.TMPresentationReconciler"
+ contentType="org.eclipse.linuxtools.docker.editor.ls">
+ </presentationReconciler>
+ </extension>
+ <extension point="org.eclipse.ui.genericeditor.icons">
+ <icon contentType="org.eclipse.linuxtools.docker.editor.ls" icon="icons/dockerfile.png" />
+ </extension>
+
+</plugin>
diff --git a/containers/org.eclipse.linuxtools.docker.editor.ls/pom.xml b/containers/org.eclipse.linuxtools.docker.editor.ls/pom.xml
new file mode 100644
index 0000000000000000000000000000000000000000..2679de9c113d77e650b7956790c040469b74eb72
--- /dev/null
+++ b/containers/org.eclipse.linuxtools.docker.editor.ls/pom.xml
@@ -0,0 +1,53 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.eclipse.linuxtools</groupId>
+ <artifactId>org.eclipse.linuxtools.docker</artifactId>
+ <version>5.1.0</version>
+ </parent>
+ <artifactId>org.eclipse.linuxtools.docker.editor.ls</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <packaging>eclipse-plugin</packaging>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-clean-plugin</artifactId>
+ <version>3.1.0</version>
+ <configuration>
+ <filesets>
+ <fileset>
+ <directory>language-server/</directory>
+ </fileset>
+ </filesets>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>exec-maven-plugin</artifactId>
+ <version>1.6.0</version>
+ <executions>
+ <execution>
+ <id>npm-install</id>
+ <goals>
+ <goal>exec</goal>
+ </goals>
+ <phase>generate-resources</phase>
+ <configuration>
+ <executable>npm</executable>
+ <arguments>
+ <arg>install</arg>
+ <arg>--no-bin-links</arg>
+ <arg>dockerfile-language-server-nodejs@0.1.1</arg>
+ </arguments>
+ <workingDirectory>language-server/</workingDirectory>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
diff --git a/containers/org.eclipse.linuxtools.docker.editor.ls/src/org/eclipse/linuxtools/docker/editor/ls/DockerfileLanguageServer.java b/containers/org.eclipse.linuxtools.docker.editor.ls/src/org/eclipse/linuxtools/docker/editor/ls/DockerfileLanguageServer.java
new file mode 100644
index 0000000000000000000000000000000000000000..3c7a84dfafe695f8458cea554f982752a8c5aeb1
--- /dev/null
+++ b/containers/org.eclipse.linuxtools.docker.editor.ls/src/org/eclipse/linuxtools/docker/editor/ls/DockerfileLanguageServer.java
@@ -0,0 +1,43 @@
+/*******************************************************************************
+ * Copyright (c) 2017 Red Hat Inc. and others.
+ *
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package org.eclipse.linuxtools.docker.editor.ls;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.core.runtime.FileLocator;
+import org.eclipse.lsp4e.server.ProcessStreamConnectionProvider;
+
+public class DockerfileLanguageServer extends ProcessStreamConnectionProvider {
+
+ final static String PATH = "/language-server/node_modules/dockerfile-language-server-nodejs/lib/server.js"; //$NON-NLS-1$
+
+ public DockerfileLanguageServer() {
+ List<String> command = new ArrayList<> ();
+ try {
+ URL url = FileLocator.toFileURL(getClass().getResource(PATH));
+ String resourcePath = new File (url.getPath()).getAbsolutePath();
+ String nodePath = InitializeLaunchConfigurations.getNodeJsLocation();
+ if (nodePath != null) {
+ command.add(nodePath);
+ command.add(resourcePath);
+ command.add("--stdio"); //$NON-NLS-1$
+ setCommands(command);
+ setWorkingDirectory(System.getProperty("user.dir")); //$NON-NLS-1$
+ }
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ }
+
+}
diff --git a/containers/org.eclipse.linuxtools.docker.editor.ls/src/org/eclipse/linuxtools/docker/editor/ls/InitializeLaunchConfigurations.java b/containers/org.eclipse.linuxtools.docker.editor.ls/src/org/eclipse/linuxtools/docker/editor/ls/InitializeLaunchConfigurations.java
new file mode 100644
index 0000000000000000000000000000000000000000..6616f00c254df0ecac153bcd29bf630e1d7163b0
--- /dev/null
+++ b/containers/org.eclipse.linuxtools.docker.editor.ls/src/org/eclipse/linuxtools/docker/editor/ls/InitializeLaunchConfigurations.java
@@ -0,0 +1,73 @@
+/*******************************************************************************
+ * Copyright (c) 2016 Red Hat Inc. and others.
+ *
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package org.eclipse.linuxtools.docker.editor.ls;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.wildwebdeveloper.embedder.node.NodeJSManager;
+
+public class InitializeLaunchConfigurations {
+
+ private static boolean alreadyWarned;
+
+ public static String getNodeJsLocation() {
+
+ File nodeJsRuntime = NodeJSManager.getNodeJsLocation();
+ if (nodeJsRuntime != null) {
+ return nodeJsRuntime.getAbsolutePath();
+ }
+
+ String res = null;
+ String[] command = new String[] { "/bin/bash", "-c", "which node" };
+ if (Platform.getOS().equals(Platform.OS_WIN32)) {
+ command = new String[] { "cmd", "/c", "where node" };
+ }
+
+ BufferedReader reader = null;
+ try {
+ Process p = Runtime.getRuntime().exec(command);
+ reader = new BufferedReader(new InputStreamReader(p.getInputStream()));
+ res = reader.readLine();
+ } catch (IOException e) {
+ // try other defaults
+ }
+
+ // Try default install path as last resort
+ if (res == null && Platform.getOS().equals(Platform.OS_MACOSX)) {
+ res = "/usr/local/bin/node";
+ }
+
+ if (res != null && Files.exists(Paths.get(res))) {
+ return res;
+ } else if (!alreadyWarned) {
+ warnNodeJSMissing();
+ alreadyWarned = true;
+ }
+
+ return null;
+ }
+
+ private static void warnNodeJSMissing() {
+ Display.getDefault().asyncExec(() -> {
+ MessageDialog.openWarning(Display.getCurrent().getActiveShell(), "Missing node.js",
+ "Could not find node.js. This will result in editors missing key features.\n"
+ + "Please make sure node.js is installed and that your PATH environement variable contains the location to the `node` executable.");
+ });
+ }
+
+}
diff --git a/containers/org.eclipse.linuxtools.docker.editor/.gitignore b/containers/org.eclipse.linuxtools.docker.editor/.gitignore
deleted file mode 100644
index ae3c1726048cd06b9a143e0376ed46dd9b9a8d53..0000000000000000000000000000000000000000
--- a/containers/org.eclipse.linuxtools.docker.editor/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/bin/
diff --git a/containers/org.eclipse.linuxtools.docker.editor/.project b/containers/org.eclipse.linuxtools.docker.editor/.project
deleted file mode 100644
index 909f0809ec6ec61f3fe26562323e75758a3815d7..0000000000000000000000000000000000000000
--- a/containers/org.eclipse.linuxtools.docker.editor/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.linuxtools.docker.editor</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/containers/org.eclipse.linuxtools.docker.editor/.settings/org.eclipse.jdt.core.prefs b/containers/org.eclipse.linuxtools.docker.editor/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 10035e53593d554d94454187ed7880b562edff7f..0000000000000000000000000000000000000000
--- a/containers/org.eclipse.linuxtools.docker.editor/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,106 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled
-org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
-org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull
-org.eclipse.jdt.core.compiler.annotation.nonnull.secondary=
-org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault
-org.eclipse.jdt.core.compiler.annotation.nonnullbydefault.secondary=
-org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
-org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
-org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.8
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
-org.eclipse.jdt.core.compiler.problem.deadCode=warning
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=warning
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=error
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDefaultCase=ignore
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning
-org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled
-org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning
-org.eclipse.jdt.core.compiler.problem.nonnullTypeVariableFromLegacyInvocation=warning
-org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error
-org.eclipse.jdt.core.compiler.problem.nullReference=warning
-org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error
-org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.pessimisticNullAnalysisForFreeTypeVariables=warning
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
-org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
-org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
-org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=warning
-org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
-org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
-org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=disabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=disabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=enabled
-org.eclipse.jdt.core.compiler.problem.unusedExceptionParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameter=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning
-org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.8
diff --git a/containers/org.eclipse.linuxtools.docker.editor/.settings/org.eclipse.m2e.core.prefs b/containers/org.eclipse.linuxtools.docker.editor/.settings/org.eclipse.m2e.core.prefs
deleted file mode 100644
index f897a7f1cb2389f85fe6381425d29f0a9866fb65..0000000000000000000000000000000000000000
--- a/containers/org.eclipse.linuxtools.docker.editor/.settings/org.eclipse.m2e.core.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-activeProfiles=
-eclipse.preferences.version=1
-resolveWorkspaceProjects=true
-version=1
diff --git a/containers/org.eclipse.linuxtools.docker.editor/META-INF/MANIFEST.MF b/containers/org.eclipse.linuxtools.docker.editor/META-INF/MANIFEST.MF
deleted file mode 100644
index 39c26364a837dd740fd4c1567bf3c99db01bc7bb..0000000000000000000000000000000000000000
--- a/containers/org.eclipse.linuxtools.docker.editor/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,17 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Dockerfile Editor
-Bundle-SymbolicName: org.eclipse.linuxtools.docker.editor;singleton:=true
-Bundle-Version: 1.0.0.qualifier
-Bundle-Activator: org.eclipse.linuxtools.internal.docker.editor.Activator
-Bundle-Vendor: Eclipse Linux Tools
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.core.resources,
- org.eclipse.ui.editors,
- org.eclipse.jface.text
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Bundle-ActivationPolicy: lazy
-Export-Package: org.eclipse.linuxtools.internal.docker.editor;x-friends:="org.eclipse.linuxtools.docker.ui"
-Import-Package: org.eclipse.ui.ide
-Automatic-Module-Name: org.eclipse.linuxtools.docker.editor
diff --git a/containers/org.eclipse.linuxtools.docker.editor/about.html b/containers/org.eclipse.linuxtools.docker.editor/about.html
deleted file mode 100644
index 164f781a8fd2195f87c3d3d49946d56bce58992f..0000000000000000000000000000000000000000
--- a/containers/org.eclipse.linuxtools.docker.editor/about.html
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<title>About</title>
-</head>
-<body lang="EN-US">
- <h2>About This Content</h2>
-
- <p>November 30, 2017</p>
- <h3>License</h3>
-
- <p>
- The Eclipse Foundation makes available all content in this plug-in
- ("Content"). Unless otherwise indicated below, the Content
- is provided to you under the terms and conditions of the Eclipse
- Public License Version 2.0 ("EPL"). A copy of the EPL is
- available at <a href="http://www.eclipse.org/legal/epl-2.0">http://www.eclipse.org/legal/epl-2.0</a>.
- For purposes of the EPL, "Program" will mean the Content.
- </p>
-
- <p>
- If you did not receive this Content directly from the Eclipse
- Foundation, the Content is being redistributed by another party
- ("Redistributor") and different terms and conditions may
- apply to your use of any object code in the Content. Check the
- Redistributor's license that was provided with the Content. If no such
- license exists, contact the Redistributor. Unless otherwise indicated
- below, the terms and conditions of the EPL still apply to any source
- code in the Content and such source code may be obtained at <a
- href="http://www.eclipse.org/">http://www.eclipse.org</a>.
- </p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/containers/org.eclipse.linuxtools.docker.editor/about.ini b/containers/org.eclipse.linuxtools.docker.editor/about.ini
deleted file mode 100644
index 68dc433ff8b60a8da331483fdd8c2fd8542c5641..0000000000000000000000000000000000000000
--- a/containers/org.eclipse.linuxtools.docker.editor/about.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-featureImage=icons/about_docker.png
-aboutText=Docker Editor: Eclipse Plugin for Editing Dockerfiles
\ No newline at end of file
diff --git a/containers/org.eclipse.linuxtools.docker.editor/assets/additional-info/ADD.html b/containers/org.eclipse.linuxtools.docker.editor/assets/additional-info/ADD.html
deleted file mode 100644
index 9285576a3b7fc3e5d734ab66bd5e573cbf942795..0000000000000000000000000000000000000000
--- a/containers/org.eclipse.linuxtools.docker.editor/assets/additional-info/ADD.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<p>
-<b>ADD</b> copies files, directories or remote file URLs from a source to a destination.
-</p>
-<br/>
-<p>
-<pre>
-ADD hom* /mydir/ # adds all files starting with "hom"
-</pre>
-</p>
diff --git a/containers/org.eclipse.linuxtools.docker.editor/assets/additional-info/ARG.html b/containers/org.eclipse.linuxtools.docker.editor/assets/additional-info/ARG.html
deleted file mode 100644
index ab7c668c625f0cff471e648b246f244bb516e9da..0000000000000000000000000000000000000000
--- a/containers/org.eclipse.linuxtools.docker.editor/assets/additional-info/ARG.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<p>
-<b>ARG</b> defines a variable that users can pass at build-time to the builder with the docker build command using the --build-arg <varname>=<value> flag. If a user specifies a build argument that was not defined in the Dockerfile, the build outputs an error.
-</p>
-<br/>
-<p>
-<pre>
-ARG user1 # Defines an build argument called 'user1' without any default values
-ARG buildno # Defines an build argument called 'buildno' without any default values
-
-ARG user1=someuser # Defines and declares a default value for the build argument 'user1'
-ARG buildno=123 # Defines and declares a default value for the build argument 'buildno'
-</pre>
-</p>
diff --git a/containers/org.eclipse.linuxtools.docker.editor/assets/additional-info/CMD.html b/containers/org.eclipse.linuxtools.docker.editor/assets/additional-info/CMD.html
deleted file mode 100644
index 35ba85796775f73a0c53d4bb5b12128ec8fe25f3..0000000000000000000000000000000000000000
--- a/containers/org.eclipse.linuxtools.docker.editor/assets/additional-info/CMD.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<p>
-<b>CMD</b> provides defaults for an executing container
-</p>
-<br/>
-<p>
-There are three ways to specify a CMD: the (preferred) exec form
-<br/>
-<pre>
-CMD ["executable", "param1", "param2"]
-</pre>
-<br/>
-as default parameters to ENTRYPOINT:
-<br/>
-<pre>
-CMD ["param1","param2"]
-</pre>
-<br/>
-and in shell form
-<br/>
-<pre>
-CMD command param1 param2
-</pre>
-</p>
diff --git a/containers/org.eclipse.linuxtools.docker.editor/assets/additional-info/COPY.html b/containers/org.eclipse.linuxtools.docker.editor/assets/additional-info/COPY.html
deleted file mode 100644
index fd4890c2dacd73689374f65a00271c8c11dc1446..0000000000000000000000000000000000000000
--- a/containers/org.eclipse.linuxtools.docker.editor/assets/additional-info/COPY.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<p>
-<b>COPY</b> copies new files or directories from source and adds them to the filesystem of the container at the destination path
-</p>
-<br/>
-<p>
-<pre>
-COPY hom* /mydir/ # adds all files starting with "hom"
-</pre>
-</p>
diff --git a/containers/org.eclipse.linuxtools.docker.editor/assets/additional-info/ENTRYPOINT.html b/containers/org.eclipse.linuxtools.docker.editor/assets/additional-info/ENTRYPOINT.html
deleted file mode 100644
index 8e17e7458ef8b78ee6cdb8e34b676901afa30815..0000000000000000000000000000000000000000
--- a/containers/org.eclipse.linuxtools.docker.editor/assets/additional-info/ENTRYPOINT.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<p>
-<b>ENTRYPOINT</b> configures a container that will be run as an executable.
-</p>
-<br/>
-<p>
-There are two ways to specify an ENTRYPOINT: the (preferred) exec form
-<br/>
-<pre>
-ENTRYPOINT ["executable", "param1", "param2"]
-</pre>
-<br/>
-and the shell form:
-<br/>
-<pre>
-ENTRYPOINT command param1 param2
-</pre>
-</p>
diff --git a/containers/org.eclipse.linuxtools.docker.editor/assets/additional-info/ENV.html b/containers/org.eclipse.linuxtools.docker.editor/assets/additional-info/ENV.html
deleted file mode 100644
index 7aff5fcbbee5023cab18c6a0d8660c7b9ebab7b1..0000000000000000000000000000000000000000
--- a/containers/org.eclipse.linuxtools.docker.editor/assets/additional-info/ENV.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<p>
-<b>ENV</b> allows to declare environment variables.
-</p>
-<br/>
-<p>
-<pre>
-ENV CATALINA_HOME /usr/local/tomcat
-</pre>
-<br/>
-<pre>
-ENV LC_ALL en_US.UTF-8
-</pre>
-</p>
diff --git a/containers/org.eclipse.linuxtools.docker.editor/assets/additional-info/EXPOSE.html b/containers/org.eclipse.linuxtools.docker.editor/assets/additional-info/EXPOSE.html
deleted file mode 100644
index 443f262cdab4c1150b84d00b1fa6c6c67e66680a..0000000000000000000000000000000000000000
--- a/containers/org.eclipse.linuxtools.docker.editor/assets/additional-info/EXPOSE.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<p>
-<b>EXPOSE</b> specifies network ports on which the container will listen at runtime.
-</p>
-<br/>
-<p>
-EXPOSE 8080
-</p>
diff --git a/containers/org.eclipse.linuxtools.docker.editor/assets/additional-info/FROM.html b/containers/org.eclipse.linuxtools.docker.editor/assets/additional-info/FROM.html
deleted file mode 100644
index cff119cba88f257f2b1bfb2940fe95d00d42c170..0000000000000000000000000000000000000000
--- a/containers/org.eclipse.linuxtools.docker.editor/assets/additional-info/FROM.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<p>
-<b>FROM</b> sets the base image starting from which the image is built.
-</p>
-<br/>
-<p>
-<pre>
-FROM image
-</pre>
-<br/>
-<pre>
-FROM image:tag
-<pre>
-<br/>
-FROM image@digest
-</pre>
-</p>
-<br/>
-<p>
-<b>FROM</b> must be the first non-comment instruction in the Dockerfile
-</p>
diff --git a/containers/org.eclipse.linuxtools.docker.editor/assets/additional-info/HEALTHCHECK.html b/containers/org.eclipse.linuxtools.docker.editor/assets/additional-info/HEALTHCHECK.html
deleted file mode 100644
index 1efe13f2ccf94bbf96e4fa46eaac16aa0125f31b..0000000000000000000000000000000000000000
--- a/containers/org.eclipse.linuxtools.docker.editor/assets/additional-info/HEALTHCHECK.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<p>
-Specify the <b>HEALTHCHECK</b> of the Docker image.
-</p>
-<br/>
-<p>
-HEALTHCHECK --timeout=3s CMD curl -f http://localhost/ || exit 1
-</p>
diff --git a/containers/org.eclipse.linuxtools.docker.editor/assets/additional-info/LABEL.html b/containers/org.eclipse.linuxtools.docker.editor/assets/additional-info/LABEL.html
deleted file mode 100644
index 9055969bf73250023513f92ccc0c3cb9867d8da2..0000000000000000000000000000000000000000
--- a/containers/org.eclipse.linuxtools.docker.editor/assets/additional-info/LABEL.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<p>
-<b>LABEL</b> adds meta-data to an image using one or more key-value pairs.
-</p>
-<br/>
-<p>
-<pre>
-LABEL Description="Docker Image for running the R Service Bus" Vendor="Open Analytics NV" Version="6.2"
-</pre>
-<br/>
-<pre>
-LABEL com.example.label-without-value
-LABEL com.example.label-with-value="foo"
-LABEL version="1.0"
-LABEL description="This text illustrates \
-that label-values can span multiple lines."
-</pre>
-</p>
-<br/>
-<p>
-N.B. Image labels can be viewed using the <pre>docker inspect </pre> command.
-</p>
diff --git a/containers/org.eclipse.linuxtools.docker.editor/assets/additional-info/MAINTAINER.html b/containers/org.eclipse.linuxtools.docker.editor/assets/additional-info/MAINTAINER.html
deleted file mode 100644
index d463e6eaed979c4fc8460b0925aa293fb570df2a..0000000000000000000000000000000000000000
--- a/containers/org.eclipse.linuxtools.docker.editor/assets/additional-info/MAINTAINER.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<p>
-Specify the <b>MAINTAINER</b> of the Docker image.
-</p>
-<br/>
-<p>
-MAINTAINER "Tobias Verbeke"
-</p>
diff --git a/containers/org.eclipse.linuxtools.docker.editor/assets/additional-info/ONBUILD.html b/containers/org.eclipse.linuxtools.docker.editor/assets/additional-info/ONBUILD.html
deleted file mode 100644
index 244566d95c261c503d870dfae4da11b25fc6fc63..0000000000000000000000000000000000000000
--- a/containers/org.eclipse.linuxtools.docker.editor/assets/additional-info/ONBUILD.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<p>
-<b>ONBUILD</b> specifies a 'trigger' instruction executed when the image is used as the base for another build.
-</p>
-<br/>
-<p>
-<pre>
-ONBUILD ADD . /app/src
-ONBUILD RUN /usr/local/bin/python-build --dir /app/src
-</pre>
-</p>
diff --git a/containers/org.eclipse.linuxtools.docker.editor/assets/additional-info/RUN.html b/containers/org.eclipse.linuxtools.docker.editor/assets/additional-info/RUN.html
deleted file mode 100644
index 02718342c5800f353428e9d3ebc351c2774b0f11..0000000000000000000000000000000000000000
--- a/containers/org.eclipse.linuxtools.docker.editor/assets/additional-info/RUN.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<p>
-<b>RUN</b> executes any commands in a new layer on top of the current image and commits the results
-</p>
-<br/>
-<p>
-There are two ways to specify a RUN: the exec form
-<br/>
-<pre>
-RUN ["executable", "param1", "param2"]
-</pre>
-<br/>
-and the shell form:
-<br/>
-<pre>
-RUN command param1 param2
-</pre>
-</p>
diff --git a/containers/org.eclipse.linuxtools.docker.editor/assets/additional-info/SHELL.html b/containers/org.eclipse.linuxtools.docker.editor/assets/additional-info/SHELL.html
deleted file mode 100644
index eb4eab17e3a9d8b2dfbd99d39aa4fba53c76a2a2..0000000000000000000000000000000000000000
--- a/containers/org.eclipse.linuxtools.docker.editor/assets/additional-info/SHELL.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<p>
-<b>SHELL</b> allows overriding the default shell used for the shell form of commands. The JSON format is required: ["executable", "parameters"]. On Linux, the default is: ["/bin/sh", "-c"] whereas on Windows it is ["cmd", "/S", "/C"].
-</p>
-<br/>
-<p>
-<pre>
-SHELL ["powershell", "-command"]
-</pre>
-</p>
diff --git a/containers/org.eclipse.linuxtools.docker.editor/assets/additional-info/USER.html b/containers/org.eclipse.linuxtools.docker.editor/assets/additional-info/USER.html
deleted file mode 100644
index 05a240906b86c8e51e114dbf004edcc016407e4e..0000000000000000000000000000000000000000
--- a/containers/org.eclipse.linuxtools.docker.editor/assets/additional-info/USER.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<p>
-<b>USER</b> sets the user name or UID used when running the image.
-</p>
-<br/>
-<p>
-<pre>
-USER jenkins
-</pre>
-</p>
diff --git a/containers/org.eclipse.linuxtools.docker.editor/assets/additional-info/VOLUME.html b/containers/org.eclipse.linuxtools.docker.editor/assets/additional-info/VOLUME.html
deleted file mode 100644
index fcffb119be33d7358305faf8fee842093d57dc98..0000000000000000000000000000000000000000
--- a/containers/org.eclipse.linuxtools.docker.editor/assets/additional-info/VOLUME.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<p>
-<b>VOLUME</b> creates a mount point with the specified name
-</p>
-<br/>
-<p>
-<pre>
-VOLUME ["/data"] # specified as a JSON array
-VOLUME /var/log
-VOLUME /var/log /var/db
-</pre>
-</p>
diff --git a/containers/org.eclipse.linuxtools.docker.editor/assets/additional-info/WORKDIR.html b/containers/org.eclipse.linuxtools.docker.editor/assets/additional-info/WORKDIR.html
deleted file mode 100644
index 724c58c1b0d435a319624f59d4074d7d8eccb38c..0000000000000000000000000000000000000000
--- a/containers/org.eclipse.linuxtools.docker.editor/assets/additional-info/WORKDIR.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<p>
-<b>WORKDIR</b> sets the working directory for all WORKDIR instruction sets the working directory for any RUN, CMD, ENTRYPOINT, COPY and ADD instructions that follow
-</p>
-<br/>
-<p>
-<pre>
-WORKDIR /opt/architect
-</pre>
-</p>
diff --git a/containers/org.eclipse.linuxtools.docker.editor/assets/instructions.txt b/containers/org.eclipse.linuxtools.docker.editor/assets/instructions.txt
deleted file mode 100644
index 8c0ffccc8f97bdda7d3606055c9897f4ffd3589f..0000000000000000000000000000000000000000
--- a/containers/org.eclipse.linuxtools.docker.editor/assets/instructions.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-ADD
-ARG
-CMD
-COPY
-ENTRYPOINT
-ENV
-EXPOSE
-FROM
-HEALTHCHECK
-LABEL
-MAINTAINER
-ONBUILD
-RUN
-SHELL
-USER
-VOLUME
-WORKDIR
diff --git a/containers/org.eclipse.linuxtools.docker.editor/build.properties b/containers/org.eclipse.linuxtools.docker.editor/build.properties
deleted file mode 100644
index f4328738d0950c723f006f36e36cec2deef011de..0000000000000000000000000000000000000000
--- a/containers/org.eclipse.linuxtools.docker.editor/build.properties
+++ /dev/null
@@ -1,9 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
- .,\
- plugin.xml,\
- about.html,\
- icons/,\
- assets/,\
- about.ini
diff --git a/containers/org.eclipse.linuxtools.docker.editor/icons/about_docker.png b/containers/org.eclipse.linuxtools.docker.editor/icons/about_docker.png
deleted file mode 100644
index abf2ddd4b5d703c368c9f0462694c715d790bffd..0000000000000000000000000000000000000000
Binary files a/containers/org.eclipse.linuxtools.docker.editor/icons/about_docker.png and /dev/null differ
diff --git a/containers/org.eclipse.linuxtools.docker.editor/plugin.xml b/containers/org.eclipse.linuxtools.docker.editor/plugin.xml
deleted file mode 100644
index db215f032e075a7d7b74fc64322199bcb5a47e4f..0000000000000000000000000000000000000000
--- a/containers/org.eclipse.linuxtools.docker.editor/plugin.xml
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.4"?>
-<plugin>
- <extension
- point="org.eclipse.core.contenttype.contentTypes">
- <content-type
- base-type="org.eclipse.core.runtime.text"
- file-extensions="dockerfile"
- file-names="Dockerfile"
- id="org.eclipse.linuxtools.dockerfile.content-type"
- name="Dockerfile"
- priority="high">
- </content-type>
- </extension>
- <extension
- point="org.eclipse.ui.editors.documentProviders">
- <provider
- class="org.eclipse.linuxtools.internal.docker.editor.DockerDocumentProvider"
- extensions="dockerfile"
- id="org.eclipse.linuxtools.docker.editor.documentProvider">
- </provider>
- </extension>
- <extension
- point="org.eclipse.ui.genericeditor.presentationReconcilers">
- <presentationReconciler
- class="org.eclipse.linuxtools.internal.docker.editor.DockerPresentationReconciler"
- contentType="org.eclipse.linuxtools.dockerfile.content-type">
- </presentationReconciler>
- </extension>
- <extension point="org.eclipse.ui.genericeditor.contentAssistProcessors">
- <contentAssistProcessor
- class="org.eclipse.linuxtools.internal.docker.editor.assist.CompletionProcessor"
- contentType="org.eclipse.linuxtools.dockerfile.content-type">
- </contentAssistProcessor>
- </extension>
- <extension point="org.eclipse.ui.genericeditor.hoverProviders">
- <hoverProvider
- class="org.eclipse.linuxtools.internal.docker.editor.DockerHover"
- contentType="org.eclipse.linuxtools.dockerfile.content-type">
- </hoverProvider>
- </extension>
- <extension
- point="org.eclipse.ui.editors">
- <editor
- class="org.eclipse.linuxtools.internal.docker.editor.DockerEditor"
- contributorClass="org.eclipse.ui.texteditor.BasicTextEditorActionContributor"
- default="false"
- icon="icons/dockerfile.png"
- id="org.eclipse.linuxtools.DockerEditor"
- name="Dockerfile Editor">
- <contentTypeBinding
- contentTypeId="org.eclipse.linuxtools.dockerfile.content-type">
- </contentTypeBinding>
- </editor>
- </extension>
- <extension
- point="org.eclipse.ui.themes">
- <themeElementCategory
- id="org.eclipse.linuxtools.docker.editor.presentation"
- label="Dockerfile">
- </themeElementCategory>
- <colorDefinition
- categoryId="org.eclipse.linuxtools.docker.editor.presentation"
- id="org.eclipse.linuxtools.docker.editor.color.instruction"
- label="Instruction"
- value="0,128,0">
- </colorDefinition>
- <colorDefinition
- categoryId="org.eclipse.linuxtools.docker.editor.presentation"
- id="org.eclipse.linuxtools.docker.editor.color.string"
- label="String"
- value="0,0,255">
- </colorDefinition>
- <colorDefinition
- categoryId="org.eclipse.linuxtools.docker.editor.presentation"
- id="org.eclipse.linuxtools.docker.editor.color.comment"
- label="Comment"
- value="128,128,128">
- </colorDefinition>
- <colorDefinition
- categoryId="org.eclipse.linuxtools.docker.editor.presentation"
- id="org.eclipse.linuxtools.docker.editor.color.variable"
- label="Variable"
- value="255,0,0">
- </colorDefinition>
- </extension>
-
-</plugin>
diff --git a/containers/org.eclipse.linuxtools.docker.editor/pom.xml b/containers/org.eclipse.linuxtools.docker.editor/pom.xml
deleted file mode 100644
index 38c95d889a224dd724af742edde7e5b9fdd429c6..0000000000000000000000000000000000000000
--- a/containers/org.eclipse.linuxtools.docker.editor/pom.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.eclipse.linuxtools</groupId>
- <artifactId>org.eclipse.linuxtools.docker</artifactId>
- <version>4.4.0</version>
- </parent>
- <artifactId>org.eclipse.linuxtools.docker.editor</artifactId>
- <version>1.0.0-SNAPSHOT</version>
- <packaging>eclipse-plugin</packaging>
-
-</project>
diff --git a/containers/org.eclipse.linuxtools.docker.editor/src/org/eclipse/linuxtools/internal/docker/editor/Activator.java b/containers/org.eclipse.linuxtools.docker.editor/src/org/eclipse/linuxtools/internal/docker/editor/Activator.java
deleted file mode 100644
index 41f7038c5bbdf7bd9fc80b46ca27eb92eb431294..0000000000000000000000000000000000000000
--- a/containers/org.eclipse.linuxtools.docker.editor/src/org/eclipse/linuxtools/internal/docker/editor/Activator.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2015, 2018 Open Analytics NV and others.
- *
- * This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License 2.0
- * which is available at https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *******************************************************************************/
-package org.eclipse.linuxtools.internal.docker.editor;
-
-import org.eclipse.core.runtime.Status;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The activator class controls the plug-in life cycle
- */
-public class Activator extends AbstractUIPlugin {
-
- // The plug-in ID
- public static final String PLUGIN_ID = "org.eclipse.linuxtools.docker.editor"; //$NON-NLS-1$
-
- // The shared instance
- private static Activator plugin;
-
- @Override
- public void start(BundleContext context) throws Exception {
- super.start(context);
- plugin = this;
- }
-
- @Override
- public void stop(BundleContext context) throws Exception {
- plugin = null;
- super.stop(context);
- }
-
- /**
- * Returns the shared instance
- *
- * @return the shared instance
- */
- public static Activator getDefault() {
- return plugin;
- }
-
- public static void log(int severity, String message, Throwable cause) {
- getDefault().getLog().log(new Status(severity, PLUGIN_ID, message, cause));
- }
-}
diff --git a/containers/org.eclipse.linuxtools.docker.editor/src/org/eclipse/linuxtools/internal/docker/editor/DockerConfiguration.java b/containers/org.eclipse.linuxtools.docker.editor/src/org/eclipse/linuxtools/internal/docker/editor/DockerConfiguration.java
deleted file mode 100644
index ff5e1e9cca5ee334d37eb39056d2de4a46ab22aa..0000000000000000000000000000000000000000
--- a/containers/org.eclipse.linuxtools.docker.editor/src/org/eclipse/linuxtools/internal/docker/editor/DockerConfiguration.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2015, 2018 Open Analytics NV and others.
- *
- * This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License 2.0
- * which is available at https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *******************************************************************************/
-package org.eclipse.linuxtools.internal.docker.editor;
-
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.ITextHover;
-import org.eclipse.jface.text.contentassist.ContentAssistant;
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-import org.eclipse.jface.text.contentassist.IContentAssistant;
-import org.eclipse.jface.text.presentation.IPresentationReconciler;
-import org.eclipse.jface.text.reconciler.IReconciler;
-import org.eclipse.jface.text.reconciler.IReconcilingStrategy;
-import org.eclipse.jface.text.reconciler.Reconciler;
-import org.eclipse.jface.text.source.ISourceViewer;
-import org.eclipse.linuxtools.internal.docker.editor.assist.CompletionProcessor;
-import org.eclipse.linuxtools.internal.docker.editor.syntax.SyntaxReconcilingStrategy;
-import org.eclipse.ui.editors.text.TextSourceViewerConfiguration;
-
-public class DockerConfiguration extends TextSourceViewerConfiguration {
-
- private DockerEditor editor;
- private DockerHover hover;
-
- public DockerConfiguration(DockerEditor editor) {
- this.editor = editor;
- }
-
- @Override
- public IPresentationReconciler getPresentationReconciler(ISourceViewer sourceViewer) {
- return new DockerPresentationReconciler();
- }
-
- @Override
- public IReconciler getReconciler(ISourceViewer sourceViewer) {
- Reconciler reconciler = new Reconciler();
- IReconcilingStrategy strategy = new SyntaxReconcilingStrategy(editor);
- reconciler.setReconcilingStrategy(strategy, IDocument.DEFAULT_CONTENT_TYPE);
- return reconciler;
- }
-
- @Override
- public IContentAssistant getContentAssistant(ISourceViewer sourceViewer) {
- ContentAssistant ca = new ContentAssistant();
- IContentAssistProcessor cap = new CompletionProcessor();
- ca.setContentAssistProcessor(cap, IDocument.DEFAULT_CONTENT_TYPE);
- ca.setInformationControlCreator(getInformationControlCreator(sourceViewer));
- return ca;
- }
-
- @Override
- public ITextHover getTextHover(ISourceViewer sourceViewer, String contentType) {
- if (hover == null) {
- hover = new DockerHover();
- }
- return hover;
- }
-
-}
diff --git a/containers/org.eclipse.linuxtools.docker.editor/src/org/eclipse/linuxtools/internal/docker/editor/DockerDocumentProvider.java b/containers/org.eclipse.linuxtools.docker.editor/src/org/eclipse/linuxtools/internal/docker/editor/DockerDocumentProvider.java
deleted file mode 100644
index 2ed4bef9f66c70b0854df32b639fc3e9aaf800dd..0000000000000000000000000000000000000000
--- a/containers/org.eclipse.linuxtools.docker.editor/src/org/eclipse/linuxtools/internal/docker/editor/DockerDocumentProvider.java
+++ /dev/null
@@ -1,210 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2015, 2018 Open Analytics NV and others.
- *
- * This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License 2.0
- * which is available at https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *******************************************************************************/
-package org.eclipse.linuxtools.internal.docker.editor;
-
-import java.io.ByteArrayInputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.nio.ByteBuffer;
-import java.nio.CharBuffer;
-import java.nio.charset.CharacterCodingException;
-import java.nio.charset.Charset;
-import java.nio.charset.CharsetEncoder;
-import java.nio.charset.CodingErrorAction;
-import java.nio.charset.IllegalCharsetNameException;
-import java.nio.charset.UnmappableCharacterException;
-import java.nio.charset.UnsupportedCharsetException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-
-import org.eclipse.core.runtime.Assert;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.IDocumentPartitioner;
-import org.eclipse.jface.text.rules.FastPartitioner;
-import org.eclipse.linuxtools.internal.docker.editor.scanner.DockerPartitionScanner;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.editors.text.EditorsUI;
-import org.eclipse.ui.editors.text.FileDocumentProvider;
-import org.eclipse.ui.ide.FileStoreEditorInput;
-import org.eclipse.ui.texteditor.ResourceMarkerAnnotationModel;
-
-public class DockerDocumentProvider extends FileDocumentProvider {
-
- @Override
- protected IDocument createDocument(Object element) throws CoreException {
- IDocument document = super.createDocument(element);
- if (document != null) {
- DockerPartitionScanner scanner = new DockerPartitionScanner();
- IDocumentPartitioner partitioner = new FastPartitioner(scanner,
- DockerPartitionScanner.ALLOWED_CONTENT_TYPES);
- partitioner.connect(document);
- document.setDocumentPartitioner(partitioner);
- }
- return document;
- }
-
- @Override
- public String getEncoding(Object element) {
- return Charset.defaultCharset().name();
- }
-
- @Override
- public boolean isReadOnly(Object element) {
- if (element instanceof FileStoreEditorInput) {
- String path = ((FileStoreEditorInput) element).getURI().getPath();
- return !new File(path).canWrite();
- } else {
- return super.isReadOnly(element);
- }
- }
-
- @Override
- public boolean isModifiable(Object element) {
- if (element instanceof FileStoreEditorInput) {
- String path = ((FileStoreEditorInput) element).getURI().getPath();
- return new File(path).canWrite();
- } else {
- return super.isModifiable(element);
- }
- }
-
- @Override
- protected boolean setDocumentContent(IDocument document, IEditorInput editorInput, String encoding)
- throws CoreException {
- if (editorInput instanceof FileStoreEditorInput) {
- String path = ((FileStoreEditorInput) editorInput).getURI().getPath();
- InputStream in;
- try {
- in = new FileInputStream(path);
- } catch (FileNotFoundException e) {
- return false;
- }
- super.setDocumentContent(document, in, encoding);
- return true;
- } else {
- return super.setDocumentContent(document, editorInput, encoding);
- }
- }
-
- @Override
- protected void doSaveDocument(IProgressMonitor monitor, Object element, IDocument document, boolean overwrite)
- throws CoreException {
- if (element instanceof FileStoreEditorInput) {
-
- String encoding = null;
-
- ElementInfo info = getElementInfo(element);
- Path filePath = Paths.get(((FileStoreEditorInput) element).getURI());
-
- encoding = getEncoding(element);
-
- Charset charset;
- try {
- charset = Charset.forName(encoding);
- } catch (UnsupportedCharsetException ex) {
- String message = NLS.bind(Messages.DockerDocumentProvider_encoding_not_supported, encoding);
- IStatus s = new Status(IStatus.ERROR, EditorsUI.PLUGIN_ID, IStatus.OK, message, ex);
- throw new CoreException(s);
- } catch (IllegalCharsetNameException ex) {
- String message = NLS.bind(Messages.DockerDocumentProvider_encoding_not_legal, encoding);
- IStatus s = new Status(IStatus.ERROR, EditorsUI.PLUGIN_ID, IStatus.OK, message, ex);
- throw new CoreException(s);
- }
-
- CharsetEncoder encoder = charset.newEncoder();
- encoder.onMalformedInput(CodingErrorAction.REPLACE);
- encoder.onUnmappableCharacter(CodingErrorAction.REPORT);
-
- InputStream stream;
-
- try {
- byte[] bytes;
- ByteBuffer byteBuffer = encoder.encode(CharBuffer.wrap(document.get()));
- if (byteBuffer.hasArray())
- bytes = byteBuffer.array();
- else {
- bytes = new byte[byteBuffer.limit()];
- byteBuffer.get(bytes);
- }
- stream = new ByteArrayInputStream(bytes, 0, byteBuffer.limit());
- } catch (CharacterCodingException ex) {
- Assert.isTrue(ex instanceof UnmappableCharacterException);
- String message = NLS.bind(Messages.DockerDocumentProvider_cannot_be_mapped
- + Messages.DockerDocumentProvider_chars_not_supported, encoding);
- IStatus s = new Status(IStatus.ERROR, EditorsUI.PLUGIN_ID, EditorsUI.CHARSET_MAPPING_FAILED, message,
- null);
- throw new CoreException(s);
- }
-
- if (Files.exists(filePath)) {
- // inform about the upcoming content change
- fireElementStateChanging(element);
- try (FileWriter fw = new FileWriter(filePath.toFile());
- InputStreamReader istream = new InputStreamReader(stream)) {
- char[] bb = new char[1024];
- int nRead = istream.read(bb);
- while (nRead > 0) {
- fw.write(bb, 0, nRead);
- nRead = istream.read(bb);
- }
- } catch (RuntimeException | IOException x) {
- // inform about failure
- fireElementStateChangeFailed(element);
- throw new CoreException(new Status(IStatus.ERROR, Activator.PLUGIN_ID, x.getMessage()));
- }
-
- // If here, the editor state will be flipped to "not dirty".
- // Thus, the state changing flag will be reset.
-
- if (info != null) {
-
- ResourceMarkerAnnotationModel model = (ResourceMarkerAnnotationModel) info.fModel;
- if (model != null)
- model.updateMarkers(info.fDocument);
- }
-
- } else {
- try {
- Files.createFile(filePath);
- try (FileWriter fw = new FileWriter(filePath.toFile());
- InputStreamReader istream = new InputStreamReader(stream)) {
- char[] bb = new char[1024];
- int nRead = istream.read(bb);
- while (nRead > 0) {
- fw.write(bb, 0, nRead);
- nRead = istream.read(bb);
- }
- } catch (IOException x) {
- throw x;
- }
- } catch (IOException e) {
- throw new CoreException(new Status(IStatus.ERROR, Activator.PLUGIN_ID, e.getMessage()));
- } finally {
- monitor.done();
- }
- }
-
- } else {
- super.doSaveDocument(monitor, element, document, overwrite);
- }
- }
-
-}
\ No newline at end of file
diff --git a/containers/org.eclipse.linuxtools.docker.editor/src/org/eclipse/linuxtools/internal/docker/editor/DockerEditor.java b/containers/org.eclipse.linuxtools.docker.editor/src/org/eclipse/linuxtools/internal/docker/editor/DockerEditor.java
deleted file mode 100644
index fff9fab08ba1586d0d77e1703eb07f9086b96a68..0000000000000000000000000000000000000000
--- a/containers/org.eclipse.linuxtools.docker.editor/src/org/eclipse/linuxtools/internal/docker/editor/DockerEditor.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2015, 2018 Open Analytics NV and others.
- *
- * This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License 2.0
- * which is available at https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *******************************************************************************/
-package org.eclipse.linuxtools.internal.docker.editor;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.linuxtools.internal.docker.editor.syntax.SyntaxProblemReporter;
-import org.eclipse.ui.editors.text.TextEditor;
-
-public class DockerEditor extends TextEditor {
-
- public DockerEditor() {
- super();
- setSourceViewerConfiguration(new DockerConfiguration(this));
- setDocumentProvider(new DockerDocumentProvider());
- }
-
- @Override
- public void doSave(IProgressMonitor progressMonitor) {
- try {
- IResource resource = getEditorInput().getAdapter(IResource.class);
- IDocument document = getDocumentProvider().getDocument(getEditorInput());
- new SyntaxProblemReporter().checkAndApply(document, 0, document.getLength(), resource);
- } catch (CoreException | BadLocationException e) {
- Activator.log(IStatus.ERROR, "Failed to perform syntax check", e);
- }
- super.doSave(progressMonitor);
- }
-}
diff --git a/containers/org.eclipse.linuxtools.docker.editor/src/org/eclipse/linuxtools/internal/docker/editor/DockerHover.java b/containers/org.eclipse.linuxtools.docker.editor/src/org/eclipse/linuxtools/internal/docker/editor/DockerHover.java
deleted file mode 100644
index 96aa000b99cd97ee2bf240141febc8c7b308d57b..0000000000000000000000000000000000000000
--- a/containers/org.eclipse.linuxtools.docker.editor/src/org/eclipse/linuxtools/internal/docker/editor/DockerHover.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2017, 2018 Red Hat Inc and others.
- *
- * This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License 2.0
- * which is available at https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- * Red Hat - initial API and implmentation.
- *******************************************************************************/
-package org.eclipse.linuxtools.internal.docker.editor;
-
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.DefaultInformationControl;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.IInformationControlCreator;
-import org.eclipse.jface.text.IRegion;
-import org.eclipse.jface.text.ITextHover;
-import org.eclipse.jface.text.ITextHoverExtension;
-import org.eclipse.jface.text.ITextViewer;
-import org.eclipse.jface.text.Region;
-import org.eclipse.linuxtools.internal.docker.editor.util.AssetLoader;
-
-public class DockerHover implements ITextHover, ITextHoverExtension {
-
- private AssetLoader loader;
-
- public DockerHover() {
- loader = new AssetLoader();
- }
-
- @Override
- public String getHoverInfo(ITextViewer textViewer, IRegion hoverRegion) {
- String varName = null;
- try {
- varName = textViewer.getDocument().get(hoverRegion.getOffset(), hoverRegion.getLength());
- } catch (BadLocationException e) {
- return null;
- }
-
- return loader.getInfo(varName);
- }
-
- @Override
- public IRegion getHoverRegion(ITextViewer textViewer, int offset) {
- return findWord(textViewer.getDocument(), offset);
- }
-
- @Override
- public IInformationControlCreator getHoverControlCreator() {
- return parent -> new DefaultInformationControl(parent, false);
- }
-
- private IRegion findWord(IDocument document, int offset) {
- int start = -2;
- int end = -1;
-
- try {
-
- int pos = offset;
- char c;
-
- while (pos >= 0) {
- c = document.getChar(pos);
- if (!Character.isUnicodeIdentifierPart(c))
- break;
- --pos;
- }
-
- start = pos;
-
- pos = offset;
- int length = document.getLength();
-
- while (pos < length) {
- c = document.getChar(pos);
- if (!Character.isUnicodeIdentifierPart(c))
- break;
- ++pos;
- }
-
- end = pos;
-
- } catch (BadLocationException x) {
- }
-
- if (start >= -1 && end > -1) {
- if (start == offset && end == offset)
- return new Region(offset, 0);
- else if (start == offset)
- return new Region(start, end - start);
- else
- return new Region(start + 1, end - start - 1);
- }
-
- return null;
- }
-
-}
diff --git a/containers/org.eclipse.linuxtools.docker.editor/src/org/eclipse/linuxtools/internal/docker/editor/DockerPresentationReconciler.java b/containers/org.eclipse.linuxtools.docker.editor/src/org/eclipse/linuxtools/internal/docker/editor/DockerPresentationReconciler.java
deleted file mode 100644
index 001fefb3eedb334c562221f92dd332bd7df259e0..0000000000000000000000000000000000000000
--- a/containers/org.eclipse.linuxtools.docker.editor/src/org/eclipse/linuxtools/internal/docker/editor/DockerPresentationReconciler.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2017, 2018 Red Hat Inc and others.
- *
- * This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License 2.0
- * which is available at https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- * Red Hat - initial API and implmentation.
- *******************************************************************************/
-package org.eclipse.linuxtools.internal.docker.editor;
-
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.presentation.PresentationReconciler;
-import org.eclipse.jface.text.rules.DefaultDamagerRepairer;
-import org.eclipse.linuxtools.internal.docker.editor.scanner.DockerCommentScanner;
-import org.eclipse.linuxtools.internal.docker.editor.scanner.DockerInstructionScanner;
-import org.eclipse.linuxtools.internal.docker.editor.scanner.DockerPartitionScanner;
-
-public class DockerPresentationReconciler extends PresentationReconciler {
-
- public DockerPresentationReconciler() {
- super();
- DefaultDamagerRepairer dr = new DefaultDamagerRepairer(new DockerCommentScanner());
- this.setDamager(dr, DockerPartitionScanner.TYPE_COMMENT);
- this.setRepairer(dr, DockerPartitionScanner.TYPE_COMMENT);
-
- dr = new DefaultDamagerRepairer(new DockerInstructionScanner());
- this.setDamager(dr, IDocument.DEFAULT_CONTENT_TYPE);
- this.setRepairer(dr, IDocument.DEFAULT_CONTENT_TYPE);
- }
-
-}
diff --git a/containers/org.eclipse.linuxtools.docker.editor/src/org/eclipse/linuxtools/internal/docker/editor/Messages.java b/containers/org.eclipse.linuxtools.docker.editor/src/org/eclipse/linuxtools/internal/docker/editor/Messages.java
deleted file mode 100644
index 57eb6652498ef8a950db98f1c4d49e4c620e4d4a..0000000000000000000000000000000000000000
--- a/containers/org.eclipse.linuxtools.docker.editor/src/org/eclipse/linuxtools/internal/docker/editor/Messages.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2016, 2018 Red Hat.
- *
- * This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License 2.0
- * which is available at https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- * Red Hat - Initial Contribution
- *******************************************************************************/
-package org.eclipse.linuxtools.internal.docker.editor;
-
-import org.eclipse.osgi.util.NLS;
-
-public class Messages extends NLS {
- private static final String BUNDLE_NAME = "org.eclipse.linuxtools.internal.docker.editor.messages"; //$NON-NLS-1$
- public static String DockerDocumentProvider_cannot_be_mapped;
- public static String DockerDocumentProvider_chars_not_supported;
- public static String DockerDocumentProvider_encoding_not_legal;
- public static String DockerDocumentProvider_encoding_not_supported;
- static {
- // initialize resource bundle
- NLS.initializeMessages(BUNDLE_NAME, Messages.class);
- }
-
- private Messages() {
- }
-}
diff --git a/containers/org.eclipse.linuxtools.docker.editor/src/org/eclipse/linuxtools/internal/docker/editor/assist/CompletionProcessor.java b/containers/org.eclipse.linuxtools.docker.editor/src/org/eclipse/linuxtools/internal/docker/editor/assist/CompletionProcessor.java
deleted file mode 100644
index df9ac06a21c184655bea5c67191469eafe34fab4..0000000000000000000000000000000000000000
--- a/containers/org.eclipse.linuxtools.docker.editor/src/org/eclipse/linuxtools/internal/docker/editor/assist/CompletionProcessor.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2015, 2018 Open Analytics NV and others.
- *
- * This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License 2.0
- * which is available at https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *******************************************************************************/
-package org.eclipse.linuxtools.internal.docker.editor.assist;
-
-import java.util.ArrayList;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.ITextViewer;
-import org.eclipse.jface.text.contentassist.ICompletionProposal;
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-import org.eclipse.jface.text.contentassist.IContextInformation;
-import org.eclipse.jface.text.contentassist.IContextInformationValidator;
-import org.eclipse.linuxtools.internal.docker.editor.Activator;
-import org.eclipse.linuxtools.internal.docker.editor.scanner.InstructionWordRule;
-import org.eclipse.linuxtools.internal.docker.editor.util.AssetLoader;
-
-public class CompletionProcessor implements IContentAssistProcessor {
-
- private static final ICompletionProposal[] NO_COMPLETIONS = {};
- private static final IContextInformation[] NO_CONTEXTS = {};
- private static final char[] PROPOSAL_ACTIVATION_CHARS = {};
- private static final char[] INFO_ACTIVATION_CHARS = {};
- private AssetLoader assetLoader;
-
- public CompletionProcessor() {
- assetLoader = new AssetLoader();
- }
-
- @Override
- public ICompletionProposal[] computeCompletionProposals(ITextViewer viewer, int offset) {
- try {
- IDocument document = viewer.getDocument();
- ArrayList<ICompletionProposal> result = new ArrayList<>();
-
- int lineNr = document.getLineOfOffset(offset);
- int lineOffset = document.getLineOffset(lineNr);
-
- boolean isNewLine = (offset == 0) || (document.getChar(offset - 1) == '\n');
- if (isNewLine) {
- for (String instr : InstructionWordRule.INSTRUCTIONS)
- result.add(new CompletionProposal(instr, lineOffset, 0, assetLoader.getInfo(instr)));
- }
-
- boolean isFirstWord = true;
- for (int i = lineOffset; i < offset; i++) {
- if (Character.isWhitespace(document.getChar(i)))
- isFirstWord = false;
- }
- if (isFirstWord) {
- String prefix = "";
- for (int i = lineOffset; i < offset; i++)
- prefix += document.getChar(i);
- for (String instr : InstructionWordRule.INSTRUCTIONS) {
- if (instr.toLowerCase().startsWith(prefix.toLowerCase()))
- result.add(
- new CompletionProposal(instr, lineOffset, prefix.length(), assetLoader.getInfo(instr)));
- }
- }
-
- return result.toArray(new ICompletionProposal[result.size()]);
- } catch (Exception e) {
- Activator.getDefault().getLog()
- .log(new Status(IStatus.WARNING, Activator.PLUGIN_ID, "Failed to compute completion proposals", e));
- return NO_COMPLETIONS;
- }
- }
-
- @Override
- public IContextInformation[] computeContextInformation(ITextViewer viewer, int offset) {
- return NO_CONTEXTS;
- }
-
- @Override
- public char[] getCompletionProposalAutoActivationCharacters() {
- return PROPOSAL_ACTIVATION_CHARS;
- }
-
- @Override
- public char[] getContextInformationAutoActivationCharacters() {
- return INFO_ACTIVATION_CHARS;
- }
-
- @Override
- public String getErrorMessage() {
- return "";
- }
-
- @Override
- public IContextInformationValidator getContextInformationValidator() {
- return null;
- }
-
-}
\ No newline at end of file
diff --git a/containers/org.eclipse.linuxtools.docker.editor/src/org/eclipse/linuxtools/internal/docker/editor/assist/CompletionProposal.java b/containers/org.eclipse.linuxtools.docker.editor/src/org/eclipse/linuxtools/internal/docker/editor/assist/CompletionProposal.java
deleted file mode 100644
index 511e4a783e9bc9f67b7de5833f38b9cb51bdc2be..0000000000000000000000000000000000000000
--- a/containers/org.eclipse.linuxtools.docker.editor/src/org/eclipse/linuxtools/internal/docker/editor/assist/CompletionProposal.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2015, 2018 Open Analytics NV and others.
- *
- * This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License 2.0
- * which is available at https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *******************************************************************************/
-package org.eclipse.linuxtools.internal.docker.editor.assist;
-
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.DefaultInformationControl;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.IInformationControlCreator;
-import org.eclipse.jface.text.contentassist.ICompletionProposal;
-import org.eclipse.jface.text.contentassist.ICompletionProposalExtension3;
-import org.eclipse.jface.text.contentassist.IContextInformation;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.graphics.Point;
-
-/**
- * Based on {@link org.eclipse.jface.text.contentassist.CompletionProposal} with
- * added functionality for showing additional information formatted as HTML.
- */
-public class CompletionProposal implements ICompletionProposal, ICompletionProposalExtension3 {
-
- private String fReplacementString;
- private int fReplacementOffset;
- private int fReplacementLength;
-
- private String fAdditionalProposalInfo;
-
- public CompletionProposal(String replacementString, int replacementOffset, int replacementLength,
- String additionalProposalInfo) {
- this.fReplacementString = replacementString;
- this.fReplacementOffset = replacementOffset;
- this.fReplacementLength = replacementLength;
- this.fAdditionalProposalInfo = additionalProposalInfo;
- }
-
- @Override
- public void apply(IDocument document) {
- try {
- document.replace(fReplacementOffset, fReplacementLength, fReplacementString);
- } catch (BadLocationException x) {
- // ignore
- }
- }
-
- @Override
- public Point getSelection(IDocument document) {
- return new Point(fReplacementOffset + fReplacementString.length(), 0);
- }
-
- @Override
- public String getDisplayString() {
- return fReplacementString;
- }
-
- @Override
- public String getAdditionalProposalInfo() {
- return fAdditionalProposalInfo;
- }
-
- @Override
- public IInformationControlCreator getInformationControlCreator() {
- return shell -> new DefaultInformationControl(shell, true);
- }
-
- @Override
- public IContextInformation getContextInformation() {
- return null;
- }
-
- @Override
- public Image getImage() {
- return null;
- }
-
- @Override
- public CharSequence getPrefixCompletionText(IDocument document, int completionOffset) {
- return null;
- }
-
- @Override
- public int getPrefixCompletionStart(IDocument document, int completionOffset) {
- return 0;
- }
-
-}
\ No newline at end of file
diff --git a/containers/org.eclipse.linuxtools.docker.editor/src/org/eclipse/linuxtools/internal/docker/editor/messages.properties b/containers/org.eclipse.linuxtools.docker.editor/src/org/eclipse/linuxtools/internal/docker/editor/messages.properties
deleted file mode 100644
index e6ad7ef8ed2e0ba907082edf9477f9f124e5f184..0000000000000000000000000000000000000000
--- a/containers/org.eclipse.linuxtools.docker.editor/src/org/eclipse/linuxtools/internal/docker/editor/messages.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-DockerDocumentProvider_cannot_be_mapped=Some characters cannot be mapped using {0} character encoding.
-DockerDocumentProvider_chars_not_supported=Either change the encoding or remove the characters which are not supported by the {0} character encoding.
-DockerDocumentProvider_encoding_not_legal=Character encoding {0} is not a legal character encoding.
-DockerDocumentProvider_encoding_not_supported=Character encoding {0} is not supported by this platform.
diff --git a/containers/org.eclipse.linuxtools.docker.editor/src/org/eclipse/linuxtools/internal/docker/editor/scanner/DockerCommentScanner.java b/containers/org.eclipse.linuxtools.docker.editor/src/org/eclipse/linuxtools/internal/docker/editor/scanner/DockerCommentScanner.java
deleted file mode 100644
index fc60be54221f8aeef381abf2df3ed4e5327b4bfa..0000000000000000000000000000000000000000
--- a/containers/org.eclipse.linuxtools.docker.editor/src/org/eclipse/linuxtools/internal/docker/editor/scanner/DockerCommentScanner.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2015, 2018 Open Analytics NV and others.
- *
- * This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License 2.0
- * which is available at https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *******************************************************************************/
-package org.eclipse.linuxtools.internal.docker.editor.scanner;
-
-import org.eclipse.jface.text.TextAttribute;
-import org.eclipse.jface.text.rules.EndOfLineRule;
-import org.eclipse.jface.text.rules.ICharacterScanner;
-import org.eclipse.jface.text.rules.IRule;
-import org.eclipse.jface.text.rules.IToken;
-import org.eclipse.jface.text.rules.RuleBasedScanner;
-import org.eclipse.jface.text.rules.Token;
-import org.eclipse.linuxtools.internal.docker.editor.syntax.SyntaxColors;
-
-public class DockerCommentScanner extends RuleBasedScanner {
-
- public static final String COMMENT_SEQUENCE = "#";
-
- public DockerCommentScanner() {
- IToken token = new Token(new TextAttribute(SyntaxColors.getCommentColor()));
-
- IRule[] rules = new IRule[1];
- rules[0] = new EndOfLineRule(COMMENT_SEQUENCE, token) {
- @Override
- public IToken evaluate(ICharacterScanner scanner, boolean resume) {
- if (getColumn() > 0)
- return Token.UNDEFINED;
- return super.evaluate(scanner, resume);
- }
- };
-
- setRules(rules);
- }
-}
diff --git a/containers/org.eclipse.linuxtools.docker.editor/src/org/eclipse/linuxtools/internal/docker/editor/scanner/DockerInstructionScanner.java b/containers/org.eclipse.linuxtools.docker.editor/src/org/eclipse/linuxtools/internal/docker/editor/scanner/DockerInstructionScanner.java
deleted file mode 100644
index 2e6cd5493c26a89e3334de99689db1bad4fb66b2..0000000000000000000000000000000000000000
--- a/containers/org.eclipse.linuxtools.docker.editor/src/org/eclipse/linuxtools/internal/docker/editor/scanner/DockerInstructionScanner.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2015, 2018 Open Analytics NV and others.
- *
- * This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License 2.0
- * which is available at https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *******************************************************************************/
-package org.eclipse.linuxtools.internal.docker.editor.scanner;
-
-import org.eclipse.jface.text.TextAttribute;
-import org.eclipse.jface.text.rules.EndOfLineRule;
-import org.eclipse.jface.text.rules.ICharacterScanner;
-import org.eclipse.jface.text.rules.IRule;
-import org.eclipse.jface.text.rules.IToken;
-import org.eclipse.jface.text.rules.RuleBasedScanner;
-import org.eclipse.jface.text.rules.SingleLineRule;
-import org.eclipse.jface.text.rules.Token;
-import org.eclipse.linuxtools.internal.docker.editor.syntax.SyntaxColors;
-
-public class DockerInstructionScanner extends RuleBasedScanner {
-
- public DockerInstructionScanner() {
- IToken instructionToken = new Token(new TextAttribute(SyntaxColors.getInstructionColor()));
- IToken stringToken = new Token(new TextAttribute(SyntaxColors.getStringColor()));
- IToken varToken = new Token(new TextAttribute(SyntaxColors.getVariableColor()));
- IToken commentToken = new Token(new TextAttribute(SyntaxColors.getCommentColor()));
-
- IRule[] rules = new IRule[5];
- rules[0] = new InstructionWordRule(instructionToken);
- rules[1] = new SingleLineRule("\"", "\"", stringToken, '\\');
- rules[2] = new SingleLineRule("\'", "\'", stringToken, '\\');
- rules[3] = new SingleLineRule("${", "}", varToken, '\\');
- rules[4] = new EndOfLineRule("#", commentToken) {
- @Override
- public IToken evaluate(ICharacterScanner scanner, boolean resume) {
- if (getColumn() > 0)
- return Token.UNDEFINED;
- return super.evaluate(scanner, resume);
- }
- };
-
- setRules(rules);
- }
-}
diff --git a/containers/org.eclipse.linuxtools.docker.editor/src/org/eclipse/linuxtools/internal/docker/editor/scanner/DockerPartitionScanner.java b/containers/org.eclipse.linuxtools.docker.editor/src/org/eclipse/linuxtools/internal/docker/editor/scanner/DockerPartitionScanner.java
deleted file mode 100644
index ff403e7945b9e53b28097ee6cc61ecc5a95806af..0000000000000000000000000000000000000000
--- a/containers/org.eclipse.linuxtools.docker.editor/src/org/eclipse/linuxtools/internal/docker/editor/scanner/DockerPartitionScanner.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2015, 2018 Open Analytics NV and others.
- *
- * This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License 2.0
- * which is available at https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *******************************************************************************/
-package org.eclipse.linuxtools.internal.docker.editor.scanner;
-
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.rules.EndOfLineRule;
-import org.eclipse.jface.text.rules.IPredicateRule;
-import org.eclipse.jface.text.rules.IToken;
-import org.eclipse.jface.text.rules.RuleBasedPartitionScanner;
-import org.eclipse.jface.text.rules.Token;
-
-/**
- * This scanner partitions the document in two things:
- * <ul>
- * <li>Comments, of type TYPE_COMMENT</li>
- * <li>Everything else, of type {@link IDocument#DEFAULT_CONTENT_TYPE}</li>
- * </ul>
- */
-public class DockerPartitionScanner extends RuleBasedPartitionScanner {
-
- public final static String TYPE_COMMENT = "__docker_comment";
-
- public final static String[] ALLOWED_CONTENT_TYPES = { TYPE_COMMENT };
-
- public DockerPartitionScanner() {
- IToken commentToken = new Token(TYPE_COMMENT);
- IPredicateRule[] rules = new IPredicateRule[1];
- rules[0] = new EndOfLineRule(DockerCommentScanner.COMMENT_SEQUENCE, commentToken);
- setPredicateRules(rules);
- }
-
-}
diff --git a/containers/org.eclipse.linuxtools.docker.editor/src/org/eclipse/linuxtools/internal/docker/editor/scanner/InstructionWordRule.java b/containers/org.eclipse.linuxtools.docker.editor/src/org/eclipse/linuxtools/internal/docker/editor/scanner/InstructionWordRule.java
deleted file mode 100644
index 44f1c36bc2e1d54313209e9f44e7b1d0b2c51e50..0000000000000000000000000000000000000000
--- a/containers/org.eclipse.linuxtools.docker.editor/src/org/eclipse/linuxtools/internal/docker/editor/scanner/InstructionWordRule.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2015, 2018 Open Analytics NV and others.
- *
- * This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License 2.0
- * which is available at https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *******************************************************************************/
-package org.eclipse.linuxtools.internal.docker.editor.scanner;
-
-import java.io.IOException;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jface.text.rules.IToken;
-import org.eclipse.jface.text.rules.IWordDetector;
-import org.eclipse.jface.text.rules.Token;
-import org.eclipse.jface.text.rules.WordRule;
-import org.eclipse.linuxtools.internal.docker.editor.Activator;
-import org.eclipse.linuxtools.internal.docker.editor.util.AssetLoader;
-
-public class InstructionWordRule extends WordRule {
-
- public static final String[] INSTRUCTIONS;
-
- private static final String INSTRUCTION_FILE_PATH = "assets/instructions.txt";
-
- // Load instructions from the text file.
- static {
- String[] loadedInstructions = new String[0];
- try {
- String contentsString = AssetLoader.loadAsset(INSTRUCTION_FILE_PATH);
- String lineSeparator = (contentsString.contains("\r\n")) ? "\r\n" : "\n";
- loadedInstructions = contentsString.split(lineSeparator);
- } catch (IOException e) {
- Activator.log(IStatus.WARNING,
- "No content assist available: error while reading instruction file: " + INSTRUCTION_FILE_PATH, e);
- }
- INSTRUCTIONS = loadedInstructions;
- }
-
- public InstructionWordRule(IToken instructionToken) {
- super(new InstructionWordDetector(), Token.UNDEFINED, true);
- setColumnConstraint(0);
- for (String instruction : INSTRUCTIONS)
- addWord(instruction, instructionToken);
- }
-
- private static class InstructionWordDetector implements IWordDetector {
-
- @Override
- public boolean isWordStart(char c) {
- return Character.isJavaIdentifierStart(c);
- }
-
- @Override
- public boolean isWordPart(char c) {
- return Character.isJavaIdentifierPart(c);
- }
-
- }
-}
\ No newline at end of file
diff --git a/containers/org.eclipse.linuxtools.docker.editor/src/org/eclipse/linuxtools/internal/docker/editor/syntax/SyntaxColors.java b/containers/org.eclipse.linuxtools.docker.editor/src/org/eclipse/linuxtools/internal/docker/editor/syntax/SyntaxColors.java
deleted file mode 100644
index 716d6875d8df704617d63a02ea51a4c333fe5222..0000000000000000000000000000000000000000
--- a/containers/org.eclipse.linuxtools.docker.editor/src/org/eclipse/linuxtools/internal/docker/editor/syntax/SyntaxColors.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2015, 2018 Open Analytics NV and others.
- *
- * This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License 2.0
- * which is available at https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *******************************************************************************/
-package org.eclipse.linuxtools.internal.docker.editor.syntax;
-
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.themes.ITheme;
-
-public class SyntaxColors {
-
- private static final String COLOR_DEF_INSTRUCTION = "org.eclipse.linuxtools.docker.editor.color.instruction";
- private static final String COLOR_DEF_STRING = "org.eclipse.linuxtools.docker.editor.color.string";
- private static final String COLOR_DEF_COMMENT = "org.eclipse.linuxtools.docker.editor.color.comment";
- private static final String COLOR_DEF_VARIABLE = "org.eclipse.linuxtools.docker.editor.color.variable";
-
- public static Color getInstructionColor() {
- return getTheme().getColorRegistry().get(COLOR_DEF_INSTRUCTION);
- }
-
- public static Color getStringColor() {
- return getTheme().getColorRegistry().get(COLOR_DEF_STRING);
- }
-
- public static Color getCommentColor() {
- return getTheme().getColorRegistry().get(COLOR_DEF_COMMENT);
- }
-
- public static Color getVariableColor() {
- return getTheme().getColorRegistry().get(COLOR_DEF_VARIABLE);
- }
-
- private static ITheme getTheme() {
- return PlatformUI.getWorkbench().getThemeManager().getCurrentTheme();
- }
-}
diff --git a/containers/org.eclipse.linuxtools.docker.editor/src/org/eclipse/linuxtools/internal/docker/editor/syntax/SyntaxProblemReporter.java b/containers/org.eclipse.linuxtools.docker.editor/src/org/eclipse/linuxtools/internal/docker/editor/syntax/SyntaxProblemReporter.java
deleted file mode 100644
index da555e7f3bc24d339dde3e1e85263c4e71870509..0000000000000000000000000000000000000000
--- a/containers/org.eclipse.linuxtools.docker.editor/src/org/eclipse/linuxtools/internal/docker/editor/syntax/SyntaxProblemReporter.java
+++ /dev/null
@@ -1,120 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2015, 2018 Open Analytics NV and others.
- *
- * This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License 2.0
- * which is available at https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *******************************************************************************/
-package org.eclipse.linuxtools.internal.docker.editor.syntax;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.linuxtools.internal.docker.editor.scanner.DockerCommentScanner;
-import org.eclipse.linuxtools.internal.docker.editor.scanner.InstructionWordRule;
-
-public class SyntaxProblemReporter {
-
- private static final String LINE_SEP = System.getProperty("line.separator");
-
- public void checkAndApply(IDocument document, int offset, int length, IResource resource)
- throws CoreException, BadLocationException {
-
- // We can't do problem report when file is external (no IResource)
- if (resource == null) {
- return;
- }
- boolean fullScan = (offset == 0 && length == document.getLength());
-
- // Clear any existing markers in the affected region.
- IMarker[] markers = resource.findMarkers(IMarker.PROBLEM, true, IResource.DEPTH_ZERO);
- List<IMarker> markersToDelete = new ArrayList<>();
- for (IMarker marker : markers) {
- int markerLineNr = (Integer) marker.getAttribute(IMarker.LINE_NUMBER);
- int regionLineNr = document.getLineOfOffset(offset);
- if (fullScan || markerLineNr == regionLineNr)
- markersToDelete.add(marker);
- }
- for (IMarker marker : markersToDelete)
- marker.delete();
-
- // Apply new problems as needed.
- List<SyntaxProblem> problems = check(document, offset, length);
- for (SyntaxProblem problem : problems) {
- IMarker marker = resource.createMarker(IMarker.PROBLEM);
- marker.setAttribute(IMarker.SEVERITY, problem.severity);
- marker.setAttribute(IMarker.MESSAGE, problem.message);
- marker.setAttribute(IMarker.LINE_NUMBER, document.getLineOfOffset(problem.offset));
- marker.setAttribute(IMarker.CHAR_START, problem.offset);
- marker.setAttribute(IMarker.CHAR_END, problem.offset + problem.length);
- }
- }
-
- public List<SyntaxProblem> check(IDocument document, int offset, int length) throws BadLocationException {
- String region = document.get(offset, length);
- int lineCount = region.split(LINE_SEP).length;
- int startingLineNr = document.getLineOfOffset(offset);
-
- List<SyntaxProblem> problems = new ArrayList<>();
-
- for (int lineNr = startingLineNr; lineNr < startingLineNr + lineCount; lineNr++) {
- int lineOffset = document.getLineOffset(lineNr);
- int lineEnd = document.getLength();
- if (lineNr + startingLineNr + 1 < lineCount)
- lineEnd = document.getLineOffset(lineNr + 1);
-
- int endOfFirstWord = 0;
- for (; endOfFirstWord < lineEnd - lineOffset; endOfFirstWord++) {
- if (Character.isWhitespace(document.getChar(lineOffset + endOfFirstWord)))
- break;
- }
-
- String firstWord = document.get(lineOffset, endOfFirstWord);
- if (firstWord.trim().isEmpty())
- continue;
- if (firstWord.trim().startsWith(DockerCommentScanner.COMMENT_SEQUENCE))
- continue;
-
- String matchingInstruction = null;
- for (String instr : InstructionWordRule.INSTRUCTIONS) {
- if (instr.equalsIgnoreCase(firstWord)) {
- matchingInstruction = instr;
- break;
- }
- }
-
- if (matchingInstruction == null) {
- // Error: unknown instruction
- problems.add(new SyntaxProblem(IMarker.SEVERITY_ERROR, lineOffset, firstWord.length(),
- "Unknown instruction: " + firstWord));
- } else if (!matchingInstruction.equals(firstWord)) {
- // Warning: case incorrect
- problems.add(new SyntaxProblem(IMarker.SEVERITY_WARNING, lineOffset, firstWord.length(),
- "Instructions should be upper case"));
- }
- }
-
- return problems;
- }
-
- public static class SyntaxProblem {
- public int severity;
- public int offset;
- public int length;
- public String message;
-
- public SyntaxProblem(int severity, int offset, int length, String message) {
- this.severity = severity;
- this.offset = offset;
- this.length = length;
- this.message = message;
- }
- }
-}
diff --git a/containers/org.eclipse.linuxtools.docker.editor/src/org/eclipse/linuxtools/internal/docker/editor/syntax/SyntaxReconcilingStrategy.java b/containers/org.eclipse.linuxtools.docker.editor/src/org/eclipse/linuxtools/internal/docker/editor/syntax/SyntaxReconcilingStrategy.java
deleted file mode 100644
index 1251f6083b336e4bde316f4981c6798b43299f09..0000000000000000000000000000000000000000
--- a/containers/org.eclipse.linuxtools.docker.editor/src/org/eclipse/linuxtools/internal/docker/editor/syntax/SyntaxReconcilingStrategy.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2015, 2018 Open Analytics NV and others.
- *
- * This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License 2.0
- * which is available at https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *******************************************************************************/
-package org.eclipse.linuxtools.internal.docker.editor.syntax;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.IRegion;
-import org.eclipse.jface.text.reconciler.DirtyRegion;
-import org.eclipse.jface.text.reconciler.IReconcilingStrategy;
-import org.eclipse.jface.text.reconciler.IReconcilingStrategyExtension;
-import org.eclipse.linuxtools.internal.docker.editor.Activator;
-import org.eclipse.linuxtools.internal.docker.editor.DockerEditor;
-
-public class SyntaxReconcilingStrategy implements IReconcilingStrategy, IReconcilingStrategyExtension {
-
- private DockerEditor editor;
- private IDocument document;
-
- public SyntaxReconcilingStrategy(DockerEditor editor) {
- this.editor = editor;
- }
-
- @Override
- public void setDocument(IDocument document) {
- this.document = document;
- }
-
- @Override
- public void reconcile(DirtyRegion dirtyRegion, IRegion subRegion) {
- try {
- IResource resource = editor.getEditorInput().getAdapter(IResource.class);
- new SyntaxProblemReporter().checkAndApply(document, subRegion.getOffset(), subRegion.getLength(), resource);
- } catch (CoreException | BadLocationException e) {
- Activator.log(IStatus.ERROR, "Failed to perform syntax check", e);
- }
- }
-
- @Override
- public void reconcile(IRegion partition) {
- // Partition reconciling not supported.
- }
-
- @Override
- public void setProgressMonitor(IProgressMonitor monitor) {
- // Monitoring not supported.
- }
-
- @Override
- public void initialReconcile() {
- // Nothing to do.
- }
-}
diff --git a/containers/org.eclipse.linuxtools.docker.editor/src/org/eclipse/linuxtools/internal/docker/editor/util/AssetLoader.java b/containers/org.eclipse.linuxtools.docker.editor/src/org/eclipse/linuxtools/internal/docker/editor/util/AssetLoader.java
deleted file mode 100644
index d0ddd473a1a118f068e377065783a559e70f47f6..0000000000000000000000000000000000000000
--- a/containers/org.eclipse.linuxtools.docker.editor/src/org/eclipse/linuxtools/internal/docker/editor/util/AssetLoader.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2015, 2018 Open Analytics NV and others.
- *
- * This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License 2.0
- * which is available at https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *******************************************************************************/
-package org.eclipse.linuxtools.internal.docker.editor.util;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URL;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.linuxtools.internal.docker.editor.Activator;
-
-public class AssetLoader {
-
- private Map<String, String> additionalInfos = new HashMap<>();
- private static final String ADDITIONAL_INFO_PATH = "assets/additional-info";
-
- public AssetLoader() {
- additionalInfos = new HashMap<>();
- }
-
- public String getInfo(String instruction) {
- if (additionalInfos.containsKey(instruction))
- return additionalInfos.get(instruction);
-
- String additionalInfo = "";
- String targetFile = ADDITIONAL_INFO_PATH + "/" + instruction + ".html";
- try {
- additionalInfo = AssetLoader.loadAsset(targetFile);
- } catch (IOException e) {
- Activator.log(IStatus.WARNING, "Failed to load additional info file for instruction " + instruction, e);
- }
-
- additionalInfos.put(instruction, additionalInfo);
- return additionalInfo;
- }
-
- public static String loadAsset(String path) throws IOException {
- URL url = FileLocator.find(Activator.getDefault().getBundle(), new Path(path), null);
- if (url == null) {
- return null;
- } else {
- ByteArrayOutputStream out = new ByteArrayOutputStream();
- try (InputStream input = url.openStream()) {
-
- byte[] buffer = new byte[4096];
- int len = 0;
- do {
- len = input.read(buffer, 0, buffer.length);
- if (len > 0)
- out.write(buffer, 0, len);
- } while (len >= 0);
- }
- return new String(out.toByteArray());
- }
- }
-}
diff --git a/containers/org.eclipse.linuxtools.docker.integration.tests/.classpath b/containers/org.eclipse.linuxtools.docker.integration.tests/.classpath
index cc5ee2dc8c5926970810a833470896bd5c67a924..336abe9f465d00ba63337eaa7861d1620554f900 100644
--- a/containers/org.eclipse.linuxtools.docker.integration.tests/.classpath
+++ b/containers/org.eclipse.linuxtools.docker.integration.tests/.classpath
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src/">
<attributes>
diff --git a/containers/org.eclipse.linuxtools.docker.integration.tests/.settings/org.eclipse.jdt.core.prefs b/containers/org.eclipse.linuxtools.docker.integration.tests/.settings/org.eclipse.jdt.core.prefs
index a698e59674fc5acbc59d9c75892963a0115b7c26..a58ebdcad300d0a088dcbd63941d2c89e78a4f98 100644
--- a/containers/org.eclipse.linuxtools.docker.integration.tests/.settings/org.eclipse.jdt.core.prefs
+++ b/containers/org.eclipse.linuxtools.docker.integration.tests/.settings/org.eclipse.jdt.core.prefs
@@ -1,12 +1,15 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.compliance=11
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11
diff --git a/containers/org.eclipse.linuxtools.docker.integration.tests/META-INF/MANIFEST.MF b/containers/org.eclipse.linuxtools.docker.integration.tests/META-INF/MANIFEST.MF
index 36576a95a0df01c4ac5565f1793126358360a3c5..a8824bb021b8bee424f90c2e08f3022863408a35 100644
--- a/containers/org.eclipse.linuxtools.docker.integration.tests/META-INF/MANIFEST.MF
+++ b/containers/org.eclipse.linuxtools.docker.integration.tests/META-INF/MANIFEST.MF
@@ -24,16 +24,16 @@ Require-Bundle: org.junit,
org.apache.commons.lang,
org.eclipse.linuxtools.docker.core,
org.mockito,
- com.spotify.docker.client;bundle-version="[8.9.2,9.0.0)",
+ org.mandas.docker-client;bundle-version="3.2.1",
org.eclipse.linuxtools.docker.ui.tests,
org.eclipse.ui.console,
org.eclipse.ui,
org.eclipse.swt,
- com.google.guava;bundle-version="21.0.0",
- javax.xml.bind;bundle-version="2.2.0"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+ com.google.guava;bundle-version="21.0.0"
+Bundle-RequiredExecutionEnvironment: JavaSE-11
Bundle-ActivationPolicy: lazy
-Import-Package: org.eclipse.debug.core,
+Import-Package: javax.xml.bind;version="2.3.3",
+ org.eclipse.debug.core,
org.eclipse.linuxtools.docker.reddeer,
org.eclipse.linuxtools.docker.reddeer.condition,
org.eclipse.linuxtools.docker.reddeer.core.ui.wizards,
@@ -42,7 +42,8 @@ Import-Package: org.eclipse.debug.core,
org.eclipse.linuxtools.docker.reddeer.ui,
org.eclipse.linuxtools.docker.reddeer.ui.resources,
org.eclipse.linuxtools.docker.reddeer.utils,
- org.hamcrest;version="1.3.0"
+ org.hamcrest;version="1.3.0",
+ javax.annotation;version="1.3.5"
Automatic-Module-Name: org.eclipse.linuxtools.docker.integration.tests
diff --git a/containers/org.eclipse.linuxtools.docker.integration.tests/launchers/DockerAllBotTest Local.launch b/containers/org.eclipse.linuxtools.docker.integration.tests/launchers/DockerAllBotTest Local.launch
index 081237cbd582e3af9d974e80cb42259e13ad05b8..aa48b6a97e746187bf766f1b53ccc075efda4495 100644
--- a/containers/org.eclipse.linuxtools.docker.integration.tests/launchers/DockerAllBotTest Local.launch
+++ b/containers/org.eclipse.linuxtools.docker.integration.tests/launchers/DockerAllBotTest Local.launch
@@ -1,117 +1,486 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<launchConfiguration type="org.eclipse.reddeer.eclipse.ui.launcher.JunitLaunchConfig">
-<setAttribute key="additional_plugins">
-<setEntry value="com.spotify.docker.client:6.1.1.v20170301-1624:default:true"/>
-<setEntry value="org.apache.httpcomponents.httpclient:4.5.2.v20170210-0925:default:true"/>
-<setEntry value="org.apache.httpcomponents.httpcore:4.4.6.v20170210-0925:default:true"/>
-<setEntry value="org.eclipse.linuxtools.docker.core:3.1.0.qualifier:default:true"/>
-<setEntry value="org.eclipse.linuxtools.docker.editor:1.0.0.qualifier:default:true"/>
-<setEntry value="org.eclipse.linuxtools.docker.integration.tests:1.0.0.qualifier:default:true"/>
-<setEntry value="org.eclipse.linuxtools.docker.reddeer:1.0.0.qualifier:default:true"/>
-<setEntry value="org.eclipse.linuxtools.docker.tests.hamcrest-wrap:1.2.0.qualifier:default:true"/>
-<setEntry value="org.eclipse.linuxtools.docker.ui.tests:2.1.0.qualifier:default:true"/>
-<setEntry value="org.eclipse.linuxtools.docker.ui:3.1.0.qualifier:default:true"/>
-<setEntry value="org.slf4j.api:1.7.2.v20121108-1250:default:true"/>
-</setAttribute>
-<booleanAttribute key="append.args" value="true"/>
-<stringAttribute key="application" value="org.eclipse.pde.junit.runtime.coretestapplication"/>
-<booleanAttribute key="askclear" value="false"/>
-<booleanAttribute key="automaticAdd" value="true"/>
-<booleanAttribute key="automaticValidate" value="true"/>
-<stringAttribute key="bootstrap" value=""/>
-<stringAttribute key="checked" value="[NONE]"/>
-<booleanAttribute key="clearConfig" value="true"/>
-<booleanAttribute key="clearws" value="true"/>
-<booleanAttribute key="clearwslog" value="false"/>
-<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/pde-junit"/>
-<booleanAttribute key="default" value="false"/>
-<stringAttribute key="featureDefaultLocation" value="workspace"/>
-<stringAttribute key="featurePluginResolution" value="workspace"/>
-<booleanAttribute key="includeOptional" value="true"/>
-<stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/org.eclipse.linuxtools.docker.integration.tests/src/org/eclipse/linuxtools/docker/integration/tests/DockerAllBotTest.java"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="1"/>
-</listAttribute>
-<mapAttribute key="org.eclipse.debug.core.environmentVariables">
-<mapEntry key="DISPLAY" value=":2"/>
-</mapAttribute>
-<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
-<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
-<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
-<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
-<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.linuxtools.docker.integration.tests.DockerAllBotTest"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog -consolelog"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.linuxtools.docker.integration.tests"/>
-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-DdockerMockito=false -DunixSocket=unix:///var/run/docker.sock -Dusage_reporting_enabled=false -DdockerHubUsername=test -DdockerHubEmail=test@test.com -DdockerHubPassword=password -DdockerComposePath=//testpath"/>
-<stringAttribute key="pde.version" value="3.3"/>
-<stringAttribute key="product" value="org.eclipse.platform.ide"/>
-<stringAttribute key="rd.launch.property.rd.captureScreenshot" value="true"/>
-<stringAttribute key="rd.launch.property.rd.closeShells" value="true"/>
-<stringAttribute key="rd.launch.property.rd.closeWelcomeScreen" value="true"/>
-<stringAttribute key="rd.launch.property.rd.disableMavenIndex" value="true"/>
-<stringAttribute key="rd.launch.property.rd.logCollectorEnabled" value="true"/>
-<stringAttribute key="rd.launch.property.rd.logLevel" value="ALL"/>
-<stringAttribute key="rd.launch.property.rd.logMessageFilter" value="ALL"/>
-<stringAttribute key="rd.launch.property.rd.openAssociatedPerspective" value="never"/>
-<stringAttribute key="rd.launch.property.rd.pauseFailedTest" value="false"/>
-<stringAttribute key="rd.launch.property.rd.timePeriodFactor" value="1.0"/>
-<setAttribute key="selected_features">
-<setEntry value="org.eclipse.cdt.autotools:default"/>
-<setEntry value="org.eclipse.cdt.gdb:default"/>
-<setEntry value="org.eclipse.cdt.gnu.build:default"/>
-<setEntry value="org.eclipse.cdt.gnu.debug:default"/>
-<setEntry value="org.eclipse.cdt.gnu.dsf:default"/>
-<setEntry value="org.eclipse.cdt.native:default"/>
-<setEntry value="org.eclipse.cdt.platform:default"/>
-<setEntry value="org.eclipse.cdt:default"/>
-<setEntry value="org.eclipse.draw2d:default"/>
-<setEntry value="org.eclipse.e4.rcp:default"/>
-<setEntry value="org.eclipse.ecf.core.feature:default"/>
-<setEntry value="org.eclipse.ecf.core.ssl.feature:default"/>
-<setEntry value="org.eclipse.ecf.filetransfer.feature:default"/>
-<setEntry value="org.eclipse.ecf.filetransfer.httpclient4.feature:default"/>
-<setEntry value="org.eclipse.ecf.filetransfer.httpclient4.ssl.feature:default"/>
-<setEntry value="org.eclipse.ecf.filetransfer.ssl.feature:default"/>
-<setEntry value="org.eclipse.emf.common:default"/>
-<setEntry value="org.eclipse.emf.ecore:default"/>
-<setEntry value="org.eclipse.equinox.p2.core.feature:default"/>
-<setEntry value="org.eclipse.equinox.p2.extras.feature:default"/>
-<setEntry value="org.eclipse.equinox.p2.rcp.feature:default"/>
-<setEntry value="org.eclipse.equinox.p2.user.ui:default"/>
-<setEntry value="org.eclipse.help:default"/>
-<setEntry value="org.eclipse.jgit:default"/>
-<setEntry value="org.eclipse.launchbar:default"/>
-<setEntry value="org.eclipse.license:default"/>
-<setEntry value="org.eclipse.linuxtools.docker.feature:default"/>
-<setEntry value="org.eclipse.platform:default"/>
-<setEntry value="org.eclipse.ptp.rdt.sync:default"/>
-<setEntry value="org.eclipse.rcp:default"/>
-<setEntry value="org.eclipse.remote:default"/>
-<setEntry value="org.eclipse.swtbot.eclipse:default"/>
-<setEntry value="org.eclipse.swtbot.forms:default"/>
-<setEntry value="org.eclipse.swtbot:default"/>
-<setEntry value="org.eclipse.tm.terminal.connector.local.feature:default"/>
-<setEntry value="org.eclipse.tm.terminal.connector.ssh.feature:default"/>
-<setEntry value="org.eclipse.tm.terminal.connector.telnet.feature:default"/>
-<setEntry value="org.eclipse.tm.terminal.control.feature:default"/>
-<setEntry value="org.eclipse.tm.terminal.feature:default"/>
-<setEntry value="org.eclipse.tm.terminal.view.feature:default"/>
-<setEntry value="org.eclipse.zest:default"/>
-<setEntry value="org.jboss.reddeer.eclipse.feature:default"/>
-<setEntry value="org.jboss.reddeer.junit.extension.feature:default"/>
-<setEntry value="org.jboss.reddeer.ui.feature:default"/>
-</setAttribute>
-<stringAttribute key="selected_target_plugins" value="com.fasterxml.jackson.core.jackson-annotations@default:default,com.fasterxml.jackson.core.jackson-core@default:default,com.fasterxml.jackson.core.jackson-databind@default:default,com.fasterxml.jackson.datatype.jackson-datatype-guava@default:default,com.fasterxml.jackson.jaxrs.jackson-jaxrs-base@default:default,com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider@default:default,com.github.jnr.constants@default:default,com.github.jnr.enxio@default:default,com.github.jnr.ffi@default:default,com.github.jnr.jffi.native@default:false,com.github.jnr.jffi@default:default,com.github.jnr.posix@default:default,com.github.jnr.unixsocket@default:default,com.google.gson@default:default,com.google.guava@default:default,com.ibm.icu@default:default,com.jcraft.jsch@default:default,com.spotify.docker.client@default:true,com.sun.el@default:default,javaewah@default:default,javassist@default:default,javax.annotation@default:default,javax.el@default:default,javax.inject@default:default,javax.servlet.jsp@default:default,javax.servlet@default:default,javax.ws.rs@default:default,javax.xml@default:default,jnr.x86asm@default:default,org.aopalliance@default:default,org.apache.ant@default:default,org.apache.batik.css@default:default,org.apache.batik.util.gui@default:default,org.apache.batik.util@default:default,org.apache.commons.beanutils@default:default,org.apache.commons.codec@default:default,org.apache.commons.compress@default:default,org.apache.commons.io@default:default,org.apache.commons.jxpath@default:default,org.apache.commons.lang3.source@default:default,org.apache.commons.lang3@default:default,org.apache.commons.lang@default:default,org.apache.commons.logging@default:default,org.apache.felix.gogo.command@default:default,org.apache.felix.gogo.runtime@default:default,org.apache.felix.gogo.shell@default:default,org.apache.httpcomponents.httpclient*4.3.6.v201511171540@default:default,org.apache.httpcomponents.httpclient*4.5.2.v20161115-1643@default:default,org.apache.httpcomponents.httpcore*4.3.3.v201411290715@default:default,org.apache.httpcomponents.httpcore*4.4.4.v20161115-1643@default:default,org.apache.jasper.glassfish@default:default,org.apache.log4j@default:default,org.apache.lucene.analysis@default:default,org.apache.lucene.core@default:default,org.apache.xerces@default:default,org.apache.xml.resolver@default:default,org.apache.xml.serializer@default:default,org.assertj@default:default,org.bouncycastle.bcpkix@default:default,org.bouncycastle.bcprov@default:default,org.cyberneko.html@default:default,org.eclipse.ant.core@default:default,org.eclipse.ant.launching@default:default,org.eclipse.ant.ui@default:default,org.eclipse.cdt.autotools.core@default:default,org.eclipse.cdt.autotools.docs@default:default,org.eclipse.cdt.autotools.ui@default:default,org.eclipse.cdt.build.gcc.core@default:default,org.eclipse.cdt.codan.checkers.ui@default:default,org.eclipse.cdt.codan.checkers@default:default,org.eclipse.cdt.codan.core.cxx@default:default,org.eclipse.cdt.codan.core@default:default,org.eclipse.cdt.codan.ui.cxx@default:default,org.eclipse.cdt.codan.ui@default:default,org.eclipse.cdt.core.linux.x86_64@default:false,org.eclipse.cdt.core.linux@default:false,org.eclipse.cdt.core.native@default:default,org.eclipse.cdt.core@default:default,org.eclipse.cdt.debug.core@default:default,org.eclipse.cdt.debug.ui@default:default,org.eclipse.cdt.doc.user@default:default,org.eclipse.cdt.dsf.gdb.ui@default:default,org.eclipse.cdt.dsf.gdb@default:default,org.eclipse.cdt.dsf.ui@default:default,org.eclipse.cdt.dsf@default:default,org.eclipse.cdt.gdb.ui@default:default,org.eclipse.cdt.gdb@default:default,org.eclipse.cdt.launch@default:default,org.eclipse.cdt.make.core@default:default,org.eclipse.cdt.make.ui@default:default,org.eclipse.cdt.managedbuilder.core@default:default,org.eclipse.cdt.managedbuilder.gnu.ui@default:default,org.eclipse.cdt.managedbuilder.ui@default:default,org.eclipse.cdt.native.serial@default:default,org.eclipse.cdt.remote.core@default:default,org.eclipse.cdt.ui@default:default,org.eclipse.cdt@default:default,org.eclipse.compare.core@default:default,org.eclipse.compare@default:default,org.eclipse.core.commands@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.databinding.beans@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.core.databinding@default:default,org.eclipse.core.expressions@default:default,org.eclipse.core.externaltools@default:default,org.eclipse.core.filebuffers@default:default,org.eclipse.core.filesystem.linux.x86_64@default:false,org.eclipse.core.filesystem@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.net.linux.x86_64@default:false,org.eclipse.core.net@default:default,org.eclipse.core.resources@default:default,org.eclipse.core.runtime@default:true,org.eclipse.core.variables@default:default,org.eclipse.debug.core@default:default,org.eclipse.debug.ui@default:default,org.eclipse.draw2d@default:default,org.eclipse.dstore.core@default:default,org.eclipse.dstore.extra@default:default,org.eclipse.e4.core.commands@default:default,org.eclipse.e4.core.contexts@default:default,org.eclipse.e4.core.di.annotations@default:default,org.eclipse.e4.core.di.extensions@default:default,org.eclipse.e4.core.di@default:default,org.eclipse.e4.core.services@default:default,org.eclipse.e4.emf.xpath@default:default,org.eclipse.e4.ui.bindings@default:default,org.eclipse.e4.ui.css.core@default:default,org.eclipse.e4.ui.css.swt.theme@default:default,org.eclipse.e4.ui.css.swt@default:default,org.eclipse.e4.ui.di@default:default,org.eclipse.e4.ui.dialogs@default:default,org.eclipse.e4.ui.model.workbench@default:default,org.eclipse.e4.ui.services@default:default,org.eclipse.e4.ui.swt.gtk@default:false,org.eclipse.e4.ui.widgets@default:default,org.eclipse.e4.ui.workbench.addons.swt@default:default,org.eclipse.e4.ui.workbench.renderers.swt@default:default,org.eclipse.e4.ui.workbench.swt@default:default,org.eclipse.e4.ui.workbench3@default:default,org.eclipse.e4.ui.workbench@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.ecf.provider.filetransfer.httpclient4.ssl@default:false,org.eclipse.ecf.provider.filetransfer.httpclient4@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.ecf@default:default,org.eclipse.emf.common@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.bidi@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.concurrent@default:default,org.eclipse.equinox.console@default:default,org.eclipse.equinox.ds@1:true,org.eclipse.equinox.event@default:default,org.eclipse.equinox.frameworkadmin.equinox@default:default,org.eclipse.equinox.frameworkadmin@default:default,org.eclipse.equinox.http.jetty@default:default,org.eclipse.equinox.http.registry@default:default,org.eclipse.equinox.http.servlet@default:default,org.eclipse.equinox.jsp.jasper.registry@default:default,org.eclipse.equinox.jsp.jasper@default:default,org.eclipse.equinox.launcher.gtk.linux.x86_64@default:false,org.eclipse.equinox.launcher@default:default,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.equinox.p2.console@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.equinox.p2.director.app@default:default,org.eclipse.equinox.p2.director@default:default,org.eclipse.equinox.p2.directorywatcher@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.equinox.p2.extensionlocation@default:default,org.eclipse.equinox.p2.garbagecollector@default:default,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.equinox.p2.operations@default:default,org.eclipse.equinox.p2.publisher.eclipse@default:default,org.eclipse.equinox.p2.publisher@default:default,org.eclipse.equinox.p2.reconciler.dropins@default:default,org.eclipse.equinox.p2.repository.tools@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.equinox.p2.touchpoint.eclipse@default:default,org.eclipse.equinox.p2.touchpoint.natives@default:default,org.eclipse.equinox.p2.transport.ecf@default:default,org.eclipse.equinox.p2.ui.importexport@default:default,org.eclipse.equinox.p2.ui.sdk.scheduler@default:default,org.eclipse.equinox.p2.ui.sdk@default:default,org.eclipse.equinox.p2.ui@default:default,org.eclipse.equinox.p2.updatechecker@default:default,org.eclipse.equinox.p2.updatesite@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.security.ui@default:default,org.eclipse.equinox.security@default:default,org.eclipse.equinox.simpleconfigurator.manipulator@default:default,org.eclipse.equinox.simpleconfigurator@1:true,org.eclipse.equinox.util@default:default,org.eclipse.gef@default:default,org.eclipse.help.base@default:default,org.eclipse.help.ui@default:default,org.eclipse.help.webapp@default:default,org.eclipse.help@default:default,org.eclipse.jdt.core.manipulation@default:default,org.eclipse.jdt.core@default:default,org.eclipse.jdt.debug.ui@default:default,org.eclipse.jdt.debug@default:default,org.eclipse.jdt.junit.core@default:default,org.eclipse.jdt.junit.runtime@default:default,org.eclipse.jdt.junit@default:default,org.eclipse.jdt.launching@default:default,org.eclipse.jdt.ui@default:default,org.eclipse.jetty.continuation@default:default,org.eclipse.jetty.http@default:default,org.eclipse.jetty.io@default:default,org.eclipse.jetty.security@default:default,org.eclipse.jetty.server@default:default,org.eclipse.jetty.servlet@default:default,org.eclipse.jetty.util@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.jface.text@default:default,org.eclipse.jface@default:default,org.eclipse.jgit.archive@default:default,org.eclipse.jgit@default:default,org.eclipse.jsch.core@default:default,org.eclipse.jsch.ui@default:default,org.eclipse.launchbar.core@default:default,org.eclipse.launchbar.ui.controls@default:default,org.eclipse.launchbar.ui@default:default,org.eclipse.ltk.core.refactoring@default:default,org.eclipse.ltk.ui.refactoring@default:default,org.eclipse.osgi.compatibility.state@default:false,org.eclipse.osgi.services@default:default,org.eclipse.osgi.util@default:default,org.eclipse.osgi@-1:true,org.eclipse.pde.build@default:default,org.eclipse.pde.core@default:default,org.eclipse.pde.launching@default:default,org.eclipse.pde.runtime@default:default,org.eclipse.pde.ui@default:default,org.eclipse.platform.doc.user@default:default,org.eclipse.platform@default:default,org.eclipse.ptp.rdt.sync.core@default:default,org.eclipse.ptp.rdt.sync.git.core@default:default,org.eclipse.ptp.rdt.sync.git.ui@default:default,org.eclipse.ptp.rdt.sync.ui@default:default,org.eclipse.rcp@default:default,org.eclipse.remote.console@default:default,org.eclipse.remote.core@default:default,org.eclipse.remote.doc.isv@default:default,org.eclipse.remote.jsch.core@default:default,org.eclipse.remote.jsch.ui@default:default,org.eclipse.remote.serial.core@default:default,org.eclipse.remote.serial.ui@default:default,org.eclipse.remote.telnet.core@default:default,org.eclipse.remote.telnet.ui@default:default,org.eclipse.remote.ui@default:default,org.eclipse.search@default:default,org.eclipse.swt.gtk.linux.x86_64@default:false,org.eclipse.swt@default:default,org.eclipse.swtbot.e4.finder@default:default,org.eclipse.swtbot.eclipse.core@default:default,org.eclipse.swtbot.eclipse.finder@default:default,org.eclipse.swtbot.forms.finder@default:default,org.eclipse.swtbot.go@default:default,org.eclipse.swtbot.junit4_x@default:default,org.eclipse.swtbot.swt.finder@default:default,org.eclipse.team.core@default:default,org.eclipse.team.ui@default:default,org.eclipse.text@default:default,org.eclipse.tm.terminal.connector.local@default:default,org.eclipse.tm.terminal.connector.process@default:default,org.eclipse.tm.terminal.connector.serial@default:default,org.eclipse.tm.terminal.connector.ssh@default:default,org.eclipse.tm.terminal.connector.telnet@default:default,org.eclipse.tm.terminal.control@default:default,org.eclipse.tm.terminal.view.core@default:default,org.eclipse.tm.terminal.view.ui@default:default,org.eclipse.tools.templates.core@default:default,org.eclipse.tools.templates.ui@default:default,org.eclipse.ui.browser@default:default,org.eclipse.ui.cheatsheets@default:default,org.eclipse.ui.console@default:default,org.eclipse.ui.editors@default:default,org.eclipse.ui.externaltools@default:default,org.eclipse.ui.forms@default:default,org.eclipse.ui.ide.application@default:default,org.eclipse.ui.ide@default:default,org.eclipse.ui.intro.quicklinks@default:default,org.eclipse.ui.intro.universal@default:default,org.eclipse.ui.intro@default:default,org.eclipse.ui.monitoring@default:default,org.eclipse.ui.navigator.resources@default:default,org.eclipse.ui.navigator@default:default,org.eclipse.ui.net@default:default,org.eclipse.ui.themes@default:default,org.eclipse.ui.trace@default:default,org.eclipse.ui.views.log@default:default,org.eclipse.ui.views.properties.tabbed@default:default,org.eclipse.ui.views@default:default,org.eclipse.ui.workbench.texteditor@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.ui@default:default,org.eclipse.update.configurator@3:true,org.eclipse.wb.core.lib@default:default,org.eclipse.wst.common.core@default:default,org.eclipse.wst.internet.monitor.core@default:default,org.eclipse.wst.server.core@default:default,org.eclipse.wst.server.discovery@default:default,org.eclipse.wst.server.ui@default:default,org.eclipse.zest.core@default:default,org.eclipse.zest.layouts@default:default,org.glassfish.hk2.api@default:default,org.glassfish.hk2.locator@default:default,org.glassfish.hk2.osgi-resource-locator@default:default,org.glassfish.hk2.utils@default:default,org.glassfish.jersey.apache.connector@default:default,org.glassfish.jersey.bundles.repackaged.jersey-guava@default:default,org.glassfish.jersey.core.jersey-client@default:default,org.glassfish.jersey.core.jersey-common@default:default,org.glassfish.jersey.core.jersey-server@default:default,org.glassfish.jersey.ext.entityfiltering@default:default,org.glassfish.jersey.media.jersey-media-json-jackson@default:default,org.hamcrest.core@default:default,org.hamcrest.library@default:default,org.jboss.reddeer.common@default:default,org.jboss.reddeer.core@default:default,org.jboss.reddeer.direct@default:default,org.jboss.reddeer.eclipse@default:default,org.jboss.reddeer.gef@default:default,org.jboss.reddeer.go@default:default,org.jboss.reddeer.jface@default:default,org.jboss.reddeer.junit.extension@default:default,org.jboss.reddeer.junit@default:default,org.jboss.reddeer.requirements@default:default,org.jboss.reddeer.swt@default:default,org.jboss.reddeer.ui@default:default,org.jboss.reddeer.uiforms@default:default,org.jboss.reddeer.workbench@default:default,org.junit@default:default,org.mockito@default:default,org.objectweb.asm.analysis@default:default,org.objectweb.asm.tree@default:default,org.objectweb.asm.util@default:default,org.objectweb.asm@default:default,org.objenesis@default:default,org.sat4j.core@default:default,org.sat4j.pb@default:default,org.slf4j.api*1.7.10.v20160921-1923@default:default,org.slf4j.api*1.7.2.v20121108-1250@default:default,org.slf4j.impl.log4j12@default:false,org.swtchart@default:default,org.tukaani.xz@default:default,org.w3c.css.sac@default:default,org.w3c.dom.events@default:default,org.w3c.dom.smil@default:default,org.w3c.dom.svg@default:default"/>
-<stringAttribute key="selected_workspace_plugins" value="org.eclipse.linuxtools.docker.core@default:default,org.eclipse.linuxtools.docker.docs@default:default,org.eclipse.linuxtools.docker.editor@default:default,org.eclipse.linuxtools.docker.integration.tests@default:default,org.eclipse.linuxtools.docker.reddeer@default:default,org.eclipse.linuxtools.docker.tests.hamcrest-wrap@default:default,org.eclipse.linuxtools.docker.ui.tests@default:default,org.eclipse.linuxtools.docker.ui@default:default"/>
-<booleanAttribute key="show_selected_only" value="false"/>
-<booleanAttribute key="tracing" value="false"/>
-<booleanAttribute key="useCustomFeatures" value="true"/>
-<booleanAttribute key="useDefaultConfig" value="true"/>
-<booleanAttribute key="useDefaultConfigArea" value="false"/>
-<booleanAttribute key="useProduct" value="false"/>
+ <setAttribute key="additional_plugins">
+ <setEntry value="org.apache.httpcomponents.httpclient:4.5.10.v20200114-1512:default:true:default:default"/>
+ <setEntry value="org.apache.httpcomponents.httpcore:4.4.12.v20200108-1212:default:true:default:default"/>
+ <setEntry value="org.eclipse.linuxtools.docker.core:5.0.0.qualifier:default:true:default:default"/>
+ <setEntry value="org.eclipse.linuxtools.docker.integration.tests:2.2.0.qualifier:default:true:default:default"/>
+ <setEntry value="org.eclipse.linuxtools.docker.reddeer:2.2.0.qualifier:default:true:default:default"/>
+ <setEntry value="org.eclipse.linuxtools.docker.tests.hamcrest-wrap:1.2.0.qualifier:default:true:default:default"/>
+ <setEntry value="org.eclipse.linuxtools.docker.ui.tests:2.2.0.qualifier:default:true:default:default"/>
+ <setEntry value="org.eclipse.linuxtools.docker.ui:5.0.0.qualifier:default:true:default:default"/>
+ <setEntry value="org.slf4j.api:1.7.2.v20121108-1250:default:true:default:default"/>
+ </setAttribute>
+ <booleanAttribute key="append.args" value="true"/>
+ <stringAttribute key="application" value="org.eclipse.pde.junit.runtime.coretestapplication"/>
+ <booleanAttribute key="askclear" value="false"/>
+ <booleanAttribute key="automaticAdd" value="true"/>
+ <booleanAttribute key="automaticValidate" value="true"/>
+ <stringAttribute key="bootstrap" value=""/>
+ <stringAttribute key="checked" value="[NONE]"/>
+ <booleanAttribute key="clearConfig" value="true"/>
+ <booleanAttribute key="clearws" value="true"/>
+ <booleanAttribute key="clearwslog" value="false"/>
+ <stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/pde-junit"/>
+ <booleanAttribute key="default" value="false"/>
+ <stringAttribute key="featureDefaultLocation" value="workspace"/>
+ <stringAttribute key="featurePluginResolution" value="workspace"/>
+ <booleanAttribute key="includeOptional" value="true"/>
+ <stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/>
+ <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+ <listEntry value="/org.eclipse.linuxtools.docker.integration.tests/src/org/eclipse/linuxtools/docker/integration/tests/DockerAllBotTest.java"/>
+ </listAttribute>
+ <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+ <listEntry value="1"/>
+ </listAttribute>
+ <mapAttribute key="org.eclipse.debug.core.environmentVariables">
+ <mapEntry key="DISPLAY" value=":2"/>
+ </mapAttribute>
+ <stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
+ <booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
+ <stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
+ <stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
+ <stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
+ <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.linuxtools.docker.integration.tests.DockerAllBotTest"/>
+ <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog -consolelog"/>
+ <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.linuxtools.docker.integration.tests"/>
+ <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
+ <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-DdockerMockito=false -DunixSocket=unix:///var/run/docker.sock -Dusage_reporting_enabled=false -DdockerHubUsername=test -DdockerHubEmail=test@test.com -DdockerHubPassword=password -DdockerComposePath=//testpath"/>
+ <stringAttribute key="pde.version" value="3.3"/>
+ <stringAttribute key="product" value="org.eclipse.platform.ide"/>
+ <stringAttribute key="rd.launch.property.rd.captureScreenshot" value="true"/>
+ <stringAttribute key="rd.launch.property.rd.closeShells" value="true"/>
+ <stringAttribute key="rd.launch.property.rd.closeWelcomeScreen" value="true"/>
+ <stringAttribute key="rd.launch.property.rd.defaultKey" value="org.eclipse.reddeer.widget.key"/>
+ <stringAttribute key="rd.launch.property.rd.disableMavenIndex" value="true"/>
+ <stringAttribute key="rd.launch.property.rd.logCollectorEnabled" value="true"/>
+ <stringAttribute key="rd.launch.property.rd.logLevel" value="ALL"/>
+ <stringAttribute key="rd.launch.property.rd.logMessageFilter" value="ALL"/>
+ <stringAttribute key="rd.launch.property.rd.maximizeWorkbench" value="true"/>
+ <stringAttribute key="rd.launch.property.rd.openAssociatedPerspective" value="never"/>
+ <stringAttribute key="rd.launch.property.rd.pauseFailedTest" value="false"/>
+ <stringAttribute key="rd.launch.property.rd.timePeriodFactor" value="1.0"/>
+ <setAttribute key="selected_features">
+ <setEntry value="org.eclipse.cdt.autotools:default"/>
+ <setEntry value="org.eclipse.cdt.gdb:default"/>
+ <setEntry value="org.eclipse.cdt.gnu.build:default"/>
+ <setEntry value="org.eclipse.cdt.gnu.debug:default"/>
+ <setEntry value="org.eclipse.cdt.gnu.dsf:default"/>
+ <setEntry value="org.eclipse.cdt.native:default"/>
+ <setEntry value="org.eclipse.cdt.platform:default"/>
+ <setEntry value="org.eclipse.cdt:default"/>
+ <setEntry value="org.eclipse.draw2d:default"/>
+ <setEntry value="org.eclipse.e4.rcp:default"/>
+ <setEntry value="org.eclipse.ecf.core.feature:default"/>
+ <setEntry value="org.eclipse.ecf.core.ssl.feature:default"/>
+ <setEntry value="org.eclipse.ecf.filetransfer.feature:default"/>
+ <setEntry value="org.eclipse.ecf.filetransfer.ssl.feature:default"/>
+ <setEntry value="org.eclipse.emf.common:default"/>
+ <setEntry value="org.eclipse.emf.ecore:default"/>
+ <setEntry value="org.eclipse.equinox.p2.core.feature:default"/>
+ <setEntry value="org.eclipse.equinox.p2.extras.feature:default"/>
+ <setEntry value="org.eclipse.equinox.p2.rcp.feature:default"/>
+ <setEntry value="org.eclipse.equinox.p2.user.ui:default"/>
+ <setEntry value="org.eclipse.help:default"/>
+ <setEntry value="org.eclipse.jgit:default"/>
+ <setEntry value="org.eclipse.launchbar:default"/>
+ <setEntry value="org.eclipse.license:default"/>
+ <setEntry value="org.eclipse.linuxtools.docker.feature:default"/>
+ <setEntry value="org.eclipse.platform:default"/>
+ <setEntry value="org.eclipse.ptp.rdt.sync:default"/>
+ <setEntry value="org.eclipse.rcp:default"/>
+ <setEntry value="org.eclipse.remote:default"/>
+ <setEntry value="org.eclipse.swtbot.eclipse:default"/>
+ <setEntry value="org.eclipse.swtbot.forms:default"/>
+ <setEntry value="org.eclipse.swtbot:default"/>
+ <setEntry value="org.eclipse.tm.terminal.connector.local.feature:default"/>
+ <setEntry value="org.eclipse.tm.terminal.connector.ssh.feature:default"/>
+ <setEntry value="org.eclipse.tm.terminal.connector.telnet.feature:default"/>
+ <setEntry value="org.eclipse.tm.terminal.control.feature:default"/>
+ <setEntry value="org.eclipse.tm.terminal.feature:default"/>
+ <setEntry value="org.eclipse.tm.terminal.view.feature:default"/>
+ <setEntry value="org.eclipse.zest:default"/>
+ </setAttribute>
+ <setAttribute key="selected_target_bundles">
+ <setEntry value="com.fasterxml.jackson.core.jackson-annotations@default:default"/>
+ <setEntry value="com.fasterxml.jackson.core.jackson-core@default:default"/>
+ <setEntry value="com.fasterxml.jackson.core.jackson-databind@default:default"/>
+ <setEntry value="com.fasterxml.jackson.datatype.jackson-datatype-guava@default:default"/>
+ <setEntry value="com.fasterxml.jackson.jaxrs.jackson-jaxrs-base@default:default"/>
+ <setEntry value="com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider@default:default"/>
+ <setEntry value="com.github.jnr.constants@default:default"/>
+ <setEntry value="com.github.jnr.enxio@default:default"/>
+ <setEntry value="com.github.jnr.ffi@default:default"/>
+ <setEntry value="com.github.jnr.jffi.native@default:false"/>
+ <setEntry value="com.github.jnr.jffi@default:default"/>
+ <setEntry value="com.github.jnr.posix@default:default"/>
+ <setEntry value="com.github.jnr.unixsocket@default:default"/>
+ <setEntry value="com.google.gson@default:default"/>
+ <setEntry value="com.google.guava@default:default"/>
+ <setEntry value="com.ibm.icu@default:default"/>
+ <setEntry value="com.jcraft.jsch@default:default"/>
+ <setEntry value="com.sun.el@default:default"/>
+ <setEntry value="javaewah@default:default"/>
+ <setEntry value="javassist@default:default"/>
+ <setEntry value="javax.annotation@default:default"/>
+ <setEntry value="javax.el@default:default"/>
+ <setEntry value="javax.inject@default:default"/>
+ <setEntry value="javax.servlet.jsp@default:default"/>
+ <setEntry value="javax.servlet@default:default"/>
+ <setEntry value="javax.ws.rs@default:default"/>
+ <setEntry value="javax.xml@default:default"/>
+ <setEntry value="jnr.x86asm@default:default"/>
+ <setEntry value="org.aopalliance@default:default"/>
+ <setEntry value="org.apache.ant@default:default"/>
+ <setEntry value="org.apache.batik.css@default:default"/>
+ <setEntry value="org.apache.batik.util.gui@default:default"/>
+ <setEntry value="org.apache.batik.util@default:default"/>
+ <setEntry value="org.apache.commons.beanutils@default:default"/>
+ <setEntry value="org.apache.commons.codec@default:default"/>
+ <setEntry value="org.apache.commons.compress@default:default"/>
+ <setEntry value="org.apache.commons.io@default:default"/>
+ <setEntry value="org.apache.commons.jxpath@default:default"/>
+ <setEntry value="org.apache.commons.lang3.source@default:default"/>
+ <setEntry value="org.apache.commons.lang3@default:default"/>
+ <setEntry value="org.apache.commons.lang@default:default"/>
+ <setEntry value="org.apache.commons.logging@default:default"/>
+ <setEntry value="org.apache.felix.gogo.command@default:default"/>
+ <setEntry value="org.apache.felix.gogo.runtime@default:default"/>
+ <setEntry value="org.apache.felix.gogo.shell@default:default"/>
+ <setEntry value="org.apache.httpcomponents.httpclient*4.3.6.v201511171540@default:default"/>
+ <setEntry value="org.apache.httpcomponents.httpclient*4.5.2.v20161115-1643@default:default"/>
+ <setEntry value="org.apache.httpcomponents.httpcore*4.3.3.v201411290715@default:default"/>
+ <setEntry value="org.apache.httpcomponents.httpcore*4.4.4.v20161115-1643@default:default"/>
+ <setEntry value="org.apache.jasper.glassfish@default:default"/>
+ <setEntry value="org.apache.log4j@default:default"/>
+ <setEntry value="org.apache.lucene.analysis@default:default"/>
+ <setEntry value="org.apache.lucene.core@default:default"/>
+ <setEntry value="org.apache.xerces@default:default"/>
+ <setEntry value="org.apache.xml.resolver@default:default"/>
+ <setEntry value="org.apache.xml.serializer@default:default"/>
+ <setEntry value="org.assertj@default:default"/>
+ <setEntry value="org.bouncycastle.bcpkix@default:default"/>
+ <setEntry value="org.bouncycastle.bcprov@default:default"/>
+ <setEntry value="org.cyberneko.html@default:default"/>
+ <setEntry value="org.eclipse.ant.core@default:default"/>
+ <setEntry value="org.eclipse.ant.launching@default:default"/>
+ <setEntry value="org.eclipse.ant.ui@default:default"/>
+ <setEntry value="org.eclipse.cdt.autotools.core@default:default"/>
+ <setEntry value="org.eclipse.cdt.autotools.docs@default:default"/>
+ <setEntry value="org.eclipse.cdt.autotools.ui@default:default"/>
+ <setEntry value="org.eclipse.cdt.build.gcc.core@default:default"/>
+ <setEntry value="org.eclipse.cdt.codan.checkers.ui@default:default"/>
+ <setEntry value="org.eclipse.cdt.codan.checkers@default:default"/>
+ <setEntry value="org.eclipse.cdt.codan.core.cxx@default:default"/>
+ <setEntry value="org.eclipse.cdt.codan.core@default:default"/>
+ <setEntry value="org.eclipse.cdt.codan.ui.cxx@default:default"/>
+ <setEntry value="org.eclipse.cdt.codan.ui@default:default"/>
+ <setEntry value="org.eclipse.cdt.core.linux.x86_64@default:false"/>
+ <setEntry value="org.eclipse.cdt.core.linux@default:false"/>
+ <setEntry value="org.eclipse.cdt.core.native@default:default"/>
+ <setEntry value="org.eclipse.cdt.core@default:default"/>
+ <setEntry value="org.eclipse.cdt.debug.core@default:default"/>
+ <setEntry value="org.eclipse.cdt.debug.ui@default:default"/>
+ <setEntry value="org.eclipse.cdt.doc.user@default:default"/>
+ <setEntry value="org.eclipse.cdt.dsf.gdb.ui@default:default"/>
+ <setEntry value="org.eclipse.cdt.dsf.gdb@default:default"/>
+ <setEntry value="org.eclipse.cdt.dsf.ui@default:default"/>
+ <setEntry value="org.eclipse.cdt.dsf@default:default"/>
+ <setEntry value="org.eclipse.cdt.gdb.ui@default:default"/>
+ <setEntry value="org.eclipse.cdt.gdb@default:default"/>
+ <setEntry value="org.eclipse.cdt.launch@default:default"/>
+ <setEntry value="org.eclipse.cdt.make.core@default:default"/>
+ <setEntry value="org.eclipse.cdt.make.ui@default:default"/>
+ <setEntry value="org.eclipse.cdt.managedbuilder.core@default:default"/>
+ <setEntry value="org.eclipse.cdt.managedbuilder.gnu.ui@default:default"/>
+ <setEntry value="org.eclipse.cdt.managedbuilder.ui@default:default"/>
+ <setEntry value="org.eclipse.cdt.native.serial@default:default"/>
+ <setEntry value="org.eclipse.cdt.remote.core@default:default"/>
+ <setEntry value="org.eclipse.cdt.ui@default:default"/>
+ <setEntry value="org.eclipse.cdt@default:default"/>
+ <setEntry value="org.eclipse.compare.core@default:default"/>
+ <setEntry value="org.eclipse.compare@default:default"/>
+ <setEntry value="org.eclipse.core.commands@default:default"/>
+ <setEntry value="org.eclipse.core.contenttype@default:default"/>
+ <setEntry value="org.eclipse.core.databinding.beans@default:default"/>
+ <setEntry value="org.eclipse.core.databinding.observable@default:default"/>
+ <setEntry value="org.eclipse.core.databinding.property@default:default"/>
+ <setEntry value="org.eclipse.core.databinding@default:default"/>
+ <setEntry value="org.eclipse.core.expressions@default:default"/>
+ <setEntry value="org.eclipse.core.externaltools@default:default"/>
+ <setEntry value="org.eclipse.core.filebuffers@default:default"/>
+ <setEntry value="org.eclipse.core.filesystem.linux.x86_64@default:false"/>
+ <setEntry value="org.eclipse.core.filesystem@default:default"/>
+ <setEntry value="org.eclipse.core.jobs@default:default"/>
+ <setEntry value="org.eclipse.core.net.linux.x86_64@default:false"/>
+ <setEntry value="org.eclipse.core.net@default:default"/>
+ <setEntry value="org.eclipse.core.resources@default:default"/>
+ <setEntry value="org.eclipse.core.runtime@default:true"/>
+ <setEntry value="org.eclipse.core.variables@default:default"/>
+ <setEntry value="org.eclipse.debug.core@default:default"/>
+ <setEntry value="org.eclipse.debug.ui@default:default"/>
+ <setEntry value="org.eclipse.draw2d@default:default"/>
+ <setEntry value="org.eclipse.dstore.core@default:default"/>
+ <setEntry value="org.eclipse.dstore.extra@default:default"/>
+ <setEntry value="org.eclipse.e4.core.commands@default:default"/>
+ <setEntry value="org.eclipse.e4.core.contexts@default:default"/>
+ <setEntry value="org.eclipse.e4.core.di.annotations@default:default"/>
+ <setEntry value="org.eclipse.e4.core.di.extensions@default:default"/>
+ <setEntry value="org.eclipse.e4.core.di@default:default"/>
+ <setEntry value="org.eclipse.e4.core.services@default:default"/>
+ <setEntry value="org.eclipse.e4.emf.xpath@default:default"/>
+ <setEntry value="org.eclipse.e4.ui.bindings@default:default"/>
+ <setEntry value="org.eclipse.e4.ui.css.core@default:default"/>
+ <setEntry value="org.eclipse.e4.ui.css.swt.theme@default:default"/>
+ <setEntry value="org.eclipse.e4.ui.css.swt@default:default"/>
+ <setEntry value="org.eclipse.e4.ui.di@default:default"/>
+ <setEntry value="org.eclipse.e4.ui.dialogs@default:default"/>
+ <setEntry value="org.eclipse.e4.ui.model.workbench@default:default"/>
+ <setEntry value="org.eclipse.e4.ui.services@default:default"/>
+ <setEntry value="org.eclipse.e4.ui.swt.gtk@default:false"/>
+ <setEntry value="org.eclipse.e4.ui.widgets@default:default"/>
+ <setEntry value="org.eclipse.e4.ui.workbench.addons.swt@default:default"/>
+ <setEntry value="org.eclipse.e4.ui.workbench.renderers.swt@default:default"/>
+ <setEntry value="org.eclipse.e4.ui.workbench.swt@default:default"/>
+ <setEntry value="org.eclipse.e4.ui.workbench3@default:default"/>
+ <setEntry value="org.eclipse.e4.ui.workbench@default:default"/>
+ <setEntry value="org.eclipse.ecf.filetransfer@default:default"/>
+ <setEntry value="org.eclipse.ecf.identity@default:default"/>
+ <setEntry value="org.eclipse.ecf.provider.filetransfer.httpclient4.ssl@default:false"/>
+ <setEntry value="org.eclipse.ecf.provider.filetransfer.httpclient4@default:default"/>
+ <setEntry value="org.eclipse.ecf.provider.filetransfer.ssl@default:false"/>
+ <setEntry value="org.eclipse.ecf.provider.filetransfer@default:default"/>
+ <setEntry value="org.eclipse.ecf.ssl@default:false"/>
+ <setEntry value="org.eclipse.ecf@default:default"/>
+ <setEntry value="org.eclipse.emf.common@default:default"/>
+ <setEntry value="org.eclipse.emf.ecore.change@default:default"/>
+ <setEntry value="org.eclipse.emf.ecore.xmi@default:default"/>
+ <setEntry value="org.eclipse.emf.ecore@default:default"/>
+ <setEntry value="org.eclipse.equinox.app@default:default"/>
+ <setEntry value="org.eclipse.equinox.bidi@default:default"/>
+ <setEntry value="org.eclipse.equinox.common@2:true"/>
+ <setEntry value="org.eclipse.equinox.concurrent@default:default"/>
+ <setEntry value="org.eclipse.equinox.console@default:default"/>
+ <setEntry value="org.eclipse.equinox.ds@1:true"/>
+ <setEntry value="org.eclipse.equinox.event@default:default"/>
+ <setEntry value="org.eclipse.equinox.frameworkadmin.equinox@default:default"/>
+ <setEntry value="org.eclipse.equinox.frameworkadmin@default:default"/>
+ <setEntry value="org.eclipse.equinox.http.jetty@default:default"/>
+ <setEntry value="org.eclipse.equinox.http.registry@default:default"/>
+ <setEntry value="org.eclipse.equinox.http.servlet@default:default"/>
+ <setEntry value="org.eclipse.equinox.jsp.jasper.registry@default:default"/>
+ <setEntry value="org.eclipse.equinox.jsp.jasper@default:default"/>
+ <setEntry value="org.eclipse.equinox.launcher.gtk.linux.x86_64@default:false"/>
+ <setEntry value="org.eclipse.equinox.launcher@default:default"/>
+ <setEntry value="org.eclipse.equinox.p2.artifact.repository@default:default"/>
+ <setEntry value="org.eclipse.equinox.p2.console@default:default"/>
+ <setEntry value="org.eclipse.equinox.p2.core@default:default"/>
+ <setEntry value="org.eclipse.equinox.p2.director.app@default:default"/>
+ <setEntry value="org.eclipse.equinox.p2.director@default:default"/>
+ <setEntry value="org.eclipse.equinox.p2.directorywatcher@default:default"/>
+ <setEntry value="org.eclipse.equinox.p2.engine@default:default"/>
+ <setEntry value="org.eclipse.equinox.p2.extensionlocation@default:default"/>
+ <setEntry value="org.eclipse.equinox.p2.garbagecollector@default:default"/>
+ <setEntry value="org.eclipse.equinox.p2.jarprocessor@default:default"/>
+ <setEntry value="org.eclipse.equinox.p2.metadata.repository@default:default"/>
+ <setEntry value="org.eclipse.equinox.p2.metadata@default:default"/>
+ <setEntry value="org.eclipse.equinox.p2.operations@default:default"/>
+ <setEntry value="org.eclipse.equinox.p2.publisher.eclipse@default:default"/>
+ <setEntry value="org.eclipse.equinox.p2.publisher@default:default"/>
+ <setEntry value="org.eclipse.equinox.p2.reconciler.dropins@default:default"/>
+ <setEntry value="org.eclipse.equinox.p2.repository.tools@default:default"/>
+ <setEntry value="org.eclipse.equinox.p2.repository@default:default"/>
+ <setEntry value="org.eclipse.equinox.p2.touchpoint.eclipse@default:default"/>
+ <setEntry value="org.eclipse.equinox.p2.touchpoint.natives@default:default"/>
+ <setEntry value="org.eclipse.equinox.p2.transport.ecf@default:default"/>
+ <setEntry value="org.eclipse.equinox.p2.ui.importexport@default:default"/>
+ <setEntry value="org.eclipse.equinox.p2.ui.sdk.scheduler@default:default"/>
+ <setEntry value="org.eclipse.equinox.p2.ui.sdk@default:default"/>
+ <setEntry value="org.eclipse.equinox.p2.ui@default:default"/>
+ <setEntry value="org.eclipse.equinox.p2.updatechecker@default:default"/>
+ <setEntry value="org.eclipse.equinox.p2.updatesite@default:default"/>
+ <setEntry value="org.eclipse.equinox.preferences@default:default"/>
+ <setEntry value="org.eclipse.equinox.registry@default:default"/>
+ <setEntry value="org.eclipse.equinox.security.ui@default:default"/>
+ <setEntry value="org.eclipse.equinox.security@default:default"/>
+ <setEntry value="org.eclipse.equinox.simpleconfigurator.manipulator@default:default"/>
+ <setEntry value="org.eclipse.equinox.simpleconfigurator@1:true"/>
+ <setEntry value="org.eclipse.equinox.util@default:default"/>
+ <setEntry value="org.eclipse.gef@default:default"/>
+ <setEntry value="org.eclipse.help.base@default:default"/>
+ <setEntry value="org.eclipse.help.ui@default:default"/>
+ <setEntry value="org.eclipse.help.webapp@default:default"/>
+ <setEntry value="org.eclipse.help@default:default"/>
+ <setEntry value="org.eclipse.jdt.core.manipulation@default:default"/>
+ <setEntry value="org.eclipse.jdt.core@default:default"/>
+ <setEntry value="org.eclipse.jdt.debug.ui@default:default"/>
+ <setEntry value="org.eclipse.jdt.debug@default:default"/>
+ <setEntry value="org.eclipse.jdt.junit.core@default:default"/>
+ <setEntry value="org.eclipse.jdt.junit.runtime@default:default"/>
+ <setEntry value="org.eclipse.jdt.junit@default:default"/>
+ <setEntry value="org.eclipse.jdt.launching@default:default"/>
+ <setEntry value="org.eclipse.jdt.ui@default:default"/>
+ <setEntry value="org.eclipse.jetty.continuation@default:default"/>
+ <setEntry value="org.eclipse.jetty.http@default:default"/>
+ <setEntry value="org.eclipse.jetty.io@default:default"/>
+ <setEntry value="org.eclipse.jetty.security@default:default"/>
+ <setEntry value="org.eclipse.jetty.server@default:default"/>
+ <setEntry value="org.eclipse.jetty.servlet@default:default"/>
+ <setEntry value="org.eclipse.jetty.util@default:default"/>
+ <setEntry value="org.eclipse.jface.databinding@default:default"/>
+ <setEntry value="org.eclipse.jface.text@default:default"/>
+ <setEntry value="org.eclipse.jface@default:default"/>
+ <setEntry value="org.eclipse.jgit.archive@default:default"/>
+ <setEntry value="org.eclipse.jgit@default:default"/>
+ <setEntry value="org.eclipse.jsch.core@default:default"/>
+ <setEntry value="org.eclipse.jsch.ui@default:default"/>
+ <setEntry value="org.eclipse.launchbar.core@default:default"/>
+ <setEntry value="org.eclipse.launchbar.ui.controls@default:default"/>
+ <setEntry value="org.eclipse.launchbar.ui@default:default"/>
+ <setEntry value="org.eclipse.ltk.core.refactoring@default:default"/>
+ <setEntry value="org.eclipse.ltk.ui.refactoring@default:default"/>
+ <setEntry value="org.eclipse.osgi.compatibility.state@default:false"/>
+ <setEntry value="org.eclipse.osgi.services@default:default"/>
+ <setEntry value="org.eclipse.osgi.util@default:default"/>
+ <setEntry value="org.eclipse.osgi@-1:true"/>
+ <setEntry value="org.eclipse.pde.build@default:default"/>
+ <setEntry value="org.eclipse.pde.core@default:default"/>
+ <setEntry value="org.eclipse.pde.launching@default:default"/>
+ <setEntry value="org.eclipse.pde.runtime@default:default"/>
+ <setEntry value="org.eclipse.pde.ui@default:default"/>
+ <setEntry value="org.eclipse.platform.doc.user@default:default"/>
+ <setEntry value="org.eclipse.platform@default:default"/>
+ <setEntry value="org.eclipse.ptp.rdt.sync.core@default:default"/>
+ <setEntry value="org.eclipse.ptp.rdt.sync.git.core@default:default"/>
+ <setEntry value="org.eclipse.ptp.rdt.sync.git.ui@default:default"/>
+ <setEntry value="org.eclipse.ptp.rdt.sync.ui@default:default"/>
+ <setEntry value="org.eclipse.rcp@default:default"/>
+ <setEntry value="org.eclipse.remote.console@default:default"/>
+ <setEntry value="org.eclipse.remote.core@default:default"/>
+ <setEntry value="org.eclipse.remote.doc.isv@default:default"/>
+ <setEntry value="org.eclipse.remote.jsch.core@default:default"/>
+ <setEntry value="org.eclipse.remote.jsch.ui@default:default"/>
+ <setEntry value="org.eclipse.remote.serial.core@default:default"/>
+ <setEntry value="org.eclipse.remote.serial.ui@default:default"/>
+ <setEntry value="org.eclipse.remote.telnet.core@default:default"/>
+ <setEntry value="org.eclipse.remote.telnet.ui@default:default"/>
+ <setEntry value="org.eclipse.remote.ui@default:default"/>
+ <setEntry value="org.eclipse.search@default:default"/>
+ <setEntry value="org.eclipse.swt.gtk.linux.x86_64@default:false"/>
+ <setEntry value="org.eclipse.swt@default:default"/>
+ <setEntry value="org.eclipse.swtbot.e4.finder@default:default"/>
+ <setEntry value="org.eclipse.swtbot.eclipse.core@default:default"/>
+ <setEntry value="org.eclipse.swtbot.eclipse.finder@default:default"/>
+ <setEntry value="org.eclipse.swtbot.forms.finder@default:default"/>
+ <setEntry value="org.eclipse.swtbot.go@default:default"/>
+ <setEntry value="org.eclipse.swtbot.junit4_x@default:default"/>
+ <setEntry value="org.eclipse.swtbot.swt.finder@default:default"/>
+ <setEntry value="org.eclipse.team.core@default:default"/>
+ <setEntry value="org.eclipse.team.ui@default:default"/>
+ <setEntry value="org.eclipse.text@default:default"/>
+ <setEntry value="org.eclipse.tm.terminal.connector.local@default:default"/>
+ <setEntry value="org.eclipse.tm.terminal.connector.process@default:default"/>
+ <setEntry value="org.eclipse.tm.terminal.connector.serial@default:default"/>
+ <setEntry value="org.eclipse.tm.terminal.connector.ssh@default:default"/>
+ <setEntry value="org.eclipse.tm.terminal.connector.telnet@default:default"/>
+ <setEntry value="org.eclipse.tm.terminal.control@default:default"/>
+ <setEntry value="org.eclipse.tm.terminal.view.core@default:default"/>
+ <setEntry value="org.eclipse.tm.terminal.view.ui@default:default"/>
+ <setEntry value="org.eclipse.tools.templates.core@default:default"/>
+ <setEntry value="org.eclipse.tools.templates.ui@default:default"/>
+ <setEntry value="org.eclipse.ui.browser@default:default"/>
+ <setEntry value="org.eclipse.ui.cheatsheets@default:default"/>
+ <setEntry value="org.eclipse.ui.console@default:default"/>
+ <setEntry value="org.eclipse.ui.editors@default:default"/>
+ <setEntry value="org.eclipse.ui.externaltools@default:default"/>
+ <setEntry value="org.eclipse.ui.forms@default:default"/>
+ <setEntry value="org.eclipse.ui.ide.application@default:default"/>
+ <setEntry value="org.eclipse.ui.ide@default:default"/>
+ <setEntry value="org.eclipse.ui.intro.quicklinks@default:default"/>
+ <setEntry value="org.eclipse.ui.intro.universal@default:default"/>
+ <setEntry value="org.eclipse.ui.intro@default:default"/>
+ <setEntry value="org.eclipse.ui.monitoring@default:default"/>
+ <setEntry value="org.eclipse.ui.navigator.resources@default:default"/>
+ <setEntry value="org.eclipse.ui.navigator@default:default"/>
+ <setEntry value="org.eclipse.ui.net@default:default"/>
+ <setEntry value="org.eclipse.ui.themes@default:default"/>
+ <setEntry value="org.eclipse.ui.trace@default:default"/>
+ <setEntry value="org.eclipse.ui.views.log@default:default"/>
+ <setEntry value="org.eclipse.ui.views.properties.tabbed@default:default"/>
+ <setEntry value="org.eclipse.ui.views@default:default"/>
+ <setEntry value="org.eclipse.ui.workbench.texteditor@default:default"/>
+ <setEntry value="org.eclipse.ui.workbench@default:default"/>
+ <setEntry value="org.eclipse.ui@default:default"/>
+ <setEntry value="org.eclipse.update.configurator@3:true"/>
+ <setEntry value="org.eclipse.wb.core.lib@default:default"/>
+ <setEntry value="org.eclipse.wst.common.core@default:default"/>
+ <setEntry value="org.eclipse.wst.internet.monitor.core@default:default"/>
+ <setEntry value="org.eclipse.wst.server.core@default:default"/>
+ <setEntry value="org.eclipse.wst.server.discovery@default:default"/>
+ <setEntry value="org.eclipse.wst.server.ui@default:default"/>
+ <setEntry value="org.eclipse.zest.core@default:default"/>
+ <setEntry value="org.eclipse.zest.layouts@default:default"/>
+ <setEntry value="org.glassfish.hk2.api@default:default"/>
+ <setEntry value="org.glassfish.hk2.locator@default:default"/>
+ <setEntry value="org.glassfish.hk2.osgi-resource-locator@default:default"/>
+ <setEntry value="org.glassfish.hk2.utils@default:default"/>
+ <setEntry value="org.glassfish.jersey.apache.connector@default:default"/>
+ <setEntry value="org.glassfish.jersey.bundles.repackaged.jersey-guava@default:default"/>
+ <setEntry value="org.glassfish.jersey.core.jersey-client@default:default"/>
+ <setEntry value="org.glassfish.jersey.core.jersey-common@default:default"/>
+ <setEntry value="org.glassfish.jersey.core.jersey-server@default:default"/>
+ <setEntry value="org.glassfish.jersey.ext.entityfiltering@default:default"/>
+ <setEntry value="org.glassfish.jersey.media.jersey-media-json-jackson@default:default"/>
+ <setEntry value="org.hamcrest.core@default:default"/>
+ <setEntry value="org.hamcrest.library@default:default"/>
+ <setEntry value="org.jboss.reddeer.common@default:default"/>
+ <setEntry value="org.jboss.reddeer.core@default:default"/>
+ <setEntry value="org.jboss.reddeer.direct@default:default"/>
+ <setEntry value="org.jboss.reddeer.eclipse@default:default"/>
+ <setEntry value="org.jboss.reddeer.gef@default:default"/>
+ <setEntry value="org.jboss.reddeer.go@default:default"/>
+ <setEntry value="org.jboss.reddeer.jface@default:default"/>
+ <setEntry value="org.jboss.reddeer.junit.extension@default:default"/>
+ <setEntry value="org.jboss.reddeer.junit@default:default"/>
+ <setEntry value="org.jboss.reddeer.requirements@default:default"/>
+ <setEntry value="org.jboss.reddeer.swt@default:default"/>
+ <setEntry value="org.jboss.reddeer.ui@default:default"/>
+ <setEntry value="org.jboss.reddeer.uiforms@default:default"/>
+ <setEntry value="org.jboss.reddeer.workbench@default:default"/>
+ <setEntry value="org.junit@default:default"/>
+ <setEntry value="org.mandas.docker.client@default:true"/>
+ <setEntry value="org.mockito@default:default"/>
+ <setEntry value="org.objectweb.asm.analysis@default:default"/>
+ <setEntry value="org.objectweb.asm.tree@default:default"/>
+ <setEntry value="org.objectweb.asm.util@default:default"/>
+ <setEntry value="org.objectweb.asm@default:default"/>
+ <setEntry value="org.objenesis@default:default"/>
+ <setEntry value="org.sat4j.core@default:default"/>
+ <setEntry value="org.sat4j.pb@default:default"/>
+ <setEntry value="org.slf4j.api*1.7.10.v20160921-1923@default:default"/>
+ <setEntry value="org.slf4j.api*1.7.2.v20121108-1250@default:default"/>
+ <setEntry value="org.slf4j.impl.log4j12@default:false"/>
+ <setEntry value="org.swtchart@default:default"/>
+ <setEntry value="org.tukaani.xz@default:default"/>
+ <setEntry value="org.w3c.css.sac@default:default"/>
+ <setEntry value="org.w3c.dom.events@default:default"/>
+ <setEntry value="org.w3c.dom.smil@default:default"/>
+ <setEntry value="org.w3c.dom.svg@default:default"/>
+ </setAttribute>
+ <setAttribute key="selected_workspace_bundles">
+ <setEntry value="org.eclipse.linuxtools.docker.core@default:default"/>
+ <setEntry value="org.eclipse.linuxtools.docker.docs@default:default"/>
+ <setEntry value="org.eclipse.linuxtools.docker.editor@default:default"/>
+ <setEntry value="org.eclipse.linuxtools.docker.integration.tests@default:default"/>
+ <setEntry value="org.eclipse.linuxtools.docker.reddeer@default:default"/>
+ <setEntry value="org.eclipse.linuxtools.docker.tests.hamcrest-wrap@default:default"/>
+ <setEntry value="org.eclipse.linuxtools.docker.ui.tests@default:default"/>
+ <setEntry value="org.eclipse.linuxtools.docker.ui@default:default"/>
+ </setAttribute>
+ <booleanAttribute key="show_selected_only" value="false"/>
+ <booleanAttribute key="tracing" value="false"/>
+ <booleanAttribute key="useCustomFeatures" value="true"/>
+ <booleanAttribute key="useDefaultConfig" value="true"/>
+ <booleanAttribute key="useDefaultConfigArea" value="false"/>
+ <booleanAttribute key="useProduct" value="false"/>
</launchConfiguration>
diff --git a/containers/org.eclipse.linuxtools.docker.integration.tests/launchers/DockerAllBotTest Mockito.launch b/containers/org.eclipse.linuxtools.docker.integration.tests/launchers/DockerAllBotTest Mockito.launch
index 361936406aabb302415bc0bd1d1c23e372432070..40eb1e0675bd78898c00a6009073e920e375f645 100644
--- a/containers/org.eclipse.linuxtools.docker.integration.tests/launchers/DockerAllBotTest Mockito.launch
+++ b/containers/org.eclipse.linuxtools.docker.integration.tests/launchers/DockerAllBotTest Mockito.launch
@@ -1,118 +1,486 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<launchConfiguration type="org.eclipse.reddeer.eclipse.ui.launcher.JunitLaunchConfig">
-<setAttribute key="additional_plugins">
-<setEntry value="com.spotify.docker.client:3.6.8.v20161117-2005:default:true"/>
-<setEntry value="org.apache.httpcomponents.httpclient:4.5.2.v20161115-1643:default:true"/>
-<setEntry value="org.apache.httpcomponents.httpcore:4.4.4.v20161115-1643:default:true"/>
-<setEntry value="org.eclipse.linuxtools.docker.core:2.3.0.qualifier:default:true"/>
-<setEntry value="org.eclipse.linuxtools.docker.editor:1.0.0.qualifier:default:true"/>
-<setEntry value="org.eclipse.linuxtools.docker.integration.tests:1.0.0.qualifier:default:true"/>
-<setEntry value="org.eclipse.linuxtools.docker.reddeer:1.0.0.qualifier:default:true"/>
-<setEntry value="org.eclipse.linuxtools.docker.tests.hamcrest-wrap:1.2.0.qualifier:default:true"/>
-<setEntry value="org.eclipse.linuxtools.docker.ui.tests:2.1.0.qualifier:default:true"/>
-<setEntry value="org.eclipse.linuxtools.docker.ui:2.3.0.qualifier:default:true"/>
-<setEntry value="org.slf4j.api:1.7.10.v20160921-1923:default:true"/>
-</setAttribute>
-<booleanAttribute key="append.args" value="true"/>
-<stringAttribute key="application" value="org.eclipse.pde.junit.runtime.coretestapplication"/>
-<booleanAttribute key="askclear" value="false"/>
-<booleanAttribute key="automaticAdd" value="true"/>
-<booleanAttribute key="automaticValidate" value="true"/>
-<stringAttribute key="bootstrap" value=""/>
-<stringAttribute key="checked" value="[NONE]"/>
-<booleanAttribute key="clearConfig" value="true"/>
-<booleanAttribute key="clearws" value="true"/>
-<booleanAttribute key="clearwslog" value="false"/>
-<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/pde-junit"/>
-<booleanAttribute key="default" value="false"/>
-<stringAttribute key="featureDefaultLocation" value="workspace"/>
-<stringAttribute key="featurePluginResolution" value="workspace"/>
-<booleanAttribute key="includeOptional" value="true"/>
-<stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/org.eclipse.linuxtools.docker.integration.tests/src/org/eclipse/linuxtools/docker/integration/tests/DockerAllBotTest.java"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="1"/>
-</listAttribute>
-<mapAttribute key="org.eclipse.debug.core.environmentVariables">
-<mapEntry key="DISPLAY" value=":1"/>
-</mapAttribute>
-<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
-<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
-<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
-<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
-<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.linuxtools.docker.integration.tests.DockerAllBotTest"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog -consolelog"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.linuxtools.docker.integration.tests"/>
-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-DdockerMockito=true -Dusage_reporting_enabled=false -DdockerHubUsername=test -DdockerHubEmail=test@test.com -DdockerHubPassword=password -DdockerComposePath=//testpath"/>
-<stringAttribute key="pde.version" value="3.3"/>
-<stringAttribute key="product" value="org.eclipse.platform.ide"/>
-<stringAttribute key="rd.launch.property.rd.captureScreenshot" value="true"/>
-<stringAttribute key="rd.launch.property.rd.closeShells" value="true"/>
-<stringAttribute key="rd.launch.property.rd.closeWelcomeScreen" value="true"/>
-<stringAttribute key="rd.launch.property.rd.disableMavenIndex" value="true"/>
-<stringAttribute key="rd.launch.property.rd.logCollectorEnabled" value="true"/>
-<stringAttribute key="rd.launch.property.rd.logLevel" value="ALL"/>
-<stringAttribute key="rd.launch.property.rd.logMessageFilter" value="ALL"/>
-<stringAttribute key="rd.launch.property.rd.openAssociatedPerspective" value="never"/>
-<stringAttribute key="rd.launch.property.rd.pauseFailedTest" value="false"/>
-<stringAttribute key="rd.launch.property.rd.timePeriodFactor" value="1.0"/>
-<setAttribute key="selected_features">
-<setEntry value="org.eclipse.cdt.autotools:default"/>
-<setEntry value="org.eclipse.cdt.gdb:default"/>
-<setEntry value="org.eclipse.cdt.gnu.build:default"/>
-<setEntry value="org.eclipse.cdt.gnu.debug:default"/>
-<setEntry value="org.eclipse.cdt.gnu.dsf:default"/>
-<setEntry value="org.eclipse.cdt.native:default"/>
-<setEntry value="org.eclipse.cdt.platform:default"/>
-<setEntry value="org.eclipse.cdt:default"/>
-<setEntry value="org.eclipse.draw2d:default"/>
-<setEntry value="org.eclipse.e4.rcp:default"/>
-<setEntry value="org.eclipse.ecf.core.feature:default"/>
-<setEntry value="org.eclipse.ecf.core.ssl.feature:default"/>
-<setEntry value="org.eclipse.ecf.filetransfer.feature:default"/>
-<setEntry value="org.eclipse.ecf.filetransfer.httpclient4.feature:default"/>
-<setEntry value="org.eclipse.ecf.filetransfer.httpclient4.ssl.feature:default"/>
-<setEntry value="org.eclipse.ecf.filetransfer.ssl.feature:default"/>
-<setEntry value="org.eclipse.emf.common:default"/>
-<setEntry value="org.eclipse.emf.ecore:default"/>
-<setEntry value="org.eclipse.equinox.p2.core.feature:default"/>
-<setEntry value="org.eclipse.equinox.p2.extras.feature:default"/>
-<setEntry value="org.eclipse.equinox.p2.rcp.feature:default"/>
-<setEntry value="org.eclipse.equinox.p2.user.ui:default"/>
-<setEntry value="org.eclipse.help:default"/>
-<setEntry value="org.eclipse.jgit:default"/>
-<setEntry value="org.eclipse.launchbar:default"/>
-<setEntry value="org.eclipse.license:default"/>
-<setEntry value="org.eclipse.linuxtools.docker.feature:default"/>
-<setEntry value="org.eclipse.platform:default"/>
-<setEntry value="org.eclipse.ptp.rdt.sync:default"/>
-<setEntry value="org.eclipse.rcp:default"/>
-<setEntry value="org.eclipse.remote:default"/>
-<setEntry value="org.eclipse.swtbot.eclipse:default"/>
-<setEntry value="org.eclipse.swtbot.forms:default"/>
-<setEntry value="org.eclipse.swtbot:default"/>
-<setEntry value="org.eclipse.tm.terminal.connector.local.feature:default"/>
-<setEntry value="org.eclipse.tm.terminal.connector.serial.feature:default"/>
-<setEntry value="org.eclipse.tm.terminal.connector.ssh.feature:default"/>
-<setEntry value="org.eclipse.tm.terminal.connector.telnet.feature:default"/>
-<setEntry value="org.eclipse.tm.terminal.control.feature:default"/>
-<setEntry value="org.eclipse.tm.terminal.feature:default"/>
-<setEntry value="org.eclipse.tm.terminal.view.feature:default"/>
-<setEntry value="org.eclipse.zest:default"/>
-<setEntry value="org.jboss.reddeer.eclipse.feature:default"/>
-<setEntry value="org.jboss.reddeer.junit.extension.feature:default"/>
-<setEntry value="org.jboss.reddeer.ui.feature:default"/>
-</setAttribute>
-<stringAttribute key="selected_target_plugins" value="com.fasterxml.jackson.core.jackson-annotations@default:default,com.fasterxml.jackson.core.jackson-core@default:default,com.fasterxml.jackson.core.jackson-databind@default:default,com.fasterxml.jackson.datatype.jackson-datatype-guava@default:default,com.fasterxml.jackson.jaxrs.jackson-jaxrs-base@default:default,com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider@default:default,com.github.jnr.constants@default:default,com.github.jnr.enxio@default:default,com.github.jnr.ffi@default:default,com.github.jnr.jffi.native@default:false,com.github.jnr.jffi@default:default,com.github.jnr.posix@default:default,com.github.jnr.unixsocket@default:default,com.google.gson@default:default,com.google.guava@default:default,com.ibm.icu@default:default,com.jcraft.jsch@default:default,com.spotify.docker.client@default:true,com.sun.el@default:default,javaewah@default:default,javassist@default:default,javax.annotation@default:default,javax.el@default:default,javax.inject@default:default,javax.servlet.jsp@default:default,javax.servlet@default:default,javax.ws.rs@default:default,javax.xml@default:default,jnr.x86asm@default:default,org.aopalliance@default:default,org.apache.ant@default:default,org.apache.batik.css@default:default,org.apache.batik.util.gui@default:default,org.apache.batik.util@default:default,org.apache.commons.beanutils@default:default,org.apache.commons.codec@default:default,org.apache.commons.compress@default:default,org.apache.commons.io@default:default,org.apache.commons.jxpath@default:default,org.apache.commons.lang3.source@default:default,org.apache.commons.lang3@default:default,org.apache.commons.lang@default:default,org.apache.commons.logging@default:default,org.apache.felix.gogo.command@default:default,org.apache.felix.gogo.runtime@default:default,org.apache.felix.gogo.shell@default:default,org.apache.httpcomponents.httpclient*4.3.6.v201511171540@default:default,org.apache.httpcomponents.httpclient*4.5.2.v20161115-1643@default:default,org.apache.httpcomponents.httpcore*4.3.3.v201411290715@default:default,org.apache.httpcomponents.httpcore*4.4.4.v20161115-1643@default:default,org.apache.jasper.glassfish@default:default,org.apache.log4j@default:default,org.apache.lucene.analysis@default:default,org.apache.lucene.core@default:default,org.apache.xerces@default:default,org.apache.xml.resolver@default:default,org.apache.xml.serializer@default:default,org.assertj@default:default,org.bouncycastle.bcpkix@default:default,org.bouncycastle.bcprov@default:default,org.cyberneko.html@default:default,org.eclipse.ant.core@default:default,org.eclipse.ant.launching@default:default,org.eclipse.ant.ui@default:default,org.eclipse.cdt.autotools.core@default:default,org.eclipse.cdt.autotools.docs@default:default,org.eclipse.cdt.autotools.ui@default:default,org.eclipse.cdt.build.gcc.core@default:default,org.eclipse.cdt.codan.checkers.ui@default:default,org.eclipse.cdt.codan.checkers@default:default,org.eclipse.cdt.codan.core.cxx@default:default,org.eclipse.cdt.codan.core@default:default,org.eclipse.cdt.codan.ui.cxx@default:default,org.eclipse.cdt.codan.ui@default:default,org.eclipse.cdt.core.linux.x86_64@default:false,org.eclipse.cdt.core.linux@default:false,org.eclipse.cdt.core.native@default:default,org.eclipse.cdt.core@default:default,org.eclipse.cdt.debug.core@default:default,org.eclipse.cdt.debug.ui@default:default,org.eclipse.cdt.doc.user@default:default,org.eclipse.cdt.dsf.gdb.ui@default:default,org.eclipse.cdt.dsf.gdb@default:default,org.eclipse.cdt.dsf.ui@default:default,org.eclipse.cdt.dsf@default:default,org.eclipse.cdt.gdb.ui@default:default,org.eclipse.cdt.gdb@default:default,org.eclipse.cdt.launch@default:default,org.eclipse.cdt.make.core@default:default,org.eclipse.cdt.make.ui@default:default,org.eclipse.cdt.managedbuilder.core@default:default,org.eclipse.cdt.managedbuilder.gnu.ui@default:default,org.eclipse.cdt.managedbuilder.ui@default:default,org.eclipse.cdt.native.serial@default:default,org.eclipse.cdt.remote.core@default:default,org.eclipse.cdt.ui@default:default,org.eclipse.cdt@default:default,org.eclipse.compare.core@default:default,org.eclipse.compare@default:default,org.eclipse.core.commands@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.databinding.beans@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.core.databinding@default:default,org.eclipse.core.expressions@default:default,org.eclipse.core.externaltools@default:default,org.eclipse.core.filebuffers@default:default,org.eclipse.core.filesystem.linux.x86_64@default:false,org.eclipse.core.filesystem@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.net.linux.x86_64@default:false,org.eclipse.core.net@default:default,org.eclipse.core.resources@default:default,org.eclipse.core.runtime@default:true,org.eclipse.core.variables@default:default,org.eclipse.debug.core@default:default,org.eclipse.debug.ui@default:default,org.eclipse.draw2d@default:default,org.eclipse.dstore.core@default:default,org.eclipse.dstore.extra@default:default,org.eclipse.e4.core.commands@default:default,org.eclipse.e4.core.contexts@default:default,org.eclipse.e4.core.di.annotations@default:default,org.eclipse.e4.core.di.extensions@default:default,org.eclipse.e4.core.di@default:default,org.eclipse.e4.core.services@default:default,org.eclipse.e4.emf.xpath@default:default,org.eclipse.e4.ui.bindings@default:default,org.eclipse.e4.ui.css.core@default:default,org.eclipse.e4.ui.css.swt.theme@default:default,org.eclipse.e4.ui.css.swt@default:default,org.eclipse.e4.ui.di@default:default,org.eclipse.e4.ui.dialogs@default:default,org.eclipse.e4.ui.model.workbench@default:default,org.eclipse.e4.ui.services@default:default,org.eclipse.e4.ui.swt.gtk@default:false,org.eclipse.e4.ui.widgets@default:default,org.eclipse.e4.ui.workbench.addons.swt@default:default,org.eclipse.e4.ui.workbench.renderers.swt@default:default,org.eclipse.e4.ui.workbench.swt@default:default,org.eclipse.e4.ui.workbench3@default:default,org.eclipse.e4.ui.workbench@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.ecf.provider.filetransfer.httpclient4.ssl@default:false,org.eclipse.ecf.provider.filetransfer.httpclient4@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.ecf@default:default,org.eclipse.emf.common@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.bidi@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.concurrent@default:default,org.eclipse.equinox.console@default:default,org.eclipse.equinox.ds@1:true,org.eclipse.equinox.event@default:default,org.eclipse.equinox.frameworkadmin.equinox@default:default,org.eclipse.equinox.frameworkadmin@default:default,org.eclipse.equinox.http.jetty@default:default,org.eclipse.equinox.http.registry@default:default,org.eclipse.equinox.http.servlet@default:default,org.eclipse.equinox.jsp.jasper.registry@default:default,org.eclipse.equinox.jsp.jasper@default:default,org.eclipse.equinox.launcher.gtk.linux.x86_64@default:false,org.eclipse.equinox.launcher@default:default,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.equinox.p2.console@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.equinox.p2.director.app@default:default,org.eclipse.equinox.p2.director@default:default,org.eclipse.equinox.p2.directorywatcher@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.equinox.p2.extensionlocation@default:default,org.eclipse.equinox.p2.garbagecollector@default:default,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.equinox.p2.operations@default:default,org.eclipse.equinox.p2.publisher.eclipse@default:default,org.eclipse.equinox.p2.publisher@default:default,org.eclipse.equinox.p2.reconciler.dropins@default:default,org.eclipse.equinox.p2.repository.tools@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.equinox.p2.touchpoint.eclipse@default:default,org.eclipse.equinox.p2.touchpoint.natives@default:default,org.eclipse.equinox.p2.transport.ecf@default:default,org.eclipse.equinox.p2.ui.importexport@default:default,org.eclipse.equinox.p2.ui.sdk.scheduler@default:default,org.eclipse.equinox.p2.ui.sdk@default:default,org.eclipse.equinox.p2.ui@default:default,org.eclipse.equinox.p2.updatechecker@default:default,org.eclipse.equinox.p2.updatesite@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.security.ui@default:default,org.eclipse.equinox.security@default:default,org.eclipse.equinox.simpleconfigurator.manipulator@default:default,org.eclipse.equinox.simpleconfigurator@1:true,org.eclipse.equinox.util@default:default,org.eclipse.gef@default:default,org.eclipse.help.base@default:default,org.eclipse.help.ui@default:default,org.eclipse.help.webapp@default:default,org.eclipse.help@default:default,org.eclipse.jdt.core.manipulation@default:default,org.eclipse.jdt.core@default:default,org.eclipse.jdt.debug.ui@default:default,org.eclipse.jdt.debug@default:default,org.eclipse.jdt.junit.core@default:default,org.eclipse.jdt.junit.runtime@default:default,org.eclipse.jdt.junit@default:default,org.eclipse.jdt.launching@default:default,org.eclipse.jdt.ui@default:default,org.eclipse.jetty.continuation@default:default,org.eclipse.jetty.http@default:default,org.eclipse.jetty.io@default:default,org.eclipse.jetty.security@default:default,org.eclipse.jetty.server@default:default,org.eclipse.jetty.servlet@default:default,org.eclipse.jetty.util@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.jface.text@default:default,org.eclipse.jface@default:default,org.eclipse.jgit.archive@default:default,org.eclipse.jgit@default:default,org.eclipse.jsch.core@default:default,org.eclipse.jsch.ui@default:default,org.eclipse.launchbar.core@default:default,org.eclipse.launchbar.ui.controls@default:default,org.eclipse.launchbar.ui@default:default,org.eclipse.ltk.core.refactoring@default:default,org.eclipse.ltk.ui.refactoring@default:default,org.eclipse.osgi.compatibility.state@default:false,org.eclipse.osgi.services@default:default,org.eclipse.osgi.util@default:default,org.eclipse.osgi@-1:true,org.eclipse.pde.build@default:default,org.eclipse.pde.core@default:default,org.eclipse.pde.launching@default:default,org.eclipse.pde.runtime@default:default,org.eclipse.pde.ui@default:default,org.eclipse.platform.doc.user@default:default,org.eclipse.platform@default:default,org.eclipse.ptp.rdt.sync.core@default:default,org.eclipse.ptp.rdt.sync.git.core@default:default,org.eclipse.ptp.rdt.sync.git.ui@default:default,org.eclipse.ptp.rdt.sync.ui@default:default,org.eclipse.rcp@default:default,org.eclipse.remote.console@default:default,org.eclipse.remote.core@default:default,org.eclipse.remote.doc.isv@default:default,org.eclipse.remote.jsch.core@default:default,org.eclipse.remote.jsch.ui@default:default,org.eclipse.remote.serial.core@default:default,org.eclipse.remote.serial.ui@default:default,org.eclipse.remote.telnet.core@default:default,org.eclipse.remote.telnet.ui@default:default,org.eclipse.remote.ui@default:default,org.eclipse.search@default:default,org.eclipse.swt.gtk.linux.x86_64@default:false,org.eclipse.swt@default:default,org.eclipse.swtbot.e4.finder@default:default,org.eclipse.swtbot.eclipse.core@default:default,org.eclipse.swtbot.eclipse.finder@default:default,org.eclipse.swtbot.forms.finder@default:default,org.eclipse.swtbot.go@default:default,org.eclipse.swtbot.junit4_x@default:default,org.eclipse.swtbot.swt.finder@default:default,org.eclipse.team.core@default:default,org.eclipse.team.ui@default:default,org.eclipse.text@default:default,org.eclipse.tm.terminal.connector.local@default:default,org.eclipse.tm.terminal.connector.process@default:default,org.eclipse.tm.terminal.connector.serial@default:default,org.eclipse.tm.terminal.connector.ssh@default:default,org.eclipse.tm.terminal.connector.telnet@default:default,org.eclipse.tm.terminal.control@default:default,org.eclipse.tm.terminal.view.core@default:default,org.eclipse.tm.terminal.view.ui@default:default,org.eclipse.tools.templates.core@default:default,org.eclipse.tools.templates.ui@default:default,org.eclipse.ui.browser@default:default,org.eclipse.ui.cheatsheets@default:default,org.eclipse.ui.console@default:default,org.eclipse.ui.editors@default:default,org.eclipse.ui.externaltools@default:default,org.eclipse.ui.forms@default:default,org.eclipse.ui.ide.application@default:default,org.eclipse.ui.ide@default:default,org.eclipse.ui.intro.quicklinks@default:default,org.eclipse.ui.intro.universal@default:default,org.eclipse.ui.intro@default:default,org.eclipse.ui.monitoring@default:default,org.eclipse.ui.navigator.resources@default:default,org.eclipse.ui.navigator@default:default,org.eclipse.ui.net@default:default,org.eclipse.ui.themes@default:default,org.eclipse.ui.trace@default:default,org.eclipse.ui.views.log@default:default,org.eclipse.ui.views.properties.tabbed@default:default,org.eclipse.ui.views@default:default,org.eclipse.ui.workbench.texteditor@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.ui@default:default,org.eclipse.update.configurator@3:true,org.eclipse.wb.core.lib@default:default,org.eclipse.wst.common.core@default:default,org.eclipse.wst.internet.monitor.core@default:default,org.eclipse.wst.server.core@default:default,org.eclipse.wst.server.discovery@default:default,org.eclipse.wst.server.ui@default:default,org.eclipse.zest.core@default:default,org.eclipse.zest.layouts@default:default,org.glassfish.hk2.api@default:default,org.glassfish.hk2.locator@default:default,org.glassfish.hk2.osgi-resource-locator@default:default,org.glassfish.hk2.utils@default:default,org.glassfish.jersey.apache.connector@default:default,org.glassfish.jersey.bundles.repackaged.jersey-guava@default:default,org.glassfish.jersey.core.jersey-client@default:default,org.glassfish.jersey.core.jersey-common@default:default,org.glassfish.jersey.core.jersey-server@default:default,org.glassfish.jersey.ext.entityfiltering@default:default,org.glassfish.jersey.media.jersey-media-json-jackson@default:default,org.hamcrest.core@default:default,org.hamcrest.library@default:default,org.jboss.reddeer.common@default:default,org.jboss.reddeer.core@default:default,org.jboss.reddeer.direct@default:default,org.jboss.reddeer.eclipse@default:default,org.jboss.reddeer.gef@default:default,org.jboss.reddeer.go@default:default,org.jboss.reddeer.jface@default:default,org.jboss.reddeer.junit.extension@default:default,org.jboss.reddeer.junit@default:default,org.jboss.reddeer.requirements@default:default,org.jboss.reddeer.swt@default:default,org.jboss.reddeer.ui@default:default,org.jboss.reddeer.uiforms@default:default,org.jboss.reddeer.workbench@default:default,org.junit@default:default,org.mockito@default:default,org.objectweb.asm.analysis@default:default,org.objectweb.asm.tree@default:default,org.objectweb.asm.util@default:default,org.objectweb.asm@default:default,org.objenesis@default:default,org.sat4j.core@default:default,org.sat4j.pb@default:default,org.slf4j.api*1.7.10.v20160921-1923@default:default,org.slf4j.api*1.7.2.v20121108-1250@default:default,org.slf4j.impl.log4j12@default:false,org.swtchart@default:default,org.tukaani.xz@default:default,org.w3c.css.sac@default:default,org.w3c.dom.events@default:default,org.w3c.dom.smil@default:default,org.w3c.dom.svg@default:default"/>
-<stringAttribute key="selected_workspace_plugins" value="org.eclipse.linuxtools.docker.core@default:default,org.eclipse.linuxtools.docker.docs@default:default,org.eclipse.linuxtools.docker.editor@default:default,org.eclipse.linuxtools.docker.integration.tests@default:default,org.eclipse.linuxtools.docker.reddeer@default:default,org.eclipse.linuxtools.docker.tests.hamcrest-wrap@default:default,org.eclipse.linuxtools.docker.ui.tests@default:default,org.eclipse.linuxtools.docker.ui@default:default"/>
-<booleanAttribute key="show_selected_only" value="false"/>
-<booleanAttribute key="tracing" value="false"/>
-<booleanAttribute key="useCustomFeatures" value="true"/>
-<booleanAttribute key="useDefaultConfig" value="true"/>
-<booleanAttribute key="useDefaultConfigArea" value="false"/>
-<booleanAttribute key="useProduct" value="false"/>
+ <setAttribute key="additional_plugins">
+ <setEntry value="org.apache.httpcomponents.httpclient:4.5.10.v20200114-1512:default:true:default:default"/>
+ <setEntry value="org.apache.httpcomponents.httpcore:4.4.12.v20200108-1212:default:true:default:default"/>
+ <setEntry value="org.eclipse.linuxtools.docker.core:5.0.0.qualifier:default:true:default:default"/>
+ <setEntry value="org.eclipse.linuxtools.docker.integration.tests:2.2.0.qualifier:default:true:default:default"/>
+ <setEntry value="org.eclipse.linuxtools.docker.reddeer:2.2.0.qualifier:default:true:default:default"/>
+ <setEntry value="org.eclipse.linuxtools.docker.tests.hamcrest-wrap:1.2.0.qualifier:default:true:default:default"/>
+ <setEntry value="org.eclipse.linuxtools.docker.ui.tests:2.2.0.qualifier:default:true:default:default"/>
+ <setEntry value="org.eclipse.linuxtools.docker.ui:5.0.0.qualifier:default:true:default:default"/>
+ <setEntry value="org.slf4j.api:1.7.30.v20200204-2150:default:true:default:default"/>
+ </setAttribute>
+ <booleanAttribute key="append.args" value="true"/>
+ <stringAttribute key="application" value="org.eclipse.pde.junit.runtime.coretestapplication"/>
+ <booleanAttribute key="askclear" value="false"/>
+ <booleanAttribute key="automaticAdd" value="true"/>
+ <booleanAttribute key="automaticValidate" value="true"/>
+ <stringAttribute key="bootstrap" value=""/>
+ <stringAttribute key="checked" value="[NONE]"/>
+ <booleanAttribute key="clearConfig" value="true"/>
+ <booleanAttribute key="clearws" value="true"/>
+ <booleanAttribute key="clearwslog" value="false"/>
+ <stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/pde-junit"/>
+ <booleanAttribute key="default" value="false"/>
+ <stringAttribute key="featureDefaultLocation" value="workspace"/>
+ <stringAttribute key="featurePluginResolution" value="workspace"/>
+ <booleanAttribute key="includeOptional" value="true"/>
+ <stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/>
+ <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+ <listEntry value="/org.eclipse.linuxtools.docker.integration.tests/src/org/eclipse/linuxtools/docker/integration/tests/DockerAllBotTest.java"/>
+ </listAttribute>
+ <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+ <listEntry value="1"/>
+ </listAttribute>
+ <mapAttribute key="org.eclipse.debug.core.environmentVariables">
+ <mapEntry key="DISPLAY" value=":1"/>
+ </mapAttribute>
+ <stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
+ <booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
+ <stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
+ <stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
+ <stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
+ <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.linuxtools.docker.integration.tests.DockerAllBotTest"/>
+ <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog -consolelog"/>
+ <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.linuxtools.docker.integration.tests"/>
+ <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
+ <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-DdockerMockito=true -Dusage_reporting_enabled=false -DdockerHubUsername=test -DdockerHubEmail=test@test.com -DdockerHubPassword=password -DdockerComposePath=//testpath"/>
+ <stringAttribute key="pde.version" value="3.3"/>
+ <stringAttribute key="product" value="org.eclipse.platform.ide"/>
+ <stringAttribute key="rd.launch.property.rd.captureScreenshot" value="true"/>
+ <stringAttribute key="rd.launch.property.rd.closeShells" value="true"/>
+ <stringAttribute key="rd.launch.property.rd.closeWelcomeScreen" value="true"/>
+ <stringAttribute key="rd.launch.property.rd.defaultKey" value="org.eclipse.reddeer.widget.key"/>
+ <stringAttribute key="rd.launch.property.rd.disableMavenIndex" value="true"/>
+ <stringAttribute key="rd.launch.property.rd.logCollectorEnabled" value="true"/>
+ <stringAttribute key="rd.launch.property.rd.logLevel" value="ALL"/>
+ <stringAttribute key="rd.launch.property.rd.logMessageFilter" value="ALL"/>
+ <stringAttribute key="rd.launch.property.rd.maximizeWorkbench" value="true"/>
+ <stringAttribute key="rd.launch.property.rd.openAssociatedPerspective" value="never"/>
+ <stringAttribute key="rd.launch.property.rd.pauseFailedTest" value="false"/>
+ <stringAttribute key="rd.launch.property.rd.timePeriodFactor" value="1.0"/>
+ <setAttribute key="selected_features">
+ <setEntry value="org.eclipse.cdt.autotools:default"/>
+ <setEntry value="org.eclipse.cdt.gdb:default"/>
+ <setEntry value="org.eclipse.cdt.gnu.build:default"/>
+ <setEntry value="org.eclipse.cdt.gnu.debug:default"/>
+ <setEntry value="org.eclipse.cdt.gnu.dsf:default"/>
+ <setEntry value="org.eclipse.cdt.native:default"/>
+ <setEntry value="org.eclipse.cdt.platform:default"/>
+ <setEntry value="org.eclipse.cdt:default"/>
+ <setEntry value="org.eclipse.draw2d:default"/>
+ <setEntry value="org.eclipse.e4.rcp:default"/>
+ <setEntry value="org.eclipse.ecf.core.feature:default"/>
+ <setEntry value="org.eclipse.ecf.core.ssl.feature:default"/>
+ <setEntry value="org.eclipse.ecf.filetransfer.feature:default"/>
+ <setEntry value="org.eclipse.ecf.filetransfer.ssl.feature:default"/>
+ <setEntry value="org.eclipse.emf.common:default"/>
+ <setEntry value="org.eclipse.emf.ecore:default"/>
+ <setEntry value="org.eclipse.equinox.p2.core.feature:default"/>
+ <setEntry value="org.eclipse.equinox.p2.extras.feature:default"/>
+ <setEntry value="org.eclipse.equinox.p2.rcp.feature:default"/>
+ <setEntry value="org.eclipse.equinox.p2.user.ui:default"/>
+ <setEntry value="org.eclipse.help:default"/>
+ <setEntry value="org.eclipse.jgit:default"/>
+ <setEntry value="org.eclipse.launchbar:default"/>
+ <setEntry value="org.eclipse.license:default"/>
+ <setEntry value="org.eclipse.linuxtools.docker.feature:default"/>
+ <setEntry value="org.eclipse.platform:default"/>
+ <setEntry value="org.eclipse.ptp.rdt.sync:default"/>
+ <setEntry value="org.eclipse.rcp:default"/>
+ <setEntry value="org.eclipse.remote:default"/>
+ <setEntry value="org.eclipse.swtbot.eclipse:default"/>
+ <setEntry value="org.eclipse.swtbot.forms:default"/>
+ <setEntry value="org.eclipse.swtbot:default"/>
+ <setEntry value="org.eclipse.tm.terminal.connector.local.feature:default"/>
+ <setEntry value="org.eclipse.tm.terminal.connector.ssh.feature:default"/>
+ <setEntry value="org.eclipse.tm.terminal.connector.telnet.feature:default"/>
+ <setEntry value="org.eclipse.tm.terminal.control.feature:default"/>
+ <setEntry value="org.eclipse.tm.terminal.feature:default"/>
+ <setEntry value="org.eclipse.tm.terminal.view.feature:default"/>
+ <setEntry value="org.eclipse.zest:default"/>
+ </setAttribute>
+ <setAttribute key="selected_target_bundles">
+ <setEntry value="com.fasterxml.jackson.core.jackson-annotations@default:default"/>
+ <setEntry value="com.fasterxml.jackson.core.jackson-core@default:default"/>
+ <setEntry value="com.fasterxml.jackson.core.jackson-databind@default:default"/>
+ <setEntry value="com.fasterxml.jackson.datatype.jackson-datatype-guava@default:default"/>
+ <setEntry value="com.fasterxml.jackson.jaxrs.jackson-jaxrs-base@default:default"/>
+ <setEntry value="com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider@default:default"/>
+ <setEntry value="com.github.jnr.constants@default:default"/>
+ <setEntry value="com.github.jnr.enxio@default:default"/>
+ <setEntry value="com.github.jnr.ffi@default:default"/>
+ <setEntry value="com.github.jnr.jffi.native@default:false"/>
+ <setEntry value="com.github.jnr.jffi@default:default"/>
+ <setEntry value="com.github.jnr.posix@default:default"/>
+ <setEntry value="com.github.jnr.unixsocket@default:default"/>
+ <setEntry value="com.google.gson@default:default"/>
+ <setEntry value="com.google.guava@default:default"/>
+ <setEntry value="com.ibm.icu@default:default"/>
+ <setEntry value="com.jcraft.jsch@default:default"/>
+ <setEntry value="com.sun.el@default:default"/>
+ <setEntry value="javaewah@default:default"/>
+ <setEntry value="javassist@default:default"/>
+ <setEntry value="javax.annotation@default:default"/>
+ <setEntry value="javax.el@default:default"/>
+ <setEntry value="javax.inject@default:default"/>
+ <setEntry value="javax.servlet.jsp@default:default"/>
+ <setEntry value="javax.servlet@default:default"/>
+ <setEntry value="javax.ws.rs@default:default"/>
+ <setEntry value="javax.xml@default:default"/>
+ <setEntry value="jnr.x86asm@default:default"/>
+ <setEntry value="org.aopalliance@default:default"/>
+ <setEntry value="org.apache.ant@default:default"/>
+ <setEntry value="org.apache.batik.css@default:default"/>
+ <setEntry value="org.apache.batik.util.gui@default:default"/>
+ <setEntry value="org.apache.batik.util@default:default"/>
+ <setEntry value="org.apache.commons.beanutils@default:default"/>
+ <setEntry value="org.apache.commons.codec@default:default"/>
+ <setEntry value="org.apache.commons.compress@default:default"/>
+ <setEntry value="org.apache.commons.io@default:default"/>
+ <setEntry value="org.apache.commons.jxpath@default:default"/>
+ <setEntry value="org.apache.commons.lang3.source@default:default"/>
+ <setEntry value="org.apache.commons.lang3@default:default"/>
+ <setEntry value="org.apache.commons.lang@default:default"/>
+ <setEntry value="org.apache.commons.logging@default:default"/>
+ <setEntry value="org.apache.felix.gogo.command@default:default"/>
+ <setEntry value="org.apache.felix.gogo.runtime@default:default"/>
+ <setEntry value="org.apache.felix.gogo.shell@default:default"/>
+ <setEntry value="org.apache.httpcomponents.httpclient*4.3.6.v201511171540@default:default"/>
+ <setEntry value="org.apache.httpcomponents.httpclient*4.5.2.v20161115-1643@default:default"/>
+ <setEntry value="org.apache.httpcomponents.httpcore*4.3.3.v201411290715@default:default"/>
+ <setEntry value="org.apache.httpcomponents.httpcore*4.4.4.v20161115-1643@default:default"/>
+ <setEntry value="org.apache.jasper.glassfish@default:default"/>
+ <setEntry value="org.apache.log4j@default:default"/>
+ <setEntry value="org.apache.lucene.analysis@default:default"/>
+ <setEntry value="org.apache.lucene.core@default:default"/>
+ <setEntry value="org.apache.xerces@default:default"/>
+ <setEntry value="org.apache.xml.resolver@default:default"/>
+ <setEntry value="org.apache.xml.serializer@default:default"/>
+ <setEntry value="org.assertj@default:default"/>
+ <setEntry value="org.bouncycastle.bcpkix@default:default"/>
+ <setEntry value="org.bouncycastle.bcprov@default:default"/>
+ <setEntry value="org.cyberneko.html@default:default"/>
+ <setEntry value="org.eclipse.ant.core@default:default"/>
+ <setEntry value="org.eclipse.ant.launching@default:default"/>
+ <setEntry value="org.eclipse.ant.ui@default:default"/>
+ <setEntry value="org.eclipse.cdt.autotools.core@default:default"/>
+ <setEntry value="org.eclipse.cdt.autotools.docs@default:default"/>
+ <setEntry value="org.eclipse.cdt.autotools.ui@default:default"/>
+ <setEntry value="org.eclipse.cdt.build.gcc.core@default:default"/>
+ <setEntry value="org.eclipse.cdt.codan.checkers.ui@default:default"/>
+ <setEntry value="org.eclipse.cdt.codan.checkers@default:default"/>
+ <setEntry value="org.eclipse.cdt.codan.core.cxx@default:default"/>
+ <setEntry value="org.eclipse.cdt.codan.core@default:default"/>
+ <setEntry value="org.eclipse.cdt.codan.ui.cxx@default:default"/>
+ <setEntry value="org.eclipse.cdt.codan.ui@default:default"/>
+ <setEntry value="org.eclipse.cdt.core.linux.x86_64@default:false"/>
+ <setEntry value="org.eclipse.cdt.core.linux@default:false"/>
+ <setEntry value="org.eclipse.cdt.core.native@default:default"/>
+ <setEntry value="org.eclipse.cdt.core@default:default"/>
+ <setEntry value="org.eclipse.cdt.debug.core@default:default"/>
+ <setEntry value="org.eclipse.cdt.debug.ui@default:default"/>
+ <setEntry value="org.eclipse.cdt.doc.user@default:default"/>
+ <setEntry value="org.eclipse.cdt.dsf.gdb.ui@default:default"/>
+ <setEntry value="org.eclipse.cdt.dsf.gdb@default:default"/>
+ <setEntry value="org.eclipse.cdt.dsf.ui@default:default"/>
+ <setEntry value="org.eclipse.cdt.dsf@default:default"/>
+ <setEntry value="org.eclipse.cdt.gdb.ui@default:default"/>
+ <setEntry value="org.eclipse.cdt.gdb@default:default"/>
+ <setEntry value="org.eclipse.cdt.launch@default:default"/>
+ <setEntry value="org.eclipse.cdt.make.core@default:default"/>
+ <setEntry value="org.eclipse.cdt.make.ui@default:default"/>
+ <setEntry value="org.eclipse.cdt.managedbuilder.core@default:default"/>
+ <setEntry value="org.eclipse.cdt.managedbuilder.gnu.ui@default:default"/>
+ <setEntry value="org.eclipse.cdt.managedbuilder.ui@default:default"/>
+ <setEntry value="org.eclipse.cdt.native.serial@default:default"/>
+ <setEntry value="org.eclipse.cdt.remote.core@default:default"/>
+ <setEntry value="org.eclipse.cdt.ui@default:default"/>
+ <setEntry value="org.eclipse.cdt@default:default"/>
+ <setEntry value="org.eclipse.compare.core@default:default"/>
+ <setEntry value="org.eclipse.compare@default:default"/>
+ <setEntry value="org.eclipse.core.commands@default:default"/>
+ <setEntry value="org.eclipse.core.contenttype@default:default"/>
+ <setEntry value="org.eclipse.core.databinding.beans@default:default"/>
+ <setEntry value="org.eclipse.core.databinding.observable@default:default"/>
+ <setEntry value="org.eclipse.core.databinding.property@default:default"/>
+ <setEntry value="org.eclipse.core.databinding@default:default"/>
+ <setEntry value="org.eclipse.core.expressions@default:default"/>
+ <setEntry value="org.eclipse.core.externaltools@default:default"/>
+ <setEntry value="org.eclipse.core.filebuffers@default:default"/>
+ <setEntry value="org.eclipse.core.filesystem.linux.x86_64@default:false"/>
+ <setEntry value="org.eclipse.core.filesystem@default:default"/>
+ <setEntry value="org.eclipse.core.jobs@default:default"/>
+ <setEntry value="org.eclipse.core.net.linux.x86_64@default:false"/>
+ <setEntry value="org.eclipse.core.net@default:default"/>
+ <setEntry value="org.eclipse.core.resources@default:default"/>
+ <setEntry value="org.eclipse.core.runtime@default:true"/>
+ <setEntry value="org.eclipse.core.variables@default:default"/>
+ <setEntry value="org.eclipse.debug.core@default:default"/>
+ <setEntry value="org.eclipse.debug.ui@default:default"/>
+ <setEntry value="org.eclipse.draw2d@default:default"/>
+ <setEntry value="org.eclipse.dstore.core@default:default"/>
+ <setEntry value="org.eclipse.dstore.extra@default:default"/>
+ <setEntry value="org.eclipse.e4.core.commands@default:default"/>
+ <setEntry value="org.eclipse.e4.core.contexts@default:default"/>
+ <setEntry value="org.eclipse.e4.core.di.annotations@default:default"/>
+ <setEntry value="org.eclipse.e4.core.di.extensions@default:default"/>
+ <setEntry value="org.eclipse.e4.core.di@default:default"/>
+ <setEntry value="org.eclipse.e4.core.services@default:default"/>
+ <setEntry value="org.eclipse.e4.emf.xpath@default:default"/>
+ <setEntry value="org.eclipse.e4.ui.bindings@default:default"/>
+ <setEntry value="org.eclipse.e4.ui.css.core@default:default"/>
+ <setEntry value="org.eclipse.e4.ui.css.swt.theme@default:default"/>
+ <setEntry value="org.eclipse.e4.ui.css.swt@default:default"/>
+ <setEntry value="org.eclipse.e4.ui.di@default:default"/>
+ <setEntry value="org.eclipse.e4.ui.dialogs@default:default"/>
+ <setEntry value="org.eclipse.e4.ui.model.workbench@default:default"/>
+ <setEntry value="org.eclipse.e4.ui.services@default:default"/>
+ <setEntry value="org.eclipse.e4.ui.swt.gtk@default:false"/>
+ <setEntry value="org.eclipse.e4.ui.widgets@default:default"/>
+ <setEntry value="org.eclipse.e4.ui.workbench.addons.swt@default:default"/>
+ <setEntry value="org.eclipse.e4.ui.workbench.renderers.swt@default:default"/>
+ <setEntry value="org.eclipse.e4.ui.workbench.swt@default:default"/>
+ <setEntry value="org.eclipse.e4.ui.workbench3@default:default"/>
+ <setEntry value="org.eclipse.e4.ui.workbench@default:default"/>
+ <setEntry value="org.eclipse.ecf.filetransfer@default:default"/>
+ <setEntry value="org.eclipse.ecf.identity@default:default"/>
+ <setEntry value="org.eclipse.ecf.provider.filetransfer.httpclient4.ssl@default:false"/>
+ <setEntry value="org.eclipse.ecf.provider.filetransfer.httpclient4@default:default"/>
+ <setEntry value="org.eclipse.ecf.provider.filetransfer.ssl@default:false"/>
+ <setEntry value="org.eclipse.ecf.provider.filetransfer@default:default"/>
+ <setEntry value="org.eclipse.ecf.ssl@default:false"/>
+ <setEntry value="org.eclipse.ecf@default:default"/>
+ <setEntry value="org.eclipse.emf.common@default:default"/>
+ <setEntry value="org.eclipse.emf.ecore.change@default:default"/>
+ <setEntry value="org.eclipse.emf.ecore.xmi@default:default"/>
+ <setEntry value="org.eclipse.emf.ecore@default:default"/>
+ <setEntry value="org.eclipse.equinox.app@default:default"/>
+ <setEntry value="org.eclipse.equinox.bidi@default:default"/>
+ <setEntry value="org.eclipse.equinox.common@2:true"/>
+ <setEntry value="org.eclipse.equinox.concurrent@default:default"/>
+ <setEntry value="org.eclipse.equinox.console@default:default"/>
+ <setEntry value="org.eclipse.equinox.ds@1:true"/>
+ <setEntry value="org.eclipse.equinox.event@default:default"/>
+ <setEntry value="org.eclipse.equinox.frameworkadmin.equinox@default:default"/>
+ <setEntry value="org.eclipse.equinox.frameworkadmin@default:default"/>
+ <setEntry value="org.eclipse.equinox.http.jetty@default:default"/>
+ <setEntry value="org.eclipse.equinox.http.registry@default:default"/>
+ <setEntry value="org.eclipse.equinox.http.servlet@default:default"/>
+ <setEntry value="org.eclipse.equinox.jsp.jasper.registry@default:default"/>
+ <setEntry value="org.eclipse.equinox.jsp.jasper@default:default"/>
+ <setEntry value="org.eclipse.equinox.launcher.gtk.linux.x86_64@default:false"/>
+ <setEntry value="org.eclipse.equinox.launcher@default:default"/>
+ <setEntry value="org.eclipse.equinox.p2.artifact.repository@default:default"/>
+ <setEntry value="org.eclipse.equinox.p2.console@default:default"/>
+ <setEntry value="org.eclipse.equinox.p2.core@default:default"/>
+ <setEntry value="org.eclipse.equinox.p2.director.app@default:default"/>
+ <setEntry value="org.eclipse.equinox.p2.director@default:default"/>
+ <setEntry value="org.eclipse.equinox.p2.directorywatcher@default:default"/>
+ <setEntry value="org.eclipse.equinox.p2.engine@default:default"/>
+ <setEntry value="org.eclipse.equinox.p2.extensionlocation@default:default"/>
+ <setEntry value="org.eclipse.equinox.p2.garbagecollector@default:default"/>
+ <setEntry value="org.eclipse.equinox.p2.jarprocessor@default:default"/>
+ <setEntry value="org.eclipse.equinox.p2.metadata.repository@default:default"/>
+ <setEntry value="org.eclipse.equinox.p2.metadata@default:default"/>
+ <setEntry value="org.eclipse.equinox.p2.operations@default:default"/>
+ <setEntry value="org.eclipse.equinox.p2.publisher.eclipse@default:default"/>
+ <setEntry value="org.eclipse.equinox.p2.publisher@default:default"/>
+ <setEntry value="org.eclipse.equinox.p2.reconciler.dropins@default:default"/>
+ <setEntry value="org.eclipse.equinox.p2.repository.tools@default:default"/>
+ <setEntry value="org.eclipse.equinox.p2.repository@default:default"/>
+ <setEntry value="org.eclipse.equinox.p2.touchpoint.eclipse@default:default"/>
+ <setEntry value="org.eclipse.equinox.p2.touchpoint.natives@default:default"/>
+ <setEntry value="org.eclipse.equinox.p2.transport.ecf@default:default"/>
+ <setEntry value="org.eclipse.equinox.p2.ui.importexport@default:default"/>
+ <setEntry value="org.eclipse.equinox.p2.ui.sdk.scheduler@default:default"/>
+ <setEntry value="org.eclipse.equinox.p2.ui.sdk@default:default"/>
+ <setEntry value="org.eclipse.equinox.p2.ui@default:default"/>
+ <setEntry value="org.eclipse.equinox.p2.updatechecker@default:default"/>
+ <setEntry value="org.eclipse.equinox.p2.updatesite@default:default"/>
+ <setEntry value="org.eclipse.equinox.preferences@default:default"/>
+ <setEntry value="org.eclipse.equinox.registry@default:default"/>
+ <setEntry value="org.eclipse.equinox.security.ui@default:default"/>
+ <setEntry value="org.eclipse.equinox.security@default:default"/>
+ <setEntry value="org.eclipse.equinox.simpleconfigurator.manipulator@default:default"/>
+ <setEntry value="org.eclipse.equinox.simpleconfigurator@1:true"/>
+ <setEntry value="org.eclipse.equinox.util@default:default"/>
+ <setEntry value="org.eclipse.gef@default:default"/>
+ <setEntry value="org.eclipse.help.base@default:default"/>
+ <setEntry value="org.eclipse.help.ui@default:default"/>
+ <setEntry value="org.eclipse.help.webapp@default:default"/>
+ <setEntry value="org.eclipse.help@default:default"/>
+ <setEntry value="org.eclipse.jdt.core.manipulation@default:default"/>
+ <setEntry value="org.eclipse.jdt.core@default:default"/>
+ <setEntry value="org.eclipse.jdt.debug.ui@default:default"/>
+ <setEntry value="org.eclipse.jdt.debug@default:default"/>
+ <setEntry value="org.eclipse.jdt.junit.core@default:default"/>
+ <setEntry value="org.eclipse.jdt.junit.runtime@default:default"/>
+ <setEntry value="org.eclipse.jdt.junit@default:default"/>
+ <setEntry value="org.eclipse.jdt.launching@default:default"/>
+ <setEntry value="org.eclipse.jdt.ui@default:default"/>
+ <setEntry value="org.eclipse.jetty.continuation@default:default"/>
+ <setEntry value="org.eclipse.jetty.http@default:default"/>
+ <setEntry value="org.eclipse.jetty.io@default:default"/>
+ <setEntry value="org.eclipse.jetty.security@default:default"/>
+ <setEntry value="org.eclipse.jetty.server@default:default"/>
+ <setEntry value="org.eclipse.jetty.servlet@default:default"/>
+ <setEntry value="org.eclipse.jetty.util@default:default"/>
+ <setEntry value="org.eclipse.jface.databinding@default:default"/>
+ <setEntry value="org.eclipse.jface.text@default:default"/>
+ <setEntry value="org.eclipse.jface@default:default"/>
+ <setEntry value="org.eclipse.jgit.archive@default:default"/>
+ <setEntry value="org.eclipse.jgit@default:default"/>
+ <setEntry value="org.eclipse.jsch.core@default:default"/>
+ <setEntry value="org.eclipse.jsch.ui@default:default"/>
+ <setEntry value="org.eclipse.launchbar.core@default:default"/>
+ <setEntry value="org.eclipse.launchbar.ui.controls@default:default"/>
+ <setEntry value="org.eclipse.launchbar.ui@default:default"/>
+ <setEntry value="org.eclipse.ltk.core.refactoring@default:default"/>
+ <setEntry value="org.eclipse.ltk.ui.refactoring@default:default"/>
+ <setEntry value="org.eclipse.osgi.compatibility.state@default:false"/>
+ <setEntry value="org.eclipse.osgi.services@default:default"/>
+ <setEntry value="org.eclipse.osgi.util@default:default"/>
+ <setEntry value="org.eclipse.osgi@-1:true"/>
+ <setEntry value="org.eclipse.pde.build@default:default"/>
+ <setEntry value="org.eclipse.pde.core@default:default"/>
+ <setEntry value="org.eclipse.pde.launching@default:default"/>
+ <setEntry value="org.eclipse.pde.runtime@default:default"/>
+ <setEntry value="org.eclipse.pde.ui@default:default"/>
+ <setEntry value="org.eclipse.platform.doc.user@default:default"/>
+ <setEntry value="org.eclipse.platform@default:default"/>
+ <setEntry value="org.eclipse.ptp.rdt.sync.core@default:default"/>
+ <setEntry value="org.eclipse.ptp.rdt.sync.git.core@default:default"/>
+ <setEntry value="org.eclipse.ptp.rdt.sync.git.ui@default:default"/>
+ <setEntry value="org.eclipse.ptp.rdt.sync.ui@default:default"/>
+ <setEntry value="org.eclipse.rcp@default:default"/>
+ <setEntry value="org.eclipse.remote.console@default:default"/>
+ <setEntry value="org.eclipse.remote.core@default:default"/>
+ <setEntry value="org.eclipse.remote.doc.isv@default:default"/>
+ <setEntry value="org.eclipse.remote.jsch.core@default:default"/>
+ <setEntry value="org.eclipse.remote.jsch.ui@default:default"/>
+ <setEntry value="org.eclipse.remote.serial.core@default:default"/>
+ <setEntry value="org.eclipse.remote.serial.ui@default:default"/>
+ <setEntry value="org.eclipse.remote.telnet.core@default:default"/>
+ <setEntry value="org.eclipse.remote.telnet.ui@default:default"/>
+ <setEntry value="org.eclipse.remote.ui@default:default"/>
+ <setEntry value="org.eclipse.search@default:default"/>
+ <setEntry value="org.eclipse.swt.gtk.linux.x86_64@default:false"/>
+ <setEntry value="org.eclipse.swt@default:default"/>
+ <setEntry value="org.eclipse.swtbot.e4.finder@default:default"/>
+ <setEntry value="org.eclipse.swtbot.eclipse.core@default:default"/>
+ <setEntry value="org.eclipse.swtbot.eclipse.finder@default:default"/>
+ <setEntry value="org.eclipse.swtbot.forms.finder@default:default"/>
+ <setEntry value="org.eclipse.swtbot.go@default:default"/>
+ <setEntry value="org.eclipse.swtbot.junit4_x@default:default"/>
+ <setEntry value="org.eclipse.swtbot.swt.finder@default:default"/>
+ <setEntry value="org.eclipse.team.core@default:default"/>
+ <setEntry value="org.eclipse.team.ui@default:default"/>
+ <setEntry value="org.eclipse.text@default:default"/>
+ <setEntry value="org.eclipse.tm.terminal.connector.local@default:default"/>
+ <setEntry value="org.eclipse.tm.terminal.connector.process@default:default"/>
+ <setEntry value="org.eclipse.tm.terminal.connector.serial@default:default"/>
+ <setEntry value="org.eclipse.tm.terminal.connector.ssh@default:default"/>
+ <setEntry value="org.eclipse.tm.terminal.connector.telnet@default:default"/>
+ <setEntry value="org.eclipse.tm.terminal.control@default:default"/>
+ <setEntry value="org.eclipse.tm.terminal.view.core@default:default"/>
+ <setEntry value="org.eclipse.tm.terminal.view.ui@default:default"/>
+ <setEntry value="org.eclipse.tools.templates.core@default:default"/>
+ <setEntry value="org.eclipse.tools.templates.ui@default:default"/>
+ <setEntry value="org.eclipse.ui.browser@default:default"/>
+ <setEntry value="org.eclipse.ui.cheatsheets@default:default"/>
+ <setEntry value="org.eclipse.ui.console@default:default"/>
+ <setEntry value="org.eclipse.ui.editors@default:default"/>
+ <setEntry value="org.eclipse.ui.externaltools@default:default"/>
+ <setEntry value="org.eclipse.ui.forms@default:default"/>
+ <setEntry value="org.eclipse.ui.ide.application@default:default"/>
+ <setEntry value="org.eclipse.ui.ide@default:default"/>
+ <setEntry value="org.eclipse.ui.intro.quicklinks@default:default"/>
+ <setEntry value="org.eclipse.ui.intro.universal@default:default"/>
+ <setEntry value="org.eclipse.ui.intro@default:default"/>
+ <setEntry value="org.eclipse.ui.monitoring@default:default"/>
+ <setEntry value="org.eclipse.ui.navigator.resources@default:default"/>
+ <setEntry value="org.eclipse.ui.navigator@default:default"/>
+ <setEntry value="org.eclipse.ui.net@default:default"/>
+ <setEntry value="org.eclipse.ui.themes@default:default"/>
+ <setEntry value="org.eclipse.ui.trace@default:default"/>
+ <setEntry value="org.eclipse.ui.views.log@default:default"/>
+ <setEntry value="org.eclipse.ui.views.properties.tabbed@default:default"/>
+ <setEntry value="org.eclipse.ui.views@default:default"/>
+ <setEntry value="org.eclipse.ui.workbench.texteditor@default:default"/>
+ <setEntry value="org.eclipse.ui.workbench@default:default"/>
+ <setEntry value="org.eclipse.ui@default:default"/>
+ <setEntry value="org.eclipse.update.configurator@3:true"/>
+ <setEntry value="org.eclipse.wb.core.lib@default:default"/>
+ <setEntry value="org.eclipse.wst.common.core@default:default"/>
+ <setEntry value="org.eclipse.wst.internet.monitor.core@default:default"/>
+ <setEntry value="org.eclipse.wst.server.core@default:default"/>
+ <setEntry value="org.eclipse.wst.server.discovery@default:default"/>
+ <setEntry value="org.eclipse.wst.server.ui@default:default"/>
+ <setEntry value="org.eclipse.zest.core@default:default"/>
+ <setEntry value="org.eclipse.zest.layouts@default:default"/>
+ <setEntry value="org.glassfish.hk2.api@default:default"/>
+ <setEntry value="org.glassfish.hk2.locator@default:default"/>
+ <setEntry value="org.glassfish.hk2.osgi-resource-locator@default:default"/>
+ <setEntry value="org.glassfish.hk2.utils@default:default"/>
+ <setEntry value="org.glassfish.jersey.apache.connector@default:default"/>
+ <setEntry value="org.glassfish.jersey.bundles.repackaged.jersey-guava@default:default"/>
+ <setEntry value="org.glassfish.jersey.core.jersey-client@default:default"/>
+ <setEntry value="org.glassfish.jersey.core.jersey-common@default:default"/>
+ <setEntry value="org.glassfish.jersey.core.jersey-server@default:default"/>
+ <setEntry value="org.glassfish.jersey.ext.entityfiltering@default:default"/>
+ <setEntry value="org.glassfish.jersey.media.jersey-media-json-jackson@default:default"/>
+ <setEntry value="org.hamcrest.core@default:default"/>
+ <setEntry value="org.hamcrest.library@default:default"/>
+ <setEntry value="org.jboss.reddeer.common@default:default"/>
+ <setEntry value="org.jboss.reddeer.core@default:default"/>
+ <setEntry value="org.jboss.reddeer.direct@default:default"/>
+ <setEntry value="org.jboss.reddeer.eclipse@default:default"/>
+ <setEntry value="org.jboss.reddeer.gef@default:default"/>
+ <setEntry value="org.jboss.reddeer.go@default:default"/>
+ <setEntry value="org.jboss.reddeer.jface@default:default"/>
+ <setEntry value="org.jboss.reddeer.junit.extension@default:default"/>
+ <setEntry value="org.jboss.reddeer.junit@default:default"/>
+ <setEntry value="org.jboss.reddeer.requirements@default:default"/>
+ <setEntry value="org.jboss.reddeer.swt@default:default"/>
+ <setEntry value="org.jboss.reddeer.ui@default:default"/>
+ <setEntry value="org.jboss.reddeer.uiforms@default:default"/>
+ <setEntry value="org.jboss.reddeer.workbench@default:default"/>
+ <setEntry value="org.junit@default:default"/>
+ <setEntry value="org.mandas.docker.client@default:true"/>
+ <setEntry value="org.mockito@default:default"/>
+ <setEntry value="org.objectweb.asm.analysis@default:default"/>
+ <setEntry value="org.objectweb.asm.tree@default:default"/>
+ <setEntry value="org.objectweb.asm.util@default:default"/>
+ <setEntry value="org.objectweb.asm@default:default"/>
+ <setEntry value="org.objenesis@default:default"/>
+ <setEntry value="org.sat4j.core@default:default"/>
+ <setEntry value="org.sat4j.pb@default:default"/>
+ <setEntry value="org.slf4j.api*1.7.10.v20160921-1923@default:default"/>
+ <setEntry value="org.slf4j.api*1.7.2.v20121108-1250@default:default"/>
+ <setEntry value="org.slf4j.impl.log4j12@default:false"/>
+ <setEntry value="org.swtchart@default:default"/>
+ <setEntry value="org.tukaani.xz@default:default"/>
+ <setEntry value="org.w3c.css.sac@default:default"/>
+ <setEntry value="org.w3c.dom.events@default:default"/>
+ <setEntry value="org.w3c.dom.smil@default:default"/>
+ <setEntry value="org.w3c.dom.svg@default:default"/>
+ </setAttribute>
+ <setAttribute key="selected_workspace_bundles">
+ <setEntry value="org.eclipse.linuxtools.docker.core@default:default"/>
+ <setEntry value="org.eclipse.linuxtools.docker.docs@default:default"/>
+ <setEntry value="org.eclipse.linuxtools.docker.editor@default:default"/>
+ <setEntry value="org.eclipse.linuxtools.docker.integration.tests@default:default"/>
+ <setEntry value="org.eclipse.linuxtools.docker.reddeer@default:default"/>
+ <setEntry value="org.eclipse.linuxtools.docker.tests.hamcrest-wrap@default:default"/>
+ <setEntry value="org.eclipse.linuxtools.docker.ui.tests@default:default"/>
+ <setEntry value="org.eclipse.linuxtools.docker.ui@default:default"/>
+ </setAttribute>
+ <booleanAttribute key="show_selected_only" value="false"/>
+ <booleanAttribute key="tracing" value="false"/>
+ <booleanAttribute key="useCustomFeatures" value="true"/>
+ <booleanAttribute key="useDefaultConfig" value="true"/>
+ <booleanAttribute key="useDefaultConfigArea" value="false"/>
+ <booleanAttribute key="useProduct" value="false"/>
</launchConfiguration>
diff --git a/containers/org.eclipse.linuxtools.docker.integration.tests/pom.xml b/containers/org.eclipse.linuxtools.docker.integration.tests/pom.xml
index 92de28d21fa017480f9c9a5b1d69ae7cca074be7..25997266fa1f4644d348e7cb78b9c30cb3187d29 100644
--- a/containers/org.eclipse.linuxtools.docker.integration.tests/pom.xml
+++ b/containers/org.eclipse.linuxtools.docker.integration.tests/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.eclipse.linuxtools</groupId>
<artifactId>org.eclipse.linuxtools.docker</artifactId>
- <version>4.4.0</version>
+ <version>5.1.0</version>
</parent>
<artifactId>org.eclipse.linuxtools.docker.integration.tests</artifactId>
<version>2.2.0-SNAPSHOT</version>
diff --git a/containers/org.eclipse.linuxtools.docker.integration.tests/src/org/eclipse/linuxtools/docker/integration/tests/container/BasicSecurityTest.java b/containers/org.eclipse.linuxtools.docker.integration.tests/src/org/eclipse/linuxtools/docker/integration/tests/container/BasicSecurityTest.java
index 2d251ba4d7a12069c6a3ecb746c10d03f255c51c..e8a323213f51be0bd3315dc61150242c24b4247b 100644
--- a/containers/org.eclipse.linuxtools.docker.integration.tests/src/org/eclipse/linuxtools/docker/integration/tests/container/BasicSecurityTest.java
+++ b/containers/org.eclipse.linuxtools.docker.integration.tests/src/org/eclipse/linuxtools/docker/integration/tests/container/BasicSecurityTest.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2017, 2018 Red Hat, Inc.
+ * Copyright (c) 2017, 2020 Red Hat, Inc.
*
* This program and the accompanying materials are made
* available under the terms of the Eclipse Public License 2.0
@@ -33,8 +33,8 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import com.spotify.docker.client.DockerClient;
-import com.spotify.docker.client.exceptions.DockerException;
+import org.mandas.docker.client.DockerClient;
+import org.mandas.docker.client.exceptions.DockerException;
/**
*
diff --git a/containers/org.eclipse.linuxtools.docker.integration.tests/src/org/eclipse/linuxtools/docker/integration/tests/container/ContainerLogTest.java b/containers/org.eclipse.linuxtools.docker.integration.tests/src/org/eclipse/linuxtools/docker/integration/tests/container/ContainerLogTest.java
index fc86b43d3e18d4ffa1addbaa4e97e7439bf83195..aff3485841fb3eed8f42613aa3d692030e73e40b 100644
--- a/containers/org.eclipse.linuxtools.docker.integration.tests/src/org/eclipse/linuxtools/docker/integration/tests/container/ContainerLogTest.java
+++ b/containers/org.eclipse.linuxtools.docker.integration.tests/src/org/eclipse/linuxtools/docker/integration/tests/container/ContainerLogTest.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2017,2018 Red Hat, Inc.
+ * Copyright (c) 2017,2020 Red Hat, Inc.
*
* This program and the accompanying materials are made
* available under the terms of the Eclipse Public License 2.0
@@ -39,7 +39,7 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import com.spotify.docker.client.DockerClient;
+import org.mandas.docker.client.DockerClient;
public class ContainerLogTest extends AbstractImageBotTest {
diff --git a/containers/org.eclipse.linuxtools.docker.integration.tests/src/org/eclipse/linuxtools/docker/integration/tests/container/LabelsTest.java b/containers/org.eclipse.linuxtools.docker.integration.tests/src/org/eclipse/linuxtools/docker/integration/tests/container/LabelsTest.java
index 73bb69018b6040d997117410a0db8a75b0d35978..f80cb334189868867d9ceb5e4ad77f3b5c4447ee 100644
--- a/containers/org.eclipse.linuxtools.docker.integration.tests/src/org/eclipse/linuxtools/docker/integration/tests/container/LabelsTest.java
+++ b/containers/org.eclipse.linuxtools.docker.integration.tests/src/org/eclipse/linuxtools/docker/integration/tests/container/LabelsTest.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2017, 2018 Red Hat, Inc.
+ * Copyright (c) 2017, 2020 Red Hat, Inc.
*
* This program and the accompanying materials are made
* available under the terms of the Eclipse Public License 2.0
@@ -36,8 +36,8 @@ import org.junit.Before;
import org.junit.Test;
import com.google.common.collect.ImmutableMap;
-import com.spotify.docker.client.DockerClient;
-import com.spotify.docker.client.exceptions.DockerException;
+import org.mandas.docker.client.DockerClient;
+import org.mandas.docker.client.exceptions.DockerException;
public class LabelsTest extends AbstractImageBotTest {
diff --git a/containers/org.eclipse.linuxtools.docker.integration.tests/src/org/eclipse/linuxtools/docker/integration/tests/container/LinkContainersTest.java b/containers/org.eclipse.linuxtools.docker.integration.tests/src/org/eclipse/linuxtools/docker/integration/tests/container/LinkContainersTest.java
index b6781be9532321d9839a83e6bb3510ce3f574a6f..fe397599ef51f1a448a947c7eb3c5d4549c63864 100644
--- a/containers/org.eclipse.linuxtools.docker.integration.tests/src/org/eclipse/linuxtools/docker/integration/tests/container/LinkContainersTest.java
+++ b/containers/org.eclipse.linuxtools.docker.integration.tests/src/org/eclipse/linuxtools/docker/integration/tests/container/LinkContainersTest.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2017, 2018 Red Hat, Inc.
+ * Copyright (c) 2017, 2020 Red Hat, Inc.
*
* This program and the accompanying materials are made
* available under the terms of the Eclipse Public License 2.0
@@ -36,7 +36,7 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import com.spotify.docker.client.DockerClient;
+import org.mandas.docker.client.DockerClient;
public class LinkContainersTest extends AbstractImageBotTest {
diff --git a/containers/org.eclipse.linuxtools.docker.integration.tests/src/org/eclipse/linuxtools/docker/integration/tests/container/NetworkModeTest.java b/containers/org.eclipse.linuxtools.docker.integration.tests/src/org/eclipse/linuxtools/docker/integration/tests/container/NetworkModeTest.java
index ae5bad863f09f215ff0cf14956da08e0e2ffd3e0..fd40bf0053c4e63fe042f4138f666281bd502e2c 100644
--- a/containers/org.eclipse.linuxtools.docker.integration.tests/src/org/eclipse/linuxtools/docker/integration/tests/container/NetworkModeTest.java
+++ b/containers/org.eclipse.linuxtools.docker.integration.tests/src/org/eclipse/linuxtools/docker/integration/tests/container/NetworkModeTest.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2017, 2018 Red Hat, Inc.
+ * Copyright (c) 2017, 2020 Red Hat, Inc.
*
* This program and the accompanying materials are made
* available under the terms of the Eclipse Public License 2.0
@@ -35,8 +35,8 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import com.spotify.docker.client.DockerClient;
-import com.spotify.docker.client.exceptions.DockerException;
+import org.mandas.docker.client.DockerClient;
+import org.mandas.docker.client.exceptions.DockerException;
public class NetworkModeTest extends AbstractImageBotTest {
diff --git a/containers/org.eclipse.linuxtools.docker.integration.tests/src/org/eclipse/linuxtools/docker/integration/tests/container/PrivilegedModeTest.java b/containers/org.eclipse.linuxtools.docker.integration.tests/src/org/eclipse/linuxtools/docker/integration/tests/container/PrivilegedModeTest.java
index ed92dbfadd81143715b002e64f345fc1f2092ecd..738406f4b7ffcf19352834d008b0d6b3ab2482fd 100644
--- a/containers/org.eclipse.linuxtools.docker.integration.tests/src/org/eclipse/linuxtools/docker/integration/tests/container/PrivilegedModeTest.java
+++ b/containers/org.eclipse.linuxtools.docker.integration.tests/src/org/eclipse/linuxtools/docker/integration/tests/container/PrivilegedModeTest.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2017, 2018 Red Hat, Inc.
+ * Copyright (c) 2017, 2020 Red Hat, Inc.
*
* This program and the accompanying materials are made
* available under the terms of the Eclipse Public License 2.0
@@ -33,8 +33,8 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import com.spotify.docker.client.DockerClient;
-import com.spotify.docker.client.exceptions.DockerException;
+import org.mandas.docker.client.DockerClient;
+import org.mandas.docker.client.exceptions.DockerException;
public class PrivilegedModeTest extends AbstractImageBotTest {
diff --git a/containers/org.eclipse.linuxtools.docker.integration.tests/src/org/eclipse/linuxtools/docker/integration/tests/container/UnconfinedTest.java b/containers/org.eclipse.linuxtools.docker.integration.tests/src/org/eclipse/linuxtools/docker/integration/tests/container/UnconfinedTest.java
index e1dc9012fc29caefb592278f43a57f9bf9b7406d..f16da3349d8e3ab63d9ba82809fb0a762e8c9430 100644
--- a/containers/org.eclipse.linuxtools.docker.integration.tests/src/org/eclipse/linuxtools/docker/integration/tests/container/UnconfinedTest.java
+++ b/containers/org.eclipse.linuxtools.docker.integration.tests/src/org/eclipse/linuxtools/docker/integration/tests/container/UnconfinedTest.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2017, 2018 Red Hat, Inc.
+ * Copyright (c) 2017, 2020 Red Hat, Inc.
*
* This program and the accompanying materials are made
* available under the terms of the Eclipse Public License 2.0
@@ -33,8 +33,8 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import com.spotify.docker.client.DockerClient;
-import com.spotify.docker.client.exceptions.DockerException;
+import org.mandas.docker.client.DockerClient;
+import org.mandas.docker.client.exceptions.DockerException;
public class UnconfinedTest extends AbstractImageBotTest {
diff --git a/containers/org.eclipse.linuxtools.docker.integration.tests/src/org/eclipse/linuxtools/docker/integration/tests/container/VariablesTest.java b/containers/org.eclipse.linuxtools.docker.integration.tests/src/org/eclipse/linuxtools/docker/integration/tests/container/VariablesTest.java
index 4f0adba7ce813a1eb5d72959bbeb4b0b3f05db50..96c1898d39a7be43cad767af5b7d7cfb604ad5f7 100644
--- a/containers/org.eclipse.linuxtools.docker.integration.tests/src/org/eclipse/linuxtools/docker/integration/tests/container/VariablesTest.java
+++ b/containers/org.eclipse.linuxtools.docker.integration.tests/src/org/eclipse/linuxtools/docker/integration/tests/container/VariablesTest.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2017, 2018 Red Hat, Inc.
+ * Copyright (c) 2017, 2020 Red Hat, Inc.
*
* This program and the accompanying materials are made
* available under the terms of the Eclipse Public License 2.0
@@ -34,12 +34,12 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import com.spotify.docker.client.DockerClient;
-import com.spotify.docker.client.exceptions.DockerException;
-import com.spotify.docker.client.messages.Container;
-import com.spotify.docker.client.messages.ContainerInfo;
-import com.spotify.docker.client.messages.Image;
-import com.spotify.docker.client.messages.ImageInfo;
+import org.mandas.docker.client.DockerClient;
+import org.mandas.docker.client.exceptions.DockerException;
+import org.mandas.docker.client.messages.Container;
+import org.mandas.docker.client.messages.ContainerInfo;
+import org.mandas.docker.client.messages.Image;
+import org.mandas.docker.client.messages.ImageInfo;
public class VariablesTest extends AbstractImageBotTest {
diff --git a/containers/org.eclipse.linuxtools.docker.integration.tests/src/org/eclipse/linuxtools/docker/integration/tests/container/VolumeMountTest.java b/containers/org.eclipse.linuxtools.docker.integration.tests/src/org/eclipse/linuxtools/docker/integration/tests/container/VolumeMountTest.java
index ec42a8cfacb2f4da949a02682bbdd7585ece4149..1c59ae0b79851e8e124dfd1f3ce54261f172721c 100644
--- a/containers/org.eclipse.linuxtools.docker.integration.tests/src/org/eclipse/linuxtools/docker/integration/tests/container/VolumeMountTest.java
+++ b/containers/org.eclipse.linuxtools.docker.integration.tests/src/org/eclipse/linuxtools/docker/integration/tests/container/VolumeMountTest.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2017, 2018 Red Hat, Inc.
+ * Copyright (c) 2017, 2020 Red Hat, Inc.
*
* This program and the accompanying materials are made
* available under the terms of the Eclipse Public License 2.0
@@ -39,8 +39,8 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import com.spotify.docker.client.DockerClient;
-import com.spotify.docker.client.exceptions.DockerException;
+import org.mandas.docker.client.DockerClient;
+import org.mandas.docker.client.exceptions.DockerException;
public class VolumeMountTest extends AbstractImageBotTest {
diff --git a/containers/org.eclipse.linuxtools.docker.integration.tests/src/org/eclipse/linuxtools/docker/integration/tests/image/HierarchyViewTest.java b/containers/org.eclipse.linuxtools.docker.integration.tests/src/org/eclipse/linuxtools/docker/integration/tests/image/HierarchyViewTest.java
index 9fac9cd11dc14d1133f6f7468e614c0bb70a1ea6..a1eef7eda52118a04880b22cbda7d8d12b6133e9 100644
--- a/containers/org.eclipse.linuxtools.docker.integration.tests/src/org/eclipse/linuxtools/docker/integration/tests/image/HierarchyViewTest.java
+++ b/containers/org.eclipse.linuxtools.docker.integration.tests/src/org/eclipse/linuxtools/docker/integration/tests/image/HierarchyViewTest.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2017, 2018 Red Hat, Inc.
+ * Copyright (c) 2017, 2020 Red Hat, Inc.
*
* This program and the accompanying materials are made
* available under the terms of the Eclipse Public License 2.0
@@ -31,8 +31,8 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import com.spotify.docker.client.DockerClient;
-import com.spotify.docker.client.messages.Image;
+import org.mandas.docker.client.DockerClient;
+import org.mandas.docker.client.messages.Image;
public class HierarchyViewTest extends AbstractImageBotTest {
private static final int DAEMON_MAJOR_VERSION = 11;
diff --git a/containers/org.eclipse.linuxtools.docker.integration.tests/src/org/eclipse/linuxtools/docker/integration/tests/mock/MockDockerConnection.java b/containers/org.eclipse.linuxtools.docker.integration.tests/src/org/eclipse/linuxtools/docker/integration/tests/mock/MockDockerConnection.java
index c6c62967be6b2ee00ad753e7b11d74d13d53eaac..60990468bdd13c52808a9dd53f9b9dedcecfb68a 100644
--- a/containers/org.eclipse.linuxtools.docker.integration.tests/src/org/eclipse/linuxtools/docker/integration/tests/mock/MockDockerConnection.java
+++ b/containers/org.eclipse.linuxtools.docker.integration.tests/src/org/eclipse/linuxtools/docker/integration/tests/mock/MockDockerConnection.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2017, 2018 Red Hat, Inc.
+ * Copyright (c) 2017, 2020 Red Hat, Inc.
*
* This program and the accompanying materials are made
* available under the terms of the Eclipse Public License 2.0
@@ -22,8 +22,8 @@ import org.eclipse.linuxtools.internal.docker.core.UnixSocketConnectionSettings;
import org.mockito.ArgumentMatchers;
import org.mockito.Mockito;
-import com.spotify.docker.client.DockerClient;
-import com.spotify.docker.client.exceptions.DockerCertificateException;
+import org.mandas.docker.client.DockerClient;
+import org.mandas.docker.client.exceptions.DockerCertificateException;
public class MockDockerConnection {
diff --git a/containers/org.eclipse.linuxtools.docker.integration.tests/src/org/eclipse/linuxtools/docker/integration/tests/mock/MockUtils.java b/containers/org.eclipse.linuxtools.docker.integration.tests/src/org/eclipse/linuxtools/docker/integration/tests/mock/MockUtils.java
index e9238d0346cca3c9619a38005e2713bbb22ffac8..02976f629e111981258f5ec7d749443031596b87 100644
--- a/containers/org.eclipse.linuxtools.docker.integration.tests/src/org/eclipse/linuxtools/docker/integration/tests/mock/MockUtils.java
+++ b/containers/org.eclipse.linuxtools.docker.integration.tests/src/org/eclipse/linuxtools/docker/integration/tests/mock/MockUtils.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2017,2018 Red Hat, Inc.
+ * Copyright (c) 2017,2020 Red Hat, Inc.
*
* This program and the accompanying materials are made
* available under the terms of the Eclipse Public License 2.0
@@ -28,8 +28,8 @@ import org.eclipse.linuxtools.internal.docker.ui.testutils.MockImageFactory;
import org.eclipse.reddeer.eclipse.ui.browser.WebBrowserView;
import org.eclipse.reddeer.eclipse.ui.console.ConsoleView;
-import com.spotify.docker.client.DockerClient;
-import com.spotify.docker.client.messages.ContainerInfo;
+import org.mandas.docker.client.DockerClient;
+import org.mandas.docker.client.messages.ContainerInfo;
public class MockUtils {
diff --git a/containers/org.eclipse.linuxtools.docker.integration.tests/src/org/eclipse/linuxtools/docker/integration/tests/ui/SearchDialogTest.java b/containers/org.eclipse.linuxtools.docker.integration.tests/src/org/eclipse/linuxtools/docker/integration/tests/ui/SearchDialogTest.java
index 5e6b4a8bdd512f2c200e43c982f5eb8364437289..d51550fb8c8d46964ffe4deac7b23b9240fe376f 100644
--- a/containers/org.eclipse.linuxtools.docker.integration.tests/src/org/eclipse/linuxtools/docker/integration/tests/ui/SearchDialogTest.java
+++ b/containers/org.eclipse.linuxtools.docker.integration.tests/src/org/eclipse/linuxtools/docker/integration/tests/ui/SearchDialogTest.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2017,2018 Red Hat, Inc.
+ * Copyright (c) 2017,2020 Red Hat, Inc.
*
* This program and the accompanying materials are made
* available under the terms of the Eclipse Public License 2.0
@@ -19,7 +19,6 @@ import static org.junit.Assert.fail;
import java.util.List;
-import org.eclipse.linuxtools.docker.core.IDockerImage;
import org.eclipse.linuxtools.docker.integration.tests.image.AbstractImageBotTest;
import org.eclipse.linuxtools.docker.integration.tests.mock.MockDockerConnectionManager;
import org.eclipse.linuxtools.docker.reddeer.core.ui.wizards.ImageSearchPage;
@@ -40,7 +39,7 @@ import org.eclipse.reddeer.workbench.core.condition.JobIsRunning;
import org.junit.Before;
import org.junit.Test;
-import com.spotify.docker.client.DockerClient;
+import org.mandas.docker.client.DockerClient;
public class SearchDialogTest extends AbstractImageBotTest {
@@ -97,7 +96,7 @@ public class SearchDialogTest extends AbstractImageBotTest {
.build();
final DockerConnection dockerConnection = MockDockerConnectionFactory.from(DEFAULT_CONNECTION_NAME, client)
.withDefaultTCPConnectionSettings();
- final IDockerImage image = MockDockerImageFactory.name(IMAGE_NAME + ":" + IMAGE_TAG).connection(dockerConnection).build();
+ MockDockerImageFactory.name(IMAGE_NAME + ":" + IMAGE_TAG).connection(dockerConnection).build();
MockDockerConnectionManager.configureConnectionManager(dockerConnection);
}
diff --git a/containers/org.eclipse.linuxtools.docker.reddeer/.classpath b/containers/org.eclipse.linuxtools.docker.reddeer/.classpath
index f193818786f61c1c84ac29c76272f500fcc97986..d9ea9da4513add273a04571dc2fa40c1c0262661 100644
--- a/containers/org.eclipse.linuxtools.docker.reddeer/.classpath
+++ b/containers/org.eclipse.linuxtools.docker.reddeer/.classpath
@@ -1,11 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src">
<attributes>
<attribute name="test" value="true"/>
</attributes>
</classpathentry>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
+ <attributes>
+ <attribute name="module" value="true"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
diff --git a/containers/org.eclipse.linuxtools.docker.reddeer/.settings/org.eclipse.jdt.core.prefs b/containers/org.eclipse.linuxtools.docker.reddeer/.settings/org.eclipse.jdt.core.prefs
index 0c68a61dca867ceb49e79d2402935261ec3e3809..a58ebdcad300d0a088dcbd63941d2c89e78a4f98 100644
--- a/containers/org.eclipse.linuxtools.docker.reddeer/.settings/org.eclipse.jdt.core.prefs
+++ b/containers/org.eclipse.linuxtools.docker.reddeer/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,15 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=11
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11
diff --git a/containers/org.eclipse.linuxtools.docker.reddeer/META-INF/MANIFEST.MF b/containers/org.eclipse.linuxtools.docker.reddeer/META-INF/MANIFEST.MF
index 8bb954cfe53569aca78f8328f31d72e101ae0094..523c7ad1d6ded2c2c9dad9af573837911ec7a5c3 100644
--- a/containers/org.eclipse.linuxtools.docker.reddeer/META-INF/MANIFEST.MF
+++ b/containers/org.eclipse.linuxtools.docker.reddeer/META-INF/MANIFEST.MF
@@ -6,7 +6,7 @@ Bundle-Version: 2.2.0.qualifier
Bundle-Activator: org.eclipse.linuxtools.docker.reddeer.Activator
Bundle-ActivationPolicy: lazy
Bundle-Vendor: Red Hat
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
Require-Bundle: org.junit,
org.eclipse.swt,
org.eclipse.ui,
@@ -33,5 +33,6 @@ Export-Package: org.eclipse.linuxtools.docker.reddeer.condition,
org.eclipse.linuxtools.docker.reddeer.utils,
org.eclipse.linuxtools.docker.reddeer.requirements,
org.eclipse.linuxtools.docker.reddeer
-Import-Package: org.eclipse.linuxtools.internal.docker.ui.testutils
+Import-Package: org.eclipse.linuxtools.internal.docker.ui.testutils,
+ javax.annotation;version="1.3.5"
Automatic-Module-Name: org.eclipse.linuxtools.docker.reddeer
diff --git a/containers/org.eclipse.linuxtools.docker.reddeer/pom.xml b/containers/org.eclipse.linuxtools.docker.reddeer/pom.xml
index 895f7d839b6bdf27c27690d8f2e9731500be70f8..13e77f998b8824d2b788e7681be855e926bbc819 100644
--- a/containers/org.eclipse.linuxtools.docker.reddeer/pom.xml
+++ b/containers/org.eclipse.linuxtools.docker.reddeer/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.eclipse.linuxtools</groupId>
<artifactId>org.eclipse.linuxtools.docker</artifactId>
- <version>4.4.0</version>
+ <version>5.1.0</version>
</parent>
<artifactId>org.eclipse.linuxtools.docker.reddeer</artifactId>
<version>2.2.0-SNAPSHOT</version>
diff --git a/containers/org.eclipse.linuxtools.docker.reddeer/src/org/eclipse/linuxtools/docker/reddeer/ui/resources/DockerConnection.java b/containers/org.eclipse.linuxtools.docker.reddeer/src/org/eclipse/linuxtools/docker/reddeer/ui/resources/DockerConnection.java
index de11a118e2ba9bf5158d39635f6b288c4d1c5655..409149d942d5a9976916a0a9ada373d5a69237af 100644
--- a/containers/org.eclipse.linuxtools.docker.reddeer/src/org/eclipse/linuxtools/docker/reddeer/ui/resources/DockerConnection.java
+++ b/containers/org.eclipse.linuxtools.docker.reddeer/src/org/eclipse/linuxtools/docker/reddeer/ui/resources/DockerConnection.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2017,2018 Red Hat, Inc.
+ * Copyright (c) 2017,2020 Red Hat, Inc.
*
* This program and the accompanying materials are made
* available under the terms of the Eclipse Public License 2.0
@@ -32,7 +32,6 @@ import org.eclipse.reddeer.swt.impl.combo.DefaultCombo;
import org.eclipse.reddeer.swt.impl.menu.ContextMenu;
import org.eclipse.reddeer.swt.impl.shell.DefaultShell;
import org.eclipse.reddeer.swt.impl.text.LabeledText;
-import org.eclipse.reddeer.swt.impl.toolbar.DefaultToolItem;
import org.eclipse.reddeer.workbench.core.condition.JobIsRunning;
public class DockerConnection extends AbstractDockerExplorerItem {
@@ -46,7 +45,8 @@ public class DockerConnection extends AbstractDockerExplorerItem {
public void enableConnection() {
select();
- new DefaultToolItem("Enable Connection").click();
+// new DefaultToolItem("Enable Connection").click();
+ new ContextMenu().getItem("Refresh").select();
new WaitWhile(new JobIsRunning());
}
@@ -203,7 +203,9 @@ public class DockerConnection extends AbstractDockerExplorerItem {
public void removeConnection() {
select();
- new DefaultToolItem("Remove Connection").click();
+ // Use context menu instead of Tab toolbar button as this is not working with 4.17 I-build
+// new DefaultToolItem("Remove Connection").click();
+ new ContextMenu().getItem("Remove").select();
new WaitWhile(new JobIsRunning());
}
diff --git a/containers/org.eclipse.linuxtools.docker.reddeer/src/org/eclipse/linuxtools/docker/reddeer/utils/BrowserContentsCheck.java b/containers/org.eclipse.linuxtools.docker.reddeer/src/org/eclipse/linuxtools/docker/reddeer/utils/BrowserContentsCheck.java
index fc12cc65fc76e40360b1a47220f239a9bcb10e6b..baea5b4c386ff1924f9b438d56cf45139680beaf 100644
--- a/containers/org.eclipse.linuxtools.docker.reddeer/src/org/eclipse/linuxtools/docker/reddeer/utils/BrowserContentsCheck.java
+++ b/containers/org.eclipse.linuxtools.docker.reddeer/src/org/eclipse/linuxtools/docker/reddeer/utils/BrowserContentsCheck.java
@@ -120,10 +120,12 @@ public class BrowserContentsCheck {
this.browser = browser;
}
+ @Override
public boolean test() {
return !browser.getText().equals("");
}
+ @Override
public String description() {
return "Browser is empty!";
}
diff --git a/containers/org.eclipse.linuxtools.docker.tests-feature/feature.xml b/containers/org.eclipse.linuxtools.docker.tests-feature/feature.xml
index c191abc5bab8183481f41712dc48807fdcfe085d..9a7fda1290b08c3b9c18958c0f6f359527c537c5 100644
--- a/containers/org.eclipse.linuxtools.docker.tests-feature/feature.xml
+++ b/containers/org.eclipse.linuxtools.docker.tests-feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.linuxtools.docker.tests.feature"
label="%featureName"
- version="4.4.0.qualifier"
+ version="5.1.0.qualifier"
provider-name="%featureProvider"
license-feature="org.eclipse.license"
license-feature-version="0.0.0">
diff --git a/containers/org.eclipse.linuxtools.docker.tests-feature/pom.xml b/containers/org.eclipse.linuxtools.docker.tests-feature/pom.xml
index ca6c19c3fba22799132aaf53b1510f907f5a4777..bb1f9df1064685b995a19e04d44204bef43bf944 100644
--- a/containers/org.eclipse.linuxtools.docker.tests-feature/pom.xml
+++ b/containers/org.eclipse.linuxtools.docker.tests-feature/pom.xml
@@ -14,11 +14,11 @@
<parent>
<groupId>org.eclipse.linuxtools</groupId>
<artifactId>org.eclipse.linuxtools.docker</artifactId>
- <version>4.4.0</version>
+ <version>5.1.0</version>
</parent>
<artifactId>org.eclipse.linuxtools.docker.tests.feature</artifactId>
- <version>4.4.0-SNAPSHOT</version>
+ <version>5.1.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
<name>Linux Tools Docker Tooling Test Feature</name>
diff --git a/containers/org.eclipse.linuxtools.docker.tests.hamcrest-wrap/.classpath b/containers/org.eclipse.linuxtools.docker.tests.hamcrest-wrap/.classpath
index cc5ee2dc8c5926970810a833470896bd5c67a924..336abe9f465d00ba63337eaa7861d1620554f900 100644
--- a/containers/org.eclipse.linuxtools.docker.tests.hamcrest-wrap/.classpath
+++ b/containers/org.eclipse.linuxtools.docker.tests.hamcrest-wrap/.classpath
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src/">
<attributes>
diff --git a/containers/org.eclipse.linuxtools.docker.tests.hamcrest-wrap/.settings/org.eclipse.jdt.core.prefs b/containers/org.eclipse.linuxtools.docker.tests.hamcrest-wrap/.settings/org.eclipse.jdt.core.prefs
index 0c68a61dca867ceb49e79d2402935261ec3e3809..7adc0fb9a0d32bd6b4e3ce6f305ab7165208865c 100644
--- a/containers/org.eclipse.linuxtools.docker.tests.hamcrest-wrap/.settings/org.eclipse.jdt.core.prefs
+++ b/containers/org.eclipse.linuxtools.docker.tests.hamcrest-wrap/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,10 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
+org.eclipse.jdt.core.compiler.compliance=11
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11
diff --git a/containers/org.eclipse.linuxtools.docker.tests.hamcrest-wrap/META-INF/MANIFEST.MF b/containers/org.eclipse.linuxtools.docker.tests.hamcrest-wrap/META-INF/MANIFEST.MF
index 1e608001731a223d361b8b2ec4f606102928ac5c..1703dfbfa6d6d2b0e6e2671d0b41dec339d2b12f 100644
--- a/containers/org.eclipse.linuxtools.docker.tests.hamcrest-wrap/META-INF/MANIFEST.MF
+++ b/containers/org.eclipse.linuxtools.docker.tests.hamcrest-wrap/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: Wrapper for hamcrest
Bundle-SymbolicName: org.eclipse.linuxtools.docker.tests.hamcrest-wrap
Bundle-Version: 1.2.0.qualifier
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
Require-Bundle: org.hamcrest.core;bundle-version="1.3.0",
org.hamcrest.library;bundle-version="1.3.0"
Export-Package: org.hamcrest;version="1.3.0"
diff --git a/containers/org.eclipse.linuxtools.docker.tests.hamcrest-wrap/pom.xml b/containers/org.eclipse.linuxtools.docker.tests.hamcrest-wrap/pom.xml
index 0cd53dfd461eef11bcddd9cc3598357223105a1f..b50f4de8d6b895366b5052a6b1ead175dad01fda 100644
--- a/containers/org.eclipse.linuxtools.docker.tests.hamcrest-wrap/pom.xml
+++ b/containers/org.eclipse.linuxtools.docker.tests.hamcrest-wrap/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.linuxtools</groupId>
<artifactId>org.eclipse.linuxtools.docker</artifactId>
- <version>4.4.0</version>
+ <version>5.1.0</version>
</parent>
<artifactId>org.eclipse.linuxtools.docker.tests.hamcrest-wrap</artifactId>
<version>1.2.0-SNAPSHOT</version>
diff --git a/containers/org.eclipse.linuxtools.docker.ui.tests/.classpath b/containers/org.eclipse.linuxtools.docker.ui.tests/.classpath
index cc5ee2dc8c5926970810a833470896bd5c67a924..336abe9f465d00ba63337eaa7861d1620554f900 100644
--- a/containers/org.eclipse.linuxtools.docker.ui.tests/.classpath
+++ b/containers/org.eclipse.linuxtools.docker.ui.tests/.classpath
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src/">
<attributes>
diff --git a/containers/org.eclipse.linuxtools.docker.ui.tests/.settings/org.eclipse.jdt.core.prefs b/containers/org.eclipse.linuxtools.docker.ui.tests/.settings/org.eclipse.jdt.core.prefs
index 56af8e10400e86098517ef505dec9e0754ecbb33..75e08ee961f7ac69d57d75ab1afc0750144ea935 100644
--- a/containers/org.eclipse.linuxtools.docker.ui.tests/.settings/org.eclipse.jdt.core.prefs
+++ b/containers/org.eclipse.linuxtools.docker.ui.tests/.settings/org.eclipse.jdt.core.prefs
@@ -10,9 +10,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.compliance=11
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -26,6 +26,7 @@ org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=warning
org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
@@ -71,6 +72,7 @@ org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=warn
org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
@@ -103,4 +105,5 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11
diff --git a/containers/org.eclipse.linuxtools.docker.ui.tests/.settings/org.eclipse.jdt.ui.prefs b/containers/org.eclipse.linuxtools.docker.ui.tests/.settings/org.eclipse.jdt.ui.prefs
index 8287721b8731abd8e0462116acb2238d3d08756a..c1375a58841ed9caec0de3254515a877f253f6c2 100644
--- a/containers/org.eclipse.linuxtools.docker.ui.tests/.settings/org.eclipse.jdt.ui.prefs
+++ b/containers/org.eclipse.linuxtools.docker.ui.tests/.settings/org.eclipse.jdt.ui.prefs
@@ -13,31 +13,40 @@ sp_cleanup.always_use_blocks=true
sp_cleanup.always_use_parentheses_in_expressions=false
sp_cleanup.always_use_this_for_non_static_field_access=false
sp_cleanup.always_use_this_for_non_static_method_access=false
-sp_cleanup.convert_functional_interfaces=false
+sp_cleanup.convert_functional_interfaces=true
sp_cleanup.convert_to_enhanced_for_loop=false
+sp_cleanup.convert_to_enhanced_for_loop_if_loop_var_used=false
sp_cleanup.correct_indentation=false
sp_cleanup.format_source_code=true
sp_cleanup.format_source_code_changes_only=true
sp_cleanup.insert_inferred_type_arguments=false
+sp_cleanup.lazy_logical_operator=false
sp_cleanup.make_local_variable_final=true
sp_cleanup.make_parameters_final=false
sp_cleanup.make_private_fields_final=true
sp_cleanup.make_type_abstract_if_missing_method=false
sp_cleanup.make_variable_declarations_final=false
+sp_cleanup.merge_conditional_blocks=false
sp_cleanup.never_use_blocks=false
sp_cleanup.never_use_parentheses_in_expressions=true
+sp_cleanup.number_suffix=false
+sp_cleanup.objects_equals=false
sp_cleanup.on_save_use_additional_actions=true
sp_cleanup.organize_imports=true
+sp_cleanup.push_down_negation=false
sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
sp_cleanup.qualify_static_member_accesses_with_declaring_class=false
sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
sp_cleanup.remove_private_constructors=true
+sp_cleanup.remove_redundant_modifiers=true
+sp_cleanup.remove_redundant_semicolons=true
sp_cleanup.remove_redundant_type_arguments=true
sp_cleanup.remove_trailing_whitespaces=true
sp_cleanup.remove_trailing_whitespaces_all=true
sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
+sp_cleanup.remove_unnecessary_array_creation=true
sp_cleanup.remove_unnecessary_casts=true
sp_cleanup.remove_unnecessary_nls_tags=false
sp_cleanup.remove_unused_imports=false
@@ -46,11 +55,14 @@ sp_cleanup.remove_unused_private_fields=true
sp_cleanup.remove_unused_private_members=false
sp_cleanup.remove_unused_private_methods=true
sp_cleanup.remove_unused_private_types=true
+sp_cleanup.simplify_lambda_expression_and_method_ref=true
sp_cleanup.sort_members=false
sp_cleanup.sort_members_all=false
sp_cleanup.use_anonymous_class_creation=false
+sp_cleanup.use_autoboxing=false
sp_cleanup.use_blocks=false
sp_cleanup.use_blocks_only_for_return_and_throw=false
+sp_cleanup.use_directly_map_method=true
sp_cleanup.use_lambda=true
sp_cleanup.use_parentheses_in_expressions=false
sp_cleanup.use_this_for_non_static_field_access=false
@@ -58,3 +70,5 @@ sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
sp_cleanup.use_this_for_non_static_method_access=false
sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
sp_cleanup.use_type_arguments=false
+sp_cleanup.use_unboxing=false
+sp_cleanup.use_var=false
diff --git a/containers/org.eclipse.linuxtools.docker.ui.tests/META-INF/MANIFEST.MF b/containers/org.eclipse.linuxtools.docker.ui.tests/META-INF/MANIFEST.MF
index 38716fdabcd826d3dcb25668cb63e23971e147b1..797d739b2ff463236f74e793b44062e95258ae21 100644
--- a/containers/org.eclipse.linuxtools.docker.ui.tests/META-INF/MANIFEST.MF
+++ b/containers/org.eclipse.linuxtools.docker.ui.tests/META-INF/MANIFEST.MF
@@ -9,7 +9,7 @@ Require-Bundle: org.eclipse.linuxtools.docker.ui;bundle-version="1.0.0",
org.hamcrest.library;bundle-version="1.3.0",
org.hamcrest.core;bundle-version="1.3.0",
org.eclipse.core.databinding;bundle-version="1.5.0",
- com.spotify.docker.client;bundle-version="[8.9.2,9.0.0)",
+ org.mandas.docker-client;bundle-version="3.2.1",
org.eclipse.swtbot.junit4_x;bundle-version="2.3.0",
org.eclipse.swtbot.swt.finder;bundle-version="2.3.0",
org.eclipse.swtbot.eclipse.finder;bundle-version="2.3.0",
@@ -23,17 +23,20 @@ Require-Bundle: org.eclipse.linuxtools.docker.ui;bundle-version="1.0.0",
org.eclipse.linuxtools.docker.tests.hamcrest-wrap;bundle-version="1.2.0",
com.google.guava;bundle-version="15.0.0",
org.glassfish.hk2.api;bundle-version="2.3.0",
+ org.glassfish.jersey.core.jersey-common;bundle-version="2.3.0",
+ org.glassfish.jersey.containers.servlet.core;bundle-version="2.3.0",
+ org.glassfish.jersey.inject.jersey-hk2;bundle-version="2.3.0",
com.fasterxml.jackson.core.jackson-core;bundle-version="2.5.0",
com.fasterxml.jackson.core.jackson-databind;bundle-version="2.5.0",
org.slf4j.api;bundle-version="1.7.2",
- org.glassfish.jersey.bundles.repackaged.jersey-guava;bundle-version="2.14.0",
org.eclipse.ui.ide,
org.eclipse.debug.ui,
org.eclipse.ui.console;bundle-version="3.6.100",
org.eclipse.launchbar.ui;bundle-version="2.0.1",
- org.eclipse.launchbar.ui.controls;bundle-version="1.0.0",
- javax.xml.bind;bundle-version="2.2.0"
+ org.eclipse.launchbar.ui.controls;bundle-version="1.0.0"
+Import-Package: javax.xml.bind;version="2.3.3",
+ javax.annotation;version="1.3.5"
Bundle-ClassPath: .
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
Export-Package: org.eclipse.linuxtools.internal.docker.ui.testutils;x-friends:="org.eclipse.linuxtools.docker.reddeer,org.eclipse.linuxtools.docker.reddeer.ui,org.eclipse.linuxtools.docker.integration.tests"
Automatic-Module-Name: org.eclipse.linuxtools.docker.ui.tests
diff --git a/containers/org.eclipse.linuxtools.docker.ui.tests/pom.xml b/containers/org.eclipse.linuxtools.docker.ui.tests/pom.xml
index 3bd6c70f023d791f7f5eadebf00f7ea4613118f8..a0e4a7b4dae2a36dbb00f8bc75206534a0a38e2f 100644
--- a/containers/org.eclipse.linuxtools.docker.ui.tests/pom.xml
+++ b/containers/org.eclipse.linuxtools.docker.ui.tests/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.linuxtools</groupId>
<artifactId>org.eclipse.linuxtools.docker</artifactId>
- <version>4.4.0</version>
+ <version>5.1.0</version>
</parent>
<artifactId>org.eclipse.linuxtools.docker.ui.tests</artifactId>
<version>2.2.0-SNAPSHOT</version>
diff --git a/containers/org.eclipse.linuxtools.docker.ui.tests/src/org/eclipse/linuxtools/docker/core/DockerConnectionManagerTest.java b/containers/org.eclipse.linuxtools.docker.ui.tests/src/org/eclipse/linuxtools/docker/core/DockerConnectionManagerTest.java
index 4387e2d923fa3134a020ea6c1b5eba8163cbd849..9c313a76f8b5ca272c0406a01fbe96fe718be8c7 100644
--- a/containers/org.eclipse.linuxtools.docker.ui.tests/src/org/eclipse/linuxtools/docker/core/DockerConnectionManagerTest.java
+++ b/containers/org.eclipse.linuxtools.docker.ui.tests/src/org/eclipse/linuxtools/docker/core/DockerConnectionManagerTest.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2015, 2018 Red Hat.
+ * Copyright (c) 2015, 2020 Red Hat.
*
* This program and the accompanying materials are made
* available under the terms of the Eclipse Public License 2.0
@@ -38,7 +38,7 @@ import org.junit.AfterClass;
import org.junit.Before;
import org.junit.Test;
-import com.spotify.docker.client.DockerClient;
+import org.mandas.docker.client.DockerClient;
public class DockerConnectionManagerTest {
diff --git a/containers/org.eclipse.linuxtools.docker.ui.tests/src/org/eclipse/linuxtools/docker/core/DockerExceptionTest.java b/containers/org.eclipse.linuxtools.docker.ui.tests/src/org/eclipse/linuxtools/docker/core/DockerExceptionTest.java
index 4593bcbea482bd12029a9609bb6259b603ad6934..9672d4fb4f70a7cf0cc4fb51ebc2e1fa78ef5775 100644
--- a/containers/org.eclipse.linuxtools.docker.ui.tests/src/org/eclipse/linuxtools/docker/core/DockerExceptionTest.java
+++ b/containers/org.eclipse.linuxtools.docker.ui.tests/src/org/eclipse/linuxtools/docker/core/DockerExceptionTest.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2016,2018 Red Hat.
+ * Copyright (c) 2016, 2020 Red Hat and others.
*
* This program and the accompanying materials are made
* available under the terms of the Eclipse Public License 2.0
@@ -15,11 +15,15 @@ package org.eclipse.linuxtools.docker.core;
import static org.assertj.core.api.Assertions.assertThat;
+import java.net.URI;
+import java.net.URISyntaxException;
+
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameter;
import org.junit.runners.Parameterized.Parameters;
+import org.mandas.docker.client.exceptions.DockerRequestException;
/**
* Testing the {@link DockerException} class
@@ -28,14 +32,68 @@ import org.junit.runners.Parameterized.Parameters;
public class DockerExceptionTest {
@Parameters
- public static Object[][] getData() {
+ public static Object[][] getData() throws URISyntaxException {
final Object[][] data = new Object[][] {
+ // 0: Normal exceptions
new Object[] { new DockerException("this is an error"), "this is an error" },
+ // 1:
new Object[] { new DockerException("error with message: 232"), "error with message: 232" },
+ // 2: Use passed message or message from original exception - Behave like
+ // Throwable
+ new Object[] { new DockerException(null, new RuntimeException("This is a test")),
+ "java.lang.RuntimeException: This is a test" },
+ // 3:
+ new Object[] { new DockerException("First", new RuntimeException("This is a test")), "First" },
+ // 4: Do not parse passed message
new Object[] {
new DockerException(
"{\"message\":\"invalid reference format: repository name must be lowercase\"}"),
- "invalid reference format: repository name must be lowercase" }, };
+ "{\"message\":\"invalid reference format: repository name must be lowercase\"}" },
+ // 5: Decode DockerRequestException
+ new Object[] { new DockerException(null, new DockerRequestException("m", new URI("http://none"), 404,
+ "{\"message\":\"invalid reference format: repository name must be lowercase\"}", null)),
+ "invalid reference format: repository name must be lowercase"
+ },
+ // 6: DockerRequestException and prefix message
+ new Object[] { new DockerException("Additional info", new DockerRequestException("m", new URI("http://none"), 404,
+ "{\"message\":\"invalid reference format: repository name must be lowercase\"}", null)),
+ "Additional info; invalid reference format: repository name must be lowercase"
+ },
+ // 7: DockerRequestException Without Json-message - use toString
+ new Object[] {
+ new DockerException(
+ new DockerRequestException("Hello", new URI("http://none"), 404, "Response", null)),
+ "org.mandas.docker.client.exceptions.DockerRequestException: Request error: Hello http://none: 404, body: Response" },
+ // 8:
+ new Object[] {
+ new DockerException("Additional info",
+ new DockerRequestException("Hello", new URI("http://none"), 404, "Response", null)),
+ "Additional info" },
+ // 9: Search DockerRequestException
+ new Object[] { new DockerException(null,
+ new RuntimeException(new DockerRequestException("m", new URI("http://none"), 404,
+ "{\"message\":\"invalid reference format: repository name must be lowercase\"}",
+ null))),
+ "invalid reference format: repository name must be lowercase" },
+ // 10: Wrapped in exception with message
+ new Object[] { new DockerException(null, new RuntimeException("Hello", new DockerRequestException("m",
+ new URI("http://none"), 404,
+ "{\"message\":\"invalid reference format: repository name must be lowercase\"}",
+ null))),
+ "invalid reference format: repository name must be lowercase" },
+ // 11: Wrapped twice
+ new Object[] {
+ new DockerException(null,
+ new RuntimeException(new RuntimeException(new DockerRequestException("m",
+ new URI("http://none"), 404,
+ "{\"message\":\"invalid reference format: repository name must be lowercase\"}",
+ null)))),
+ "invalid reference format: repository name must be lowercase" },
+ // 12: Wrapped without message
+ new Object[] { new DockerException(null, new RuntimeException("Hello",
+ new DockerRequestException("m", new URI("http://none"), 404, "Do not show this", null))),
+ "java.lang.RuntimeException: Hello" },
+ };
return data;
}
diff --git a/containers/org.eclipse.linuxtools.docker.ui.tests/src/org/eclipse/linuxtools/internal/docker/core/DockerClientFactoryTest.java b/containers/org.eclipse.linuxtools.docker.ui.tests/src/org/eclipse/linuxtools/internal/docker/core/DockerClientFactoryTest.java
index 82fa69103029fe329b485454f676a71ee5eca5c3..72c325c95e994b1e6591ef2d4a3ea75b06be41a8 100644
--- a/containers/org.eclipse.linuxtools.docker.ui.tests/src/org/eclipse/linuxtools/internal/docker/core/DockerClientFactoryTest.java
+++ b/containers/org.eclipse.linuxtools.docker.ui.tests/src/org/eclipse/linuxtools/internal/docker/core/DockerClientFactoryTest.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2016, 2018 Red Hat.
+ * Copyright (c) 2016, 2020 Red Hat.
*
* This program and the accompanying materials are made
* available under the terms of the Eclipse Public License 2.0
@@ -17,8 +17,8 @@ import static org.assertj.core.api.Assertions.assertThat;
import org.junit.Test;
-import com.spotify.docker.client.DockerClient;
-import com.spotify.docker.client.exceptions.DockerCertificateException;
+import org.mandas.docker.client.DockerClient;
+import org.mandas.docker.client.exceptions.DockerCertificateException;
/**
* Testing the {@link DockerClientFactory}
diff --git a/containers/org.eclipse.linuxtools.docker.ui.tests/src/org/eclipse/linuxtools/internal/docker/core/DockerConnectionTest.java b/containers/org.eclipse.linuxtools.docker.ui.tests/src/org/eclipse/linuxtools/internal/docker/core/DockerConnectionTest.java
index 8f3ad3f30af125a86c1d6d8e38a500472d70f19e..8462de293e356739e8ebedaea067d215b726193a 100644
--- a/containers/org.eclipse.linuxtools.docker.ui.tests/src/org/eclipse/linuxtools/internal/docker/core/DockerConnectionTest.java
+++ b/containers/org.eclipse.linuxtools.docker.ui.tests/src/org/eclipse/linuxtools/internal/docker/core/DockerConnectionTest.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2016, 2018 Red Hat.
+ * Copyright (c) 2016, 2020 Red Hat.
*
* This program and the accompanying materials are made
* available under the terms of the Eclipse Public License 2.0
@@ -29,10 +29,10 @@ import org.eclipse.linuxtools.internal.docker.ui.testutils.MockDockerConnectionF
import org.eclipse.linuxtools.internal.docker.ui.testutils.MockImageFactory;
import org.junit.Test;
-import com.spotify.docker.client.DockerClient;
-import com.spotify.docker.client.exceptions.DockerCertificateException;
-import com.spotify.docker.client.messages.Container;
-import com.spotify.docker.client.messages.Image;
+import org.mandas.docker.client.DockerClient;
+import org.mandas.docker.client.exceptions.DockerCertificateException;
+import org.mandas.docker.client.messages.Container;
+import org.mandas.docker.client.messages.Image;
/**
* Testing the {@link DockerConnection} class.
diff --git a/containers/org.eclipse.linuxtools.docker.ui.tests/src/org/eclipse/linuxtools/internal/docker/core/DockerImageQualifierTestCase.java b/containers/org.eclipse.linuxtools.docker.ui.tests/src/org/eclipse/linuxtools/internal/docker/core/DockerImageQualifierTestCase.java
index 2d84f67f9b53af644503da02d246c99cf2b09560..a2f8b6bafe609d3d38e7f80aae2d2df1e90b0ff1 100644
--- a/containers/org.eclipse.linuxtools.docker.ui.tests/src/org/eclipse/linuxtools/internal/docker/core/DockerImageQualifierTestCase.java
+++ b/containers/org.eclipse.linuxtools.docker.ui.tests/src/org/eclipse/linuxtools/internal/docker/core/DockerImageQualifierTestCase.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2016, 2018 Red Hat.
+ * Copyright (c) 2016, 2020 Red Hat.
*
* This program and the accompanying materials are made
* available under the terms of the Eclipse Public License 2.0
@@ -33,8 +33,8 @@ import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameter;
import org.junit.runners.Parameterized.Parameters;
-import com.spotify.docker.client.DockerClient;
-import com.spotify.docker.client.messages.Image;
+import org.mandas.docker.client.DockerClient;
+import org.mandas.docker.client.messages.Image;
/**
* Verifying that images are properly qualified as {@code Top-Level},
diff --git a/containers/org.eclipse.linuxtools.docker.ui.tests/src/org/eclipse/linuxtools/internal/docker/ui/commands/CommandUtilsSWTBotTest.java b/containers/org.eclipse.linuxtools.docker.ui.tests/src/org/eclipse/linuxtools/internal/docker/ui/commands/CommandUtilsSWTBotTest.java
index db767ca7a19ef61f50376370c7cb4bc3dd6a2480..889687c5586291070bbb05137141dea51da53390 100644
--- a/containers/org.eclipse.linuxtools.docker.ui.tests/src/org/eclipse/linuxtools/internal/docker/ui/commands/CommandUtilsSWTBotTest.java
+++ b/containers/org.eclipse.linuxtools.docker.ui.tests/src/org/eclipse/linuxtools/internal/docker/ui/commands/CommandUtilsSWTBotTest.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2015, 2018 Red Hat.
+ * Copyright (c) 2015, 2020 Red Hat.
*
* This program and the accompanying materials are made
* available under the terms of the Eclipse Public License 2.0
@@ -35,7 +35,7 @@ import org.junit.ClassRule;
import org.junit.Rule;
import org.junit.Test;
-import com.spotify.docker.client.DockerClient;
+import org.mandas.docker.client.DockerClient;
/**
*
diff --git a/containers/org.eclipse.linuxtools.docker.ui.tests/src/org/eclipse/linuxtools/internal/docker/ui/launch/BuildDockerImageShortcutSWTBotTest.java b/containers/org.eclipse.linuxtools.docker.ui.tests/src/org/eclipse/linuxtools/internal/docker/ui/launch/BuildDockerImageShortcutSWTBotTest.java
index 147fbe2889e1693ba4bc553708b5b2ae1b92ec0f..12389e447a678f04da00b9eedf1888446441ad0f 100644
--- a/containers/org.eclipse.linuxtools.docker.ui.tests/src/org/eclipse/linuxtools/internal/docker/ui/launch/BuildDockerImageShortcutSWTBotTest.java
+++ b/containers/org.eclipse.linuxtools.docker.ui.tests/src/org/eclipse/linuxtools/internal/docker/ui/launch/BuildDockerImageShortcutSWTBotTest.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2016, 2018 Red Hat.
+ * Copyright (c) 2016, 2020 Red Hat.
*
* This program and the accompanying materials are made
* available under the terms of the Eclipse Public License 2.0
@@ -46,8 +46,8 @@ import org.junit.Test;
import org.mockito.ArgumentMatchers;
import org.mockito.Mockito;
-import com.spotify.docker.client.DockerClient;
-import com.spotify.docker.client.ProgressHandler;
+import org.mandas.docker.client.DockerClient;
+import org.mandas.docker.client.ProgressHandler;
/**
* Testing the {@link BuildDockerImageShortcut}
@@ -110,7 +110,7 @@ public class BuildDockerImageShortcutSWTBotTest {
@Test
@RunWithProject("foo")
public void shouldPromptDialogThenBuildDockerImageOnFirstCall()
- throws InterruptedException, com.spotify.docker.client.exceptions.DockerException, IOException {
+ throws InterruptedException, org.mandas.docker.client.exceptions.DockerException, IOException {
// given
final DockerClient client = MockDockerClientFactory.build();
final DockerConnection dockerConnection = MockDockerConnectionFactory.from("Test", client).withDefaultTCPConnectionSettings();
@@ -134,7 +134,7 @@ public class BuildDockerImageShortcutSWTBotTest {
@Test
@RunWithProject("foo")
public void shouldBuildDockerImageImmediatelyOnSecondCall()
- throws InterruptedException, com.spotify.docker.client.exceptions.DockerException, IOException {
+ throws InterruptedException, org.mandas.docker.client.exceptions.DockerException, IOException {
// given
final DockerClient client = MockDockerClientFactory.build();
final DockerConnection dockerConnection = MockDockerConnectionFactory.from("Test", client).withDefaultTCPConnectionSettings();
@@ -164,7 +164,7 @@ public class BuildDockerImageShortcutSWTBotTest {
@Test
@RunWithProject("foo")
public void shouldNotBuildDockerImageOnSecondCallWhenAllConnectionWereRemoved()
- throws InterruptedException, com.spotify.docker.client.exceptions.DockerException, IOException {
+ throws InterruptedException, org.mandas.docker.client.exceptions.DockerException, IOException {
// given
final DockerClient client = MockDockerClientFactory.build();
final DockerConnection dockerConnection = MockDockerConnectionFactory.from("Test", client).withDefaultTCPConnectionSettings();
@@ -202,7 +202,7 @@ public class BuildDockerImageShortcutSWTBotTest {
@RunWithProject("foo")
public void shouldPromptForAnotherConnectionWhenBuildingDockerImageOnSecondCallAfterConnectionWasReplaced()
- throws InterruptedException, com.spotify.docker.client.exceptions.DockerException, IOException {
+ throws InterruptedException, org.mandas.docker.client.exceptions.DockerException, IOException {
// given
final DockerClient client = MockDockerClientFactory.build();
final DockerConnection dockerConnection = MockDockerConnectionFactory.from("Test", client).withDefaultTCPConnectionSettings();
@@ -243,7 +243,7 @@ public class BuildDockerImageShortcutSWTBotTest {
@Test
@RunWithProject("foo")
public void shouldNotBuildDockerImageOnSecondCallWhenDockerfileWasRemoved()
- throws InterruptedException, com.spotify.docker.client.exceptions.DockerException, IOException, CoreException {
+ throws InterruptedException, org.mandas.docker.client.exceptions.DockerException, IOException, CoreException {
// given
final DockerClient client = MockDockerClientFactory.build();
final DockerConnection dockerConnection = MockDockerConnectionFactory.from("Test", client)
diff --git a/containers/org.eclipse.linuxtools.docker.ui.tests/src/org/eclipse/linuxtools/internal/docker/ui/launch/DockerComposeSWTBotTest.java b/containers/org.eclipse.linuxtools.docker.ui.tests/src/org/eclipse/linuxtools/internal/docker/ui/launch/DockerComposeSWTBotTest.java
index f3b49c1f65f407c39ccc1641ef77c3f0c0de3d47..862ca922b0928dac03b71072bee701d8a2bace1b 100644
--- a/containers/org.eclipse.linuxtools.docker.ui.tests/src/org/eclipse/linuxtools/internal/docker/ui/launch/DockerComposeSWTBotTest.java
+++ b/containers/org.eclipse.linuxtools.docker.ui.tests/src/org/eclipse/linuxtools/internal/docker/ui/launch/DockerComposeSWTBotTest.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2016, 2018 Red Hat.
+ * Copyright (c) 2016, 2020 Red Hat.
*
* This program and the accompanying materials are made
* available under the terms of the Eclipse Public License 2.0
@@ -57,12 +57,9 @@ import org.junit.ClassRule;
import org.junit.Ignore;
import org.junit.Rule;
import org.junit.Test;
+import org.mandas.docker.client.DockerClient;
import org.mockito.ArgumentMatchers;
import org.mockito.Mockito;
-import org.mockito.invocation.InvocationOnMock;
-import org.mockito.stubbing.Answer;
-
-import com.spotify.docker.client.DockerClient;
/**
* Testing the {@link DockerCompose} utility class using SWTBot.
@@ -124,13 +121,9 @@ public class DockerComposeSWTBotTest {
.workingDir(ArgumentMatchers.anyString()).start())
.thenReturn(mockDockerComposeUpProcess);
latch = new CountDownLatch(1);
- Mockito.when(mockDockerComposeUpProcess.waitFor()).then(new Answer<Object>() {
-
- @Override
- public Object answer(InvocationOnMock invocation) throws Throwable {
- latch.await(5, TimeUnit.SECONDS);
- return 0;
- }
+ Mockito.when(mockDockerComposeUpProcess.waitFor()).then(invocation -> {
+ latch.await(5, TimeUnit.SECONDS);
+ return 0;
});
}
diff --git a/containers/org.eclipse.linuxtools.docker.ui.tests/src/org/eclipse/linuxtools/internal/docker/ui/testutils/MockContainerConfigFactory.java b/containers/org.eclipse.linuxtools.docker.ui.tests/src/org/eclipse/linuxtools/internal/docker/ui/testutils/MockContainerConfigFactory.java
index ae925f0b0ecae70afc219bf2e543792639d165c6..3f3ffd0f35f50280a6a557e8d7598ba01ec8784c 100644
--- a/containers/org.eclipse.linuxtools.docker.ui.tests/src/org/eclipse/linuxtools/internal/docker/ui/testutils/MockContainerConfigFactory.java
+++ b/containers/org.eclipse.linuxtools.docker.ui.tests/src/org/eclipse/linuxtools/internal/docker/ui/testutils/MockContainerConfigFactory.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2017, 2018 Red Hat.
+ * Copyright (c) 2017, 2020 Red Hat.
*
* This program and the accompanying materials are made
* available under the terms of the Eclipse Public License 2.0
@@ -15,7 +15,7 @@ package org.eclipse.linuxtools.internal.docker.ui.testutils;
import org.mockito.Mockito;
import com.google.common.collect.ImmutableMap;
-import com.spotify.docker.client.messages.ContainerConfig;
+import org.mandas.docker.client.messages.ContainerConfig;
public class MockContainerConfigFactory {
diff --git a/containers/org.eclipse.linuxtools.docker.ui.tests/src/org/eclipse/linuxtools/internal/docker/ui/testutils/MockContainerFactory.java b/containers/org.eclipse.linuxtools.docker.ui.tests/src/org/eclipse/linuxtools/internal/docker/ui/testutils/MockContainerFactory.java
index 2c2645b2756b2506a48fcbb14d6fceeb7a7b0524..e24772c912e232433d3cfbbbcc2f259b7cca9071 100644
--- a/containers/org.eclipse.linuxtools.docker.ui.tests/src/org/eclipse/linuxtools/internal/docker/ui/testutils/MockContainerFactory.java
+++ b/containers/org.eclipse.linuxtools.docker.ui.tests/src/org/eclipse/linuxtools/internal/docker/ui/testutils/MockContainerFactory.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2015, 2018 Red Hat.
+ * Copyright (c) 2015, 2020 Red Hat.
*
* This program and the accompanying materials are made
* available under the terms of the Eclipse Public License 2.0
@@ -25,7 +25,7 @@ import org.eclipse.linuxtools.docker.core.Messages;
import org.mockito.Mockito;
import com.google.common.collect.ImmutableList;
-import com.spotify.docker.client.messages.Container;
+import org.mandas.docker.client.messages.Container;
/**
* A factory for mock {@link Container}s.
diff --git a/containers/org.eclipse.linuxtools.docker.ui.tests/src/org/eclipse/linuxtools/internal/docker/ui/testutils/MockContainerInfoFactory.java b/containers/org.eclipse.linuxtools.docker.ui.tests/src/org/eclipse/linuxtools/internal/docker/ui/testutils/MockContainerInfoFactory.java
index f2137071e2ab5100ff0102d6c70689e07c32e8ae..dac238f0bd104a9860e52efd7d513bd7bfba5e07 100644
--- a/containers/org.eclipse.linuxtools.docker.ui.tests/src/org/eclipse/linuxtools/internal/docker/ui/testutils/MockContainerInfoFactory.java
+++ b/containers/org.eclipse.linuxtools.docker.ui.tests/src/org/eclipse/linuxtools/internal/docker/ui/testutils/MockContainerInfoFactory.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2015, 2018 Red Hat.
+ * Copyright (c) 2015, 2020 Red Hat.
*
* This program and the accompanying materials are made
* available under the terms of the Eclipse Public License 2.0
@@ -18,15 +18,15 @@ import java.util.Date;
import java.util.HashMap;
import java.util.List;
+import org.mandas.docker.client.messages.ContainerConfig;
+import org.mandas.docker.client.messages.ContainerInfo;
+import org.mandas.docker.client.messages.HostConfig;
+import org.mandas.docker.client.messages.NetworkSettings;
+import org.mandas.docker.client.messages.PortBinding;
import org.mockito.Mockito;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
-import com.spotify.docker.client.messages.ContainerConfig;
-import com.spotify.docker.client.messages.ContainerInfo;
-import com.spotify.docker.client.messages.HostConfig;
-import com.spotify.docker.client.messages.NetworkSettings;
-import com.spotify.docker.client.messages.PortBinding;
/**
* A factory for mock {@link ContainerInfo}s.
@@ -115,8 +115,7 @@ public class MockContainerInfoFactory {
Mockito.when(this.containerInfo.processLabel()).thenReturn(null);
Mockito.when(this.containerInfo.hostsPath()).thenReturn(null);
Mockito.when(this.containerInfo.mountLabel()).thenReturn(null);
- Mockito.when(this.containerInfo.volumes()).thenReturn(null);
- Mockito.when(this.containerInfo.volumesRw()).thenReturn(null);
+ Mockito.when(this.containerInfo.mounts()).thenReturn(null);
}
diff --git a/containers/org.eclipse.linuxtools.docker.ui.tests/src/org/eclipse/linuxtools/internal/docker/ui/testutils/MockDockerClientFactory.java b/containers/org.eclipse.linuxtools.docker.ui.tests/src/org/eclipse/linuxtools/internal/docker/ui/testutils/MockDockerClientFactory.java
index f967ecc33c929ada8fae8ed9601fd8e0f1e85b87..196e9bdd3b6ad9f2183545689452e9a6f59018a9 100644
--- a/containers/org.eclipse.linuxtools.docker.ui.tests/src/org/eclipse/linuxtools/internal/docker/ui/testutils/MockDockerClientFactory.java
+++ b/containers/org.eclipse.linuxtools.docker.ui.tests/src/org/eclipse/linuxtools/internal/docker/ui/testutils/MockDockerClientFactory.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2015, 2018 Red Hat Inc. and others.
+ * Copyright (c) 2015, 2020 Red Hat Inc. and others.
*
* This program and the accompanying materials are made
* available under the terms of the Eclipse Public License 2.0
@@ -28,14 +28,14 @@ import org.eclipse.linuxtools.docker.core.IDockerImage;
import org.mockito.ArgumentMatchers;
import org.mockito.Mockito;
-import com.spotify.docker.client.DockerClient;
-import com.spotify.docker.client.exceptions.DockerException;
-import com.spotify.docker.client.messages.Container;
-import com.spotify.docker.client.messages.ContainerInfo;
-import com.spotify.docker.client.messages.Image;
-import com.spotify.docker.client.messages.ImageInfo;
-import com.spotify.docker.client.messages.ImageSearchResult;
-import com.spotify.docker.client.messages.Info;
+import org.mandas.docker.client.DockerClient;
+import org.mandas.docker.client.exceptions.DockerException;
+import org.mandas.docker.client.messages.Container;
+import org.mandas.docker.client.messages.ContainerInfo;
+import org.mandas.docker.client.messages.Image;
+import org.mandas.docker.client.messages.ImageInfo;
+import org.mandas.docker.client.messages.ImageSearchResult;
+import org.mandas.docker.client.messages.Info;
/**
* Factory for mocked {@link IDockerConnection}
diff --git a/containers/org.eclipse.linuxtools.docker.ui.tests/src/org/eclipse/linuxtools/internal/docker/ui/testutils/MockDockerConnectionFactory.java b/containers/org.eclipse.linuxtools.docker.ui.tests/src/org/eclipse/linuxtools/internal/docker/ui/testutils/MockDockerConnectionFactory.java
index f468f5ac02117fd6531d0fd02fa24e59a9b72790..cc82040738ef7e06400e6a468744c2741f67b7ea 100644
--- a/containers/org.eclipse.linuxtools.docker.ui.tests/src/org/eclipse/linuxtools/internal/docker/ui/testutils/MockDockerConnectionFactory.java
+++ b/containers/org.eclipse.linuxtools.docker.ui.tests/src/org/eclipse/linuxtools/internal/docker/ui/testutils/MockDockerConnectionFactory.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2015, 2018 Red Hat.
+ * Copyright (c) 2015, 2020 Red Hat.
*
* This program and the accompanying materials are made
* available under the terms of the Eclipse Public License 2.0
@@ -23,8 +23,8 @@ import org.eclipse.linuxtools.internal.docker.core.UnixSocketConnectionSettings;
import org.mockito.ArgumentMatchers;
import org.mockito.Mockito;
-import com.spotify.docker.client.DockerClient;
-import com.spotify.docker.client.exceptions.DockerCertificateException;
+import org.mandas.docker.client.DockerClient;
+import org.mandas.docker.client.exceptions.DockerCertificateException;
/**
* Factory for mocked {@link IDockerConnection}
diff --git a/containers/org.eclipse.linuxtools.docker.ui.tests/src/org/eclipse/linuxtools/internal/docker/ui/testutils/MockImageFactory.java b/containers/org.eclipse.linuxtools.docker.ui.tests/src/org/eclipse/linuxtools/internal/docker/ui/testutils/MockImageFactory.java
index 4ca11a407969426fe404d0ed9d376dcb51238446..a1039d8378881e29122ed0846e7d86169e8b1d01 100644
--- a/containers/org.eclipse.linuxtools.docker.ui.tests/src/org/eclipse/linuxtools/internal/docker/ui/testutils/MockImageFactory.java
+++ b/containers/org.eclipse.linuxtools.docker.ui.tests/src/org/eclipse/linuxtools/internal/docker/ui/testutils/MockImageFactory.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2015, 2018 Red Hat.
+ * Copyright (c) 2015, 2020 Red Hat.
*
* This program and the accompanying materials are made
* available under the terms of the Eclipse Public License 2.0
@@ -24,7 +24,7 @@ import java.util.stream.Stream;
import org.mockito.Mockito;
import com.google.common.collect.ImmutableList;
-import com.spotify.docker.client.messages.Image;
+import org.mandas.docker.client.messages.Image;
/**
* A factory for mock {@link Image}s.
diff --git a/containers/org.eclipse.linuxtools.docker.ui.tests/src/org/eclipse/linuxtools/internal/docker/ui/testutils/MockImageInfoFactory.java b/containers/org.eclipse.linuxtools.docker.ui.tests/src/org/eclipse/linuxtools/internal/docker/ui/testutils/MockImageInfoFactory.java
index f410ad7cff11f5f184ef2fb72e964ae0a385c1db..1872687e2ed90793b0b2923bfd1a8150e931b4f3 100644
--- a/containers/org.eclipse.linuxtools.docker.ui.tests/src/org/eclipse/linuxtools/internal/docker/ui/testutils/MockImageInfoFactory.java
+++ b/containers/org.eclipse.linuxtools.docker.ui.tests/src/org/eclipse/linuxtools/internal/docker/ui/testutils/MockImageInfoFactory.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2015, 2018 Red Hat.
+ * Copyright (c) 2015, 2020 Red Hat.
*
* This program and the accompanying materials are made
* available under the terms of the Eclipse Public License 2.0
@@ -19,8 +19,8 @@ import org.mockito.Mockito;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableSet;
-import com.spotify.docker.client.messages.ContainerConfig;
-import com.spotify.docker.client.messages.ImageInfo;
+import org.mandas.docker.client.messages.ContainerConfig;
+import org.mandas.docker.client.messages.ImageInfo;
/**
* A factory for mock {@link ImageInfo}s.
diff --git a/containers/org.eclipse.linuxtools.docker.ui.tests/src/org/eclipse/linuxtools/internal/docker/ui/testutils/MockImageSearchResultFactory.java b/containers/org.eclipse.linuxtools.docker.ui.tests/src/org/eclipse/linuxtools/internal/docker/ui/testutils/MockImageSearchResultFactory.java
index 1f5b76d0d9d679c99d519cb1343074a74c867581..3d89245dafe704550abd9e636f0ecbe377ebe1a7 100644
--- a/containers/org.eclipse.linuxtools.docker.ui.tests/src/org/eclipse/linuxtools/internal/docker/ui/testutils/MockImageSearchResultFactory.java
+++ b/containers/org.eclipse.linuxtools.docker.ui.tests/src/org/eclipse/linuxtools/internal/docker/ui/testutils/MockImageSearchResultFactory.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2016, 2018 Red Hat.
+ * Copyright (c) 2016, 2020 Red Hat.
*
* This program and the accompanying materials are made
* available under the terms of the Eclipse Public License 2.0
@@ -15,7 +15,7 @@ package org.eclipse.linuxtools.internal.docker.ui.testutils;
import org.mockito.Mockito;
-import com.spotify.docker.client.messages.ImageSearchResult;
+import org.mandas.docker.client.messages.ImageSearchResult;
/**
* Factory for mocked {@link ImageSearchResult} instances.
diff --git a/containers/org.eclipse.linuxtools.docker.ui.tests/src/org/eclipse/linuxtools/internal/docker/ui/views/DockerContainersViewSWTBotTest.java b/containers/org.eclipse.linuxtools.docker.ui.tests/src/org/eclipse/linuxtools/internal/docker/ui/views/DockerContainersViewSWTBotTest.java
index cac458edf34a9a961554357e7885b921559961f8..e494e70528070e5a8b561886a5bbd0756d022c50 100644
--- a/containers/org.eclipse.linuxtools.docker.ui.tests/src/org/eclipse/linuxtools/internal/docker/ui/views/DockerContainersViewSWTBotTest.java
+++ b/containers/org.eclipse.linuxtools.docker.ui.tests/src/org/eclipse/linuxtools/internal/docker/ui/views/DockerContainersViewSWTBotTest.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2016, 2018 Red Hat.
+ * Copyright (c) 2016, 2020 Red Hat.
*
* This program and the accompanying materials are made
* available under the terms of the Eclipse Public License 2.0
@@ -47,7 +47,7 @@ import org.junit.ClassRule;
import org.junit.Rule;
import org.junit.Test;
-import com.spotify.docker.client.DockerClient;
+import org.mandas.docker.client.DockerClient;
/**
* Testing the {@link DockerContainersView}
diff --git a/containers/org.eclipse.linuxtools.docker.ui.tests/src/org/eclipse/linuxtools/internal/docker/ui/views/DockerExplorerViewSWTBotTest.java b/containers/org.eclipse.linuxtools.docker.ui.tests/src/org/eclipse/linuxtools/internal/docker/ui/views/DockerExplorerViewSWTBotTest.java
index 1075dda7101930e124f14fc93285f6d2543ec257..07417d90fa5db6679b10c162494a944254591e2d 100644
--- a/containers/org.eclipse.linuxtools.docker.ui.tests/src/org/eclipse/linuxtools/internal/docker/ui/views/DockerExplorerViewSWTBotTest.java
+++ b/containers/org.eclipse.linuxtools.docker.ui.tests/src/org/eclipse/linuxtools/internal/docker/ui/views/DockerExplorerViewSWTBotTest.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2015, 2018 Red Hat.
+ * Copyright (c) 2015, 2020 Red Hat.
*
* This program and the accompanying materials are made
* available under the terms of the Eclipse Public License 2.0
@@ -58,8 +58,8 @@ import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mockito;
-import com.spotify.docker.client.DockerClient;
-import com.spotify.docker.client.exceptions.DockerException;
+import org.mandas.docker.client.DockerClient;
+import org.mandas.docker.client.exceptions.DockerException;
/**
* Testing the {@link DockerExplorerView} {@link Viewer}
diff --git a/containers/org.eclipse.linuxtools.docker.ui.tests/src/org/eclipse/linuxtools/internal/docker/ui/views/DockerImageHierarchyViewSWTBotTest.java b/containers/org.eclipse.linuxtools.docker.ui.tests/src/org/eclipse/linuxtools/internal/docker/ui/views/DockerImageHierarchyViewSWTBotTest.java
index de9472017ec1ea6153db386943c8fec7791bfaf7..17b2791be39f976e1c0fc19a234833dff1474991 100644
--- a/containers/org.eclipse.linuxtools.docker.ui.tests/src/org/eclipse/linuxtools/internal/docker/ui/views/DockerImageHierarchyViewSWTBotTest.java
+++ b/containers/org.eclipse.linuxtools.docker.ui.tests/src/org/eclipse/linuxtools/internal/docker/ui/views/DockerImageHierarchyViewSWTBotTest.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2016, 2018 Red Hat.
+ * Copyright (c) 2016, 2020 Red Hat.
*
* This program and the accompanying materials are made
* available under the terms of the Eclipse Public License 2.0
@@ -49,9 +49,9 @@ import org.junit.ClassRule;
import org.junit.Rule;
import org.junit.Test;
-import com.spotify.docker.client.DockerClient;
-import com.spotify.docker.client.messages.Container;
-import com.spotify.docker.client.messages.Image;
+import org.mandas.docker.client.DockerClient;
+import org.mandas.docker.client.messages.Container;
+import org.mandas.docker.client.messages.Image;
/**
* Testing the {@link DockerImageHierarchyView} call from the
@@ -61,7 +61,6 @@ public class DockerImageHierarchyViewSWTBotTest {
private SWTWorkbenchBot bot = new SWTWorkbenchBot();
private SWTBotView dockerExplorerViewBot;
- private DockerExplorerView dockerExplorerView;
@ClassRule
public static CloseWelcomePageRule closeWelcomePage = new CloseWelcomePageRule(
@@ -87,7 +86,6 @@ public class DockerImageHierarchyViewSWTBotTest {
}
});
this.dockerExplorerViewBot = bot.viewById(DockerExplorerView.VIEW_ID);
- this.dockerExplorerView = (DockerExplorerView) (dockerExplorerViewBot.getViewReference().getView(true));
// make sure that the Docker Image Hierarchy view is closed
this.bot.views().stream().filter(v -> v.getReference().getId().equals(DockerImageHierarchyView.VIEW_ID))
.forEach(v -> v.close());
diff --git a/containers/org.eclipse.linuxtools.docker.ui.tests/src/org/eclipse/linuxtools/internal/docker/ui/views/DockerImagesViewSWTBotTest.java b/containers/org.eclipse.linuxtools.docker.ui.tests/src/org/eclipse/linuxtools/internal/docker/ui/views/DockerImagesViewSWTBotTest.java
index 4d61fe0dd9562e4cacf4555ba09176863b592891..99120ee9e6a54a57f665445e411fd68063fa5645 100644
--- a/containers/org.eclipse.linuxtools.docker.ui.tests/src/org/eclipse/linuxtools/internal/docker/ui/views/DockerImagesViewSWTBotTest.java
+++ b/containers/org.eclipse.linuxtools.docker.ui.tests/src/org/eclipse/linuxtools/internal/docker/ui/views/DockerImagesViewSWTBotTest.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2016, 2018 Red Hat.
+ * Copyright (c) 2016, 2020 Red Hat.
*
* This program and the accompanying materials are made
* available under the terms of the Eclipse Public License 2.0
@@ -46,7 +46,7 @@ import org.junit.ClassRule;
import org.junit.Rule;
import org.junit.Test;
-import com.spotify.docker.client.DockerClient;
+import org.mandas.docker.client.DockerClient;
/**
* Testing the {@link DockerImagesView} using {@link SWTBot}.
diff --git a/containers/org.eclipse.linuxtools.docker.ui.tests/src/org/eclipse/linuxtools/internal/docker/ui/wizards/EditDockerConnectionSWTBotTest.java b/containers/org.eclipse.linuxtools.docker.ui.tests/src/org/eclipse/linuxtools/internal/docker/ui/wizards/EditDockerConnectionSWTBotTest.java
index 35f7d1040084228f2733984b3079259eee57bc60..195127826a45f82ad2b7b07747f96fe9b41dc658 100644
--- a/containers/org.eclipse.linuxtools.docker.ui.tests/src/org/eclipse/linuxtools/internal/docker/ui/wizards/EditDockerConnectionSWTBotTest.java
+++ b/containers/org.eclipse.linuxtools.docker.ui.tests/src/org/eclipse/linuxtools/internal/docker/ui/wizards/EditDockerConnectionSWTBotTest.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2015, 2019 Red Hat.
+ * Copyright (c) 2015, 2020 Red Hat.
*
* This program and the accompanying materials are made
* available under the terms of the Eclipse Public License 2.0
@@ -17,6 +17,7 @@ import static org.assertj.core.api.Assertions.assertThat;
import java.io.File;
import java.io.IOException;
+import java.util.ArrayList;
import java.util.concurrent.TimeUnit;
import org.eclipse.core.resources.IResource;
@@ -71,7 +72,7 @@ import org.junit.runner.RunWith;
import org.mockito.ArgumentMatchers;
import org.mockito.Mockito;
-import com.spotify.docker.client.DockerClient;
+import org.mandas.docker.client.DockerClient;
/**
* Testing the {@link EditDockerConnection} {@link Wizard}
@@ -148,7 +149,8 @@ public class EditDockerConnectionSWTBotTest {
final IDockerHostConfig hostConfig = MockDockerHostConfigFactory.publishAllPorts(true).networkMode(networkMode)
.build();
final ILaunchConfiguration runImageLaunchConfiguration = LaunchConfigurationUtils
- .createRunImageLaunchConfiguration(image, containerConfig, hostConfig, "some_container", false);
+ .createRunImageLaunchConfiguration(image, containerConfig, hostConfig, new ArrayList<String>(),
+ "some_container", false);
return runImageLaunchConfiguration.getName();
}
@@ -386,7 +388,7 @@ public class EditDockerConnectionSWTBotTest {
@Test
public void shouldRefreshDockerExplorerViewWhenConnectionNameChanged() {
// given
- final IDockerConnection connection = configureTCPConnection("Test");
+ configureTCPConnection("Test");
final SWTBotTreeItem connectionTreeItem = SWTUtils.getTreeItem(dockerExplorer.bot(), "Test");
assertThat(connectionTreeItem).isNotNull();
// when
diff --git a/containers/org.eclipse.linuxtools.docker.ui.tests/src/org/eclipse/linuxtools/internal/docker/ui/wizards/ImagePullSWTBotTest.java b/containers/org.eclipse.linuxtools.docker.ui.tests/src/org/eclipse/linuxtools/internal/docker/ui/wizards/ImagePullSWTBotTest.java
index 7adf082f165783b970d1e37e38927a828981a6d7..43d9e0f8cab4423e473596a0560037101fbdb64d 100644
--- a/containers/org.eclipse.linuxtools.docker.ui.tests/src/org/eclipse/linuxtools/internal/docker/ui/wizards/ImagePullSWTBotTest.java
+++ b/containers/org.eclipse.linuxtools.docker.ui.tests/src/org/eclipse/linuxtools/internal/docker/ui/wizards/ImagePullSWTBotTest.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2016, 2018 Red Hat.
+ * Copyright (c) 2016, 2020 Red Hat.
*
* This program and the accompanying materials are made
* available under the terms of the Eclipse Public License 2.0
@@ -35,7 +35,6 @@ import org.eclipse.linuxtools.internal.docker.ui.testutils.swt.CloseWelcomePageR
import org.eclipse.linuxtools.internal.docker.ui.testutils.swt.DockerConnectionManagerUtils;
import org.eclipse.linuxtools.internal.docker.ui.testutils.swt.MenuAssertion;
import org.eclipse.linuxtools.internal.docker.ui.testutils.swt.SWTUtils;
-import org.eclipse.linuxtools.internal.docker.ui.views.DockerExplorerView;
import org.eclipse.swtbot.eclipse.finder.SWTWorkbenchBot;
import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotView;
import org.junit.After;
@@ -47,8 +46,8 @@ import org.junit.Test;
import org.mockito.ArgumentMatchers;
import org.mockito.Mockito;
-import com.spotify.docker.client.DockerClient;
-import com.spotify.docker.client.exceptions.DockerException;
+import org.mandas.docker.client.DockerClient;
+import org.mandas.docker.client.exceptions.DockerException;
/**
* Testing the {@link ImagePull} wizard
@@ -56,7 +55,6 @@ import com.spotify.docker.client.exceptions.DockerException;
public class ImagePullSWTBotTest {
private SWTWorkbenchBot bot = new SWTWorkbenchBot();
- private DockerExplorerView dockerExplorerView;
private SWTBotView dockerExplorerViewBot;
@ClassRule
@@ -74,7 +72,6 @@ public class ImagePullSWTBotTest {
@Before
public void lookupDockerExplorerView() {
this.dockerExplorerViewBot = bot.viewById("org.eclipse.linuxtools.docker.ui.dockerExplorerView");
- this.dockerExplorerView = (DockerExplorerView) (dockerExplorerViewBot.getViewReference().getView(true));
this.dockerExplorerViewBot.show();
this.dockerExplorerViewBot.setFocus();
this.defaultRegistryAccountStorageManager = RegistryAccountManager.getInstance().getStorageManager();
diff --git a/containers/org.eclipse.linuxtools.docker.ui.tests/src/org/eclipse/linuxtools/internal/docker/ui/wizards/ImagePushSWTBotTests.java b/containers/org.eclipse.linuxtools.docker.ui.tests/src/org/eclipse/linuxtools/internal/docker/ui/wizards/ImagePushSWTBotTests.java
index 9d4c5eb0e6032d7dc947756079415443913dfe5d..2a343e11b273be982d8b7ce46a3fe225cead0147 100644
--- a/containers/org.eclipse.linuxtools.docker.ui.tests/src/org/eclipse/linuxtools/internal/docker/ui/wizards/ImagePushSWTBotTests.java
+++ b/containers/org.eclipse.linuxtools.docker.ui.tests/src/org/eclipse/linuxtools/internal/docker/ui/wizards/ImagePushSWTBotTests.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2016, 2018 Red Hat.
+ * Copyright (c) 2016, 2020 Red Hat.
*
* This program and the accompanying materials are made
* available under the terms of the Eclipse Public License 2.0
@@ -46,9 +46,9 @@ import org.junit.Test;
import org.mockito.ArgumentMatchers;
import org.mockito.Mockito;
-import com.spotify.docker.client.DockerClient;
-import com.spotify.docker.client.ProgressHandler;
-import com.spotify.docker.client.exceptions.DockerException;
+import org.mandas.docker.client.DockerClient;
+import org.mandas.docker.client.ProgressHandler;
+import org.mandas.docker.client.exceptions.DockerException;
/**
* Testing the {@link ImagePush} wizard
diff --git a/containers/org.eclipse.linuxtools.docker.ui.tests/src/org/eclipse/linuxtools/internal/docker/ui/wizards/ImageRunSWTBotTest.java b/containers/org.eclipse.linuxtools.docker.ui.tests/src/org/eclipse/linuxtools/internal/docker/ui/wizards/ImageRunSWTBotTest.java
index 7ae6ce9adff2e725249ed620b28defbf7c1144ae..3d644285d8446708c3b43f06d353f0c174c5ff41 100644
--- a/containers/org.eclipse.linuxtools.docker.ui.tests/src/org/eclipse/linuxtools/internal/docker/ui/wizards/ImageRunSWTBotTest.java
+++ b/containers/org.eclipse.linuxtools.docker.ui.tests/src/org/eclipse/linuxtools/internal/docker/ui/wizards/ImageRunSWTBotTest.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2015, 2018 Red Hat.
+ * Copyright (c) 2015, 2020 Red Hat.
*
* This program and the accompanying materials are made
* available under the terms of the Eclipse Public License 2.0
@@ -15,6 +15,7 @@ package org.eclipse.linuxtools.internal.docker.ui.wizards;
import static org.assertj.core.api.Assertions.assertThat;
+import java.util.ArrayList;
import java.util.Arrays;
import java.util.concurrent.TimeUnit;
@@ -43,7 +44,6 @@ import org.eclipse.linuxtools.internal.docker.ui.testutils.swt.CloseShellRule;
import org.eclipse.linuxtools.internal.docker.ui.testutils.swt.CloseWelcomePageRule;
import org.eclipse.linuxtools.internal.docker.ui.testutils.swt.DockerConnectionManagerUtils;
import org.eclipse.linuxtools.internal.docker.ui.testutils.swt.SWTUtils;
-import org.eclipse.linuxtools.internal.docker.ui.views.DockerExplorerView;
import org.eclipse.swtbot.eclipse.finder.SWTWorkbenchBot;
import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotView;
import org.eclipse.swtbot.swt.finder.waits.Conditions;
@@ -55,13 +55,13 @@ import org.junit.Test;
import org.mockito.ArgumentMatchers;
import org.mockito.Mockito;
-import com.spotify.docker.client.DockerClient;
-import com.spotify.docker.client.exceptions.DockerException;
-import com.spotify.docker.client.messages.Container;
-import com.spotify.docker.client.messages.ContainerCreation;
-import com.spotify.docker.client.messages.ContainerInfo;
-import com.spotify.docker.client.messages.Image;
-import com.spotify.docker.client.messages.ImageInfo;
+import org.mandas.docker.client.DockerClient;
+import org.mandas.docker.client.exceptions.DockerException;
+import org.mandas.docker.client.messages.Container;
+import org.mandas.docker.client.messages.ContainerCreation;
+import org.mandas.docker.client.messages.ContainerInfo;
+import org.mandas.docker.client.messages.Image;
+import org.mandas.docker.client.messages.ImageInfo;
/**
* Testing the {@link ImageRun} wizard
@@ -69,7 +69,6 @@ import com.spotify.docker.client.messages.ImageInfo;
public class ImageRunSWTBotTest {
private SWTWorkbenchBot bot = new SWTWorkbenchBot();
- private DockerExplorerView dockerExplorerView;
private SWTBotView dockerExplorerViewBot;
private String configureRunImageLaunchConfiguration(final IDockerConnection connection, final String networkMode) {
@@ -78,7 +77,8 @@ public class ImageRunSWTBotTest {
final IDockerHostConfig hostConfig = MockDockerHostConfigFactory.publishAllPorts(true).networkMode(networkMode)
.build();
final ILaunchConfiguration runImageLaunchConfiguration = LaunchConfigurationUtils
- .createRunImageLaunchConfiguration(image, containerConfig, hostConfig, "some_container", false);
+ .createRunImageLaunchConfiguration(image, containerConfig, hostConfig, new ArrayList<String>(),
+ "some_container", false);
return runImageLaunchConfiguration.getName();
}
@@ -95,7 +95,6 @@ public class ImageRunSWTBotTest {
@Before
public void lookupDockerExplorerView() {
dockerExplorerViewBot = bot.viewById("org.eclipse.linuxtools.docker.ui.dockerExplorerView");
- dockerExplorerView = (DockerExplorerView) (dockerExplorerViewBot.getViewReference().getView(true));
dockerExplorerViewBot.show();
dockerExplorerViewBot.setFocus();
}
diff --git a/containers/org.eclipse.linuxtools.docker.ui.tests/src/org/eclipse/linuxtools/internal/docker/ui/wizards/ImageSearchSWTBotTest.java b/containers/org.eclipse.linuxtools.docker.ui.tests/src/org/eclipse/linuxtools/internal/docker/ui/wizards/ImageSearchSWTBotTest.java
index 9d83cb5bc6f0c7d9eacef539d54b557d93f2f8ac..ef80d42cd504cf13caf2f8a47a3598c26926d153 100644
--- a/containers/org.eclipse.linuxtools.docker.ui.tests/src/org/eclipse/linuxtools/internal/docker/ui/wizards/ImageSearchSWTBotTest.java
+++ b/containers/org.eclipse.linuxtools.docker.ui.tests/src/org/eclipse/linuxtools/internal/docker/ui/wizards/ImageSearchSWTBotTest.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2016, 2018 Red Hat.
+ * Copyright (c) 2016, 2020 Red Hat.
*
* This program and the accompanying materials are made
* available under the terms of the Eclipse Public License 2.0
@@ -26,7 +26,6 @@ import org.eclipse.linuxtools.internal.docker.ui.testutils.swt.CloseShellRule;
import org.eclipse.linuxtools.internal.docker.ui.testutils.swt.CloseWelcomePageRule;
import org.eclipse.linuxtools.internal.docker.ui.testutils.swt.DockerConnectionManagerUtils;
import org.eclipse.linuxtools.internal.docker.ui.testutils.swt.SWTUtils;
-import org.eclipse.linuxtools.internal.docker.ui.views.DockerExplorerView;
import org.eclipse.swtbot.eclipse.finder.SWTWorkbenchBot;
import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotView;
import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree;
@@ -36,7 +35,7 @@ import org.junit.ClassRule;
import org.junit.Rule;
import org.junit.Test;
-import com.spotify.docker.client.DockerClient;
+import org.mandas.docker.client.DockerClient;
/**
* Testing the {@link ImageSearch} wizard.
@@ -44,7 +43,6 @@ import com.spotify.docker.client.DockerClient;
public class ImageSearchSWTBotTest {
private SWTWorkbenchBot bot = new SWTWorkbenchBot();
- private DockerExplorerView dockerExplorerView;
private SWTBotView dockerExplorerViewBot;
@ClassRule
@@ -60,7 +58,6 @@ public class ImageSearchSWTBotTest {
@Before
public void lookupDockerExplorerView() {
dockerExplorerViewBot = bot.viewById("org.eclipse.linuxtools.docker.ui.dockerExplorerView");
- dockerExplorerView = (DockerExplorerView) (dockerExplorerViewBot.getViewReference().getView(true));
dockerExplorerViewBot.show();
dockerExplorerViewBot.setFocus();
}
diff --git a/containers/org.eclipse.linuxtools.docker.ui.tests/src/org/eclipse/linuxtools/internal/docker/ui/wizards/NewDockerConnectionSWTBotTest.java b/containers/org.eclipse.linuxtools.docker.ui.tests/src/org/eclipse/linuxtools/internal/docker/ui/wizards/NewDockerConnectionSWTBotTest.java
index 69271ab85688c43884d67e178e26e2fccd824b5a..0710e30903e553ce30abd6638fc423ace0736f81 100644
--- a/containers/org.eclipse.linuxtools.docker.ui.tests/src/org/eclipse/linuxtools/internal/docker/ui/wizards/NewDockerConnectionSWTBotTest.java
+++ b/containers/org.eclipse.linuxtools.docker.ui.tests/src/org/eclipse/linuxtools/internal/docker/ui/wizards/NewDockerConnectionSWTBotTest.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2015, 2018 Red Hat Inc.
+ * Copyright (c) 2015, 2020 Red Hat Inc.
*
* This program and the accompanying materials are made
* available under the terms of the Eclipse Public License 2.0
@@ -55,7 +55,7 @@ import org.junit.Rule;
import org.junit.Test;
import org.junit.runner.RunWith;
-import com.spotify.docker.client.DockerClient;
+import org.mandas.docker.client.DockerClient;
/**
* Testing the {@link NewDockerConnection} {@link Wizard}
diff --git a/containers/org.eclipse.linuxtools.docker.ui/.classpath b/containers/org.eclipse.linuxtools.docker.ui/.classpath
index cf36b561195a3e4e3849ff022040558ccc6c3074..bc57d2383d545884b89334a8dd1293afd4316f5d 100644
--- a/containers/org.eclipse.linuxtools.docker.ui/.classpath
+++ b/containers/org.eclipse.linuxtools.docker.ui/.classpath
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src/"/>
<classpathentry kind="output" path="target/classes"/>
diff --git a/containers/org.eclipse.linuxtools.docker.ui/.settings/org.eclipse.jdt.core.prefs b/containers/org.eclipse.linuxtools.docker.ui/.settings/org.eclipse.jdt.core.prefs
index afdca8b58d9f5e9a7cead82524782f49f5fbb5e9..c29081e237801474db9cb60a53ec17e87d4c5309 100644
--- a/containers/org.eclipse.linuxtools.docker.ui/.settings/org.eclipse.jdt.core.prefs
+++ b/containers/org.eclipse.linuxtools.docker.ui/.settings/org.eclipse.jdt.core.prefs
@@ -10,9 +10,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.compliance=11
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -27,6 +27,7 @@ org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=warning
org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
@@ -72,6 +73,7 @@ org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=warn
org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
@@ -108,8 +110,8 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.release=disabled
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11
org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647
org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16
diff --git a/containers/org.eclipse.linuxtools.docker.ui/.settings/org.eclipse.jdt.ui.prefs b/containers/org.eclipse.linuxtools.docker.ui/.settings/org.eclipse.jdt.ui.prefs
index ea129e97ce1031c394bfcd9fc078cf791ebe397b..46bbbc7caf9220f0f3e2e4e7ff4b54e398feb9d3 100644
--- a/containers/org.eclipse.linuxtools.docker.ui/.settings/org.eclipse.jdt.ui.prefs
+++ b/containers/org.eclipse.linuxtools.docker.ui/.settings/org.eclipse.jdt.ui.prefs
@@ -15,8 +15,8 @@ sp_cleanup.always_use_blocks=true
sp_cleanup.always_use_parentheses_in_expressions=false
sp_cleanup.always_use_this_for_non_static_field_access=false
sp_cleanup.always_use_this_for_non_static_method_access=false
-sp_cleanup.convert_functional_interfaces=false
-sp_cleanup.convert_to_enhanced_for_loop=false
+sp_cleanup.convert_functional_interfaces=true
+sp_cleanup.convert_to_enhanced_for_loop=true
sp_cleanup.correct_indentation=false
sp_cleanup.format_source_code=true
sp_cleanup.format_source_code_changes_only=true
@@ -30,17 +30,20 @@ sp_cleanup.never_use_blocks=false
sp_cleanup.never_use_parentheses_in_expressions=true
sp_cleanup.on_save_use_additional_actions=true
sp_cleanup.organize_imports=true
+sp_cleanup.push_down_negation=false
sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
sp_cleanup.qualify_static_member_accesses_with_declaring_class=false
sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
sp_cleanup.remove_private_constructors=true
-sp_cleanup.remove_redundant_modifiers=false
+sp_cleanup.remove_redundant_modifiers=true
+sp_cleanup.remove_redundant_semicolons=true
sp_cleanup.remove_redundant_type_arguments=true
-sp_cleanup.remove_trailing_whitespaces=false
+sp_cleanup.remove_trailing_whitespaces=true
sp_cleanup.remove_trailing_whitespaces_all=true
sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
+sp_cleanup.remove_unnecessary_array_creation=true
sp_cleanup.remove_unnecessary_casts=true
sp_cleanup.remove_unnecessary_nls_tags=false
sp_cleanup.remove_unused_imports=false
@@ -52,6 +55,7 @@ sp_cleanup.remove_unused_private_types=true
sp_cleanup.sort_members=false
sp_cleanup.sort_members_all=false
sp_cleanup.use_anonymous_class_creation=false
+sp_cleanup.use_autoboxing=false
sp_cleanup.use_blocks=false
sp_cleanup.use_blocks_only_for_return_and_throw=false
sp_cleanup.use_lambda=true
@@ -61,3 +65,4 @@ sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
sp_cleanup.use_this_for_non_static_method_access=false
sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
sp_cleanup.use_type_arguments=false
+sp_cleanup.use_unboxing=false
diff --git a/containers/org.eclipse.linuxtools.docker.ui/META-INF/MANIFEST.MF b/containers/org.eclipse.linuxtools.docker.ui/META-INF/MANIFEST.MF
index 8658ee62a3473fa3b79cb7e13a7cc90027b4a83a..be0bd2b70eacc47465a10eb4f6929b35e705cf21 100644
--- a/containers/org.eclipse.linuxtools.docker.ui/META-INF/MANIFEST.MF
+++ b/containers/org.eclipse.linuxtools.docker.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Docker UI Plug-in
Bundle-SymbolicName: org.eclipse.linuxtools.docker.ui;singleton:=true
-Bundle-Version: 4.4.0.qualifier
+Bundle-Version: 5.1.0.qualifier
Bundle-Activator: org.eclipse.linuxtools.docker.ui.Activator
Bundle-Vendor: Eclipse Linux Tools
Require-Bundle: org.eclipse.ui,
@@ -23,16 +23,15 @@ Require-Bundle: org.eclipse.ui,
org.eclipse.jface.databinding;bundle-version="1.9.0",
org.eclipse.debug.core;bundle-version="3.10.0",
org.eclipse.debug.ui;bundle-version="3.11.0",
- com.spotify.docker.client;bundle-version="3.6.8",
- org.eclipse.linuxtools.docker.editor,
+ org.mandas.docker-client;bundle-version="3.2.1",
org.eclipse.e4.ui.workbench;bundle-version="1.4.0",
org.eclipse.e4.ui.model.workbench;bundle-version="1.2.0",
org.eclipse.tm.terminal.view.ui;bundle-version="4.1.0",
org.eclipse.tm.terminal.view.core;bundle-version="4.0.0",
- com.ibm.icu,
- org.apache.commons.compress;bundle-version="1.6.0",
- javax.xml.bind;bundle-version="2.2.0"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+ org.apache.commons.compress;bundle-version="1.6.0"
+Import-Package: javax.xml.bind;version="2.3.3",
+ javax.annotation;version="1.3.5"
+Bundle-RequiredExecutionEnvironment: JavaSE-11
Bundle-ActivationPolicy: lazy
Bundle-Localization: plugin
Export-Package: org.eclipse.linuxtools.docker.ui,
diff --git a/containers/org.eclipse.linuxtools.docker.ui/pom.xml b/containers/org.eclipse.linuxtools.docker.ui/pom.xml
index 63546a25e5a022bb1dbbf224dcb08147515d3e38..c7e4bcbf8bb6cf2dee89adc8aa8222ff1c40c66d 100644
--- a/containers/org.eclipse.linuxtools.docker.ui/pom.xml
+++ b/containers/org.eclipse.linuxtools.docker.ui/pom.xml
@@ -4,10 +4,10 @@
<parent>
<groupId>org.eclipse.linuxtools</groupId>
<artifactId>org.eclipse.linuxtools.docker</artifactId>
- <version>4.4.0</version>
+ <version>5.1.0</version>
</parent>
<artifactId>org.eclipse.linuxtools.docker.ui</artifactId>
<packaging>eclipse-plugin</packaging>
- <version>4.4.0-SNAPSHOT</version>
+ <version>5.1.0-SNAPSHOT</version>
</project>
diff --git a/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/docker/ui/Activator.java b/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/docker/ui/Activator.java
index 53892605f49a26e3a15260c5ef97bf3bd31915c1..0922e08842045c0238684e02ef144ed6b5274f21 100644
--- a/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/docker/ui/Activator.java
+++ b/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/docker/ui/Activator.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2014, 2018 Red Hat Inc.
+ * Copyright (c) 2014, 2019 Red Hat Inc.
*
* This program and the accompanying materials are made
* available under the terms of the Eclipse Public License 2.0
@@ -19,6 +19,7 @@ import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.ui.IWorkbenchWindow;
+import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.plugin.AbstractUIPlugin;
import org.osgi.framework.BundleContext;
@@ -81,7 +82,7 @@ public class Activator extends AbstractUIPlugin {
}
public static Shell getActiveWorkbenchShell() {
- IWorkbenchWindow window = getDefault().getWorkbench()
+ IWorkbenchWindow window = PlatformUI.getWorkbench()
.getActiveWorkbenchWindow();
if (window != null) {
return window.getShell();
diff --git a/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/docker/ui/launch/ContainerLauncher.java b/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/docker/ui/launch/ContainerLauncher.java
index 8d13f965b075657297f6ba482b956f5e3410ddb6..5a967b84ada4f8e34ebd0268c2ce00b00743c545 100644
--- a/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/docker/ui/launch/ContainerLauncher.java
+++ b/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/docker/ui/launch/ContainerLauncher.java
@@ -1,6 +1,6 @@
/*******************************************************************************
- * Copyright (c) 2015, 2019 Red Hat Inc. and others.
- *
+ * Copyright (c) 2015, 2020 Red Hat Inc. and others.
+ *
* This program and the accompanying materials are made
* available under the terms of the Eclipse Public License 2.0
* which is available at https://www.eclipse.org/legal/epl-2.0/
@@ -424,6 +424,8 @@ public class ContainerLauncher {
InputStream in = ((DockerConnection) connection).copyContainer(token, containerId, volume);
+ Map<String, String> links = new HashMap<>();
+
synchronized (lockObject) {
if (!dirList.contains(volume)) {
dirList.add(volume);
@@ -449,9 +451,28 @@ public class ContainerLauncher {
path = path.append(te.getName());
File f = new File(path.toOSString());
int mode = te.getMode();
+ if (te.isSymbolicLink()) {
+ IPath linkPath = new Path(te.getLinkName());
+ if (!linkPath.isAbsolute()) {
+ if (!isWin) {
+ java.nio.file.Path p = Paths.get(path.toPortableString());
+ java.nio.file.Path link = Paths.get(te.getLinkName());
+ if (f.exists()) {
+ f.delete();
+ }
+ Files.createSymbolicLink(p, link);
+ } else {
+ linkPath = new Path(volume).append(te.getLinkName());
+ links.put(path.toPortableString(), linkPath.toPortableString());
+ }
+ } else {
+ links.put(path.toPortableString(), linkPath.toPortableString());
+ }
+ continue;
+ }
if (te.isDirectory()) {
f.mkdir();
- if (!isWin && !te.isSymbolicLink()) {
+ if (!isWin) {
Files.setPosixFilePermissions(Paths.get(path.toOSString()), toPerms(mode));
}
continue;
@@ -460,7 +481,7 @@ public class ContainerLauncher {
continue;
}
f.createNewFile();
- if (!isWin && !te.isSymbolicLink()) {
+ if (!isWin) {
Files.setPosixFilePermissions(Paths.get(path.toOSString()), toPerms(mode));
}
}
@@ -483,6 +504,88 @@ public class ContainerLauncher {
// remove from copying list so subsequent jobs might
// know that the volume
// is fully copied
+ for (String name : links.keySet()) {
+ String link = links.get(name);
+ boolean resolved = false;
+ int i = 0; // prevent infinite loop if there is a circular link
+ while (!resolved && ++i < 10) {
+ InputStream in2 = ((DockerConnection) connection).copyContainer(token, containerId,
+ link);
+ /*
+ * The input stream from copyContainer might be incomplete or non-blocking so we
+ * should wrap it in a stream that is guaranteed to block until data is
+ * available.
+ */
+ try (TarArchiveInputStream k = new TarArchiveInputStream(
+ new BlockingInputStream(in2))) {
+ TarArchiveEntry te = k.getNextTarEntry();
+ if (te != null && te.isSymbolicLink()) {
+ IPath linkPath = new Path(te.getLinkName());
+ if (!linkPath.isAbsolute()) {
+ linkPath = new Path(link).removeLastSegments(1)
+ .append(te.getLinkName());
+ }
+ link = linkPath.toPortableString();
+ continue;
+ }
+ while (te != null) {
+ long size = te.getSize();
+ IPath currDir = target.append(volume).removeLastSegments(1);
+ IPath path = currDir.append(name);
+ File f = new File(path.toOSString());
+ if (te.isSymbolicLink()) {
+ IPath linkPath = new Path(te.getLinkName());
+ if (!linkPath.isAbsolute()) {
+ if (!isWin) {
+ java.nio.file.Path p = Paths.get(path.toPortableString());
+ java.nio.file.Path linkp = Paths.get(te.getLinkName());
+ if (f.exists()) {
+ f.delete();
+ }
+ Files.createSymbolicLink(p, linkp);
+ } else {
+ // we don't follow nested links
+ }
+ } else {
+ // we don't follow nested absolute links
+ }
+ te = k.getNextTarEntry();
+ continue;
+ }
+ int mode = te.getMode();
+ if (te.isDirectory()) {
+ f.mkdir();
+ if (!isWin) {
+ Files.setPosixFilePermissions(Paths.get(path.toOSString()),
+ toPerms(mode));
+ }
+ te = k.getNextTarEntry();
+ continue;
+ }
+ f.createNewFile();
+ if (!isWin) {
+ Files.setPosixFilePermissions(Paths.get(path.toOSString()),
+ toPerms(mode));
+ }
+ try (FileOutputStream os = new FileOutputStream(f)) {
+ int bufferSize = ((int) size > 4096 ? 4096 : (int) size);
+ byte[] barray = new byte[bufferSize];
+ int result = -1;
+ while ((result = k.read(barray, 0, bufferSize)) > -1) {
+ if (monitor.isCanceled()) {
+ monitor.done();
+ k.close();
+ os.close();
+ return Status.CANCEL_STATUS;
+ }
+ os.write(barray, 0, result);
+ }
+ }
+ }
+ resolved = true;
+ }
+ }
+ }
synchronized (lockObject) {
copyingList.remove(currentVolume);
}
@@ -549,7 +652,6 @@ public class ContainerLauncher {
}
}
}
- super.finalize();
}
public ContainerLauncher() {
@@ -592,7 +694,7 @@ public class ContainerLauncher {
/**
* Perform a launch of a command in a container and output stdout/stderr to
* console.
- *
+ *
* @param id
* - id of caller to use to distinguish console owner
* @param listener
@@ -635,7 +737,7 @@ public class ContainerLauncher {
/**
* Perform a launch of a command in a container and output stdout/stderr to
* console.
- *
+ *
* @param id
* - id of caller to use to distinguish console owner
* @param listener
@@ -681,7 +783,7 @@ public class ContainerLauncher {
/**
* Perform a launch of a command in a container and output stdout/stderr to
* console.
- *
+ *
* @param id
* - id of caller to use to distinguish console owner
* @param listener
@@ -749,7 +851,7 @@ public class ContainerLauncher {
/**
* Perform a launch of a command in a container and output stdout/stderr to
* console.
- *
+ *
* @param id
* - id of caller to use to distinguish console owner
* @param listener
@@ -804,7 +906,7 @@ public class ContainerLauncher {
/**
* Perform a launch of a command in a container and output stdout/stderr to
* console.
- *
+ *
* @param id
* - id of caller to use to distinguish console owner
* @param listener
@@ -1258,7 +1360,7 @@ public class ContainerLauncher {
/**
* Fetch directories from Container and place them in a specified location.
- *
+ *
* @param connectionUri
* - uri of connection to use
* @param imageName
@@ -1268,7 +1370,7 @@ public class ContainerLauncher {
* @param hostDir
* - host directory to copy directories to
* @return 0 if successful, -1 if failure occurred
- *
+ *
* @since 3.0
*/
public int fetchContainerDirs(String connectionUri, String imageName,
@@ -1297,7 +1399,7 @@ public class ContainerLauncher {
/**
* Fetch directories from Container and place them in a specified location.
- *
+ *
* @param connectionUri
* - uri of connection to use
* @param imageName
@@ -1309,7 +1411,7 @@ public class ContainerLauncher {
* @param hostDir
* - host directory to copy directories to
* @return 0 if successful, -1 if failure occurred
- *
+ *
* @since 4.0
*/
public int fetchContainerDirs(String connectionUri, String imageName,
@@ -1339,7 +1441,7 @@ public class ContainerLauncher {
/**
* Fetch directories from Container and place them in a specified location.
* This method will wait for copy job to complete before returning.
- *
+ *
* @param connectionUri
* - uri of connection to use
* @param imageName
@@ -1349,7 +1451,7 @@ public class ContainerLauncher {
* @param hostDir
* - host directory to copy directories to
* @return 0 if successful, -1 if failure occurred
- *
+ *
* @since 4.0
*/
public int fetchContainerDirsSync(String connectionUri, String imageName,
@@ -1384,7 +1486,7 @@ public class ContainerLauncher {
/**
* Fetch directories from Container and place them in a specified location.
* This method will wait for copy job to complete before returning.
- *
+ *
* @param connectionUri
* - uri of connection to use
* @param imageName
@@ -1394,7 +1496,7 @@ public class ContainerLauncher {
* @param hostDir
* - host directory to copy directories to
* @return 0 if successful, -1 if failure occurred
- *
+ *
* @since 4.0
*/
public int fetchContainerDirsSync(String connectionUri, String imageName,
@@ -1430,7 +1532,7 @@ public class ContainerLauncher {
/**
* Create a Process to run an arbitrary command in a Container with uid of
* caller so any files created are accessible to user.
- *
+ *
* @param connectionName
* - uri of connection to use
* @param imageName
@@ -1461,10 +1563,10 @@ public class ContainerLauncher {
* - boolean whether to keep Container when done
* @return Process that can be used to check for completion and for routing
* stdout/stderr
- *
+ *
* @since 3.0
*/
- public Process runCommand(String connectionName, String imageName, IProject project,
+ public Process runCommand(String connectionName, String imageName, IProject project,
IErrorMessageHolder errMsgHolder, String command,
@SuppressWarnings("unused") String commandDir,
String workingDir,
@@ -1472,7 +1574,7 @@ public class ContainerLauncher {
Properties envMap, boolean supportStdin,
boolean privilegedMode, HashMap<String, String> labels,
boolean keepContainer) {
-
+
final List<String> cmdList = getCmdList(command);
return runCommand(connectionName, imageName, project, errMsgHolder,
cmdList, workingDir, additionalDirs, origEnv, envMap,
@@ -1482,7 +1584,7 @@ public class ContainerLauncher {
/**
* Create a Process to run an arbitrary command in a Container with uid of
* caller so any files created are accessible to user.
- *
+ *
* @param connectionName
* - uri of connection to use
* @param imageName
@@ -1511,7 +1613,7 @@ public class ContainerLauncher {
* - boolean whether to keep Container when done
* @return Process that can be used to check for completion and for routing
* stdout/stderr
- *
+ *
* @since 4.0
*/
public Process runCommand(String connectionName, String imageName,
@@ -1613,7 +1715,7 @@ public class ContainerLauncher {
id += ":" + gid.toString(); //$NON-NLS-1$
builder = builder.user(id);
}
-
+
// TODO: add group id here when supported by DockerHostConfig.Builder
// add any labels if specified
@@ -1776,7 +1878,7 @@ public class ContainerLauncher {
errMsgHolder.setErrorMessage(e.getMessage());
return null;
}
-
+
final String id = containerId;
final IDockerConnection conn = connection;
if (!((DockerConnection) conn).isLocal()) {
@@ -1807,7 +1909,7 @@ public class ContainerLauncher {
/**
* Clean up the container used for launching
- *
+ *
* @param connectionUri
* the URI of the connection used
* @param info
@@ -1833,7 +1935,7 @@ public class ContainerLauncher {
/**
* Get the reusable run console for running C/C++ executables in containers.
- *
+ *
* @return
*/
private RunConsole getConsole() {
@@ -1846,7 +1948,7 @@ public class ContainerLauncher {
/**
* Take the command string and parse it into a list of strings.
- *
+ *
* @param s
* @return list of strings
*/
@@ -1910,7 +2012,7 @@ public class ContainerLauncher {
/**
* Convert map of environment variables to a {@link List} of KEY=VALUE
* String
- *
+ *
* @param variables
* the entries to manipulate
* @return the concatenated key/values for each given variable entry
@@ -1937,13 +2039,13 @@ public class ContainerLauncher {
/**
* Get set of volumes that have been copied from Container to Host as part
* of fetchContainerDirs method.
- *
+ *
* @param connectionName
* - uri of connection used
* @param imageName
* - name of image used
* @return set of paths copied from Container to Host
- *
+ *
* @since 3.0
*/
public Set<String> getCopiedVolumes(String connectionName,
diff --git a/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/docker/ui/wizards/ImageSearch.java b/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/docker/ui/wizards/ImageSearch.java
index 96393885245c7d4d86a3675e12d592885d8b46a2..afd044cf146d98169455f1562d48d6a78a683747 100644
--- a/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/docker/ui/wizards/ImageSearch.java
+++ b/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/docker/ui/wizards/ImageSearch.java
@@ -1,6 +1,6 @@
/*******************************************************************************
- * Copyright (c) 2014, 2018 Red Hat.
- *
+ * Copyright (c) 2014, 2020 Red Hat.
+ *
* This program and the accompanying materials are made
* available under the terms of the Eclipse Public License 2.0
* which is available at https://www.eclipse.org/legal/epl-2.0/
@@ -15,9 +15,11 @@ package org.eclipse.linuxtools.docker.ui.wizards;
import org.eclipse.jface.wizard.Wizard;
import org.eclipse.jface.wizard.WizardPage;
+import org.eclipse.linuxtools.docker.core.AbstractRegistry;
import org.eclipse.linuxtools.docker.core.IDockerConnection;
import org.eclipse.linuxtools.docker.core.IDockerImage;
import org.eclipse.linuxtools.docker.core.IRegistry;
+import org.eclipse.linuxtools.internal.docker.core.RegistryInfo;
import org.eclipse.linuxtools.internal.docker.ui.wizards.ImageSearchModel;
import org.eclipse.linuxtools.internal.docker.ui.wizards.ImageSearchPage;
import org.eclipse.linuxtools.internal.docker.ui.wizards.ImageTagSelectionPage;
@@ -25,7 +27,7 @@ import org.eclipse.linuxtools.internal.docker.ui.wizards.WizardMessages;
/**
* Wizard to search for images.
- *
+ *
*/
public class ImageSearch extends Wizard {
@@ -42,12 +44,12 @@ public class ImageSearch extends Wizard {
private final ImageSearchModel imageSearchModel;
/**
- * Default Constructor
- *
- * @param connection
- * the current connection to a target Docker daemon
- * @param name
- * the current image name or <code>null</code> if not applicable
+ * Constructor
+ *
+ * @param connection the current connection to a target Docker daemon
+ * @param name the current image name or <code>null</code> if not
+ * applicable
+ * @param reg registry to use
*/
public ImageSearch(final IDockerConnection connection, final String name, final IRegistry reg) {
setWindowTitle(WizardMessages.getString("ImageSearch.title")); //$NON-NLS-1$
@@ -58,6 +60,18 @@ public class ImageSearch extends Wizard {
this.imageSearchModel, reg);
}
+ /**
+ * Constructor
+ *
+ * @param connection the current connection to a target Docker daemon
+ * @param name the current image name or <code>null</code> if not
+ * applicable
+ * @since 4.7
+ */
+ public ImageSearch(final IDockerConnection connection, final String name) {
+ this(connection, name, new RegistryInfo(AbstractRegistry.DOCKERHUB_REGISTRY, true));
+ }
+
@Override
public void addPages() {
addPage(imageSearchPage);
diff --git a/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/commands/CommandMessages.properties b/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/commands/CommandMessages.properties
index f5e3b96f67932c50531f84a840dc8bb8ca866595..e90044f6f30a2f1d75089df3b9bde48c80cb90eb 100644
--- a/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/commands/CommandMessages.properties
+++ b/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/commands/CommandMessages.properties
@@ -16,6 +16,7 @@ missing_connection=Missing connection
command.pullImage.failure.no_connection=Unable to pull an image: no connection was found in the selection.
command.copyfromcontainer.failure.no_connection=Unable to copy from container: no connection was found.
+command.copyfromcontainer.failure.possible_circular_links=More than 9 links followed: possible circular links.
command.copyfromcontainer.job.title=Copying files from {0}
command.copyfromcontainer.job.task=Copying files
command.copyfromcontainer.job.subtask=Copying {0}
diff --git a/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/commands/CopyFromContainerCommandHandler.java b/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/commands/CopyFromContainerCommandHandler.java
index 8bf49bce0a42f5699cbea12d12b3cd47e539b1e2..22aa3ab4f9178434e3f729389b318845acf95b91 100644
--- a/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/commands/CopyFromContainerCommandHandler.java
+++ b/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/commands/CopyFromContainerCommandHandler.java
@@ -1,6 +1,6 @@
/*******************************************************************************
- * Copyright (c) 2016, 2019 Red Hat Inc. and others.
- *
+ * Copyright (c) 2016, 2020 Red Hat Inc. and others.
+ *
* This program and the accompanying materials are made
* available under the terms of the Eclipse Public License 2.0
* which is available at https://www.eclipse.org/legal/epl-2.0/
@@ -20,8 +20,10 @@ import java.io.InputStream;
import java.nio.file.Files;
import java.nio.file.Paths;
import java.nio.file.attribute.PosixFilePermission;
+import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
+import java.util.Map;
import java.util.Set;
import org.apache.commons.compress.archivers.tar.TarArchiveEntry;
@@ -57,6 +59,7 @@ import org.eclipse.ui.handlers.HandlerUtil;
public class CopyFromContainerCommandHandler extends AbstractHandler {
private static final String ERROR_COPYING_FROM_CONTAINER_NO_CONNECTION = "command.copyfromcontainer.failure.no_connection"; //$NON-NLS-1$
+ private static final String ERROR_POSSIBLE_CIRCULAR_LINKS = "command.copyfromcontainer.failure.possible_circular_links"; //$NON-NLS-1$
private static final String MISSING_CONNECTION = "missing_connection"; //$NON-NLS-1$
private static final String ERROR_COPYING_FROM_CONTAINER = "command.copyfromcontainer.error.msg"; //$NON-NLS-1$
private static final String COPY_FROM_CONTAINER_JOB_TASK = "command.copyfromcontainer.job.task"; //$NON-NLS-1$
@@ -153,6 +156,7 @@ public class CopyFromContainerCommandHandler extends AbstractHandler {
monitor.beginTask(CommandMessages.getString(COPY_FROM_CONTAINER_JOB_TASK), files.size());
boolean isWin = Platform.getOS().equals(Platform.OS_WIN32);
try (Closeable token = ((DockerConnection) connection).getOperationToken()) {
+ Map<String, String> links = new HashMap<>();
for (ContainerFileProxy proxy : files) {
if (monitor.isCanceled()) {
monitor.done();
@@ -163,7 +167,7 @@ public class CopyFromContainerCommandHandler extends AbstractHandler {
proxy.getFullPath()));
monitor.worked(1);
InputStream in = ((DockerConnection) connection).copyContainer(token, container.id(),
- proxy.getLink());
+ proxy.getFullPath());
/*
* The input stream from copyContainer might be incomplete or non-blocking so we
* should wrap it in a stream that is guaranteed to block until data is
@@ -177,17 +181,39 @@ public class CopyFromContainerCommandHandler extends AbstractHandler {
path = path.append(te.getName());
File f = new File(path.toOSString());
int mode = te.getMode();
+ if (te.isSymbolicLink()) {
+ IPath linkPath = new Path(te.getLinkName());
+ if (!linkPath.isAbsolute()) {
+ // for relative links, we will create a symbolic link if
+ // we are copying a folder, otherwise, we will follow the
+ // link and copy the file it points to
+ if (!isWin && proxy.isFolder()) {
+ java.nio.file.Path p = Paths.get(path.toPortableString());
+ java.nio.file.Path link = Paths.get(te.getLinkName());
+ if (f.exists()) {
+ f.delete();
+ }
+ Files.createSymbolicLink(p, link);
+ } else {
+ linkPath = new Path(proxy.getFullPath()).removeLastSegments(1)
+ .append(te.getLinkName());
+ links.put(path.toPortableString(), linkPath.toPortableString());
+ }
+ } else {
+ links.put(path.toPortableString(), linkPath.toPortableString());
+ }
+ continue;
+ }
if (te.isDirectory()) {
f.mkdir();
- if (!isWin && !te.isSymbolicLink()) {
+ if (!isWin) {
Files.setPosixFilePermissions(Paths.get(path.toOSString()), toPerms(mode));
}
continue;
- } else {
- f.createNewFile();
- if (!isWin && !te.isSymbolicLink()) {
- Files.setPosixFilePermissions(Paths.get(path.toOSString()), toPerms(mode));
- }
+ }
+ f.createNewFile();
+ if (!isWin) {
+ Files.setPosixFilePermissions(Paths.get(path.toOSString()), toPerms(mode));
}
try (FileOutputStream os = new FileOutputStream(f)) {
int bufferSize = ((int) size > 4096 ? 4096 : (int) size);
@@ -210,10 +236,105 @@ public class CopyFromContainerCommandHandler extends AbstractHandler {
.syncExec(() -> MessageDialog.openError(
PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(),
CommandMessages.getFormattedString(ERROR_COPYING_FROM_CONTAINER,
- proxy.getLink(), container.name()),
+ proxy.getTarget(), container.name()),
e.getCause() != null ? e.getCause().getMessage() : e.getMessage()));
}
}
+ // resolve absolute links by copying the files
+ for (String name : links.keySet()) {
+ String link = links.get(name);
+ boolean resolved = false;
+ int i = 0; // prevent infinite loop if there is a circular link
+ while (!resolved && ++i < 10) {
+ try {
+ InputStream in = ((DockerConnection) connection).copyContainer(token, container.id(),
+ link);
+ /*
+ * The input stream from copyContainer might be incomplete or non-blocking so we
+ * should wrap it in a stream that is guaranteed to block until data is
+ * available.
+ */
+ try (TarArchiveInputStream k = new TarArchiveInputStream(new BlockingInputStream(in))) {
+ TarArchiveEntry te = k.getNextTarEntry();
+ if (te != null && te.isSymbolicLink()) {
+ IPath linkPath = new Path(te.getLinkName());
+ if (!linkPath.isAbsolute()) {
+ linkPath = new Path(link).removeLastSegments(1).append(te.getLinkName());
+ }
+ link = linkPath.toPortableString();
+ continue;
+ }
+ while (te != null) {
+ long size = te.getSize();
+ IPath path = new Path(name)
+ .append(new Path(te.getName()).removeFirstSegments(1));
+ File f = new File(path.toOSString());
+ if (te.isSymbolicLink()) {
+ IPath linkPath = new Path(te.getLinkName());
+ if (!isWin && !linkPath.isAbsolute()) {
+ java.nio.file.Path p = Paths.get(path.toPortableString());
+ java.nio.file.Path linkp = Paths.get(te.getLinkName());
+ if (f.exists()) {
+ f.delete();
+ }
+ Files.createSymbolicLink(p, linkp);
+ } else {
+ // we don't follow nested links
+ }
+ te = k.getNextTarEntry();
+ continue;
+ }
+ int mode = te.getMode();
+ if (te.isDirectory()) {
+ f.mkdir();
+ if (!isWin) {
+ Files.setPosixFilePermissions(Paths.get(path.toOSString()),
+ toPerms(mode));
+ }
+ te = k.getNextTarEntry();
+ continue;
+ }
+ f.createNewFile();
+ if (!isWin) {
+ Files.setPosixFilePermissions(Paths.get(path.toOSString()), toPerms(mode));
+ }
+ try (FileOutputStream os = new FileOutputStream(f)) {
+ int bufferSize = ((int) size > 4096 ? 4096 : (int) size);
+ byte[] barray = new byte[bufferSize];
+ int result = -1;
+ while ((result = k.read(barray, 0, bufferSize)) > -1) {
+ if (monitor.isCanceled()) {
+ monitor.done();
+ k.close();
+ os.close();
+ return Status.CANCEL_STATUS;
+ }
+ os.write(barray, 0, result);
+ }
+ }
+ te = k.getNextTarEntry();
+ }
+ resolved = true;
+ }
+ } catch (final DockerException e) {
+ Display.getDefault()
+ .syncExec(() -> MessageDialog.openError(
+ PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(),
+ CommandMessages.getFormattedString(ERROR_COPYING_FROM_CONTAINER, name,
+ container.name()),
+ e.getCause() != null ? e.getCause().getMessage() : e.getMessage()));
+ }
+ }
+ if (i == 10) {
+ Display.getDefault()
+ .syncExec(() -> MessageDialog.openError(
+ PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(),
+ CommandMessages.getFormattedString(ERROR_COPYING_FROM_CONTAINER, name,
+ container.name()),
+ CommandMessages.getString(ERROR_POSSIBLE_CIRCULAR_LINKS)));
+
+ }
+ }
} catch (InterruptedException e) {
// do nothing
} catch (IOException e) {
diff --git a/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/commands/PullImageCommandHandler.java b/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/commands/PullImageCommandHandler.java
index 20eebf85de8ef79c2425228e53489fbc2d42f834..981a82f8a504f83877ede5dd078200e56a333e59 100644
--- a/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/commands/PullImageCommandHandler.java
+++ b/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/commands/PullImageCommandHandler.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2015, 2018 Red Hat Inc. and others.
+ * Copyright (c) 2015, 2020 Red Hat Inc. and others.
*
* This program and the accompanying materials are made
* available under the terms of the Eclipse Public License 2.0
@@ -33,7 +33,7 @@ import org.eclipse.ui.IWorkbenchPart;
import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.handlers.HandlerUtil;
-import com.spotify.docker.client.exceptions.DockerCertificateException;
+import org.mandas.docker.client.exceptions.DockerCertificateException;
/**
* Command handler that opens the {@link ImageSearch} wizard and pulls the
diff --git a/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/commands/RunImageCommandHandler.java b/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/commands/RunImageCommandHandler.java
index e987ea9a5b0df264905ea3fe33a083baefdeb0b3..449765ae9a991a990f25865e7a06db80c7c72988 100644
--- a/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/commands/RunImageCommandHandler.java
+++ b/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/commands/RunImageCommandHandler.java
@@ -1,6 +1,6 @@
/*******************************************************************************
- * Copyright (c) 2014, 2018 Red Hat Inc. and others.
- *
+ * Copyright (c) 2014, 2020 Red Hat Inc. and others.
+ *
* This program and the accompanying materials are made
* available under the terms of the Eclipse Public License 2.0
* which is available at https://www.eclipse.org/legal/epl-2.0/
@@ -16,6 +16,8 @@ package org.eclipse.linuxtools.internal.docker.ui.commands;
import static org.eclipse.linuxtools.internal.docker.ui.commands.CommandUtils.getRunConsole;
import java.io.OutputStream;
+import java.util.ArrayList;
+import java.util.List;
import org.eclipse.core.commands.AbstractHandler;
import org.eclipse.core.commands.ExecutionEvent;
@@ -70,10 +72,11 @@ public class RunImageCommandHandler extends AbstractHandler {
if (runImage) {
final IDockerContainerConfig containerConfig = wizard
.getDockerContainerConfig();
+ List<String> unusedPorts = new ArrayList<>();
final IDockerHostConfig hostConfig = wizard
- .getDockerHostConfig();
+ .getDockerHostConfig(unusedPorts);
runImage(selectedImage, containerConfig, null,
- hostConfig, wizard.getDockerContainerName(),
+ hostConfig, unusedPorts, wizard.getDockerContainerName(),
wizard.removeWhenExits());
}
} catch (DockerException | CoreException e) {
@@ -85,7 +88,7 @@ public class RunImageCommandHandler extends AbstractHandler {
/**
* Run the given {@link IDockerImage} with the given settings
- *
+ *
* @param image
* @param containerConfig
* @param hostConfig
@@ -95,7 +98,9 @@ public class RunImageCommandHandler extends AbstractHandler {
public static void runImage(final IDockerImage image,
final IDockerContainerConfig containerConfig,
final ILaunch launch,
- final IDockerHostConfig hostConfig, final String containerName,
+ final IDockerHostConfig hostConfig,
+ final List<String> unusedPorts,
+ final String containerName,
final boolean removeWhenExits) {
final IDockerConnection connection = image.getConnection();
if (containerConfig.tty()) {
@@ -164,7 +169,7 @@ public class RunImageCommandHandler extends AbstractHandler {
// create a launch configuration from the container
LaunchConfigurationUtils.createRunImageLaunchConfiguration(image,
containerConfig,
- hostConfig, containerName,
+ hostConfig, unusedPorts, containerName,
removeWhenExits);
} catch (final DockerException | InterruptedException e) {
if (console != null) {
diff --git a/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/consoles/DockerComposeConsolePageParticipant.java b/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/consoles/DockerComposeConsolePageParticipant.java
index 21cac295989cf18a859d076e897614117038993e..57a3ad10b19b8b7a15636551ad02e3e0a453f0b6 100644
--- a/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/consoles/DockerComposeConsolePageParticipant.java
+++ b/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/consoles/DockerComposeConsolePageParticipant.java
@@ -1,6 +1,6 @@
/*******************************************************************************
- * Copyright (c) 2015, 2018 Red Hat Inc. and others.
- *
+ * Copyright (c) 2015, 2019 Red Hat Inc. and others.
+ *
* This program and the accompanying materials are made
* available under the terms of the Eclipse Public License 2.0
* which is available at https://www.eclipse.org/legal/epl-2.0/
@@ -30,7 +30,6 @@ public class DockerComposeConsolePageParticipant
implements IConsolePageParticipant, IDebugEventSetListener {
private DockerComposeConsole dockerComposeConsole;
- private IPageBookViewPage dockerComposeConsolePage;
private DockerComposeStopAction stopAction;
private boolean dockerComposeConsoleTerminated = false;
@@ -43,7 +42,6 @@ public class DockerComposeConsolePageParticipant
@Override
public void init(final IPageBookViewPage dockerComposeConsolePage,
final IConsole console) {
- this.dockerComposeConsolePage = dockerComposeConsolePage;
this.dockerComposeConsole = (DockerComposeConsole) console;
this.stopAction = new DockerComposeStopAction(
dockerComposeConsole.getConnection(),
diff --git a/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/launch/ContainerCommandProcess.java b/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/launch/ContainerCommandProcess.java
index f9c52cc78d51116dca01f7e54c73eacd8ab319e0..e20dbe048d3e96ea68e6c61e2eeded4f23cacb76 100644
--- a/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/launch/ContainerCommandProcess.java
+++ b/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/launch/ContainerCommandProcess.java
@@ -1,6 +1,6 @@
/*******************************************************************************
- * Copyright (c) 2017, 2019 Red Hat Inc. and others.
- *
+ * Copyright (c) 2017, 2020 Red Hat Inc. and others.
+ *
* This program and the accompanying materials are made
* available under the terms of the Eclipse Public License 2.0
* which is available at https://www.eclipse.org/legal/epl-2.0/
@@ -221,7 +221,7 @@ public class ContainerCommandProcess extends Process {
LaunchMessages.getFormattedString(
"ContainerNotFinished.msg", containerId)); //$NON-NLS-1$
}
- return state.exitCode();
+ return state.exitCode().intValue();
}
}
if (containerRemoved) {
@@ -276,7 +276,7 @@ public class ContainerCommandProcess extends Process {
containerRemoved = true;
connection.removeContainer(containerId);
}
- return exit.statusCode();
+ return exit.statusCode().intValue();
} catch (DockerException e) {
return -1;
}
diff --git a/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/launch/IRunDockerImageLaunchConfigurationConstants.java b/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/launch/IRunDockerImageLaunchConfigurationConstants.java
index 62e7eb7bbc9d7d8103ccdaca978b9cf0ea55fd2d..e244dca1a8ff5d7fbab7aa6108f926211a807abd 100644
--- a/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/launch/IRunDockerImageLaunchConfigurationConstants.java
+++ b/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/launch/IRunDockerImageLaunchConfigurationConstants.java
@@ -1,6 +1,6 @@
/*******************************************************************************
- * Copyright (c) 2015, 2018 Red Hat.
- *
+ * Copyright (c) 2015, 2020 Red Hat.
+ *
* This program and the accompanying materials are made
* available under the terms of the Eclipse Public License 2.0
* which is available at https://www.eclipse.org/legal/epl-2.0/
@@ -42,6 +42,8 @@ public interface IRunDockerImageLaunchConfigurationConstants {
String PUBLISHED_PORTS = "publishedPorts"; //$NON-NLS-1$
+ String UNUSED_PORTS = "unusedPorts"; //$NON-NLS-1$
+
String LINKS = "links"; //$NON-NLS-1$
String INTERACTIVE = "interactive"; //$NON-NLS-1$
diff --git a/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/launch/LaunchConfigurationUtils.java b/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/launch/LaunchConfigurationUtils.java
index a2cca041273f80e336f4591266543ab05ee69f45..d1157fa50a341159cfd13ca4da07494ff40876f6 100644
--- a/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/launch/LaunchConfigurationUtils.java
+++ b/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/launch/LaunchConfigurationUtils.java
@@ -1,6 +1,6 @@
/*******************************************************************************
- * Copyright (c) 2015,2018 Red Hat.
- *
+ * Copyright (c) 2015, 2020 Red Hat.
+ *
* This program and the accompanying materials are made
* available under the terms of the Eclipse Public License 2.0
* which is available at https://www.eclipse.org/legal/epl-2.0/
@@ -36,6 +36,7 @@ import static org.eclipse.linuxtools.internal.docker.ui.launch.IRunDockerImageLa
import static org.eclipse.linuxtools.internal.docker.ui.launch.IRunDockerImageLaunchConfigurationConstants.PUBLISHED_PORTS;
import static org.eclipse.linuxtools.internal.docker.ui.launch.IRunDockerImageLaunchConfigurationConstants.PUBLISH_ALL_PORTS;
import static org.eclipse.linuxtools.internal.docker.ui.launch.IRunDockerImageLaunchConfigurationConstants.READONLY;
+import static org.eclipse.linuxtools.internal.docker.ui.launch.IRunDockerImageLaunchConfigurationConstants.UNUSED_PORTS;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
@@ -107,7 +108,7 @@ public class LaunchConfigurationUtils {
/**
* Creates a new {@link ILaunchConfiguration} for the given
* {@link IDockerContainer}.
- *
+ *
* @param baseConfigurationName
* the base configuration name to use when creating the
* {@link ILaunchConfiguration}.
@@ -123,12 +124,14 @@ public class LaunchConfigurationUtils {
* @param removeWhenExits
* flag to indicate if container should be removed when exited
* @return the generated {@link ILaunchConfiguration}
- *
+ *
*/
public static ILaunchConfiguration createRunImageLaunchConfiguration(
final IDockerImage image,
final IDockerContainerConfig containerConfig,
- final IDockerHostConfig hostConfig, final String containerName,
+ final IDockerHostConfig hostConfig,
+ final List<String> unusedPorts,
+ final String containerName,
final boolean removeWhenExits) {
try {
final ILaunchManager manager = DebugPlugin.getDefault()
@@ -175,6 +178,7 @@ public class LaunchConfigurationUtils {
} else {
workingCopy.setAttribute(PUBLISHED_PORTS,
serializePortBindings(hostConfig.portBindings()));
+ workingCopy.setAttribute(UNUSED_PORTS, unusedPorts);
}
// links (with format being: "<containerName>:<containerAlias>")
workingCopy.setAttribute(LINKS, hostConfig.links());
@@ -200,6 +204,11 @@ public class LaunchConfigurationUtils {
volumes.add(volume.toString());
}
}
+ // volumes with no external mount
+ for (String volumePath : containerConfig.volumes().keySet()) {
+ final DataVolumeModel volume = new DataVolumeModel(volumePath);
+ volumes.add(volume.toString());
+ }
// TODO: container path declaration
workingCopy.setAttribute(DATA_VOLUMES, volumes);
@@ -214,7 +223,7 @@ public class LaunchConfigurationUtils {
if (hostConfig.networkMode() != null)
workingCopy.setAttribute(NETWORK_MODE,
hostConfig.networkMode());
-
+
// resources limitations
if (containerConfig.memory() != null) {
workingCopy.setAttribute(ENABLE_LIMITS, true);
@@ -245,7 +254,7 @@ public class LaunchConfigurationUtils {
/**
* Serializes the given Port Bindings to save them in an
* {@link ILaunchConfiguration}
- *
+ *
* @param bindings
* @return a {@link List} of port bindings serialized in the following
* format:
@@ -278,7 +287,7 @@ public class LaunchConfigurationUtils {
/**
* Serializes the given Port Bindings to save them in an
* {@link ILaunchConfiguration}
- *
+ *
* @param bindings
* @return a {@link List} of port bindings serialized in the following
* format:
@@ -310,7 +319,7 @@ public class LaunchConfigurationUtils {
/**
* Deserializes the given Port Bindings to use them in an
* {@link ILaunchConfiguration}
- *
+ *
* @param bindings
* a {@link List} of serialized bindings
* @return a {@link Map} of {@link List} of {@link IDockerPortBinding}
@@ -342,7 +351,7 @@ public class LaunchConfigurationUtils {
/**
* Computes the size of the given {@link Button} and returns the width.
- *
+ *
* @param button
* the button for which the size must be computed.
* @return the width hint for the given button
@@ -359,7 +368,7 @@ public class LaunchConfigurationUtils {
/**
* Looks-up the {@link ILaunchConfiguration} with the given type and
* <strong>IDockerImage's name</strong>.
- *
+ *
* @param type
* the configuration type
* @param imageName
@@ -377,7 +386,7 @@ public class LaunchConfigurationUtils {
/**
* Looks-up the {@link ILaunchConfiguration} with the given type and
* <strong>IDockerImage's name</strong>.
- *
+ *
* @param type
* the configuration type
* @param imageName
@@ -412,7 +421,7 @@ public class LaunchConfigurationUtils {
/**
* Returns the {@link ILaunchConfigurationWorkingCopy} with the given type
* and <strong>IDockerImage's name</strong>.
- *
+ *
* @param type
* the configuration type
* @param imageName
@@ -442,7 +451,7 @@ public class LaunchConfigurationUtils {
/**
* Looks-up the {@link ILaunchConfiguration} with the given type and
* <strong>name</strong>.
- *
+ *
* @param type
* the configuration type
* @param name
@@ -468,7 +477,7 @@ public class LaunchConfigurationUtils {
/**
* Converts the given <code>path</code> to a Unix path if the current OS if
* {@link Platform#OS_WIN32}
- *
+ *
* @param path
* the path to convert
* @return the converted path or the given path, depending on the current
@@ -485,7 +494,7 @@ public class LaunchConfigurationUtils {
/**
* Converts the given path to a portable form, replacing all "\" and ": "
* with "/" if the given <code>os</code> is {@link Platform#OS_WIN32}.
- *
+ *
* @param os
* the current OS
* @param path
@@ -514,12 +523,12 @@ public class LaunchConfigurationUtils {
/**
* Converts the given <code>path</code> back to a Windows path if the
* current OS if {@link Platform#OS_WIN32}.
- *
+ *
* <p>
* Note: This is the revert operation of
* {@link LaunchConfigurationUtils#convertToUnixPath(String)}.
* </p>
- *
+ *
* @param path
* the path to convert
* @return the converted path or the given path, depending on the current
@@ -536,7 +545,7 @@ public class LaunchConfigurationUtils {
/**
* Converts the given path to a portable form, replacing all "\" and ": "
* with "/" if the given <code>os</code> is {@link Platform#OS_WIN32}.
- *
+ *
* @param os
* the current OS
* @param path
@@ -564,7 +573,7 @@ public class LaunchConfigurationUtils {
/**
* Creates a Launch Configuration name from the given repoName or from the
* given resource's project if the repoName was <code>null</code>.
- *
+ *
* @param imageName
* the full image name
* @param resource
@@ -602,7 +611,7 @@ public class LaunchConfigurationUtils {
/**
* Creates a new {@link ILaunchConfiguration} to build an
* {@link IDockerImage} from a Dockerfile {@link IResource}.
- *
+ *
* @param connection
* the connection to use to submit the build
* @param repoName
@@ -639,7 +648,7 @@ public class LaunchConfigurationUtils {
/**
* Creates an {@link ILaunchConfiguration} for to run the
* {@code docker-compose up} command.
- *
+ *
* @param connection
* the Docker connection to use
* @param dockerComposeScript
@@ -676,7 +685,7 @@ public class LaunchConfigurationUtils {
/**
* Creates a Launch Configuration name from the given
* {@code dockerComposeScript}.
- *
+ *
* @param dockerComposeScript
* the name of the {@code Docker Compose} script
* @return the {@link ILaunchConfiguration} name
@@ -691,7 +700,7 @@ public class LaunchConfigurationUtils {
* Updates all {@link ILaunchConfiguration} of the given {@code type} where
* there is an attribute with the given {@code attributeName} of the given
* {@code oldValue}, and sets the {@code newValue} instead.
- *
+ *
* @param type
* the type of {@link ILaunchConfiguration} to find
* @param attributeName
diff --git a/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/launch/RunDockerImageLaunchConfigurationDelegate.java b/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/launch/RunDockerImageLaunchConfigurationDelegate.java
index effc99b9e35ef6f7376a25b2e31aea41eb7e5c5c..336fddd3208884c0a010a8a6b0daa2ea73cb0745 100644
--- a/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/launch/RunDockerImageLaunchConfigurationDelegate.java
+++ b/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/launch/RunDockerImageLaunchConfigurationDelegate.java
@@ -1,6 +1,6 @@
/*******************************************************************************
- * Copyright (c) 2015,2018 Red Hat.
- *
+ * Copyright (c) 2015, 2020 Red Hat.
+ *
* This program and the accompanying materials are made
* available under the terms of the Eclipse Public License 2.0
* which is available at https://www.eclipse.org/legal/epl-2.0/
@@ -69,6 +69,8 @@ public class RunDockerImageLaunchConfigurationDelegate
containerConfig,
launch,
hostConfig,
+ config.getAttribute(
+ IRunDockerImageLaunchConfigurationConstants.UNUSED_PORTS, new ArrayList<String>()),
config.getAttribute(
IRunDockerImageLaunchConfigurationConstants.CONTAINER_NAME,
(String) null),
@@ -106,7 +108,7 @@ public class RunDockerImageLaunchConfigurationDelegate
.deserializePortBindings(serializedBindings);
hostConfigBuilder.portBindings(portBindings);
}
-
+
// container links
final List<String> links = config.getAttribute(
IRunDockerImageLaunchConfigurationConstants.LINKS,
@@ -128,10 +130,10 @@ public class RunDockerImageLaunchConfigurationDelegate
bind.append(",ro"); //$NON-NLS-1$
}
binds.add(bind.toString());
-
+
}
hostConfigBuilder.binds(binds);
-
+
// run in privileged mode
final boolean privileged = config.getAttribute(
IRunDockerImageLaunchConfigurationConstants.PRIVILEGED,
@@ -188,7 +190,7 @@ public class RunDockerImageLaunchConfigurationDelegate
IRunDockerImageLaunchConfigurationConstants.ENV_VARIABLES,
new ArrayList<String>());
config.env(environmentVariables);
-
+
// labels
final Map<String, String> labelVariables = lconfig.getAttribute(
IRunDockerImageLaunchConfigurationConstants.LABELS,
@@ -251,7 +253,7 @@ public class RunDockerImageLaunchConfigurationDelegate
/**
* Show a selection dialog that allows the user to choose one of the
* connections to use to build the Image.
- *
+ *
* @param connections
* Array of connections.
* @return The chosen connection, or <code>null</code> if the user cancelled
@@ -283,7 +285,7 @@ public class RunDockerImageLaunchConfigurationDelegate
/**
* Get the active Workbench shell.
- *
+ *
* @return active shell as returned by the plug-in
*/
protected Shell getActiveWorkbenchShell() {
diff --git a/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/launch/RunImagePortsTab.java b/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/launch/RunImagePortsTab.java
index 9645db859fdb5825e172eb09820f9ea77a99f789..eb5d5900793f934e2cc880e76a3aecaf1f7f61a1 100644
--- a/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/launch/RunImagePortsTab.java
+++ b/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/launch/RunImagePortsTab.java
@@ -1,6 +1,6 @@
/*******************************************************************************
- * Copyright (c) 2015, 2019 Red Hat Inc. and others.
- *
+ * Copyright (c) 2015, 2020 Red Hat Inc. and others.
+ *
* This program and the accompanying materials are made
* available under the terms of the Eclipse Public License 2.0
* which is available at https://www.eclipse.org/legal/epl-2.0/
@@ -339,6 +339,8 @@ public class RunImagePortsTab extends AbstractLaunchConfigurationTab
final List<String> publishedPorts = configuration.getAttribute(
IRunDockerImageLaunchConfigurationConstants.PUBLISHED_PORTS,
new ArrayList<String>());
+ final List<String> unusedPorts = configuration
+ .getAttribute(IRunDockerImageLaunchConfigurationConstants.UNUSED_PORTS, new ArrayList<String>());
final Set<ExposedPortModel> selectedPorts = new HashSet<>();
for (String port : publishedPorts) {
final ImageRunSelectionModel.ExposedPortModel exposedPort = ImageRunSelectionModel.ExposedPortModel
@@ -348,6 +350,13 @@ public class RunImagePortsTab extends AbstractLaunchConfigurationTab
selectedPorts.add(exposedPort);
}
}
+ for (String port : unusedPorts) {
+ final ImageRunSelectionModel.ExposedPortModel exposedPort = ImageRunSelectionModel.ExposedPortModel
+ .createPortModel(port);
+ exposedPort.setSelected(false);
+ model.addExposedPort(exposedPort);
+ }
+
// select ports
model.setSelectedPorts(selectedPorts);
diff --git a/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/views/ConnectionInfoContentProvider.java b/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/views/ConnectionInfoContentProvider.java
index fd852fec95f899241bad747466a97967105c70f7..5aca32794689eb676e08bacf572c07659c8110e5 100644
--- a/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/views/ConnectionInfoContentProvider.java
+++ b/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/views/ConnectionInfoContentProvider.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2014, 2018 Red Hat.
+ * Copyright (c) 2014, 2020 Red Hat.
*
* This program and the accompanying materials are made
* available under the terms of the Eclipse Public License 2.0
@@ -41,8 +41,6 @@ public class ConnectionInfoContentProvider implements ITreeContentProvider {
new Object[] { "Images", connectionInfo.getImages() }, //$NON-NLS-1$
new Object[] { "Storage driver", //$NON-NLS-1$
connectionInfo.getStorageDriver() },
- new Object[] { "Execution driver", //$NON-NLS-1$
- connectionInfo.getExecutionDriver() },
new Object[] { "Kernel version", //$NON-NLS-1$
connectionInfo.getKernelVersion() },
new Object[] { "Operating system", connectionInfo.getOs() }, //$NON-NLS-1$
diff --git a/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/views/ContainerInspectContentProvider.java b/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/views/ContainerInspectContentProvider.java
index 5960edc395c8c1a92be079273f31d15035318165..ba73e65539ad1d8c603c5d662c15409b08f51e43 100644
--- a/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/views/ContainerInspectContentProvider.java
+++ b/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/views/ContainerInspectContentProvider.java
@@ -1,6 +1,6 @@
/*******************************************************************************
- * Copyright (c) 2014, 2018 Red Hat.
- *
+ * Copyright (c) 2014, 2020 Red Hat.
+ *
* This program and the accompanying materials are made
* available under the terms of the Eclipse Public License 2.0
* which is available at https://www.eclipse.org/legal/epl-2.0/
@@ -23,6 +23,7 @@ import org.eclipse.jface.viewers.ITreeContentProvider;
import org.eclipse.jface.viewers.Viewer;
import org.eclipse.linuxtools.docker.core.IDockerContainerConfig;
import org.eclipse.linuxtools.docker.core.IDockerContainerInfo;
+import org.eclipse.linuxtools.docker.core.IDockerContainerInfo2;
import org.eclipse.linuxtools.docker.core.IDockerContainerState;
import org.eclipse.linuxtools.docker.core.IDockerHostConfig;
import org.eclipse.linuxtools.docker.core.IDockerNetworkSettings;
@@ -64,8 +65,7 @@ public class ContainerInspectContentProvider implements ITreeContentProvider {
new Object[]{"Path", info.path()}, //$NON-NLS-1$
new Object[]{"ProcessLabel", info.processLabel()}, //$NON-NLS-1$
new Object[]{"ResolvConfPath", info.resolvConfPath()}, //$NON-NLS-1$
- new Object[]{"Volumes", info.volumes()}, //$NON-NLS-1$
- new Object[]{"VolumesRW", info.volumesRW()}, //$NON-NLS-1$
+ new Object[] { "Mounts", ((IDockerContainerInfo2) info).mounts() }, //$NON-NLS-1$
};
}return EMPTY;
}
@@ -81,7 +81,7 @@ public class ContainerInspectContentProvider implements ITreeContentProvider {
new Object[]{"Running", containerState.running()}, //$NON-NLS-1$
new Object[]{"Paused", containerState.paused()}, //$NON-NLS-1$
new Object[]{"Pid", containerState.pid()}, //$NON-NLS-1$
- };
+ };
} else if(propertyValue instanceof IDockerHostConfig) {
final DockerHostConfig hostConfig = (DockerHostConfig) propertyValue;
return new Object[] {
@@ -174,7 +174,7 @@ public class ContainerInspectContentProvider implements ITreeContentProvider {
i++;
}
return result;
- }
+ }
return EMPTY;
}
@@ -211,5 +211,5 @@ public class ContainerInspectContentProvider implements ITreeContentProvider {
}
return false;
}
-
+
}
diff --git a/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/views/ImageInspectPropertySection.java b/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/views/ImageInspectPropertySection.java
index a91613fdce0ab887bdc5f8499f6577e85064e138..49d1820ac439e24797f510ae0d5599dd4b6ccd74 100644
--- a/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/views/ImageInspectPropertySection.java
+++ b/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/views/ImageInspectPropertySection.java
@@ -1,6 +1,6 @@
/*******************************************************************************
- * Copyright (c) 2015, 2018 Red Hat.
- *
+ * Copyright (c) 2015, 2019 Red Hat.
+ *
* This program and the accompanying materials are made
* available under the terms of the Eclipse Public License 2.0
* which is available at https://www.eclipse.org/legal/epl-2.0/
@@ -36,15 +36,12 @@ public class ImageInspectPropertySection extends BasePropertySection {
private final static String PropertiesInfoError = "PropertiesInfoError.msg"; //$NON-NLS-1$
private final static String PropertiesLoadingImageInfo = "PropertiesLoadingImageInfo.msg"; //$NON-NLS-1$
- private IDockerImage selectedImage;
- private Object imageInfo;
-
@Override
public void createControls(Composite parent, TabbedPropertySheetPage aTabbedPropertySheetPage) {
super.createControls(parent, aTabbedPropertySheetPage);
getTreeViewer().setContentProvider(new ImageInspectContentProvider());
}
-
+
@Override
public void setInput(final IWorkbenchPart part, final ISelection selection) {
super.setInput(part, selection);
diff --git a/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/wizards/ContainerDataVolumeDialog.java b/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/wizards/ContainerDataVolumeDialog.java
index 4d71c388b8edcebcd743a82093d7cd3b7f2719b9..f4ff9ce995e0d8cc817eb3afb74d3d149e38a860 100644
--- a/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/wizards/ContainerDataVolumeDialog.java
+++ b/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/wizards/ContainerDataVolumeDialog.java
@@ -1,6 +1,6 @@
/*******************************************************************************
- * Copyright (c) 2015, 2018 Red Hat Inc. and others.
- *
+ * Copyright (c) 2015, 2020 Red Hat Inc. and others.
+ *
* This program and the accompanying materials are made
* available under the terms of the Eclipse Public License 2.0
* which is available at https://www.eclipse.org/legal/epl-2.0/
@@ -41,7 +41,8 @@ import org.eclipse.jface.viewers.ArrayContentProvider;
import org.eclipse.jface.viewers.ComboViewer;
import org.eclipse.linuxtools.docker.core.IDockerConnection;
import org.eclipse.linuxtools.docker.core.IDockerContainer;
-import org.eclipse.linuxtools.docker.core.IDockerContainerInfo;
+import org.eclipse.linuxtools.docker.core.IDockerContainerInfo2;
+import org.eclipse.linuxtools.docker.core.IDockerContainerMount;
import org.eclipse.linuxtools.internal.docker.ui.SWTImagesFactory;
import org.eclipse.linuxtools.internal.docker.ui.wizards.ImageRunResourceVolumesVariablesModel.MountType;
import org.eclipse.swt.SWT;
@@ -294,7 +295,7 @@ public class ContainerDataVolumeDialog extends Dialog {
* selected, and set the enablement of the associated {@link Control} at the
* same time (ie: the {@link Control} are only enabled when the given
* {@link Button} is selected.
- *
+ *
* @param button
* the {@link Button} to bind
* @param mountType
@@ -361,7 +362,7 @@ public class ContainerDataVolumeDialog extends Dialog {
/**
* Creates an {@link IContentProposalProvider} to propose
* {@link IDockerContainer} names based on the current text.
- *
+ *
* @param items
* @return
*/
@@ -437,15 +438,22 @@ public class ContainerDataVolumeDialog extends Dialog {
// just make sure that the dialog cannot complete
return ValidationStatus.error(null);
}
- final IDockerContainerInfo selectedContainerInfo = container.info();
- if (selectedContainerInfo != null
- && selectedContainerInfo.volumes() != null
- && !selectedContainerInfo.volumes()
- .containsKey(model.getContainerPath())) {
- return ValidationStatus
- .warning(WizardMessages.getFormattedString(
- "ContainerDataVolumeDialog.volumeWarning", //$NON-NLS-1$
- model.getContainerPath()));
+ final IDockerContainerInfo2 selectedContainerInfo = (IDockerContainerInfo2) container.info();
+ if (selectedContainerInfo != null && selectedContainerInfo.mounts() != null
+ && model.getContainerPath() != null) {
+ boolean shouldWarn = true;
+ for (IDockerContainerMount mount : selectedContainerInfo.mounts()) {
+ if (model.getContainerPath().equals(mount.source())) {
+ shouldWarn = false;
+ break;
+ }
+ }
+ if (shouldWarn) {
+ return ValidationStatus
+ .warning(WizardMessages.getFormattedString("ContainerDataVolumeDialog.volumeWarning", //$NON-NLS-1$
+ model.getContainerPath()));
+
+ }
}
}
return ValidationStatus.ok();
diff --git a/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/wizards/EditDockerConnectionPage.java b/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/wizards/EditDockerConnectionPage.java
index c06069fc5f65ed0a3aa90cf0bc48fe934713cd3f..8b36718ecc7bf971f698f6ae929182f642454958 100644
--- a/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/wizards/EditDockerConnectionPage.java
+++ b/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/wizards/EditDockerConnectionPage.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2014, 2019 Red Hat Inc. and others.
+ * Copyright (c) 2014, 2020 Red Hat Inc. and others.
*
* This program and the accompanying materials are made
* available under the terms of the Eclipse Public License 2.0
@@ -62,7 +62,7 @@ import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Text;
import org.eclipse.ui.PlatformUI;
-import com.spotify.docker.client.exceptions.DockerCertificateException;
+import org.mandas.docker.client.exceptions.DockerCertificateException;
/**
* {@link WizardPage} to edit an {@link IDockerConnection}
diff --git a/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/wizards/ImageRun.java b/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/wizards/ImageRun.java
index dd883139eb3e31bf3b23fa52a51db3b1f4101617..400954d6542856885191b67ea40eae2b82bf34e3 100644
--- a/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/wizards/ImageRun.java
+++ b/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/wizards/ImageRun.java
@@ -1,6 +1,6 @@
/*******************************************************************************
- * Copyright (c) 2014, 2018 Red Hat.
- *
+ * Copyright (c) 2014, 2020 Red Hat.
+ *
* This program and the accompanying materials are made
* available under the terms of the Eclipse Public License 2.0
* which is available at https://www.eclipse.org/legal/epl-2.0/
@@ -38,6 +38,7 @@ import org.eclipse.linuxtools.internal.docker.core.DockerHostConfig;
import org.eclipse.linuxtools.internal.docker.core.DockerPortBinding;
import org.eclipse.linuxtools.internal.docker.ui.launch.IRunDockerImageLaunchConfigurationConstants;
import org.eclipse.linuxtools.internal.docker.ui.launch.LaunchConfigurationUtils;
+import org.eclipse.linuxtools.internal.docker.ui.wizards.ImageRunResourceVolumesVariablesModel.MountType;
import org.eclipse.linuxtools.internal.docker.ui.wizards.ImageRunSelectionModel.ContainerLinkModel;
import org.eclipse.linuxtools.internal.docker.ui.wizards.ImageRunSelectionModel.ExposedPortModel;
@@ -53,7 +54,7 @@ public class ImageRun extends Wizard {
/**
* Constructor when an {@link IDockerConnection} has been selected to run an
* {@link IDockerImage}.
- *
+ *
* @param connection
* the {@link IDockerConnection} pointing to a specific Docker
* daemon/host.
@@ -71,7 +72,7 @@ public class ImageRun extends Wizard {
/**
* Full constructor with a selected {@link IDockerImage} to run.
- *
+ *
* @param selectedImage
* the {@link IDockerImage} to use to fill the wizard pages
* @throws DockerException
@@ -125,7 +126,7 @@ public class ImageRun extends Wizard {
return this.imageRunSelectionPage.getModel().isRemoveWhenExits();
}
- public IDockerHostConfig getDockerHostConfig() {
+ public IDockerHostConfig getDockerHostConfig(List<String> unusedPorts) {
final ImageRunSelectionModel selectionModel = this.imageRunSelectionPage
.getModel();
final ImageRunResourceVolumesVariablesModel resourcesModel = this.imageRunResourceVolumesPage
@@ -134,6 +135,7 @@ public class ImageRun extends Wizard {
.getModel();
final DockerHostConfig.Builder hostConfigBuilder = new DockerHostConfig.Builder();
+
if (selectionModel.isPublishAllPorts()) {
hostConfigBuilder.publishAllPorts(true);
} else {
@@ -141,6 +143,17 @@ public class ImageRun extends Wizard {
for (ExposedPortModel exposedPort : selectionModel.getExposedPorts()) {
// only selected Ports in the CheckboxTableViewer are exposed.
if (!selectionModel.getSelectedPorts().contains(exposedPort)) {
+ StringBuilder b = new StringBuilder();
+ b.append(exposedPort.getContainerPort());
+ b.append("/");
+ b.append(exposedPort.getPortType());
+ b.append(":"); //$NON-NLS-1$
+ if (exposedPort.getHostAddress() != null) {
+ b.append(exposedPort.getHostAddress());
+ }
+ b.append(":"); //$NON-NLS-1$
+ b.append(exposedPort.getHostPort());
+ unusedPorts.add(b.toString());
continue;
}
final DockerPortBinding portBinding = new DockerPortBinding(exposedPort.getHostAddress(),
@@ -262,6 +275,24 @@ public class ImageRun extends Wizard {
}
config.exposedPorts(exposedPorts);
}
+
+ Map<String, String> emptyMap = new HashMap<>();
+ @SuppressWarnings("rawtypes")
+ Map<String, Map> volumes = new HashMap<>();
+ for (DataVolumeModel dataVolume : resourcesModel.getDataVolumes()) {
+ // only data volumes selected in the CheckBoxTableViewer are
+ // included.
+ if (!resourcesModel.getSelectedDataVolumes().contains(dataVolume)) {
+ continue;
+ }
+ if (dataVolume.getMountType() == MountType.NONE) {
+ volumes.put(dataVolume.getContainerPath(), emptyMap);
+ }
+ }
+ if (!volumes.isEmpty()) {
+ config.volumes(volumes);
+ }
+
return config.build();
}
diff --git a/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/wizards/ImageRunSelectionModel.java b/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/wizards/ImageRunSelectionModel.java
index 94af1f57fe0194e3ed5ee05036c61463dbbf2451..22e5a2b4f65cf80833b622039c5e28a339814893 100644
--- a/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/wizards/ImageRunSelectionModel.java
+++ b/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/wizards/ImageRunSelectionModel.java
@@ -1,6 +1,6 @@
/*******************************************************************************
- * Copyright (c) 2014, 2018 Red Hat.
- *
+ * Copyright (c) 2014, 2020 Red Hat.
+ *
* This program and the accompanying materials are made
* available under the terms of the Eclipse Public License 2.0
* which is available at https://www.eclipse.org/legal/epl-2.0/
@@ -33,7 +33,7 @@ import org.eclipse.linuxtools.internal.docker.ui.databinding.BaseDatabindingMode
/**
* Databinding model for the {@link ImageRunSelectionPage}
- *
+ *
* @author xcoulon
*
*/
@@ -373,7 +373,7 @@ public class ImageRunSelectionModel extends BaseDatabindingModel {
/**
* Set the container links
- *
+ *
* @param links
* in the following format:
* <code><containerName>:<containerAlias></code>
@@ -477,7 +477,7 @@ public class ImageRunSelectionModel extends BaseDatabindingModel {
/**
* Parses and converts the {@link List} of the given {@link String}
* values into a {@link List} of {@link ExposedPortModel}
- *
+ *
* @param exposedPortInfos
* the input values
* @return the corresponding {@link ExposedPortModel}s
@@ -498,7 +498,7 @@ public class ImageRunSelectionModel extends BaseDatabindingModel {
/**
* Parse the given value and returns an instance of
* {@link ExposedPortModel}.
- *
+ *
* @param exposedPortInfo
* the value to parse
* @return the corresponding {@link ExposedPortModel}
@@ -512,7 +512,7 @@ public class ImageRunSelectionModel extends BaseDatabindingModel {
if (firstColumnSeparator == -1 && exposedPortInfo
.indexOf(CONTAINER_TYPE_SEPARATOR) != -1) {
final String type = exposedPortInfo.substring(
- exposedPortInfo.indexOf(CONTAINER_TYPE_SEPARATOR)); // $NON-NLS-1$
+ exposedPortInfo.indexOf(CONTAINER_TYPE_SEPARATOR) + 1); // $NON-NLS-1$
final ExposedPortModel exposedPort = new ExposedPortModel(
privatePort, type, "", privatePort); // $NON-NLS-1$
return exposedPort; // $NON-NLS-1$
@@ -521,7 +521,8 @@ public class ImageRunSelectionModel extends BaseDatabindingModel {
.indexOf(SEPARATOR,
firstColumnSeparator + 1);
final String type = exposedPortInfo.substring(
- exposedPortInfo.indexOf(CONTAINER_TYPE_SEPARATOR), // $NON-NLS-1$
+ exposedPortInfo.indexOf(CONTAINER_TYPE_SEPARATOR)
+ + 1, // $NON-NLS-1$
firstColumnSeparator); // $NON-NLS-1$
final String hostIP = exposedPortInfo.substring(
firstColumnSeparator + 1, secondColumnSeparator);
@@ -535,7 +536,7 @@ public class ImageRunSelectionModel extends BaseDatabindingModel {
/**
* Full constructor
- *
+ *
* @param privatePort
* @param portType
* @param hostAddress
@@ -554,7 +555,7 @@ public class ImageRunSelectionModel extends BaseDatabindingModel {
/**
* Create an ExposedPortModel from its toString output
- *
+ *
* @param stringValue
* @return ExposedPortModel
*/
diff --git a/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/wizards/ImageRunSelectionPage.java b/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/wizards/ImageRunSelectionPage.java
index 5637d9593016fee17b1de49e3675d25ccddb3c3d..16595a6c934cb00704cfa40aeb7ccda5d64f8a39 100644
--- a/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/wizards/ImageRunSelectionPage.java
+++ b/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/wizards/ImageRunSelectionPage.java
@@ -1,6 +1,6 @@
/*******************************************************************************
- * Copyright (c) 2014, 2019 Red Hat Inc. and others.
- *
+ * Copyright (c) 2014, 2020 Red Hat Inc. and others.
+ *
* This program and the accompanying materials are made
* available under the terms of the Eclipse Public License 2.0
* which is available at https://www.eclipse.org/legal/epl-2.0/
@@ -23,6 +23,7 @@ import static org.eclipse.linuxtools.internal.docker.ui.launch.IRunDockerImageLa
import static org.eclipse.linuxtools.internal.docker.ui.launch.IRunDockerImageLaunchConfigurationConstants.PUBLISHED_PORTS;
import static org.eclipse.linuxtools.internal.docker.ui.launch.IRunDockerImageLaunchConfigurationConstants.PUBLISH_ALL_PORTS;
import static org.eclipse.linuxtools.internal.docker.ui.launch.IRunDockerImageLaunchConfigurationConstants.READONLY;
+import static org.eclipse.linuxtools.internal.docker.ui.launch.IRunDockerImageLaunchConfigurationConstants.UNUSED_PORTS;
import java.lang.reflect.InvocationTargetException;
import java.util.ArrayList;
@@ -103,7 +104,7 @@ import org.eclipse.ui.PlatformUI;
/**
* A {@link WizardPage} to let the user select the {@link IDockerImage} to run
* and select the most common arguments (container name, port settings, etc.)
- *
+ *
* @author xcoulon
*
*/
@@ -125,13 +126,13 @@ public class ImageRunSelectionPage extends WizardPage {
/**
* Default constructor.
- *
+ *
* @param selectedImage
* the {@link IDockerImage} to run
* @param lastLaunchConfiguration
* the last {@link ILaunchConfiguration} used to run this
* {@link IDockerImage} or <code>null</code> if none exists.
- *
+ *
*/
public ImageRunSelectionPage(final IDockerImage selectedImage,
final ILaunchConfiguration lastLaunchConfiguration) {
@@ -146,10 +147,10 @@ public class ImageRunSelectionPage extends WizardPage {
/**
* Default constructor.
- *
+ *
* @param selectedConnection
* the {@link IDockerConnection} to run
- *
+ *
*/
public ImageRunSelectionPage(final IDockerConnection selectedConnection) {
super("ImageSelectionPage", //$NON-NLS-1$
@@ -269,7 +270,7 @@ public class ImageRunSelectionPage extends WizardPage {
/**
* Creates the {@link Composite} container that will display widgets to
* select an {@link IDockerImage}, name it and specify the command to run.
- *
+ *
* @param container
* the parent {@link Composite}
*/
@@ -466,7 +467,6 @@ public class ImageRunSelectionPage extends WizardPage {
exposedPortsTableViewer, ExposedPortModel.class),
BeanProperties.set(ImageRunSelectionModel.SELECTED_PORTS)
.observe(model));
- checkAllElements(exposedPortsTableViewer);
// disable the edit and removeButton if the table is empty
exposedPortsTableViewer.addSelectionChangedListener(
@@ -476,13 +476,6 @@ public class ImageRunSelectionPage extends WizardPage {
removeButton);
}
- private void checkAllElements(
- final CheckboxTableViewer exposedPortsTableViewer) {
- exposedPortsTableViewer.setAllChecked(true);
- model.setSelectedPorts(
- new HashSet<>(model.getExposedPorts()));
- }
-
private ISelectionChangedListener onSelectionChanged(
final Button... targetButtons) {
return e -> {
@@ -721,7 +714,7 @@ public class ImageRunSelectionPage extends WizardPage {
/**
* Creates an {@link IContentProposalProvider} to propose
* {@link IDockerImage} names based on the current text.
- *
+ *
* @param items
* @return
*/
@@ -859,17 +852,26 @@ public class ImageRunSelectionPage extends WizardPage {
final List<String> exposedPortInfos = lastLaunchConfiguration
.getAttribute(PUBLISHED_PORTS,
Collections.<String> emptyList());
+ final List<String> unusedPortInfos = lastLaunchConfiguration.getAttribute(UNUSED_PORTS,
+ Collections.<String>emptyList());
// FIXME: handle the case where ports where added (and selected)
// by the user.
if (selectedImageInfo != null) {
- final List<ExposedPortModel> exposedPorts = ExposedPortModel
- .fromStrings(
- selectedImageInfo.config().exposedPorts());
- model.setExposedPorts(exposedPorts);
- final List<ExposedPortModel> selectedExposedPorts = ExposedPortModel
- .fromStrings(exposedPortInfos);
- this.model.setSelectedPorts(
- new HashSet<>(selectedExposedPorts));
+ if (exposedPortInfos.isEmpty()) {
+ final List<ExposedPortModel> exposedPorts = ExposedPortModel
+ .fromStrings(selectedImageInfo.config().exposedPorts());
+ model.setExposedPorts(exposedPorts);
+ this.model.setSelectedPorts(new HashSet<>(exposedPorts));
+ } else {
+ final List<ExposedPortModel> exposedPorts = ExposedPortModel.fromStrings(exposedPortInfos);
+ model.setExposedPorts(exposedPorts);
+ this.model.setSelectedPorts(new HashSet<>(exposedPorts));
+ }
+ for (String port : unusedPortInfos) {
+ ExposedPortModel portModel = ExposedPortModel.fromString(port);
+ portModel.setSelected(false);
+ model.addExposedPort(portModel);
+ }
}
// links
diff --git a/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/wizards/NewDockerConnectionPage.java b/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/wizards/NewDockerConnectionPage.java
index 6c87e19b5c687b636a518790299666f3a3fe9689..fadf5e873fe7648ed9fe75e8a9664e667fcf840d 100644
--- a/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/wizards/NewDockerConnectionPage.java
+++ b/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/wizards/NewDockerConnectionPage.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2014, 2019 Red Hat Inc. and others
+ * Copyright (c) 2014, 2020 Red Hat Inc. and others
* .
* This program and the accompanying materials are made
* available under the terms of the Eclipse Public License 2.0
@@ -83,7 +83,7 @@ import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.dialogs.ListDialog;
import org.eclipse.ui.dialogs.PreferencesUtil;
-import com.spotify.docker.client.exceptions.DockerCertificateException;
+import org.mandas.docker.client.exceptions.DockerCertificateException;
/**
* {@link WizardPage} to input the settings to connect to a Docker
diff --git a/containers/org.eclipse.linuxtools.jdt.docker.launcher-feature/feature.xml b/containers/org.eclipse.linuxtools.jdt.docker.launcher-feature/feature.xml
index 1fa96f85ffb6d63f442c737e876bd9d6eb0f8548..2f858be3d25852c4ef7d50574da10465e6fb747e 100644
--- a/containers/org.eclipse.linuxtools.jdt.docker.launcher-feature/feature.xml
+++ b/containers/org.eclipse.linuxtools.jdt.docker.launcher-feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.linuxtools.jdt.docker.launcher.feature"
label="%featureName"
- version="4.4.0.qualifier"
+ version="5.1.0.qualifier"
provider-name="%featureProvider"
license-feature="org.eclipse.license"
license-feature-version="0.0.0">
diff --git a/containers/org.eclipse.linuxtools.jdt.docker.launcher-feature/pom.xml b/containers/org.eclipse.linuxtools.jdt.docker.launcher-feature/pom.xml
index fb4868ae4da1e951ca27cd684d839780a9ab8d6c..403704b1a5be884e97ed283c61fb2c663cc4256b 100644
--- a/containers/org.eclipse.linuxtools.jdt.docker.launcher-feature/pom.xml
+++ b/containers/org.eclipse.linuxtools.jdt.docker.launcher-feature/pom.xml
@@ -14,11 +14,11 @@
<parent>
<groupId>org.eclipse.linuxtools</groupId>
<artifactId>org.eclipse.linuxtools.docker</artifactId>
- <version>4.4.0</version>
+ <version>5.1.0</version>
</parent>
<artifactId>org.eclipse.linuxtools.jdt.docker.launcher.feature</artifactId>
- <version>4.4.0-SNAPSHOT</version>
+ <version>5.1.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
<name>Linux Tools JDT Docker Launch Feature</name>
diff --git a/containers/org.eclipse.linuxtools.jdt.docker.launcher/.classpath b/containers/org.eclipse.linuxtools.jdt.docker.launcher/.classpath
index 43b986286a9e5fd1828793fa4b2353d02ab8625f..1db08c6b4ce2fb50395b2f9c9a50c140a0bab199 100644
--- a/containers/org.eclipse.linuxtools.jdt.docker.launcher/.classpath
+++ b/containers/org.eclipse.linuxtools.jdt.docker.launcher/.classpath
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="target/classes"/>
diff --git a/containers/org.eclipse.linuxtools.jdt.docker.launcher/.settings/org.eclipse.jdt.core.prefs b/containers/org.eclipse.linuxtools.jdt.docker.launcher/.settings/org.eclipse.jdt.core.prefs
index 0c68a61dca867ceb49e79d2402935261ec3e3809..7adc0fb9a0d32bd6b4e3ce6f305ab7165208865c 100644
--- a/containers/org.eclipse.linuxtools.jdt.docker.launcher/.settings/org.eclipse.jdt.core.prefs
+++ b/containers/org.eclipse.linuxtools.jdt.docker.launcher/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,10 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
+org.eclipse.jdt.core.compiler.compliance=11
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11
diff --git a/containers/org.eclipse.linuxtools.jdt.docker.launcher/META-INF/MANIFEST.MF b/containers/org.eclipse.linuxtools.jdt.docker.launcher/META-INF/MANIFEST.MF
index 49dc178d81e3e6205863e1f84ef148c3efd2d2f5..8db2ab338cd2f292027c602a59bb0c6d64d40062 100644
--- a/containers/org.eclipse.linuxtools.jdt.docker.launcher/META-INF/MANIFEST.MF
+++ b/containers/org.eclipse.linuxtools.jdt.docker.launcher/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.linuxtools.jdt.docker.launcher;singleton:=true
Bundle-Version: 1.0.0.qualifier
Bundle-Vendor: %Bundle-Vendor
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
Bundle-ActivationPolicy: lazy
Require-Bundle: org.eclipse.debug.core,
org.eclipse.debug.ui,
@@ -17,7 +17,8 @@ Require-Bundle: org.eclipse.debug.core,
org.eclipse.osgi,
org.eclipse.linuxtools.docker.ui,
org.eclipse.linuxtools.docker.core,
- com.spotify.docker.client,
- org.eclipse.core.runtime,
- javax.xml.bind;bundle-version="2.2.0"
+ org.mandas.docker-client,
+ org.eclipse.core.runtime
+Import-Package: javax.xml.bind;version="2.3.3",
+ javax.annotation;version="1.3.5"
Automatic-Module-Name: org.eclipse.linuxtools.jdt.docker.launcher
diff --git a/containers/org.eclipse.linuxtools.jdt.docker.launcher/pom.xml b/containers/org.eclipse.linuxtools.jdt.docker.launcher/pom.xml
index c2f7899e2659c58e3bd3c462355ef62565a41ac5..99e9887e6ff603f159e25360f4fd67edb549c809 100644
--- a/containers/org.eclipse.linuxtools.jdt.docker.launcher/pom.xml
+++ b/containers/org.eclipse.linuxtools.jdt.docker.launcher/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.linuxtools</groupId>
<artifactId>org.eclipse.linuxtools.docker</artifactId>
- <version>4.4.0</version>
+ <version>5.1.0</version>
</parent>
<artifactId>org.eclipse.linuxtools.jdt.docker.launcher</artifactId>
<version>1.0.0-SNAPSHOT</version>
diff --git a/containers/org.eclipse.linuxtools.jdt.docker.launcher/src/org/eclipse/linuxtools/jdt/docker/launcher/ImageQuery.java b/containers/org.eclipse.linuxtools.jdt.docker.launcher/src/org/eclipse/linuxtools/jdt/docker/launcher/ImageQuery.java
index 47a9890cadf63a04c4379d8cc5928ed20f397af9..e4800117b171645555fa70a908728708cf2ef415 100644
--- a/containers/org.eclipse.linuxtools.jdt.docker.launcher/src/org/eclipse/linuxtools/jdt/docker/launcher/ImageQuery.java
+++ b/containers/org.eclipse.linuxtools.jdt.docker.launcher/src/org/eclipse/linuxtools/jdt/docker/launcher/ImageQuery.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2017, 2018 Red Hat Inc. and others.
+ * Copyright (c) 2017, 2020 Red Hat Inc. and others.
*
* This program and the accompanying materials are made
* available under the terms of the Eclipse Public License 2.0
@@ -13,6 +13,7 @@
package org.eclipse.linuxtools.jdt.docker.launcher;
import java.io.File;
+import java.io.IOException;
import java.nio.ByteBuffer;
import org.eclipse.linuxtools.docker.core.DockerException;
@@ -23,10 +24,10 @@ import org.eclipse.linuxtools.internal.docker.core.DockerContainerConfig;
import org.eclipse.linuxtools.internal.docker.core.DockerHostConfig;
import org.osgi.framework.Version;
-import com.spotify.docker.client.DockerClient;
-import com.spotify.docker.client.DockerClient.ExecCreateParam;
-import com.spotify.docker.client.LogStream;
-import com.spotify.docker.client.messages.ExecCreation;
+import org.mandas.docker.client.DockerClient;
+import org.mandas.docker.client.DockerClient.ExecCreateParam;
+import org.mandas.docker.client.LogStream;
+import org.mandas.docker.client.messages.ExecCreation;
public class ImageQuery {
@@ -75,7 +76,10 @@ public class ImageQuery {
} catch (Exception e) {
e.printStackTrace();
} finally {
- stream.close();
+ try {
+ stream.close();
+ } catch (IOException e) {
+ }
}
return null;
}
diff --git a/containers/pom.xml b/containers/pom.xml
index d19cebcb40969704dc478d192f2e5ce197fe8652..5dd6629281387530180047a5040d64634e858cdb 100644
--- a/containers/pom.xml
+++ b/containers/pom.xml
@@ -3,13 +3,13 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.eclipse.linuxtools</groupId>
<artifactId>org.eclipse.linuxtools.docker</artifactId>
- <version>4.4.0</version>
+ <version>5.1.0</version>
<packaging>pom</packaging>
<parent>
<groupId>org.eclipse.linuxtools</groupId>
<artifactId>linuxtools-parent</artifactId>
- <version>7.4.0</version>
+ <version>8.1.0</version>
</parent>
<properties>
@@ -25,7 +25,6 @@
<modules>
<module>org.eclipse.linuxtools.docker.core</module>
<module>org.eclipse.linuxtools.docker.ui</module>
- <module>org.eclipse.linuxtools.docker.editor</module>
<module>org.eclipse.linuxtools.docker.tests.hamcrest-wrap</module>
<module>org.eclipse.linuxtools.docker.ui.tests</module>
<module>org.eclipse.linuxtools.docker.docs</module>
@@ -33,6 +32,9 @@
<module>org.eclipse.linuxtools.docker.reddeer</module>
<module>org.eclipse.linuxtools.docker.integration.tests</module>
<module>org.eclipse.linuxtools.docker.tests-feature</module>
+ <module>org.eclipse.linuxtools.docker.editor.ls</module>
+ <module>org.eclipse.linuxtools.docker.editor.ls-feature</module>
+ <module>org.eclipse.linuxtools.docker.editor.ls.tests</module>
<module>org.eclipse.linuxtools.jdt.docker.launcher</module>
<module>org.eclipse.linuxtools.jdt.docker.launcher-feature</module>
</modules>
@@ -80,7 +82,7 @@
<dependency>
<groupId>org.eclipse.tycho.extras</groupId>
<artifactId>tycho-sourceref-jgit</artifactId>
- <version>${tycho-extras-version}</version>
+ <version>${tycho-version}</version>
</dependency>
</dependencies>
</plugin>
diff --git a/gcov/org.eclipse.linuxtools.gcov-feature/feature.xml b/gcov/org.eclipse.linuxtools.gcov-feature/feature.xml
index 7f5fc94af4ef31dd75d6732028d2d4811c3e4f19..0630afe2286b71cc4fea4c67bb90acd21e426233 100644
--- a/gcov/org.eclipse.linuxtools.gcov-feature/feature.xml
+++ b/gcov/org.eclipse.linuxtools.gcov-feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.linuxtools.gcov"
label="%featureName"
- version="7.4.0.qualifier"
+ version="8.1.0.qualifier"
provider-name="%featureProvider"
license-feature="org.eclipse.license"
license-feature-version="0.0.0">
diff --git a/gcov/org.eclipse.linuxtools.gcov-feature/pom.xml b/gcov/org.eclipse.linuxtools.gcov-feature/pom.xml
index 6482fd482346ad50d03f03faea3fb531b653d6a6..93884a019d171a90f296f8cb62822399e3cbc6be 100644
--- a/gcov/org.eclipse.linuxtools.gcov-feature/pom.xml
+++ b/gcov/org.eclipse.linuxtools.gcov-feature/pom.xml
@@ -15,12 +15,12 @@
<parent>
<artifactId>linuxtools-gcov-parent</artifactId>
<groupId>org.eclipse.linuxtools.gcov</groupId>
- <version>7.4.0</version>
+ <version>8.1.0</version>
</parent>
<artifactId>org.eclipse.linuxtools.gcov</artifactId>
<packaging>eclipse-feature</packaging>
- <version>7.4.0-SNAPSHOT</version>
+ <version>8.1.0-SNAPSHOT</version>
<name>Linux Tools GCov Feature</name>
diff --git a/gcov/org.eclipse.linuxtools.gcov.core/.classpath b/gcov/org.eclipse.linuxtools.gcov.core/.classpath
index 43b986286a9e5fd1828793fa4b2353d02ab8625f..1db08c6b4ce2fb50395b2f9c9a50c140a0bab199 100644
--- a/gcov/org.eclipse.linuxtools.gcov.core/.classpath
+++ b/gcov/org.eclipse.linuxtools.gcov.core/.classpath
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="target/classes"/>
diff --git a/gcov/org.eclipse.linuxtools.gcov.core/.settings/org.eclipse.jdt.core.prefs b/gcov/org.eclipse.linuxtools.gcov.core/.settings/org.eclipse.jdt.core.prefs
index c7a729bc42bdd228bba4cca9bb569b6c8112a3b9..7b57a5bb3c4d9512a26d4a9eed02072c9c358b85 100644
--- a/gcov/org.eclipse.linuxtools.gcov.core/.settings/org.eclipse.jdt.core.prefs
+++ b/gcov/org.eclipse.linuxtools.gcov.core/.settings/org.eclipse.jdt.core.prefs
@@ -6,9 +6,9 @@ org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annota
org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.compliance=11
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -22,6 +22,7 @@ org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=warning
org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
@@ -65,6 +66,7 @@ org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=warn
org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
@@ -96,4 +98,5 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11
diff --git a/gcov/org.eclipse.linuxtools.gcov.core/.settings/org.eclipse.jdt.ui.prefs b/gcov/org.eclipse.linuxtools.gcov.core/.settings/org.eclipse.jdt.ui.prefs
index e0093774a0e52ffd9bd9a55cb9c0f7712a792ecb..690dcacd30cc11dee03802b183eab9def580a34c 100644
--- a/gcov/org.eclipse.linuxtools.gcov.core/.settings/org.eclipse.jdt.ui.prefs
+++ b/gcov/org.eclipse.linuxtools.gcov.core/.settings/org.eclipse.jdt.ui.prefs
@@ -28,6 +28,7 @@ sp_cleanup.never_use_blocks=false
sp_cleanup.never_use_parentheses_in_expressions=true
sp_cleanup.on_save_use_additional_actions=true
sp_cleanup.organize_imports=true
+sp_cleanup.push_down_negation=false
sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
@@ -35,10 +36,12 @@ sp_cleanup.qualify_static_member_accesses_with_declaring_class=false
sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
sp_cleanup.remove_private_constructors=true
sp_cleanup.remove_redundant_modifiers=true
+sp_cleanup.remove_redundant_semicolons=true
sp_cleanup.remove_redundant_type_arguments=true
sp_cleanup.remove_trailing_whitespaces=true
sp_cleanup.remove_trailing_whitespaces_all=true
sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
+sp_cleanup.remove_unnecessary_array_creation=true
sp_cleanup.remove_unnecessary_casts=true
sp_cleanup.remove_unnecessary_nls_tags=false
sp_cleanup.remove_unused_imports=true
@@ -50,6 +53,7 @@ sp_cleanup.remove_unused_private_types=true
sp_cleanup.sort_members=false
sp_cleanup.sort_members_all=false
sp_cleanup.use_anonymous_class_creation=false
+sp_cleanup.use_autoboxing=false
sp_cleanup.use_blocks=false
sp_cleanup.use_blocks_only_for_return_and_throw=false
sp_cleanup.use_lambda=true
@@ -58,3 +62,4 @@ sp_cleanup.use_this_for_non_static_field_access=false
sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
sp_cleanup.use_this_for_non_static_method_access=false
sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+sp_cleanup.use_unboxing=false
diff --git a/gcov/org.eclipse.linuxtools.gcov.core/META-INF/MANIFEST.MF b/gcov/org.eclipse.linuxtools.gcov.core/META-INF/MANIFEST.MF
index 6aa520df5917adc11e3b1ec21b53f72eb2e97589..bbf7ad1f9f28d81a63d99e5e8a08b41a266e0df7 100644
--- a/gcov/org.eclipse.linuxtools.gcov.core/META-INF/MANIFEST.MF
+++ b/gcov/org.eclipse.linuxtools.gcov.core/META-INF/MANIFEST.MF
@@ -3,7 +3,6 @@ Bundle-ManifestVersion: 2
Bundle-Name: %bundleName
Bundle-SymbolicName: org.eclipse.linuxtools.gcov.core;singleton:=true
Bundle-Version: 6.2.0.qualifier
-Bundle-Activator: org.eclipse.linuxtools.internal.gcov.Activator
Bundle-Vendor: %bundleProvider
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
@@ -19,7 +18,7 @@ Require-Bundle: org.eclipse.ui,
org.eclipse.linuxtools.dataviewers.charts,
org.eclipse.ui.editors;bundle-version="3.8.0"
Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
Bundle-Localization: plugin
Export-Package:
org.eclipse.linuxtools.internal.gcov.parser;x-friends:="org.eclipse.linuxtools.gcov.launch",
diff --git a/gcov/org.eclipse.linuxtools.gcov.core/pom.xml b/gcov/org.eclipse.linuxtools.gcov.core/pom.xml
index 1a54de765ede95b1406aa28cbcc100eda8922d27..b1c35316b4b540d362dcdb5392e0b5d3b4ef6a6e 100644
--- a/gcov/org.eclipse.linuxtools.gcov.core/pom.xml
+++ b/gcov/org.eclipse.linuxtools.gcov.core/pom.xml
@@ -15,7 +15,7 @@
<parent>
<artifactId>linuxtools-gcov-parent</artifactId>
<groupId>org.eclipse.linuxtools.gcov</groupId>
- <version>7.4.0</version>
+ <version>8.1.0</version>
</parent>
<artifactId>org.eclipse.linuxtools.gcov.core</artifactId>
diff --git a/gcov/org.eclipse.linuxtools.gcov.core/src/org/eclipse/linuxtools/internal/gcov/Activator.java b/gcov/org.eclipse.linuxtools.gcov.core/src/org/eclipse/linuxtools/internal/gcov/Constants.java
similarity index 54%
rename from gcov/org.eclipse.linuxtools.gcov.core/src/org/eclipse/linuxtools/internal/gcov/Activator.java
rename to gcov/org.eclipse.linuxtools.gcov.core/src/org/eclipse/linuxtools/internal/gcov/Constants.java
index 61a46c2a444cdaef41cd51e647b124c069c9aa78..f2b574010001feb25d3538dff0491890e1d6c94d 100644
--- a/gcov/org.eclipse.linuxtools.gcov.core/src/org/eclipse/linuxtools/internal/gcov/Activator.java
+++ b/gcov/org.eclipse.linuxtools.gcov.core/src/org/eclipse/linuxtools/internal/gcov/Constants.java
@@ -1,6 +1,6 @@
/*******************************************************************************
* Copyright (c) 2009, 2018 STMicroelectronics and others.
- *
+ *
* This program and the accompanying materials are made
* available under the terms of the Eclipse Public License 2.0
* which is available at https://www.eclipse.org/legal/epl-2.0/
@@ -12,39 +12,13 @@
*******************************************************************************/
package org.eclipse.linuxtools.internal.gcov;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
/**
* The activator class controls the plug-in life cycle
* @since 4.2
*/
-public class Activator extends AbstractUIPlugin {
+public class Constants {
// The plug-in ID
public static final String PLUGIN_ID = "org.eclipse.linuxtools.gcov.core"; //$NON-NLS-1$
- // The shared instance
- private static Activator plugin;
-
- @Override
- public void start(BundleContext context) throws Exception {
- super.start(context);
- plugin = this;
- }
-
- @Override
- public void stop(BundleContext context) throws Exception {
- plugin = null;
- super.stop(context);
- }
-
- /**
- * Returns the shared instance
- *
- * @return the shared instance
- */
- public static Activator getDefault() {
- return plugin;
- }
}
diff --git a/gcov/org.eclipse.linuxtools.gcov.core/src/org/eclipse/linuxtools/internal/gcov/action/OpenGCAction.java b/gcov/org.eclipse.linuxtools.gcov.core/src/org/eclipse/linuxtools/internal/gcov/action/OpenGCAction.java
index 66ec9eb345e8934213d4703e53b5d0104a3b95b0..8ffe7e2247ca85f437df5d35605c967163f64fed 100644
--- a/gcov/org.eclipse.linuxtools.gcov.core/src/org/eclipse/linuxtools/internal/gcov/action/OpenGCAction.java
+++ b/gcov/org.eclipse.linuxtools.gcov.core/src/org/eclipse/linuxtools/internal/gcov/action/OpenGCAction.java
@@ -1,6 +1,6 @@
/*******************************************************************************
- * Copyright (c) 2009, 2018 STMicroelectronics and others.
- *
+ * Copyright (c) 2009, 2020 STMicroelectronics and others.
+ *
* This program and the accompanying materials are made
* available under the terms of the Eclipse Public License 2.0
* which is available at https://www.eclipse.org/legal/epl-2.0/
@@ -17,6 +17,7 @@ import java.io.BufferedReader;
import java.io.File;
import java.io.IOException;
import java.io.InputStreamReader;
+
import org.eclipse.cdt.core.model.CModelException;
import org.eclipse.cdt.core.model.CoreModel;
import org.eclipse.cdt.core.model.IBinary;
@@ -32,7 +33,6 @@ import org.eclipse.jface.dialogs.IDialogSettings;
import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.jface.window.Window;
import org.eclipse.linuxtools.binutils.utils.STSymbolManager;
-import org.eclipse.linuxtools.internal.gcov.Activator;
import org.eclipse.linuxtools.internal.gcov.dialog.OpenGCDialog;
import org.eclipse.linuxtools.internal.gcov.view.CovView;
import org.eclipse.linuxtools.internal.gcov.view.annotatedsource.GcovAnnotationModelTracker;
@@ -40,6 +40,7 @@ import org.eclipse.osgi.util.NLS;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.ui.IEditorLauncher;
import org.eclipse.ui.PlatformUI;
+import org.osgi.framework.FrameworkUtil;
/**
* Action performed when user clicks on a gcda/gcno file
@@ -105,7 +106,8 @@ public class OpenGCAction implements IEditorLauncher {
return;
}
- IDialogSettings ds = Activator.getDefault().getDialogSettings();
+ IDialogSettings ds = PlatformUI.getDialogSettingsProvider(FrameworkUtil.getBundle(OpenGCAction.class))
+ .getDialogSettings();
IDialogSettings defaultMapping = ds.getSection(OpenGCDialog.class.getName());
if (defaultMapping == null) {
defaultMapping = ds.addNewSection(OpenGCDialog.class.getName());
@@ -113,8 +115,12 @@ public class OpenGCAction implements IEditorLauncher {
String defaultBinary = defaultMapping.get(file.toOSString());
if (defaultBinary == null || defaultBinary.isEmpty() || !exists(defaultBinary)) {
//FIXME EK-LINUXTOOLS: defaultBinary = getDefaultBinary(file);
- defaultBinary =
- STSymbolManager.sharedInstance.findOneAndOnlyBinary(file).getLocation().toOSString();
+ IResource bin_resource = STSymbolManager.sharedInstance.findOneAndOnlyBinary(file);
+ if (bin_resource != null) {
+ defaultBinary = bin_resource.getLocation().toOSString();
+ } else {
+ defaultBinary = ""; //$NON-NLS-1$
+ }
}
OpenGCDialog d = new OpenGCDialog(shell, defaultBinary, file);
@@ -128,12 +134,12 @@ public class OpenGCAction implements IEditorLauncher {
t.start();
}
- private void displayCoverage(IPath file, String binaryPath, File gcda, boolean isCompleteCoverageResultWanted)
+ private void displayCoverage(IPath file, String binaryPath, File gcda, boolean isCompleteCoverageResultWanted)
{
//FIXME EK-LINUXTOOLS: IProject project = ResourcesPlugin.getWorkspace().getRoot().getFileForLocation(file).getProject();
IProject project = STSymbolManager.sharedInstance.getProjectFromFile(file);
//FIXME EK-LINUXTOOLS: Need check for null and correct action
-
+
GcovAnnotationModelTracker.getInstance().addProject(project, new Path(binaryPath));
PlatformUI.getWorkbench().getDisplay().syncExec(() -> {
GcovAnnotationModelTracker.getInstance().annotateAllCEditors();
diff --git a/gcov/org.eclipse.linuxtools.gcov.core/src/org/eclipse/linuxtools/internal/gcov/action/SwitchContentProviderAction.java b/gcov/org.eclipse.linuxtools.gcov.core/src/org/eclipse/linuxtools/internal/gcov/action/SwitchContentProviderAction.java
index 45af95360dca77daa49f92836938d40a9b15d6f8..2e546145f8042b90c4a987ca5ed093bc218ade9d 100644
--- a/gcov/org.eclipse.linuxtools.gcov.core/src/org/eclipse/linuxtools/internal/gcov/action/SwitchContentProviderAction.java
+++ b/gcov/org.eclipse.linuxtools.gcov.core/src/org/eclipse/linuxtools/internal/gcov/action/SwitchContentProviderAction.java
@@ -1,6 +1,6 @@
/*******************************************************************************
* Copyright (c) 2009, 2018 STMicroelectronics and others.
- *
+ *
* This program and the accompanying materials are made
* available under the terms of the Eclipse Public License 2.0
* which is available at https://www.eclipse.org/legal/epl-2.0/
@@ -13,35 +13,34 @@
package org.eclipse.linuxtools.internal.gcov.action;
import org.eclipse.jface.action.Action;
+import org.eclipse.jface.resource.ResourceLocator;
import org.eclipse.jface.viewers.ColumnViewer;
import org.eclipse.jface.viewers.IContentProvider;
import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.linuxtools.internal.gcov.Activator;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-
+import org.eclipse.linuxtools.internal.gcov.Constants;
- /**
- * This action changes the content provider
- */
+/**
+ * This action changes the content provider
+ */
- public class SwitchContentProviderAction extends Action {
+public class SwitchContentProviderAction extends Action {
- private final ColumnViewer viewer;
- private final IContentProvider provider;
+ private final ColumnViewer viewer;
+ private final IContentProvider provider;
- public SwitchContentProviderAction(String name, String iconPath, ColumnViewer viewer, IContentProvider provider) {
- super(name, AS_RADIO_BUTTON);
- this.setImageDescriptor(AbstractUIPlugin.imageDescriptorFromPlugin(Activator.PLUGIN_ID, iconPath));
- this.setToolTipText(name);
- this.viewer = viewer;
- this.provider = provider;
- }
+ public SwitchContentProviderAction(String name, String iconPath, ColumnViewer viewer, IContentProvider provider) {
+ super(name, AS_RADIO_BUTTON);
+ this.setImageDescriptor(ResourceLocator.imageDescriptorFromBundle(Constants.PLUGIN_ID, iconPath).get());
+ this.setToolTipText(name);
+ this.viewer = viewer;
+ this.provider = provider;
+ }
- @Override
- public void run() {
- viewer.getControl().setRedraw(false);
- viewer.setContentProvider(provider);
- ((TreeViewer)viewer).expandToLevel(2);
- viewer.getControl().setRedraw(true);
- }
- }
\ No newline at end of file
+ @Override
+ public void run() {
+ viewer.getControl().setRedraw(false);
+ viewer.setContentProvider(provider);
+ ((TreeViewer) viewer).expandToLevel(2);
+ viewer.getControl().setRedraw(true);
+ }
+}
\ No newline at end of file
diff --git a/gcov/org.eclipse.linuxtools.gcov.core/src/org/eclipse/linuxtools/internal/gcov/dialog/OpenGCDialog.java b/gcov/org.eclipse.linuxtools.gcov.core/src/org/eclipse/linuxtools/internal/gcov/dialog/OpenGCDialog.java
index a51f133f5620c7fc2fe881b06a5c8ec48547d499..0175b18693db2fc82b47bba56d843504eef6d556 100644
--- a/gcov/org.eclipse.linuxtools.gcov.core/src/org/eclipse/linuxtools/internal/gcov/dialog/OpenGCDialog.java
+++ b/gcov/org.eclipse.linuxtools.gcov.core/src/org/eclipse/linuxtools/internal/gcov/dialog/OpenGCDialog.java
@@ -1,6 +1,6 @@
/*******************************************************************************
- * Copyright (c) 2009, 2018 STMicroelectronics and others.
- *
+ * Copyright (c) 2009, 2020 STMicroelectronics and others.
+ *
* This program and the accompanying materials are made
* available under the terms of the Eclipse Public License 2.0
* which is available at https://www.eclipse.org/legal/epl-2.0/
@@ -31,7 +31,7 @@ import org.eclipse.jface.dialogs.IDialogConstants;
import org.eclipse.jface.dialogs.IDialogSettings;
import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.linuxtools.binutils.utils.STSymbolManager;
-import org.eclipse.linuxtools.internal.gcov.Activator;
+import org.eclipse.linuxtools.internal.gcov.Constants;
import org.eclipse.osgi.util.NLS;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.ModifyEvent;
@@ -52,6 +52,7 @@ import org.eclipse.ui.dialogs.ElementTreeSelectionDialog;
import org.eclipse.ui.model.WorkbenchContentProvider;
import org.eclipse.ui.model.WorkbenchLabelProvider;
import org.eclipse.ui.views.navigator.ResourceComparator;
+import org.osgi.framework.FrameworkUtil;
/**
* This dialog box is opened when user clicks on a gcno/gcda file. it allows the user to choose the binary file who
@@ -238,12 +239,12 @@ public class OpenGCDialog extends Dialog {
dialog.setInitialSelection(c.getProject());
dialog.setValidator(selection -> {
if (selection.length != 1) {
- return new Status(IStatus.ERROR, Activator.PLUGIN_ID, 0, "", null); //$NON-NLS-1$
+ return new Status(IStatus.ERROR, Constants.PLUGIN_ID, 0, "", null); //$NON-NLS-1$
}
if (!(selection[0] instanceof IFile)) {
- return new Status(IStatus.ERROR, Activator.PLUGIN_ID, 0, "", null); //$NON-NLS-1$
+ return new Status(IStatus.ERROR, Constants.PLUGIN_ID, 0, "", null); //$NON-NLS-1$
}
- return new Status(IStatus.OK, Activator.PLUGIN_ID, 0, "", null); //$NON-NLS-1$
+ return new Status(IStatus.OK, Constants.PLUGIN_ID, 0, "", null); //$NON-NLS-1$
});
if (dialog.open() == IDialogConstants.OK_ID) {
IResource resource = (IResource) dialog.getFirstResult();
@@ -274,7 +275,8 @@ public class OpenGCDialog extends Dialog {
@Override
protected void okPressed() {
- IDialogSettings ds = Activator.getDefault().getDialogSettings();
+ IDialogSettings ds = PlatformUI.getDialogSettingsProvider(FrameworkUtil.getBundle(OpenGCDialog.class))
+ .getDialogSettings();
IDialogSettings defaultMapping = ds.getSection(OpenGCDialog.class.getName());
if (defaultMapping == null) {
defaultMapping = ds.addNewSection(OpenGCDialog.class.getName());
diff --git a/gcov/org.eclipse.linuxtools.gcov.core/src/org/eclipse/linuxtools/internal/gcov/parser/CovManager.java b/gcov/org.eclipse.linuxtools.gcov.core/src/org/eclipse/linuxtools/internal/gcov/parser/CovManager.java
index c9c2a4a4fe6dded8f178e47754336d6e0935afb1..153a76b7cc14e473db049624b8a1c111c6e4e598 100644
--- a/gcov/org.eclipse.linuxtools.gcov.core/src/org/eclipse/linuxtools/internal/gcov/parser/CovManager.java
+++ b/gcov/org.eclipse.linuxtools.gcov.core/src/org/eclipse/linuxtools/internal/gcov/parser/CovManager.java
@@ -42,7 +42,7 @@ import org.eclipse.core.runtime.Status;
import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.linuxtools.binutils.utils.STStrings;
import org.eclipse.linuxtools.binutils.utils.STSymbolManager;
-import org.eclipse.linuxtools.internal.gcov.Activator;
+import org.eclipse.linuxtools.internal.gcov.Constants;
import org.eclipse.linuxtools.internal.gcov.model.CovFileTreeElement;
import org.eclipse.linuxtools.internal.gcov.model.CovFolderTreeElement;
import org.eclipse.linuxtools.internal.gcov.model.CovFunctionTreeElement;
@@ -53,6 +53,7 @@ import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.FileDialog;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.ui.PlatformUI;
+import org.osgi.framework.FrameworkUtil;
/**
* @author Xavier Raynaud <xavier.raynaud@st.com>
@@ -158,7 +159,7 @@ public class CovManager implements Serializable {
}
if (noRcrd.getFnctns().isEmpty()) {
String message = NLS.bind(Messages.CovManager_No_Funcs_Error, gcnoPath);
- Status status = new Status(IStatus.ERROR, Activator.PLUGIN_ID, message);
+ Status status = new Status(IStatus.ERROR, Constants.PLUGIN_ID, message);
throw new CoreException(status);
}
daRcrd = new GcdaRecordsParser(noRcrd.getFnctns());
@@ -420,9 +421,9 @@ public class CovManager implements Serializable {
Messages.CovManager_No_Strings_Windows_Error);
});
} else {
- Status status = new Status(IStatus.ERROR, Activator.PLUGIN_ID, IStatus.ERROR,
+ Status status = new Status(IStatus.ERROR, Constants.PLUGIN_ID, IStatus.ERROR,
Messages.CovManager_Retrieval_Error, new IOException());
- Activator.getDefault().getLog().log(status);
+ Platform.getLog(FrameworkUtil.getBundle(CovManager.class)).log(status);
}
return l;
}
diff --git a/gcov/org.eclipse.linuxtools.gcov.core/src/org/eclipse/linuxtools/internal/gcov/parser/GcdaRecordsParser.java b/gcov/org.eclipse.linuxtools.gcov.core/src/org/eclipse/linuxtools/internal/gcov/parser/GcdaRecordsParser.java
index ef0e53e650b72c094ca7341435d275b4a5799700..d4b1cea9ed30187e340b72f8b7b36553a475fad4 100644
--- a/gcov/org.eclipse.linuxtools.gcov.core/src/org/eclipse/linuxtools/internal/gcov/parser/GcdaRecordsParser.java
+++ b/gcov/org.eclipse.linuxtools.gcov.core/src/org/eclipse/linuxtools/internal/gcov/parser/GcdaRecordsParser.java
@@ -21,7 +21,7 @@ import java.util.ArrayList;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
-import org.eclipse.linuxtools.internal.gcov.Activator;
+import org.eclipse.linuxtools.internal.gcov.Constants;
import org.eclipse.linuxtools.internal.gcov.utils.BEDataInputStream;
import org.eclipse.linuxtools.internal.gcov.utils.LEDataInputStream;
import org.eclipse.linuxtools.internal.gcov.utils.MasksGenerator;
@@ -71,7 +71,7 @@ public class GcdaRecordsParser {
stream = new LEDataInputStream((DataInputStream) stream);
} else {
String message = NLS.bind(Messages.GcdaRecordsParser_magic_num_error, magic);
- Status status = new Status(IStatus.ERROR, Activator.PLUGIN_ID, message);
+ Status status = new Status(IStatus.ERROR, Constants.PLUGIN_ID, message);
throw new CoreException(status);
}
}
@@ -110,7 +110,7 @@ public class GcdaRecordsParser {
if (f.getCheksum() != fnctnChksm) {
String message = NLS.bind(Messages.GcdaRecordsParser_checksum_error, new Object[] {
currentFnctn.getName(), fnctnId });
- Status status = new Status(IStatus.ERROR, Activator.PLUGIN_ID, message);
+ Status status = new Status(IStatus.ERROR, Constants.PLUGIN_ID, message);
throw new CoreException(status);
}
@@ -132,7 +132,7 @@ public class GcdaRecordsParser {
if (!fnctnFound) {
currentFnctn = null;
String message = NLS.bind(Messages.GcdaRecordsParser_func_not_found, fnctnId);
- Status status = new Status(IStatus.ERROR, Activator.PLUGIN_ID, message);
+ Status status = new Status(IStatus.ERROR, Constants.PLUGIN_ID, message);
throw new CoreException(status);
}
@@ -143,14 +143,14 @@ public class GcdaRecordsParser {
case GCOV_COUNTER_ARCS: {
if (currentFnctn == null) {
String message = Messages.GcdaRecordsParser_func_counter_error;
- Status status = new Status(IStatus.ERROR, Activator.PLUGIN_ID, message);
+ Status status = new Status(IStatus.ERROR, Constants.PLUGIN_ID, message);
throw new CoreException(status);
}
ArrayList<Block> fnctnBlcks = currentFnctn.getFunctionBlocks();
if (fnctnBlcks.isEmpty()) {
String message = Messages.GcdaRecordsParser_func_block_empty;
- Status status = new Status(IStatus.ERROR, Activator.PLUGIN_ID, message);
+ Status status = new Status(IStatus.ERROR, Constants.PLUGIN_ID, message);
throw new CoreException(status);
}
diff --git a/gcov/org.eclipse.linuxtools.gcov.core/src/org/eclipse/linuxtools/internal/gcov/parser/GcnoRecordsParser.java b/gcov/org.eclipse.linuxtools.gcov.core/src/org/eclipse/linuxtools/internal/gcov/parser/GcnoRecordsParser.java
index ccd441f149e56ac113fba7eb8d8236775e1b78d7..e59557b335b11315c8bf42612aa6b10a67b787ac 100644
--- a/gcov/org.eclipse.linuxtools.gcov.core/src/org/eclipse/linuxtools/internal/gcov/parser/GcnoRecordsParser.java
+++ b/gcov/org.eclipse.linuxtools.gcov.core/src/org/eclipse/linuxtools/internal/gcov/parser/GcnoRecordsParser.java
@@ -22,7 +22,7 @@ import java.util.HashMap;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
-import org.eclipse.linuxtools.internal.gcov.Activator;
+import org.eclipse.linuxtools.internal.gcov.Constants;
import org.eclipse.linuxtools.internal.gcov.utils.BEDataInputStream;
import org.eclipse.linuxtools.internal.gcov.utils.GcovStringReader;
import org.eclipse.linuxtools.internal.gcov.utils.LEDataInputStream;
@@ -81,7 +81,7 @@ public class GcnoRecordsParser {
stream = new LEDataInputStream((DataInputStream) stream);
} else {
String message = NLS.bind(Messages.GcnoRecordsParser_magic_num_error, magic);
- Status status = new Status(IStatus.ERROR, Activator.PLUGIN_ID, message);
+ Status status = new Status(IStatus.ERROR, Constants.PLUGIN_ID, message);
throw new CoreException(status);
}
}
diff --git a/gcov/org.eclipse.linuxtools.gcov.core/src/org/eclipse/linuxtools/internal/gcov/view/CovView.java b/gcov/org.eclipse.linuxtools.gcov.core/src/org/eclipse/linuxtools/internal/gcov/view/CovView.java
index bc43431f6ea95c6cc86f0a31d813a6b919037da1..76487fd9eb7610ed0870a4fa74f43ff0e9a418a7 100644
--- a/gcov/org.eclipse.linuxtools.gcov.core/src/org/eclipse/linuxtools/internal/gcov/view/CovView.java
+++ b/gcov/org.eclipse.linuxtools.gcov.core/src/org/eclipse/linuxtools/internal/gcov/view/CovView.java
@@ -1,6 +1,6 @@
/*******************************************************************************
* Copyright (c) 2009, 2018 STMicroelectronics and others.
- *
+ *
* This program and the accompanying materials are made
* available under the terms of the Eclipse Public License 2.0
* which is available at https://www.eclipse.org/legal/epl-2.0/
@@ -25,6 +25,7 @@ import org.eclipse.core.resources.IProject;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Path;
+import org.eclipse.core.runtime.Platform;
import org.eclipse.core.runtime.Status;
import org.eclipse.jface.action.Action;
import org.eclipse.jface.action.IAction;
@@ -38,7 +39,7 @@ import org.eclipse.linuxtools.dataviewers.abstractviewers.AbstractSTViewer;
import org.eclipse.linuxtools.dataviewers.abstractviewers.TreeColumnViewerFilter;
import org.eclipse.linuxtools.dataviewers.actions.STExportToCSVAction;
import org.eclipse.linuxtools.dataviewers.charts.actions.ChartAction;
-import org.eclipse.linuxtools.internal.gcov.Activator;
+import org.eclipse.linuxtools.internal.gcov.Constants;
import org.eclipse.linuxtools.internal.gcov.action.SwitchContentProviderAction;
import org.eclipse.linuxtools.internal.gcov.parser.CovManager;
import org.eclipse.linuxtools.internal.gcov.parser.SourceFile;
@@ -55,6 +56,7 @@ import org.eclipse.ui.IWorkbenchPage;
import org.eclipse.ui.IWorkbenchWindow;
import org.eclipse.ui.PartInitException;
import org.eclipse.ui.PlatformUI;
+import org.osgi.framework.FrameworkUtil;
/**
* @author Xavier Raynaud <xavier.raynaud@st.com>
@@ -84,7 +86,7 @@ public class CovView extends AbstractSTDataView {
manager.add(fileAction);
manager.add(functionAction);
manager.add(new Separator());
- manager.add(new ChartAction(getViewSite().getShell(), getSTViewer()));
+ manager.add(new ChartAction(getViewSite().getShell(), getSTViewer()));
}
@Override
@@ -207,9 +209,9 @@ public class CovView extends AbstractSTDataView {
public static void reportError(Exception ex) {
final String message = NLS.bind(Messages.CovView_error_message, ex.getMessage());
- Status status = new Status(IStatus.ERROR, Activator.PLUGIN_ID, IStatus.ERROR, message, ex);
+ Status status = new Status(IStatus.ERROR, Constants.PLUGIN_ID, IStatus.ERROR, message, ex);
- Activator.getDefault().getLog().log(status);
+ Platform.getLog(FrameworkUtil.getBundle(CovView.class)).log(status);
PlatformUI.getWorkbench().getDisplay().asyncExec(() -> {
Shell s = PlatformUI.getWorkbench().getDisplay().getActiveShell();
MessageDialog.openError(s, Messages.CovView_parsing_error, message);
diff --git a/gcov/org.eclipse.linuxtools.gcov.core/src/org/eclipse/linuxtools/internal/gcov/view/CovViewer.java b/gcov/org.eclipse.linuxtools.gcov.core/src/org/eclipse/linuxtools/internal/gcov/view/CovViewer.java
index 0a4e541ab5e923fa065cf8e7662dee8ccacd8e98..986785bc57f5f850efc5ef67f7b941f8b7d29500 100644
--- a/gcov/org.eclipse.linuxtools.gcov.core/src/org/eclipse/linuxtools/internal/gcov/view/CovViewer.java
+++ b/gcov/org.eclipse.linuxtools.gcov.core/src/org/eclipse/linuxtools/internal/gcov/view/CovViewer.java
@@ -1,6 +1,6 @@
/*******************************************************************************
- * Copyright (c) 2009, 2018 STMicroelectronics and others.
- *
+ * Copyright (c) 2009, 2019 STMicroelectronics and others.
+ *
* This program and the accompanying materials are made
* available under the terms of the Eclipse Public License 2.0
* which is available at https://www.eclipse.org/legal/epl-2.0/
@@ -14,8 +14,6 @@ package org.eclipse.linuxtools.internal.gcov.view;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.Path;
import org.eclipse.jface.dialogs.IDialogSettings;
@@ -33,6 +31,8 @@ import org.eclipse.linuxtools.internal.gcov.parser.SourceFile;
import org.eclipse.linuxtools.internal.gcov.view.annotatedsource.OpenSourceFileAction;
import org.eclipse.swt.SWT;
import org.eclipse.swt.widgets.Composite;
+import org.eclipse.ui.PlatformUI;
+import org.osgi.framework.FrameworkUtil;
@@ -70,7 +70,7 @@ public class CovViewer extends AbstractSTTreeViewer {
@Override
public IDialogSettings getDialogSettings() {
- return org.eclipse.linuxtools.internal.gcov.Activator.getDefault().getDialogSettings();
+ return PlatformUI.getDialogSettingsProvider(FrameworkUtil.getBundle(CovViewer.class)).getDialogSettings();
}
@Override
@@ -94,7 +94,6 @@ public class CovViewer extends AbstractSTTreeViewer {
CovManager cvm = (CovManager) this.getInput();
SourceFile sourceFile = cvm.getSourceFile(sourceLoc);
if (sourceFile != null) {
- IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
String binaryLoc = cvm.getBinaryPath();
IPath binaryPath = new Path(binaryLoc);
//FIXME EK-LINUXTOOLS: IFile binary = root.getFileForLocation(binaryPath);
diff --git a/gcov/org.eclipse.linuxtools.gcov.core/src/org/eclipse/linuxtools/internal/gcov/view/annotatedsource/OpenSourceFileAction.java b/gcov/org.eclipse.linuxtools.gcov.core/src/org/eclipse/linuxtools/internal/gcov/view/annotatedsource/OpenSourceFileAction.java
index 305cbfe836b0f0bfd800eb6c53c8bbe2c14cdc0d..4df70912eaa00392a12268626f656cad66b042ba 100644
--- a/gcov/org.eclipse.linuxtools.gcov.core/src/org/eclipse/linuxtools/internal/gcov/view/annotatedsource/OpenSourceFileAction.java
+++ b/gcov/org.eclipse.linuxtools.gcov.core/src/org/eclipse/linuxtools/internal/gcov/view/annotatedsource/OpenSourceFileAction.java
@@ -1,6 +1,6 @@
/*******************************************************************************
* Copyright (c) 2009, 2018 STMicroelectronics and others.
- *
+ *
* This program and the accompanying materials are made
* available under the terms of the Eclipse Public License 2.0
* which is available at https://www.eclipse.org/legal/epl-2.0/
@@ -23,11 +23,12 @@ import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Path;
+import org.eclipse.core.runtime.Platform;
import org.eclipse.core.runtime.Status;
import org.eclipse.jface.text.BadLocationException;
import org.eclipse.jface.text.IDocument;
import org.eclipse.linuxtools.binutils.link2source.STLink2SourceSupport;
-import org.eclipse.linuxtools.internal.gcov.Activator;
+import org.eclipse.linuxtools.internal.gcov.Constants;
import org.eclipse.linuxtools.internal.gcov.parser.SourceFile;
import org.eclipse.ui.IEditorInput;
import org.eclipse.ui.IEditorPart;
@@ -39,6 +40,7 @@ import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.ide.IDE;
import org.eclipse.ui.texteditor.IDocumentProvider;
import org.eclipse.ui.texteditor.ITextEditor;
+import org.osgi.framework.FrameworkUtil;
public final class OpenSourceFileAction {
@@ -96,11 +98,11 @@ public final class OpenSourceFileAction {
try {
page.openEditor(new STAnnotatedSourceNotFoundEditorInput(project, sourceFile, realLocation,
lineNumber), STAnnotatedSourceNotFoundEditor.ID, true);
- } catch (PartInitException e) {
- Status s = new Status(IStatus.ERROR, Activator.PLUGIN_ID, IStatus.ERROR,
- Messages.OpenSourceFileAction_open_error, e);
- Activator.getDefault().getLog().log(s);
- }
+ } catch (PartInitException e) {
+ Status s = new Status(IStatus.ERROR, Constants.PLUGIN_ID, IStatus.ERROR,
+ Messages.OpenSourceFileAction_open_error, e);
+ Platform.getLog(FrameworkUtil.getBundle(OpenSourceFileAction.class)).log(s);
+ }
} else {
try {
IEditorPart editor = IDE.openEditorOnFileStore(page, fs);
@@ -116,13 +118,13 @@ public final class OpenSourceFileAction {
IWorkbenchPage p = editor.getSite().getPage();
p.activate(editor);
}
- } catch (PartInitException e) {
- Status s = new Status(IStatus.ERROR, Activator.PLUGIN_ID, IStatus.ERROR,
- Messages.OpenSourceFileAction_open_error, e);
- Activator.getDefault().getLog().log(s);
- }
+ } catch (PartInitException e) {
+ Status s = new Status(IStatus.ERROR, Constants.PLUGIN_ID, IStatus.ERROR,
+ Messages.OpenSourceFileAction_open_error, e);
+ Platform.getLog(FrameworkUtil.getBundle(OpenSourceFileAction.class)).log(s);
+ }
}
-
+
}
});
}
diff --git a/gcov/org.eclipse.linuxtools.gcov.docs/pom.xml b/gcov/org.eclipse.linuxtools.gcov.docs/pom.xml
index 5f020ca553abde68444cabe4c8d53ee788299a7b..c4d9427c93ae29d1929313c1d9da1a8b1783065d 100644
--- a/gcov/org.eclipse.linuxtools.gcov.docs/pom.xml
+++ b/gcov/org.eclipse.linuxtools.gcov.docs/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.eclipse.linuxtools.gcov</groupId>
<artifactId>linuxtools-gcov-parent</artifactId>
- <version>7.4.0</version>
+ <version>8.1.0</version>
</parent>
<artifactId>org.eclipse.linuxtools.gcov.docs</artifactId>
diff --git a/gcov/org.eclipse.linuxtools.gcov.launch/.classpath b/gcov/org.eclipse.linuxtools.gcov.launch/.classpath
index 43b986286a9e5fd1828793fa4b2353d02ab8625f..1db08c6b4ce2fb50395b2f9c9a50c140a0bab199 100644
--- a/gcov/org.eclipse.linuxtools.gcov.launch/.classpath
+++ b/gcov/org.eclipse.linuxtools.gcov.launch/.classpath
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="target/classes"/>
diff --git a/gcov/org.eclipse.linuxtools.gcov.launch/.settings/org.eclipse.jdt.core.prefs b/gcov/org.eclipse.linuxtools.gcov.launch/.settings/org.eclipse.jdt.core.prefs
index 9cac1c29a5b83cfb693e89a39b691b43cb315c34..c246cade924bfa7aafa1511109c6e6cecdc79374 100644
--- a/gcov/org.eclipse.linuxtools.gcov.launch/.settings/org.eclipse.jdt.core.prefs
+++ b/gcov/org.eclipse.linuxtools.gcov.launch/.settings/org.eclipse.jdt.core.prefs
@@ -6,8 +6,8 @@ org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annota
org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
+org.eclipse.jdt.core.compiler.compliance=11
org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
@@ -18,6 +18,7 @@ org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=warning
org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
@@ -61,6 +62,7 @@ org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=warn
org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=warning
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
@@ -92,4 +94,5 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11
diff --git a/gcov/org.eclipse.linuxtools.gcov.launch/META-INF/MANIFEST.MF b/gcov/org.eclipse.linuxtools.gcov.launch/META-INF/MANIFEST.MF
index fdc2087a7b4895aa12f51d4f9503d668312f5d7d..72d15bbb0ef1f3532a244cc278c4f808abf7d463 100644
--- a/gcov/org.eclipse.linuxtools.gcov.launch/META-INF/MANIFEST.MF
+++ b/gcov/org.eclipse.linuxtools.gcov.launch/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: %bundleName
Bundle-SymbolicName: org.eclipse.linuxtools.gcov.launch;singleton:=true
Bundle-Version: 1.2.0.qualifier
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
Bundle-Localization: plugin
Require-Bundle: org.eclipse.linuxtools.profiling.launch;bundle-version="1.2.0",
org.eclipse.core.runtime;bundle-version="3.8.0",
diff --git a/gcov/org.eclipse.linuxtools.gcov.launch/pom.xml b/gcov/org.eclipse.linuxtools.gcov.launch/pom.xml
index b39760a280c2eaf75233e4405f12bfe7cefe5685..7a0caca001f4da66c5f4c184f64b244fc74ca8e8 100644
--- a/gcov/org.eclipse.linuxtools.gcov.launch/pom.xml
+++ b/gcov/org.eclipse.linuxtools.gcov.launch/pom.xml
@@ -15,7 +15,7 @@
<parent>
<artifactId>linuxtools-gcov-parent</artifactId>
<groupId>org.eclipse.linuxtools.gcov</groupId>
- <version>7.4.0</version>
+ <version>8.1.0</version>
</parent>
<artifactId>org.eclipse.linuxtools.gcov.launch</artifactId>
diff --git a/gcov/org.eclipse.linuxtools.gcov.test/.classpath b/gcov/org.eclipse.linuxtools.gcov.test/.classpath
index 43b986286a9e5fd1828793fa4b2353d02ab8625f..a621c21ac550d71458aac26221ac3641277a488d 100644
--- a/gcov/org.eclipse.linuxtools.gcov.test/.classpath
+++ b/gcov/org.eclipse.linuxtools.gcov.test/.classpath
@@ -1,7 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="src" path="src"/>
+ <classpathentry kind="src" path="src">
+ <attributes>
+ <attribute name="test" value="true"/>
+ </attributes>
+ </classpathentry>
<classpathentry kind="output" path="target/classes"/>
</classpath>
diff --git a/gcov/org.eclipse.linuxtools.gcov.test/.settings/org.eclipse.jdt.core.prefs b/gcov/org.eclipse.linuxtools.gcov.test/.settings/org.eclipse.jdt.core.prefs
index 89403a77994b785316070de748ba8557617d10d2..649554d9b3307e8870e94c442906bcfe4a4e8e83 100644
--- a/gcov/org.eclipse.linuxtools.gcov.test/.settings/org.eclipse.jdt.core.prefs
+++ b/gcov/org.eclipse.linuxtools.gcov.test/.settings/org.eclipse.jdt.core.prefs
@@ -6,8 +6,8 @@ org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annota
org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
+org.eclipse.jdt.core.compiler.compliance=11
org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
@@ -18,6 +18,7 @@ org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=warning
org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
@@ -61,6 +62,7 @@ org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=warn
org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
@@ -92,4 +94,5 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11
diff --git a/gcov/org.eclipse.linuxtools.gcov.test/META-INF/MANIFEST.MF b/gcov/org.eclipse.linuxtools.gcov.test/META-INF/MANIFEST.MF
index bf4065b3518609e730d63d658cff12c365169930..12b2cbf7a178ce75c80c64222c0b30cf58cc2d52 100644
--- a/gcov/org.eclipse.linuxtools.gcov.test/META-INF/MANIFEST.MF
+++ b/gcov/org.eclipse.linuxtools.gcov.test/META-INF/MANIFEST.MF
@@ -11,7 +11,7 @@ Require-Bundle: org.junit;bundle-version="4.10.0",
org.eclipse.ui.navigator.resources,
org.eclipse.ui.navigator
Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
Bundle-Localization: plugin
Fragment-Host: org.eclipse.linuxtools.gcov.core
Automatic-Module-Name: org.eclipse.linuxtools.gcov.test
diff --git a/gcov/org.eclipse.linuxtools.gcov.test/pom.xml b/gcov/org.eclipse.linuxtools.gcov.test/pom.xml
index 926b13ad72742030b219e3fae90c70b71044af25..57d56d35899fee18023e3a1cfedaa99f25748092 100644
--- a/gcov/org.eclipse.linuxtools.gcov.test/pom.xml
+++ b/gcov/org.eclipse.linuxtools.gcov.test/pom.xml
@@ -15,7 +15,7 @@
<parent>
<artifactId>linuxtools-gcov-parent</artifactId>
<groupId>org.eclipse.linuxtools.gcov</groupId>
- <version>7.4.0</version>
+ <version>8.1.0</version>
</parent>
<artifactId>org.eclipse.linuxtools.gcov.test</artifactId>
diff --git a/gcov/pom.xml b/gcov/pom.xml
index ae0938d9b70b8b1ad8c7c639afdcd3f5dec5a9c0..cc6e2e6b56ff35e9b4eba009c0c951e8cac9914a 100644
--- a/gcov/pom.xml
+++ b/gcov/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.eclipse.linuxtools</groupId>
<artifactId>linuxtools-parent</artifactId>
- <version>7.4.0</version>
+ <version>8.1.0</version>
</parent>
<groupId>org.eclipse.linuxtools.gcov</groupId>
diff --git a/gprof/org.eclipse.linuxtools.gprof-feature/feature.xml b/gprof/org.eclipse.linuxtools.gprof-feature/feature.xml
index 068e9fa988c516222d9a123cb5992ff564bc0cca..3388b6727432d1ffec0e4beecc08ae4d4bdf854c 100644
--- a/gprof/org.eclipse.linuxtools.gprof-feature/feature.xml
+++ b/gprof/org.eclipse.linuxtools.gprof-feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.linuxtools.gprof.feature"
label="%featureName"
- version="7.4.0.qualifier"
+ version="8.1.0.qualifier"
provider-name="%provider"
license-feature="org.eclipse.license"
license-feature-version="0.0.0">
diff --git a/gprof/org.eclipse.linuxtools.gprof-feature/pom.xml b/gprof/org.eclipse.linuxtools.gprof-feature/pom.xml
index de89d33abde2c9187a56a947444e39c541a50b05..70b934451b1264af654265d7a05d5769b9e192a4 100644
--- a/gprof/org.eclipse.linuxtools.gprof-feature/pom.xml
+++ b/gprof/org.eclipse.linuxtools.gprof-feature/pom.xml
@@ -15,12 +15,12 @@
<parent>
<artifactId>linuxtools-gprof-parent</artifactId>
<groupId>org.eclipse.linuxtools.gprof</groupId>
- <version>7.4.0</version>
+ <version>8.1.0</version>
</parent>
<artifactId>org.eclipse.linuxtools.gprof.feature</artifactId>
<packaging>eclipse-feature</packaging>
- <version>7.4.0-SNAPSHOT</version>
+ <version>8.1.0-SNAPSHOT</version>
<name>Linux Tools GProf Integration Feature</name>
diff --git a/gprof/org.eclipse.linuxtools.gprof.docs/pom.xml b/gprof/org.eclipse.linuxtools.gprof.docs/pom.xml
index 98d8966615d00dc07f5215a6fc71438be826a50f..10765fd22fdeb7f382178c06aef0a80f35588385 100644
--- a/gprof/org.eclipse.linuxtools.gprof.docs/pom.xml
+++ b/gprof/org.eclipse.linuxtools.gprof.docs/pom.xml
@@ -14,7 +14,7 @@
<parent>
<artifactId>linuxtools-gprof-parent</artifactId>
<groupId>org.eclipse.linuxtools.gprof</groupId>
- <version>7.4.0</version>
+ <version>8.1.0</version>
</parent>
<artifactId>org.eclipse.linuxtools.gprof.docs</artifactId>
diff --git a/gprof/org.eclipse.linuxtools.gprof.launch/.classpath b/gprof/org.eclipse.linuxtools.gprof.launch/.classpath
index 43b986286a9e5fd1828793fa4b2353d02ab8625f..1db08c6b4ce2fb50395b2f9c9a50c140a0bab199 100644
--- a/gprof/org.eclipse.linuxtools.gprof.launch/.classpath
+++ b/gprof/org.eclipse.linuxtools.gprof.launch/.classpath
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="target/classes"/>
diff --git a/gprof/org.eclipse.linuxtools.gprof.launch/.settings/org.eclipse.jdt.core.prefs b/gprof/org.eclipse.linuxtools.gprof.launch/.settings/org.eclipse.jdt.core.prefs
index e7fba4098c67501706ddcbdc1b0d014285ad67e4..c58287391977f6ab06bcc1e42b20ec38eca518a1 100644
--- a/gprof/org.eclipse.linuxtools.gprof.launch/.settings/org.eclipse.jdt.core.prefs
+++ b/gprof/org.eclipse.linuxtools.gprof.launch/.settings/org.eclipse.jdt.core.prefs
@@ -7,9 +7,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nul
org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.compliance=11
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -23,6 +23,7 @@ org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=warning
org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
@@ -66,6 +67,7 @@ org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=warn
org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=warning
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
@@ -97,4 +99,5 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11
diff --git a/gprof/org.eclipse.linuxtools.gprof.launch/META-INF/MANIFEST.MF b/gprof/org.eclipse.linuxtools.gprof.launch/META-INF/MANIFEST.MF
index 7d3d6391def058d9055d9f522fc83e4a1e0a2ade..121d87bcf5b93e55f7e88ad5d0eceec6ed8824c1 100644
--- a/gprof/org.eclipse.linuxtools.gprof.launch/META-INF/MANIFEST.MF
+++ b/gprof/org.eclipse.linuxtools.gprof.launch/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: %bundleName
Bundle-SymbolicName: org.eclipse.linuxtools.gprof.launch;singleton:=true
Bundle-Version: 1.2.0.qualifier
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
Bundle-Localization: plugin
Require-Bundle: org.eclipse.linuxtools.profiling.launch;bundle-version="1.2.0",
org.eclipse.core.runtime;bundle-version="3.8.0",
diff --git a/gprof/org.eclipse.linuxtools.gprof.launch/pom.xml b/gprof/org.eclipse.linuxtools.gprof.launch/pom.xml
index 42cbbfc982aa270f62c9f67819cf6e4a58348b4b..44e8f88e20a50dda84bda02fa634f2f3339d6c0b 100644
--- a/gprof/org.eclipse.linuxtools.gprof.launch/pom.xml
+++ b/gprof/org.eclipse.linuxtools.gprof.launch/pom.xml
@@ -15,7 +15,7 @@
<parent>
<artifactId>linuxtools-gprof-parent</artifactId>
<groupId>org.eclipse.linuxtools.gprof</groupId>
- <version>7.4.0</version>
+ <version>8.1.0</version>
</parent>
<artifactId>org.eclipse.linuxtools.gprof.launch</artifactId>
diff --git a/gprof/org.eclipse.linuxtools.gprof.test/.classpath b/gprof/org.eclipse.linuxtools.gprof.test/.classpath
index 43b986286a9e5fd1828793fa4b2353d02ab8625f..a621c21ac550d71458aac26221ac3641277a488d 100644
--- a/gprof/org.eclipse.linuxtools.gprof.test/.classpath
+++ b/gprof/org.eclipse.linuxtools.gprof.test/.classpath
@@ -1,7 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="src" path="src"/>
+ <classpathentry kind="src" path="src">
+ <attributes>
+ <attribute name="test" value="true"/>
+ </attributes>
+ </classpathentry>
<classpathentry kind="output" path="target/classes"/>
</classpath>
diff --git a/gprof/org.eclipse.linuxtools.gprof.test/.settings/org.eclipse.jdt.core.prefs b/gprof/org.eclipse.linuxtools.gprof.test/.settings/org.eclipse.jdt.core.prefs
index 89403a77994b785316070de748ba8557617d10d2..649554d9b3307e8870e94c442906bcfe4a4e8e83 100644
--- a/gprof/org.eclipse.linuxtools.gprof.test/.settings/org.eclipse.jdt.core.prefs
+++ b/gprof/org.eclipse.linuxtools.gprof.test/.settings/org.eclipse.jdt.core.prefs
@@ -6,8 +6,8 @@ org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annota
org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
+org.eclipse.jdt.core.compiler.compliance=11
org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
@@ -18,6 +18,7 @@ org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=warning
org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
@@ -61,6 +62,7 @@ org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=warn
org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
@@ -92,4 +94,5 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11
diff --git a/gprof/org.eclipse.linuxtools.gprof.test/META-INF/MANIFEST.MF b/gprof/org.eclipse.linuxtools.gprof.test/META-INF/MANIFEST.MF
index b49f8c309929c5ad9509abe0707fec24202a155a..5c84801752d9199a68a6f6848f68f17f57d3b9f5 100644
--- a/gprof/org.eclipse.linuxtools.gprof.test/META-INF/MANIFEST.MF
+++ b/gprof/org.eclipse.linuxtools.gprof.test/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-Name: %bundleName
Bundle-SymbolicName: org.eclipse.linuxtools.gprof.test
Bundle-Version: 5.1.0.qualifier
Bundle-Vendor: %bundleProvider
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
Require-Bundle: org.junit;bundle-version="4.10.0",
org.eclipse.linuxtools.gprof.launch;bundle-version="1.0.0",
org.eclipse.linuxtools.profiling.tests;bundle-version="1.0.0",
diff --git a/gprof/org.eclipse.linuxtools.gprof.test/bigtest_gprof_input/gmon.out b/gprof/org.eclipse.linuxtools.gprof.test/bigtest_gprof_input/gmon.out
new file mode 100644
index 0000000000000000000000000000000000000000..3d425c91e1862d54f46e9ad365ee136d7c5d6645
Binary files /dev/null and b/gprof/org.eclipse.linuxtools.gprof.test/bigtest_gprof_input/gmon.out differ
diff --git a/gprof/org.eclipse.linuxtools.gprof.test/foocpp_gprof_input/gmon.out b/gprof/org.eclipse.linuxtools.gprof.test/foocpp_gprof_input/gmon.out
new file mode 100644
index 0000000000000000000000000000000000000000..3f9fdb70b62896d23ee0a422bb74e556e5f5a24c
Binary files /dev/null and b/gprof/org.eclipse.linuxtools.gprof.test/foocpp_gprof_input/gmon.out differ
diff --git a/gprof/org.eclipse.linuxtools.gprof.test/foox_gprof_input/gmon.out b/gprof/org.eclipse.linuxtools.gprof.test/foox_gprof_input/gmon.out
new file mode 100644
index 0000000000000000000000000000000000000000..e1071405b1619fae93fa9d34750ceb80c08140e0
Binary files /dev/null and b/gprof/org.eclipse.linuxtools.gprof.test/foox_gprof_input/gmon.out differ
diff --git a/gprof/org.eclipse.linuxtools.gprof.test/partially-pg-build_gprof_input/gmon.out b/gprof/org.eclipse.linuxtools.gprof.test/partially-pg-build_gprof_input/gmon.out
new file mode 100644
index 0000000000000000000000000000000000000000..c7da11fb0a8ed213448d4c8e7629fa7c775cc7fe
Binary files /dev/null and b/gprof/org.eclipse.linuxtools.gprof.test/partially-pg-build_gprof_input/gmon.out differ
diff --git a/gprof/org.eclipse.linuxtools.gprof.test/pom.xml b/gprof/org.eclipse.linuxtools.gprof.test/pom.xml
index 272ba6ddec98de4eb88d66ad8e0dc38596589f3c..44a5badb2d1fe480032e5e60f1cb22dedfefb75e 100644
--- a/gprof/org.eclipse.linuxtools.gprof.test/pom.xml
+++ b/gprof/org.eclipse.linuxtools.gprof.test/pom.xml
@@ -15,7 +15,7 @@
<parent>
<artifactId>linuxtools-gprof-parent</artifactId>
<groupId>org.eclipse.linuxtools.gprof</groupId>
- <version>7.4.0</version>
+ <version>8.1.0</version>
</parent>
<artifactId>org.eclipse.linuxtools.gprof.test</artifactId>
diff --git a/gprof/org.eclipse.linuxtools.gprof/.classpath b/gprof/org.eclipse.linuxtools.gprof/.classpath
index 43b986286a9e5fd1828793fa4b2353d02ab8625f..1db08c6b4ce2fb50395b2f9c9a50c140a0bab199 100644
--- a/gprof/org.eclipse.linuxtools.gprof/.classpath
+++ b/gprof/org.eclipse.linuxtools.gprof/.classpath
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="target/classes"/>
diff --git a/gprof/org.eclipse.linuxtools.gprof/.settings/org.eclipse.jdt.core.prefs b/gprof/org.eclipse.linuxtools.gprof/.settings/org.eclipse.jdt.core.prefs
index e8b51e59ebcd7bafb9f250bf233cd2d88d75ba20..7d0d9582830002dc46c0de6d571a9c5a8574d911 100644
--- a/gprof/org.eclipse.linuxtools.gprof/.settings/org.eclipse.jdt.core.prefs
+++ b/gprof/org.eclipse.linuxtools.gprof/.settings/org.eclipse.jdt.core.prefs
@@ -6,8 +6,8 @@ org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annota
org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
+org.eclipse.jdt.core.compiler.compliance=11
org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
@@ -18,6 +18,7 @@ org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=warning
org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
@@ -61,6 +62,7 @@ org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=warn
org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
@@ -92,4 +94,5 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11
diff --git a/gprof/org.eclipse.linuxtools.gprof/META-INF/MANIFEST.MF b/gprof/org.eclipse.linuxtools.gprof/META-INF/MANIFEST.MF
index f2134e1bb8d0ecbd6762ec67a072fd890b7b8d75..8f1e5d9ef6c763f909a78146c91ad7ff1ab43c28 100644
--- a/gprof/org.eclipse.linuxtools.gprof/META-INF/MANIFEST.MF
+++ b/gprof/org.eclipse.linuxtools.gprof/META-INF/MANIFEST.MF
@@ -15,7 +15,7 @@ Require-Bundle: org.eclipse.core.runtime,
org.eclipse.linuxtools.binutils,
org.eclipse.linuxtools.dataviewers.charts
Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
Bundle-Localization: plugin
Export-Package:
org.eclipse.linuxtools.internal.gprof.view;x-friends:="org.eclipse.linuxtools.gprof.launch"
diff --git a/gprof/org.eclipse.linuxtools.gprof/pom.xml b/gprof/org.eclipse.linuxtools.gprof/pom.xml
index b4b56865303032074de5f5cdd75f4901d94f44a7..bb49df6b04a87b42430884d0ad48eebd7eacbcf7 100644
--- a/gprof/org.eclipse.linuxtools.gprof/pom.xml
+++ b/gprof/org.eclipse.linuxtools.gprof/pom.xml
@@ -15,7 +15,7 @@
<parent>
<artifactId>linuxtools-gprof-parent</artifactId>
<groupId>org.eclipse.linuxtools.gprof</groupId>
- <version>7.4.0</version>
+ <version>8.1.0</version>
</parent>
<artifactId>org.eclipse.linuxtools.gprof</artifactId>
diff --git a/gprof/org.eclipse.linuxtools.gprof/src/org/eclipse/linuxtools/internal/gprof/Activator.java b/gprof/org.eclipse.linuxtools.gprof/src/org/eclipse/linuxtools/internal/gprof/Activator.java
index 37975809d52f82c0910771411ed88e6b85160dd4..0a77d9efeaa8366f924309eb01b8bc11babae5c4 100644
--- a/gprof/org.eclipse.linuxtools.gprof/src/org/eclipse/linuxtools/internal/gprof/Activator.java
+++ b/gprof/org.eclipse.linuxtools.gprof/src/org/eclipse/linuxtools/internal/gprof/Activator.java
@@ -13,6 +13,7 @@
package org.eclipse.linuxtools.internal.gprof;
import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.jface.resource.ResourceLocator;
import org.eclipse.ui.plugin.AbstractUIPlugin;
import org.osgi.framework.BundleContext;
@@ -56,6 +57,6 @@ public class Activator extends AbstractUIPlugin {
* @return the image descriptor
*/
public static ImageDescriptor getImageDescriptor(String path) {
- return imageDescriptorFromPlugin(PLUGIN_ID, path);
+ return ResourceLocator.imageDescriptorFromBundle(PLUGIN_ID, path).get();
}
}
diff --git a/gprof/org.eclipse.linuxtools.gprof/src/org/eclipse/linuxtools/internal/gprof/parser/GmonDecoder.java b/gprof/org.eclipse.linuxtools.gprof/src/org/eclipse/linuxtools/internal/gprof/parser/GmonDecoder.java
index b63115eae1380418235e7733b7b46bb9d61fc899..10145a1306eb149d0fbcc57f0e35481dd52b8b7e 100644
--- a/gprof/org.eclipse.linuxtools.gprof/src/org/eclipse/linuxtools/internal/gprof/parser/GmonDecoder.java
+++ b/gprof/org.eclipse.linuxtools.gprof/src/org/eclipse/linuxtools/internal/gprof/parser/GmonDecoder.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2009, 2018 STMicroelectronics and others.
+ * Copyright (c) 2009, 2019 STMicroelectronics and others.
*
* This program and the accompanying materials are made
* available under the terms of the Eclipse Public License 2.0
@@ -24,10 +24,10 @@ import java.text.DateFormat;
import java.util.Date;
import java.util.HashMap;
+import org.eclipse.cdt.core.IAddressFactory;
import org.eclipse.cdt.core.IBinaryParser.IBinaryObject;
import org.eclipse.cdt.core.IBinaryParser.ISymbol;
import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.Platform;
import org.eclipse.linuxtools.binutils.utils.STSymbolManager;
import org.eclipse.linuxtools.internal.gprof.Messages;
import org.eclipse.linuxtools.internal.gprof.utils.LEDataInputStream;
@@ -87,15 +87,20 @@ public class GmonDecoder {
this.ps = ps;
this.project = project;
program.getBinaryParser().getFormat();
+ IAddressFactory factory = program.getAddressFactory();
+ int addrSize = 4;
+ if (factory != null) {
+ addrSize = factory.getMax().getSize();
+ }
String cpu = program.getCPU();
- if (Platform.ARCH_X86_64.equals(cpu) || "amd64".equals(cpu) || "aarch64".equals(cpu) || "ppc64".equals(cpu)) { //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- histo = new HistogramDecoder64(this);
- callGraph = new CallGraphDecoder64(this);
- _32_bit_platform = false;
+ if (addrSize > 4 || cpu.endsWith("64")) { //$NON-NLS-1$
+ histo = new HistogramDecoder64(this);
+ callGraph = new CallGraphDecoder64(this);
+ _32_bit_platform = false;
} else {
- _32_bit_platform = true;
- histo = new HistogramDecoder(this);
- callGraph = new CallGraphDecoder(this);
+ _32_bit_platform = true;
+ histo = new HistogramDecoder(this);
+ callGraph = new CallGraphDecoder(this);
}
}
diff --git a/gprof/org.eclipse.linuxtools.gprof/src/org/eclipse/linuxtools/internal/gprof/view/GmonView.java b/gprof/org.eclipse.linuxtools.gprof/src/org/eclipse/linuxtools/internal/gprof/view/GmonView.java
index ba412fa65f06efd2c8ee57229a611ed4ed5e3bef..c1b33319cc4cdf23122d42d49f5811e013ae0e85 100644
--- a/gprof/org.eclipse.linuxtools.gprof/src/org/eclipse/linuxtools/internal/gprof/view/GmonView.java
+++ b/gprof/org.eclipse.linuxtools.gprof/src/org/eclipse/linuxtools/internal/gprof/view/GmonView.java
@@ -132,7 +132,7 @@ public class GmonView extends AbstractSTDataView {
manager.add(new Separator());
manager.add(switchSampleTime);
manager.add(new Separator());
- manager.add(new ChartAction(getViewSite().getShell(), getSTViewer()));
+ manager.add(new ChartAction(getViewSite().getShell(), getSTViewer()));
}
@Override
diff --git a/gprof/pom.xml b/gprof/pom.xml
index f60c2fc5dce6615490146c27e44d918013e4bbf8..43f44c2287f68f83c11ee9adc929d423bd6044f4 100644
--- a/gprof/pom.xml
+++ b/gprof/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.eclipse.linuxtools</groupId>
<artifactId>linuxtools-parent</artifactId>
- <version>7.4.0</version>
+ <version>8.1.0</version>
</parent>
<groupId>org.eclipse.linuxtools.gprof</groupId>
diff --git a/javadocs/org.eclipse.linuxtools.javadocs-feature/feature.xml b/javadocs/org.eclipse.linuxtools.javadocs-feature/feature.xml
index 7504bc4c3342d00c70b9248f982522e6e32649b5..69d7cac9addbe4eecb24246598156977552d3397 100644
--- a/javadocs/org.eclipse.linuxtools.javadocs-feature/feature.xml
+++ b/javadocs/org.eclipse.linuxtools.javadocs-feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.linuxtools.javadocs.feature"
label="%featureName"
- version="7.4.0.qualifier"
+ version="8.1.0.qualifier"
license-feature="org.eclipse.license"
license-feature-version="0.0.0"
provider-name="%provider">
diff --git a/javadocs/org.eclipse.linuxtools.javadocs-feature/pom.xml b/javadocs/org.eclipse.linuxtools.javadocs-feature/pom.xml
index c0e9a89661bd3e77f4b028bd89f0252d89beea6e..01695df779d46608f4c3f3ae6b958dc99c9a1d0e 100644
--- a/javadocs/org.eclipse.linuxtools.javadocs-feature/pom.xml
+++ b/javadocs/org.eclipse.linuxtools.javadocs-feature/pom.xml
@@ -15,13 +15,13 @@
<parent>
<artifactId>linuxtools-javadocs-parent</artifactId>
<groupId>org.eclipse.linuxtools.javadocs</groupId>
- <version>7.4.0</version>
+ <version>8.1.0</version>
</parent>
<artifactId>org.eclipse.linuxtools.javadocs.feature</artifactId>
<packaging>eclipse-feature</packaging>
- <version>7.4.0-SNAPSHOT</version>
<name>Linux Tools Javadocs Feature</name>
+ <version>8.1.0-SNAPSHOT</version>
<build>
<plugins>
diff --git a/javadocs/org.eclipse.linuxtools.javadocs.tests/.classpath b/javadocs/org.eclipse.linuxtools.javadocs.tests/.classpath
index 43b986286a9e5fd1828793fa4b2353d02ab8625f..a621c21ac550d71458aac26221ac3641277a488d 100644
--- a/javadocs/org.eclipse.linuxtools.javadocs.tests/.classpath
+++ b/javadocs/org.eclipse.linuxtools.javadocs.tests/.classpath
@@ -1,7 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="src" path="src"/>
+ <classpathentry kind="src" path="src">
+ <attributes>
+ <attribute name="test" value="true"/>
+ </attributes>
+ </classpathentry>
<classpathentry kind="output" path="target/classes"/>
</classpath>
diff --git a/javadocs/org.eclipse.linuxtools.javadocs.tests/.settings/org.eclipse.jdt.core.prefs b/javadocs/org.eclipse.linuxtools.javadocs.tests/.settings/org.eclipse.jdt.core.prefs
index 0c68a61dca867ceb49e79d2402935261ec3e3809..7adc0fb9a0d32bd6b4e3ce6f305ab7165208865c 100644
--- a/javadocs/org.eclipse.linuxtools.javadocs.tests/.settings/org.eclipse.jdt.core.prefs
+++ b/javadocs/org.eclipse.linuxtools.javadocs.tests/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,10 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
+org.eclipse.jdt.core.compiler.compliance=11
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11
diff --git a/javadocs/org.eclipse.linuxtools.javadocs.tests/META-INF/MANIFEST.MF b/javadocs/org.eclipse.linuxtools.javadocs.tests/META-INF/MANIFEST.MF
index 5f19a50eb5ac12704edc6c0b61824fe81fe21627..37cc962f3f2447d581294726ae35aa2971ed3ad4 100644
--- a/javadocs/org.eclipse.linuxtools.javadocs.tests/META-INF/MANIFEST.MF
+++ b/javadocs/org.eclipse.linuxtools.javadocs.tests/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-Name: Javadocs Plug-in Tests
Bundle-SymbolicName: org.eclipse.linuxtools.javadocs.tests
Bundle-Version: 1.0.0.qualifier
Fragment-Host: org.eclipse.linuxtools.javadocs
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
Require-Bundle: org.junit;bundle-version="4.11.0",
org.eclipse.core.resources;bundle-version="3.9.1"
Automatic-Module-Name: org.eclipse.linuxtools.javadocs.tests
diff --git a/javadocs/org.eclipse.linuxtools.javadocs.tests/pom.xml b/javadocs/org.eclipse.linuxtools.javadocs.tests/pom.xml
index 3091e22b4beaa6bf043e068c032b564e74048e5e..c9d9a01a7138e608b611be34eab2036c220af2e7 100644
--- a/javadocs/org.eclipse.linuxtools.javadocs.tests/pom.xml
+++ b/javadocs/org.eclipse.linuxtools.javadocs.tests/pom.xml
@@ -15,7 +15,7 @@
<parent>
<artifactId>linuxtools-javadocs-parent</artifactId>
<groupId>org.eclipse.linuxtools.javadocs</groupId>
- <version>7.4.0</version>
+ <version>8.1.0</version>
</parent>
<artifactId>org.eclipse.linuxtools.javadocs.tests</artifactId>
diff --git a/javadocs/org.eclipse.linuxtools.javadocs/.classpath b/javadocs/org.eclipse.linuxtools.javadocs/.classpath
index 43b986286a9e5fd1828793fa4b2353d02ab8625f..1db08c6b4ce2fb50395b2f9c9a50c140a0bab199 100644
--- a/javadocs/org.eclipse.linuxtools.javadocs/.classpath
+++ b/javadocs/org.eclipse.linuxtools.javadocs/.classpath
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="target/classes"/>
diff --git a/javadocs/org.eclipse.linuxtools.javadocs/.settings/org.eclipse.jdt.core.prefs b/javadocs/org.eclipse.linuxtools.javadocs/.settings/org.eclipse.jdt.core.prefs
index 0c68a61dca867ceb49e79d2402935261ec3e3809..7adc0fb9a0d32bd6b4e3ce6f305ab7165208865c 100644
--- a/javadocs/org.eclipse.linuxtools.javadocs/.settings/org.eclipse.jdt.core.prefs
+++ b/javadocs/org.eclipse.linuxtools.javadocs/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,10 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
+org.eclipse.jdt.core.compiler.compliance=11
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11
diff --git a/javadocs/org.eclipse.linuxtools.javadocs/META-INF/MANIFEST.MF b/javadocs/org.eclipse.linuxtools.javadocs/META-INF/MANIFEST.MF
index c27c648c74b12389642e6104ae706fa9d6a09bcf..cd1c572840ba80470876daaeeedd652a0cf1a4e1 100644
--- a/javadocs/org.eclipse.linuxtools.javadocs/META-INF/MANIFEST.MF
+++ b/javadocs/org.eclipse.linuxtools.javadocs/META-INF/MANIFEST.MF
@@ -9,6 +9,6 @@ Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
org.eclipse.help;bundle-version="3.6.0",
org.eclipse.core.filesystem;bundle-version="1.4.100"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
Bundle-ActivationPolicy: lazy
Automatic-Module-Name: org.eclipse.linuxtools.javadocs
diff --git a/javadocs/org.eclipse.linuxtools.javadocs/pom.xml b/javadocs/org.eclipse.linuxtools.javadocs/pom.xml
index 8f3753fda15510bf40943cb50d72296fbdf12caf..4b19ba14a86a2a0d8d075fffd5aba2acbbf8026d 100644
--- a/javadocs/org.eclipse.linuxtools.javadocs/pom.xml
+++ b/javadocs/org.eclipse.linuxtools.javadocs/pom.xml
@@ -15,7 +15,7 @@
<parent>
<artifactId>linuxtools-javadocs-parent</artifactId>
<groupId>org.eclipse.linuxtools.javadocs</groupId>
- <version>7.4.0</version>
+ <version>8.1.0</version>
</parent>
<artifactId>org.eclipse.linuxtools.javadocs</artifactId>
diff --git a/javadocs/pom.xml b/javadocs/pom.xml
index d11a6d9ca8e41bd9419fdde6cd2f80f9365ad05d..f06455e262626cbf34913b5c0caa123eab8a88d3 100644
--- a/javadocs/pom.xml
+++ b/javadocs/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.eclipse.linuxtools</groupId>
<artifactId>linuxtools-parent</artifactId>
- <version>7.4.0</version>
+ <version>8.1.0</version>
</parent>
<groupId>org.eclipse.linuxtools.javadocs</groupId>
diff --git a/man/org.eclipse.linuxtools.man-feature/feature.xml b/man/org.eclipse.linuxtools.man-feature/feature.xml
index 27c5486dc5efba0207c603d4248500a3aae0c098..e946d1b6730efe77d319b0f5e7ba4bc8e19534ad 100644
--- a/man/org.eclipse.linuxtools.man-feature/feature.xml
+++ b/man/org.eclipse.linuxtools.man-feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.linuxtools.man"
label="%featureName"
- version="7.4.0.qualifier"
+ version="8.1.0.qualifier"
provider-name="%provider"
license-feature="org.eclipse.license"
license-feature-version="0.0.0">
diff --git a/man/org.eclipse.linuxtools.man-feature/pom.xml b/man/org.eclipse.linuxtools.man-feature/pom.xml
index 433cb31715f43d030bbf1fa35f8891043bbc1e87..1bcad84bffb41d4ed65ac0c15c9dbdaed7251b93 100644
--- a/man/org.eclipse.linuxtools.man-feature/pom.xml
+++ b/man/org.eclipse.linuxtools.man-feature/pom.xml
@@ -20,12 +20,12 @@
<parent>
<groupId>org.eclipse.linuxtools.man</groupId>
<artifactId>linuxtools-man-parent</artifactId>
- <version>7.4.0</version>
+ <version>8.1.0</version>
</parent>
<artifactId>org.eclipse.linuxtools.man</artifactId>
<packaging>eclipse-feature</packaging>
- <version>7.4.0-SNAPSHOT</version>
+ <version>8.1.0-SNAPSHOT</version>
<name>Linux Tools Man Feature (Incubation)</name>
diff --git a/man/org.eclipse.linuxtools.man.core/.classpath b/man/org.eclipse.linuxtools.man.core/.classpath
index 43b986286a9e5fd1828793fa4b2353d02ab8625f..1db08c6b4ce2fb50395b2f9c9a50c140a0bab199 100644
--- a/man/org.eclipse.linuxtools.man.core/.classpath
+++ b/man/org.eclipse.linuxtools.man.core/.classpath
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="target/classes"/>
diff --git a/man/org.eclipse.linuxtools.man.core/.settings/org.eclipse.jdt.core.prefs b/man/org.eclipse.linuxtools.man.core/.settings/org.eclipse.jdt.core.prefs
index 8d6cd3c2f17e02341c248d4896a0f351b5355a81..739a5fd963ff12e21f959a2180cb8422c35278e9 100644
--- a/man/org.eclipse.linuxtools.man.core/.settings/org.eclipse.jdt.core.prefs
+++ b/man/org.eclipse.linuxtools.man.core/.settings/org.eclipse.jdt.core.prefs
@@ -17,9 +17,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nul
org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.compliance=11
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -34,6 +34,7 @@ org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=warning
org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
@@ -89,6 +90,7 @@ org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=warn
org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=warning
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
@@ -120,23 +122,28 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11
org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
+org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
org.eclipse.jdt.core.formatter.alignment_for_assignment=0
-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_bitwise_operator=16
org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
+org.eclipse.jdt.core.formatter.alignment_for_logical_operator=16
org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
+org.eclipse.jdt.core.formatter.alignment_for_multiplicative_operator=16
org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_string_concatenation=16
org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
@@ -212,11 +219,12 @@ org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_after_additive_operator=insert
org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_bitwise_operator=insert
org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
@@ -246,6 +254,8 @@ org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=inser
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
+org.eclipse.jdt.core.formatter.insert_space_after_logical_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_multiplicative_operator=insert
org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
@@ -269,12 +279,16 @@ org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_relational_operator=insert
org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_shift_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_string_concatenation=insert
org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_additive_operator=insert
org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_bitwise_operator=insert
org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
@@ -320,6 +334,8 @@ org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do n
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_logical_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_multiplicative_operator=insert
org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
@@ -355,8 +371,11 @@ org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not inser
org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_relational_operator=insert
org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_shift_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_string_concatenation=insert
org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
@@ -381,4 +400,8 @@ org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
org.eclipse.jdt.core.formatter.tabulation.char=tab
org.eclipse.jdt.core.formatter.tabulation.size=4
org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_additive_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_bitwise_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_logical_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_multiplicative_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_string_concatenation=true
diff --git a/man/org.eclipse.linuxtools.man.core/META-INF/MANIFEST.MF b/man/org.eclipse.linuxtools.man.core/META-INF/MANIFEST.MF
index 5950bc7c2b57bccd24021fb957ee30f8a891e5cd..9f79c6e70e69b9eaf8cc237ed513e393275c864c 100644
--- a/man/org.eclipse.linuxtools.man.core/META-INF/MANIFEST.MF
+++ b/man/org.eclipse.linuxtools.man.core/META-INF/MANIFEST.MF
@@ -7,7 +7,7 @@ Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
org.eclipse.jface.text,
com.jcraft.jsch
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
Export-Package: org.eclipse.linuxtools.internal.man.parser;x-friends:="org.eclipse.linuxtools.man.help",
org.eclipse.linuxtools.man.parser,
org.eclipse.linuxtools.man.views
diff --git a/man/org.eclipse.linuxtools.man.core/pom.xml b/man/org.eclipse.linuxtools.man.core/pom.xml
index 5e4f2e5fd5aa2bdafd7eb94557ad30faaccb97eb..d824c415b56905055b99b93ef8f62ca485930b7d 100644
--- a/man/org.eclipse.linuxtools.man.core/pom.xml
+++ b/man/org.eclipse.linuxtools.man.core/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.eclipse.linuxtools.man</groupId>
<artifactId>linuxtools-man-parent</artifactId>
- <version>7.4.0</version>
+ <version>8.1.0</version>
</parent>
<artifactId>org.eclipse.linuxtools.man.core</artifactId>
diff --git a/man/org.eclipse.linuxtools.man.help/.classpath b/man/org.eclipse.linuxtools.man.help/.classpath
index 43b986286a9e5fd1828793fa4b2353d02ab8625f..1db08c6b4ce2fb50395b2f9c9a50c140a0bab199 100644
--- a/man/org.eclipse.linuxtools.man.help/.classpath
+++ b/man/org.eclipse.linuxtools.man.help/.classpath
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="target/classes"/>
diff --git a/man/org.eclipse.linuxtools.man.help/.settings/org.eclipse.jdt.core.prefs b/man/org.eclipse.linuxtools.man.help/.settings/org.eclipse.jdt.core.prefs
index dd535f88178b48a37d0314bd25c19d0edcab58b0..3b27d2a18e83b8b3fe798007f56ebe0bea26b3c4 100644
--- a/man/org.eclipse.linuxtools.man.help/.settings/org.eclipse.jdt.core.prefs
+++ b/man/org.eclipse.linuxtools.man.help/.settings/org.eclipse.jdt.core.prefs
@@ -16,9 +16,9 @@ org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annota
org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.compliance=11
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -33,6 +33,7 @@ org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=warning
org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
@@ -88,6 +89,7 @@ org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=warn
org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=warning
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
@@ -119,23 +121,28 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11
org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
+org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
org.eclipse.jdt.core.formatter.alignment_for_assignment=0
-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_bitwise_operator=16
org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
+org.eclipse.jdt.core.formatter.alignment_for_logical_operator=16
org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
+org.eclipse.jdt.core.formatter.alignment_for_multiplicative_operator=16
org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_string_concatenation=16
org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
@@ -211,11 +218,12 @@ org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_after_additive_operator=insert
org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_bitwise_operator=insert
org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
@@ -245,6 +253,8 @@ org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=inser
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
+org.eclipse.jdt.core.formatter.insert_space_after_logical_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_multiplicative_operator=insert
org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
@@ -268,12 +278,16 @@ org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_relational_operator=insert
org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_shift_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_string_concatenation=insert
org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_additive_operator=insert
org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_bitwise_operator=insert
org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
@@ -319,6 +333,8 @@ org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do n
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_logical_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_multiplicative_operator=insert
org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
@@ -354,8 +370,11 @@ org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not inser
org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_relational_operator=insert
org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_shift_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_string_concatenation=insert
org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
@@ -380,4 +399,8 @@ org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
org.eclipse.jdt.core.formatter.tabulation.char=tab
org.eclipse.jdt.core.formatter.tabulation.size=4
org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_additive_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_bitwise_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_logical_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_multiplicative_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_string_concatenation=true
diff --git a/man/org.eclipse.linuxtools.man.help/.settings/org.eclipse.jdt.ui.prefs b/man/org.eclipse.linuxtools.man.help/.settings/org.eclipse.jdt.ui.prefs
index c43046c52cf1f909a963db1545613fdb3011e092..1080c832171e0ee5cf5076e39ec2cf7114139a30 100644
--- a/man/org.eclipse.linuxtools.man.help/.settings/org.eclipse.jdt.ui.prefs
+++ b/man/org.eclipse.linuxtools.man.help/.settings/org.eclipse.jdt.ui.prefs
@@ -1,4 +1,3 @@
-#Wed Dec 09 21:56:11 EET 2009
eclipse.preferences.version=1
editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
formatter_profile=org.eclipse.jdt.ui.default.eclipse_profile
@@ -14,33 +13,46 @@ sp_cleanup.add_missing_deprecated_annotations=true
sp_cleanup.add_missing_methods=false
sp_cleanup.add_missing_nls_tags=false
sp_cleanup.add_missing_override_annotations=true
+sp_cleanup.add_missing_override_annotations_interface_methods=true
sp_cleanup.add_serial_version_id=false
sp_cleanup.always_use_blocks=true
sp_cleanup.always_use_parentheses_in_expressions=false
sp_cleanup.always_use_this_for_non_static_field_access=false
sp_cleanup.always_use_this_for_non_static_method_access=false
-sp_cleanup.convert_to_enhanced_for_loop=false
+sp_cleanup.convert_functional_interfaces=true
+sp_cleanup.convert_to_enhanced_for_loop=true
+sp_cleanup.convert_to_enhanced_for_loop_if_loop_var_used=false
sp_cleanup.correct_indentation=false
sp_cleanup.format_source_code=true
sp_cleanup.format_source_code_changes_only=false
+sp_cleanup.insert_inferred_type_arguments=false
+sp_cleanup.lazy_logical_operator=false
sp_cleanup.make_local_variable_final=false
sp_cleanup.make_parameters_final=false
sp_cleanup.make_private_fields_final=true
sp_cleanup.make_type_abstract_if_missing_method=false
sp_cleanup.make_variable_declarations_final=false
+sp_cleanup.merge_conditional_blocks=false
sp_cleanup.never_use_blocks=false
sp_cleanup.never_use_parentheses_in_expressions=true
+sp_cleanup.number_suffix=false
+sp_cleanup.objects_equals=false
sp_cleanup.on_save_use_additional_actions=true
sp_cleanup.organize_imports=true
+sp_cleanup.push_down_negation=false
sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
sp_cleanup.qualify_static_member_accesses_with_declaring_class=false
sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
sp_cleanup.remove_private_constructors=true
+sp_cleanup.remove_redundant_modifiers=true
+sp_cleanup.remove_redundant_semicolons=true
+sp_cleanup.remove_redundant_type_arguments=true
sp_cleanup.remove_trailing_whitespaces=false
sp_cleanup.remove_trailing_whitespaces_all=true
sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
+sp_cleanup.remove_unnecessary_array_creation=true
sp_cleanup.remove_unnecessary_casts=true
sp_cleanup.remove_unnecessary_nls_tags=true
sp_cleanup.remove_unused_imports=true
@@ -49,12 +61,19 @@ sp_cleanup.remove_unused_private_fields=true
sp_cleanup.remove_unused_private_members=false
sp_cleanup.remove_unused_private_methods=true
sp_cleanup.remove_unused_private_types=true
+sp_cleanup.simplify_lambda_expression_and_method_ref=true
sp_cleanup.sort_members=false
sp_cleanup.sort_members_all=false
+sp_cleanup.use_anonymous_class_creation=false
+sp_cleanup.use_autoboxing=false
sp_cleanup.use_blocks=false
sp_cleanup.use_blocks_only_for_return_and_throw=false
+sp_cleanup.use_directly_map_method=true
+sp_cleanup.use_lambda=true
sp_cleanup.use_parentheses_in_expressions=false
sp_cleanup.use_this_for_non_static_field_access=false
sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
sp_cleanup.use_this_for_non_static_method_access=false
sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+sp_cleanup.use_unboxing=false
+sp_cleanup.use_var=false
diff --git a/man/org.eclipse.linuxtools.man.help/META-INF/MANIFEST.MF b/man/org.eclipse.linuxtools.man.help/META-INF/MANIFEST.MF
index 50d6d858952ec5523ce810eae9e83b767ad67950..6a41724951682756d4c115f17af3c0149a6261ed 100644
--- a/man/org.eclipse.linuxtools.man.help/META-INF/MANIFEST.MF
+++ b/man/org.eclipse.linuxtools.man.help/META-INF/MANIFEST.MF
@@ -7,6 +7,6 @@ Require-Bundle: org.eclipse.core.runtime,
org.eclipse.help,
org.eclipse.help.base,
org.eclipse.linuxtools.man.core;bundle-version="1.3.0"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
Bundle-Vendor: %Bundle-Vendor
Automatic-Module-Name: org.eclipse.linuxtools.man.help
diff --git a/man/org.eclipse.linuxtools.man.help/pom.xml b/man/org.eclipse.linuxtools.man.help/pom.xml
index 46eb6a1ff3fa93d1c0477ded2257dd286f6cc1b2..2bc4a9d66cff766aa3fc7851756f65440793e01d 100644
--- a/man/org.eclipse.linuxtools.man.help/pom.xml
+++ b/man/org.eclipse.linuxtools.man.help/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.eclipse.linuxtools.man</groupId>
<artifactId>linuxtools-man-parent</artifactId>
- <version>7.4.0</version>
+ <version>8.1.0</version>
</parent>
<artifactId>org.eclipse.linuxtools.man.help</artifactId>
diff --git a/man/org.eclipse.linuxtools.man.help/src/org/eclipse/linuxtools/internal/man/help/ManualToc.java b/man/org.eclipse.linuxtools.man.help/src/org/eclipse/linuxtools/internal/man/help/ManualToc.java
index eb858784c1c7e61a5326b013be55d8d8314b6e50..02f9c66b0b60514beee420ce99b4ed1e6df08af2 100644
--- a/man/org.eclipse.linuxtools.man.help/src/org/eclipse/linuxtools/internal/man/help/ManualToc.java
+++ b/man/org.eclipse.linuxtools.man.help/src/org/eclipse/linuxtools/internal/man/help/ManualToc.java
@@ -57,7 +57,7 @@ public class ManualToc implements IToc {
private void generateSections() {
// Filter to make sure we only get manual section directories
- DirectoryStream.Filter<Path> filter = new DirectoryStream.Filter<Path>() {
+ DirectoryStream.Filter<Path> filter = new DirectoryStream.Filter<>() {
private final Pattern p = Pattern.compile("^man\\d[xp]?"); //$NON-NLS-1$
@Override
diff --git a/man/pom.xml b/man/pom.xml
index 717ad8f0b7cbd9fecfacb1ec9527222227ddbdd2..abb683048f01a08395f5158b67a25716e1b3bf03 100644
--- a/man/pom.xml
+++ b/man/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.eclipse.linuxtools</groupId>
<artifactId>linuxtools-parent</artifactId>
- <version>7.4.0</version>
+ <version>8.1.0</version>
</parent>
<groupId>org.eclipse.linuxtools.man</groupId>
diff --git a/oprofile/eclipse-oprofile.metainfo.xml b/oprofile/eclipse-oprofile.metainfo.xml
deleted file mode 100644
index 240d8ffabcfca99c179d732e5c4d8f9d0893d53d..0000000000000000000000000000000000000000
--- a/oprofile/eclipse-oprofile.metainfo.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (C) 2015, 2018 Red Hat, Inc.
-
- This program and the accompanying materials are made
- available under the terms of the Eclipse Public License 2.0
- which is available at https://www.eclipse.org/legal/epl-2.0/
-
- SPDX-License-Identifier: EPL-2.0
--->
-<component type="addon">
- <id>eclipse-oprofile</id>
- <metadata_license>CC-BY-SA-3.0</metadata_license>
- <project_license>EPL-2.0</project_license>
- <extends>eclipse.desktop</extends>
- <name>Oprofile</name>
- <summary>Linux Tools Eclipse plug-ins for Oprofile profiling tool</summary>
- <url type="homepage">http://www.eclipse.org/linuxtools/projectPages/oprofile/</url>
- <updatecontact>rgrunber@redhat.com</updatecontact>
-</component>
diff --git a/oprofile/org.eclipse.linuxtools.oprofile-feature/.gitignore b/oprofile/org.eclipse.linuxtools.oprofile-feature/.gitignore
deleted file mode 100644
index 8d94ef8debe45a7bc3866f985fdc60d41c12822f..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile-feature/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-bin
-@dot
-javaCompiler...args
-build.xml
-target
diff --git a/oprofile/org.eclipse.linuxtools.oprofile-feature/.project b/oprofile/org.eclipse.linuxtools.oprofile-feature/.project
deleted file mode 100644
index e08eda091ade193b34cf53ca0986f9b69558acce..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile-feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.linuxtools.oprofile-feature</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.pde.FeatureBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.FeatureNature</nature>
- </natures>
-</projectDescription>
diff --git a/oprofile/org.eclipse.linuxtools.oprofile-feature/feature.properties b/oprofile/org.eclipse.linuxtools.oprofile-feature/feature.properties
deleted file mode 100644
index ffb7ca0febc63cb490d21f0e2d83e2c3eaf2a126..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile-feature/feature.properties
+++ /dev/null
@@ -1,16 +0,0 @@
-#*******************************************************************************
-# Copyright (c) 2008 Red Hat, Inc.
-#
-# This program and the accompanying materials are made
-# available under the terms of the Eclipse Public License 2.0
-# which is available at https://www.eclipse.org/legal/epl-2.0/
-#
-# SPDX-License-Identifier: EPL-2.0
-#
-# Contributors:
-# Red Hat, Inc. - initial API and implementation
-#********************************************************************************
-featureName=OProfile Integration
-description=Plugins to bring OProfile-based profiling into the workbench.
-provider=Eclipse Linux Tools
-copyright=Copyright 2008, 2010 Red Hat, Inc.
diff --git a/oprofile/org.eclipse.linuxtools.oprofile-feature/feature.xml b/oprofile/org.eclipse.linuxtools.oprofile-feature/feature.xml
deleted file mode 100644
index 58f2274921874d05fcf3ee522cfb6ffcb76adefb..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile-feature/feature.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
- id="org.eclipse.linuxtools.oprofile.feature"
- label="%featureName"
- version="7.4.0.qualifier"
- provider-name="%provider"
- os="linux"
- license-feature="org.eclipse.license"
- license-feature-version="0.0.0">
-
- <description>
- %description
- </description>
-
- <copyright>
- %copyright
- </copyright>
-
- <license url="%licenseURL">
- %license
- </license>
-
- <url>
- <update label="Linux Tools Update Site" url="http://download.eclipse.org/linuxtools/update"/>
- </url>
-
- <requires>
- <import plugin="org.eclipse.core.runtime" version="3.4.0" match="greaterOrEqual"/>
- <import plugin="org.eclipse.ui" version="3.4.0" match="greaterOrEqual"/>
- <import plugin="org.eclipse.cdt.core"/>
- <import plugin="org.eclipse.cdt.debug.core"/>
- <import plugin="org.eclipse.cdt.launch"/>
- <import plugin="org.eclipse.core.resources"/>
- <import plugin="org.eclipse.debug.core"/>
- <import plugin="org.eclipse.debug.ui"/>
- <import plugin="org.eclipse.linuxtools.profiling.launch"/>
- <import plugin="org.eclipse.ui.ide"/>
- <import plugin="org.eclipse.jface.text"/>
- <import plugin="org.eclipse.linuxtools.profiling.ui"/>
- <import feature="org.eclipse.linuxtools.profiling" version="0.1.0" match="greaterOrEqual"/>
- <import plugin="org.eclipse.ui.editors" version="3.4.0" match="greaterOrEqual"/>
- <import plugin="org.eclipse.linuxtools.oprofile.core" version="0.1.0" match="greaterOrEqual"/>
- <import plugin="org.eclipse.help"/>
- </requires>
-
- <plugin
- id="org.eclipse.linuxtools.oprofile.core"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.eclipse.linuxtools.oprofile.launch"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.linuxtools.oprofile.ui"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.linuxtools.oprofile.doc"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
-</feature>
diff --git a/oprofile/org.eclipse.linuxtools.oprofile-feature/p2.inf b/oprofile/org.eclipse.linuxtools.oprofile-feature/p2.inf
deleted file mode 100644
index 193bce9e3a4b159b05b4d563970bf1841be08404..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile-feature/p2.inf
+++ /dev/null
@@ -1,3 +0,0 @@
-instructions.configure=\
-org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(location:http${#58}//download.eclipse.org/linuxtools/update,type:0,name:Linux Tools,enabled:false); \
-org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(location:http${#58}//download.eclipse.org/linuxtools/update,type:1,name:Linux Tools,enabled:false);
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core.tests/.classpath b/oprofile/org.eclipse.linuxtools.oprofile.core.tests/.classpath
deleted file mode 100644
index 43b986286a9e5fd1828793fa4b2353d02ab8625f..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.core.tests/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="output" path="target/classes"/>
-</classpath>
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core.tests/.gitignore b/oprofile/org.eclipse.linuxtools.oprofile.core.tests/.gitignore
deleted file mode 100644
index 8d94ef8debe45a7bc3866f985fdc60d41c12822f..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.core.tests/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-bin
-@dot
-javaCompiler...args
-build.xml
-target
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core.tests/.settings/org.eclipse.jdt.core.prefs b/oprofile/org.eclipse.linuxtools.oprofile.core.tests/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 0f169a9f12bcab0d129a236fc0a635a231c7c9a6..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.core.tests/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,99 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled
-org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
-org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull
-org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault
-org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
-org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.8
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
-org.eclipse.jdt.core.compiler.problem.deadCode=warning
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=warning
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDefaultCase=ignore
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning
-org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled
-org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=warning
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning
-org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error
-org.eclipse.jdt.core.compiler.problem.nullReference=warning
-org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error
-org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
-org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
-org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
-org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=error
-org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
-org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
-org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=disabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=disabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=enabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.8
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core.tests/.settings/org.eclipse.jdt.ui.prefs b/oprofile/org.eclipse.linuxtools.oprofile.core.tests/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 0debfec81755a9bbb21071ef07f71a74988a058e..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.core.tests/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,54 +0,0 @@
-eclipse.preferences.version=1
-editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
-sp_cleanup.add_default_serial_version_id=true
-sp_cleanup.add_generated_serial_version_id=false
-sp_cleanup.add_missing_annotations=false
-sp_cleanup.add_missing_deprecated_annotations=true
-sp_cleanup.add_missing_methods=false
-sp_cleanup.add_missing_nls_tags=false
-sp_cleanup.add_missing_override_annotations=true
-sp_cleanup.add_missing_override_annotations_interface_methods=true
-sp_cleanup.add_serial_version_id=false
-sp_cleanup.always_use_blocks=true
-sp_cleanup.always_use_parentheses_in_expressions=false
-sp_cleanup.always_use_this_for_non_static_field_access=false
-sp_cleanup.always_use_this_for_non_static_method_access=false
-sp_cleanup.convert_to_enhanced_for_loop=false
-sp_cleanup.correct_indentation=false
-sp_cleanup.format_source_code=false
-sp_cleanup.format_source_code_changes_only=false
-sp_cleanup.make_local_variable_final=false
-sp_cleanup.make_parameters_final=false
-sp_cleanup.make_private_fields_final=true
-sp_cleanup.make_type_abstract_if_missing_method=false
-sp_cleanup.make_variable_declarations_final=false
-sp_cleanup.never_use_blocks=false
-sp_cleanup.never_use_parentheses_in_expressions=true
-sp_cleanup.on_save_use_additional_actions=true
-sp_cleanup.organize_imports=true
-sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
-sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
-sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
-sp_cleanup.qualify_static_member_accesses_with_declaring_class=false
-sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
-sp_cleanup.remove_private_constructors=true
-sp_cleanup.remove_trailing_whitespaces=true
-sp_cleanup.remove_trailing_whitespaces_all=true
-sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
-sp_cleanup.remove_unnecessary_casts=false
-sp_cleanup.remove_unnecessary_nls_tags=false
-sp_cleanup.remove_unused_imports=false
-sp_cleanup.remove_unused_local_variables=false
-sp_cleanup.remove_unused_private_fields=true
-sp_cleanup.remove_unused_private_members=false
-sp_cleanup.remove_unused_private_methods=true
-sp_cleanup.remove_unused_private_types=true
-sp_cleanup.sort_members=false
-sp_cleanup.sort_members_all=false
-sp_cleanup.use_blocks=false
-sp_cleanup.use_blocks_only_for_return_and_throw=false
-sp_cleanup.use_parentheses_in_expressions=false
-sp_cleanup.use_this_for_non_static_field_access=false
-sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
-sp_cleanup.use_this_for_non_static_method_access=false
-sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core.tests/META-INF/MANIFEST.MF b/oprofile/org.eclipse.linuxtools.oprofile.core.tests/META-INF/MANIFEST.MF
deleted file mode 100644
index 2a444d7b6078d92d5ca526b6f9a29f72248a74c1..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.core.tests/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,13 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %bundleName
-Bundle-SymbolicName: org.eclipse.linuxtools.oprofile.core.tests
-Bundle-Version: 1.0.0.qualifier
-Bundle-Vendor: %bundleProvider
-Require-Bundle: org.junit;bundle-version="4.10.0"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Bundle-ActivationPolicy: lazy
-Fragment-Host: org.eclipse.linuxtools.oprofile.core
-Import-Package: org.eclipse.linuxtools.oprofile.tests
-Bundle-Localization: plugin
-Automatic-Module-Name: org.eclipse.linuxtools.oprofile.core.tests
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core.tests/about.html b/oprofile/org.eclipse.linuxtools.oprofile.core.tests/about.html
deleted file mode 100644
index 164f781a8fd2195f87c3d3d49946d56bce58992f..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.core.tests/about.html
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<title>About</title>
-</head>
-<body lang="EN-US">
- <h2>About This Content</h2>
-
- <p>November 30, 2017</p>
- <h3>License</h3>
-
- <p>
- The Eclipse Foundation makes available all content in this plug-in
- ("Content"). Unless otherwise indicated below, the Content
- is provided to you under the terms and conditions of the Eclipse
- Public License Version 2.0 ("EPL"). A copy of the EPL is
- available at <a href="http://www.eclipse.org/legal/epl-2.0">http://www.eclipse.org/legal/epl-2.0</a>.
- For purposes of the EPL, "Program" will mean the Content.
- </p>
-
- <p>
- If you did not receive this Content directly from the Eclipse
- Foundation, the Content is being redistributed by another party
- ("Redistributor") and different terms and conditions may
- apply to your use of any object code in the Content. Check the
- Redistributor's license that was provided with the Content. If no such
- license exists, contact the Redistributor. Unless otherwise indicated
- below, the terms and conditions of the EPL still apply to any source
- code in the Content and such source code may be obtained at <a
- href="http://www.eclipse.org/">http://www.eclipse.org</a>.
- </p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core.tests/build.properties b/oprofile/org.eclipse.linuxtools.oprofile.core.tests/build.properties
deleted file mode 100644
index 4b25374817f4b42c4370901f8940552a94e3151a..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.core.tests/build.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-source.. = src/
-bin.includes = META-INF/,\
- .,\
- resources/,\
- plugin.properties
-src.includes = resources/,\
- about.html
-individualSourceBundles=true
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core.tests/plugin.properties b/oprofile/org.eclipse.linuxtools.oprofile.core.tests/plugin.properties
deleted file mode 100644
index dcf5f4f21fffb19f162662b3133a692656fed842..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.core.tests/plugin.properties
+++ /dev/null
@@ -1,14 +0,0 @@
-#*******************************************************************************
-# Copyright (c) 2009, 2018 Red Hat, Inc.
-#
-# This program and the accompanying materials are made
-# available under the terms of the Eclipse Public License 2.0
-# which is available at https://www.eclipse.org/legal/epl-2.0/
-#
-# SPDX-License-Identifier: EPL-2.0
-#
-# Contributors:
-# Kent Sebastian <ksebasti@redhat.com> - initial API and implementation
-#*******************************************************************************
-bundleName=OProfile Core Tests Plug-in
-bundleProvider=Eclipse Linux Tools
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core.tests/pom.xml b/oprofile/org.eclipse.linuxtools.oprofile.core.tests/pom.xml
deleted file mode 100644
index b79664b200ae548f6ed33bdb8824ae218ecb2cfb..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.core.tests/pom.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (C) 2011, 2018 Red Hat, Inc.
-
- This program and the accompanying materials are made
- available under the terms of the Eclipse Public License 2.0
- which is available at https://www.eclipse.org/legal/epl-2.0/
-
- SPDX-License-Identifier: EPL-2.0
--->
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <artifactId>linuxtools-oprofile-parent</artifactId>
- <groupId>org.eclipse.linuxtools.oprofile</groupId>
- <version>7.4.0</version>
- </parent>
-
- <artifactId>org.eclipse.linuxtools.oprofile.core.tests</artifactId>
- <version>1.0.0-SNAPSHOT</version>
- <packaging>eclipse-test-plugin</packaging>
-
- <name>Linux Tools OProfile Core Tests Plug-in</name>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-surefire-plugin</artifactId>
- <version>${tycho-version}</version>
- <configuration>
- <useUIHarness>true</useUIHarness>
- <useUIThread>false</useUIThread>
- <product>org.eclipse.platform.ide</product>
- <testSuite>org.eclipse.linuxtools.oprofile.core.tests</testSuite>
- <testClass>org.eclipse.linuxtools.oprofile.core.tests.AllCoreTests</testClass>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
-</project>
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core.tests/resources/dev/oprofile/0/event b/oprofile/org.eclipse.linuxtools.oprofile.core.tests/resources/dev/oprofile/0/event
deleted file mode 100644
index 573541ac9702dd3969c9bc859d2b91ec1f7e6e56..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.core.tests/resources/dev/oprofile/0/event
+++ /dev/null
@@ -1 +0,0 @@
-0
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core.tests/resources/dev/oprofile/1/event b/oprofile/org.eclipse.linuxtools.oprofile.core.tests/resources/dev/oprofile/1/event
deleted file mode 100644
index 573541ac9702dd3969c9bc859d2b91ec1f7e6e56..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.core.tests/resources/dev/oprofile/1/event
+++ /dev/null
@@ -1 +0,0 @@
-0
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core.tests/resources/dev/oprofile/cpu_type b/oprofile/org.eclipse.linuxtools.oprofile.core.tests/resources/dev/oprofile/cpu_type
deleted file mode 100644
index 5b6464f506a016b51f045aa4dcaff5f365a857be..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.core.tests/resources/dev/oprofile/cpu_type
+++ /dev/null
@@ -1 +0,0 @@
-i386/arch_perfmon
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core.tests/resources/test_check-event_invalid_counter.xml b/oprofile/org.eclipse.linuxtools.oprofile.core.tests/resources/test_check-event_invalid_counter.xml
deleted file mode 100644
index 0d95acc0f7950d50f421db6e457dd132e68b3978..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.core.tests/resources/test_check-event_invalid_counter.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<check-events>
- <result>invalid-counter</result>
-</check-events>
\ No newline at end of file
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core.tests/resources/test_check-event_invalid_umask.xml b/oprofile/org.eclipse.linuxtools.oprofile.core.tests/resources/test_check-event_invalid_umask.xml
deleted file mode 100644
index 126fd38be0d24ca908fe2859ae37664a3b40b0c2..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.core.tests/resources/test_check-event_invalid_umask.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<check-events>
- <result>invalid-um</result>
-</check-events>
\ No newline at end of file
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core.tests/resources/test_check-event_ok.xml b/oprofile/org.eclipse.linuxtools.oprofile.core.tests/resources/test_check-event_ok.xml
deleted file mode 100644
index 7f6c9a9f80e038c9e02b9407262fd4f0d4e800ea..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.core.tests/resources/test_check-event_ok.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<check-events>
- <result>ok</result>
-</check-events>
\ No newline at end of file
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core.tests/resources/test_info.xml b/oprofile/org.eclipse.linuxtools.oprofile.core.tests/resources/test_info.xml
deleted file mode 100644
index 022a5d9793b9f14937a53ed9d07a2b592c189891..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.core.tests/resources/test_info.xml
+++ /dev/null
@@ -1,140 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<info>
- <num-counters>2</num-counters>
- <cpu-frequency>800</cpu-frequency>
- <defaults>
- <sample-dir>/var/lib/oprofile/samples/</sample-dir>
- <lock-file>/var/lib/oprofile/lock</lock-file>
- <log-file>/var/lib/oprofile/samples/oprofiled.log</log-file>
- <dump-status>/var/lib/oprofile/complete_dump</dump-status>
- </defaults>
- <timer-mode>true</timer-mode>
- <event-list counter="0">
- <event>
- <name>CPU_CLK_UNHALTED</name>
- <description>Clock cycles when not halted</description>
- <value>60</value>
- <minimum>6000</minimum>
- <unit-mask>
- <type>exclusive</type>
- <default>0</default>
- <mask>
- <value>0</value>
- <description>Unhalted core cycles</description>
- </mask>
- <mask>
- <value>1</value>
- <description>Unhalted bus cycles</description>
- </mask>
- <mask>
- <value>2</value>
- <description>Unhalted bus cycles of this core while the other core is halted</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>INST_RETIRED_ANY_P</name>
- <description>number of instructions retired</description>
- <value>192</value>
- <minimum>6000</minimum>
- <unit-mask>
- <type>mandatory</type>
- <default>0</default>
- <mask>
- <value>0</value>
- <description>No unit mask</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>DTLB_MISSES</name>
- <description>DTLB miss events</description>
- <value>8</value>
- <minimum>500</minimum>
- <unit-mask>
- <type>bitmask</type>
- <default>15</default>
- <mask>
- <value>1</value>
- <description>ANY Memory accesses that missed the DTLB.</description>
- </mask>
- <mask>
- <value>2</value>
- <description>MISS_LD DTLB misses due to load operations.</description>
- </mask>
- <mask>
- <value>4</value>
- <description>L0_MISS_LD L0 DTLB misses due to load operations.</description>
- </mask>
- <mask>
- <value>8</value>
- <description>MISS_ST TLB misses due to store operations.</description>
- </mask>
- </unit-mask>
- </event>
- </event-list>
- <event-list counter="1">
- <event>
- <name>L2_M_LINES_IN</name>
- <description>number of modified lines allocated in L2</description>
- <value>37</value>
- <minimum>500</minimum>
- <unit-mask>
- <type>exclusive</type>
- <default>64</default>
- <mask>
- <value>192</value>
- <description>All cores</description>
- </mask>
- <mask>
- <value>64</value>
- <description>This core</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>L2_LINES_OUT</name>
- <description>number of recovered lines from L2</description>
- <value>38</value>
- <minimum>500</minimum>
- <unit-mask>
- <type>bitmask</type>
- <default>112</default>
- <mask>
- <value>192</value>
- <description>core: all cores</description>
- </mask>
- <mask>
- <value>64</value>
- <description>core: this core</description>
- </mask>
- <mask>
- <value>48</value>
- <description>prefetch: all inclusive</description>
- </mask>
- <mask>
- <value>16</value>
- <description>prefetch: Hardware prefetch only</description>
- </mask>
- <mask>
- <value>0</value>
- <description>prefetch: exclude hardware prefetch</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>EIST_TRANS_ALL</name>
- <description>Intel(tm) Enhanced SpeedStep(r) Technology transitions</description>
- <value>58</value>
- <minimum>500</minimum>
- <unit-mask>
- <type>notavalidtype</type>
- <default>1</default>
- <mask>
- <value>1</value>
- <description>No unit mask</description>
- </mask>
- </unit-mask>
- </event>
- </event-list>
-</info>
\ No newline at end of file
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core.tests/resources/test_info_0ctrs.xml b/oprofile/org.eclipse.linuxtools.oprofile.core.tests/resources/test_info_0ctrs.xml
deleted file mode 100644
index c7dac5069d12d7480cbb910778d6214c7b2114f6..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.core.tests/resources/test_info_0ctrs.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<info>
- <num-counters>error</num-counters>
-</info>
\ No newline at end of file
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core.tests/resources/test_info_pre_parse_expected.xml b/oprofile/org.eclipse.linuxtools.oprofile.core.tests/resources/test_info_pre_parse_expected.xml
deleted file mode 100644
index 7003f979642ff7c614bb6a34a1f430450fb73205..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.core.tests/resources/test_info_pre_parse_expected.xml
+++ /dev/null
@@ -1,5048 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<info>
- <num-counters>2</num-counters>
- <cpu-frequency>1995</cpu-frequency>
- <defaults>
- <sample-dir>/var/lib/oprofile/samples/</sample-dir>
- <lock-file>/var/lib/oprofile/lock</lock-file>
- <log-file>/var/lib/oprofile/samples/oprofiled.log</log-file>
- <dump-status>/var/lib/oprofile/complete_dump</dump-status>
- </defaults>
- <timer-mode>false</timer-mode>
- <event-list counter="0">
- <event>
- <name>CPU_CLK_UNHALTED</name>
- <description>Clock cycles when not halted</description>
- <value>60</value>
- <minimum>6000</minimum>
- <unit-mask>
- <type>exclusive</type>
- <default>0</default>
- <mask>
- <value>0</value>
- <description>Unhalted core cycles</description>
- </mask>
- <mask>
- <value>1</value>
- <description>Unhalted bus cycles</description>
- </mask>
- <mask>
- <value>2</value>
- <description>Unhalted bus cycles of this core while the other core is halted</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>INST_RETIRED_ANY_P</name>
- <description>number of instructions retired</description>
- <value>192</value>
- <minimum>6000</minimum>
- <unit-mask>
- <type>mandatory</type>
- <default>0</default>
- <mask>
- <value>0</value>
- <description>No unit mask</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>L2_RQSTS</name>
- <description>number of L2 cache requests</description>
- <value>46</value>
- <minimum>500</minimum>
- <unit-mask>
- <type>bitmask</type>
- <default>127</default>
- <mask>
- <value>192</value>
- <description>core: all cores</description>
- </mask>
- <mask>
- <value>64</value>
- <description>core: this core</description>
- </mask>
- <mask>
- <value>48</value>
- <description>prefetch: all inclusive</description>
- </mask>
- <mask>
- <value>16</value>
- <description>prefetch: Hardware prefetch only</description>
- </mask>
- <mask>
- <value>0</value>
- <description>prefetch: exclude hardware prefetch</description>
- </mask>
- <mask>
- <value>8</value>
- <description>(M)ESI: Modified</description>
- </mask>
- <mask>
- <value>4</value>
- <description>M(E)SI: Exclusive</description>
- </mask>
- <mask>
- <value>2</value>
- <description>ME(S)I: Shared</description>
- </mask>
- <mask>
- <value>1</value>
- <description>MES(I): Invalid</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>LLC_MISSES</name>
- <description>L2 cache demand requests from this core that missed the L2</description>
- <value>46</value>
- <minimum>6000</minimum>
- <unit-mask>
- <type>mandatory</type>
- <default>65</default>
- <mask>
- <value>65</value>
- <description>No unit mask</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>LLC_REFS</name>
- <description>L2 cache demand requests from this core</description>
- <value>46</value>
- <minimum>6000</minimum>
- <unit-mask>
- <type>mandatory</type>
- <default>79</default>
- <mask>
- <value>79</value>
- <description>No unit mask</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>LOAD_BLOCK</name>
- <description>events pertaining to loads</description>
- <value>3</value>
- <minimum>500</minimum>
- <unit-mask>
- <type>bitmask</type>
- <default>62</default>
- <mask>
- <value>2</value>
- <description>STA Loads blocked by a preceding store with unknown address.</description>
- </mask>
- <mask>
- <value>4</value>
- <description>STD Loads blocked by a preceding store with unknown data.</description>
- </mask>
- <mask>
- <value>8</value>
- <description>OVERLAP_STORE Loads that partially overlap an earlier store, or 4K aliased with a previous store.</description>
- </mask>
- <mask>
- <value>16</value>
- <description>UNTIL_RETIRE Loads blocked until retirement.</description>
- </mask>
- <mask>
- <value>32</value>
- <description>L1D Loads blocked by the L1 data cache.</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>STORE_BLOCK</name>
- <description>events pertaining to stores</description>
- <value>4</value>
- <minimum>500</minimum>
- <unit-mask>
- <type>bitmask</type>
- <default>11</default>
- <mask>
- <value>1</value>
- <description>SB_DRAIN_CYCLES Cycles while stores are blocked due to store buffer drain.</description>
- </mask>
- <mask>
- <value>2</value>
- <description>ORDER Cycles while store is waiting for a preceding store to be globally observed.</description>
- </mask>
- <mask>
- <value>8</value>
- <description>NOOP A store is blocked due to a conflict with an external or internal snoop.</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>MISALIGN_MEM_REF</name>
- <description>number of misaligned data memory references</description>
- <value>5</value>
- <minimum>500</minimum>
- <unit-mask>
- <type>mandatory</type>
- <default>0</default>
- <mask>
- <value>0</value>
- <description>No unit mask</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>SEGMENT_REG_LOADS</name>
- <description>number of segment register loads</description>
- <value>6</value>
- <minimum>500</minimum>
- <unit-mask>
- <type>mandatory</type>
- <default>0</default>
- <mask>
- <value>0</value>
- <description>No unit mask</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>SSE_PRE_EXEC</name>
- <description>number of SSE pre-fetch/weakly ordered insns retired</description>
- <value>7</value>
- <minimum>500</minimum>
- <unit-mask>
- <type>exclusive</type>
- <default>0</default>
- <mask>
- <value>0</value>
- <description>prefetch NTA instructions executed.</description>
- </mask>
- <mask>
- <value>1</value>
- <description>prefetch T1 instructions executed.</description>
- </mask>
- <mask>
- <value>2</value>
- <description>prefetch T1 and T2 instructions executed.</description>
- </mask>
- <mask>
- <value>3</value>
- <description>SSE weakly-ordered stores</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>DTLB_MISSES</name>
- <description>DTLB miss events</description>
- <value>8</value>
- <minimum>500</minimum>
- <unit-mask>
- <type>bitmask</type>
- <default>15</default>
- <mask>
- <value>1</value>
- <description>ANY Memory accesses that missed the DTLB.</description>
- </mask>
- <mask>
- <value>2</value>
- <description>MISS_LD DTLB misses due to load operations.</description>
- </mask>
- <mask>
- <value>4</value>
- <description>L0_MISS_LD L0 DTLB misses due to load operations.</description>
- </mask>
- <mask>
- <value>8</value>
- <description>MISS_ST TLB misses due to store operations.</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>MEMORY_DISAMBIGUATION</name>
- <description>Memory disambiguation reset cycles.</description>
- <value>9</value>
- <minimum>1000</minimum>
- <unit-mask>
- <type>exclusive</type>
- <default>1</default>
- <mask>
- <value>1</value>
- <description>RESET Memory disambiguation reset cycles.</description>
- </mask>
- <mask>
- <value>2</value>
- <description>SUCCESS Number of loads that were successfully disambiguated.</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>PAGE_WALKS</name>
- <description>Page table walk events</description>
- <value>12</value>
- <minimum>500</minimum>
- <unit-mask>
- <type>exclusive</type>
- <default>2</default>
- <mask>
- <value>1</value>
- <description>COUNT Number of page-walks executed.</description>
- </mask>
- <mask>
- <value>2</value>
- <description>CYCLES Duration of page-walks in core cycles.</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>FLOPS</name>
- <description>number of FP computational micro-ops executed</description>
- <value>16</value>
- <minimum>3000</minimum>
- <unit-mask>
- <type>mandatory</type>
- <default>0</default>
- <mask>
- <value>0</value>
- <description>No unit mask</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>FP_ASSIST</name>
- <description>number of FP assists</description>
- <value>17</value>
- <minimum>500</minimum>
- <unit-mask>
- <type>mandatory</type>
- <default>0</default>
- <mask>
- <value>0</value>
- <description>No unit mask</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>MUL</name>
- <description>number of multiplies</description>
- <value>18</value>
- <minimum>1000</minimum>
- <unit-mask>
- <type>mandatory</type>
- <default>0</default>
- <mask>
- <value>0</value>
- <description>No unit mask</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>DIV</name>
- <description>number of divides</description>
- <value>19</value>
- <minimum>500</minimum>
- <unit-mask>
- <type>mandatory</type>
- <default>0</default>
- <mask>
- <value>0</value>
- <description>No unit mask</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>CYCLES_DIV_BUSY</name>
- <description>cycles divider is busy</description>
- <value>20</value>
- <minimum>1000</minimum>
- <unit-mask>
- <type>mandatory</type>
- <default>0</default>
- <mask>
- <value>0</value>
- <description>No unit mask</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>IDLE_DURING_DIV</name>
- <description>cycles divider is busy and all other execution units are idle.</description>
- <value>24</value>
- <minimum>1000</minimum>
- <unit-mask>
- <type>mandatory</type>
- <default>0</default>
- <mask>
- <value>0</value>
- <description>No unit mask</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>DELAYED_BYPASS</name>
- <description>Delayed bypass events</description>
- <value>25</value>
- <minimum>1000</minimum>
- <unit-mask>
- <type>exclusive</type>
- <default>0</default>
- <mask>
- <value>0</value>
- <description>FP Delayed bypass to FP operation.</description>
- </mask>
- <mask>
- <value>1</value>
- <description>SIMD Delayed bypass to SIMD operation.</description>
- </mask>
- <mask>
- <value>2</value>
- <description>LOAD Delayed bypass to load operation.</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>L2_ADS</name>
- <description>Cycles the L2 address bus is in use.</description>
- <value>33</value>
- <minimum>500</minimum>
- <unit-mask>
- <type>exclusive</type>
- <default>64</default>
- <mask>
- <value>192</value>
- <description>All cores</description>
- </mask>
- <mask>
- <value>64</value>
- <description>This core</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>L2_DBUS_BUSY_RD</name>
- <description>Cycles the L2 transfers data to the core.</description>
- <value>35</value>
- <minimum>500</minimum>
- <unit-mask>
- <type>exclusive</type>
- <default>64</default>
- <mask>
- <value>192</value>
- <description>All cores</description>
- </mask>
- <mask>
- <value>64</value>
- <description>This core</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>L2_LINES_IN</name>
- <description>number of allocated lines in L2</description>
- <value>36</value>
- <minimum>500</minimum>
- <unit-mask>
- <type>bitmask</type>
- <default>112</default>
- <mask>
- <value>192</value>
- <description>core: all cores</description>
- </mask>
- <mask>
- <value>64</value>
- <description>core: this core</description>
- </mask>
- <mask>
- <value>48</value>
- <description>prefetch: all inclusive</description>
- </mask>
- <mask>
- <value>16</value>
- <description>prefetch: Hardware prefetch only</description>
- </mask>
- <mask>
- <value>0</value>
- <description>prefetch: exclude hardware prefetch</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>L2_M_LINES_IN</name>
- <description>number of modified lines allocated in L2</description>
- <value>37</value>
- <minimum>500</minimum>
- <unit-mask>
- <type>exclusive</type>
- <default>64</default>
- <mask>
- <value>192</value>
- <description>All cores</description>
- </mask>
- <mask>
- <value>64</value>
- <description>This core</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>L2_LINES_OUT</name>
- <description>number of recovered lines from L2</description>
- <value>38</value>
- <minimum>500</minimum>
- <unit-mask>
- <type>bitmask</type>
- <default>112</default>
- <mask>
- <value>192</value>
- <description>core: all cores</description>
- </mask>
- <mask>
- <value>64</value>
- <description>core: this core</description>
- </mask>
- <mask>
- <value>48</value>
- <description>prefetch: all inclusive</description>
- </mask>
- <mask>
- <value>16</value>
- <description>prefetch: Hardware prefetch only</description>
- </mask>
- <mask>
- <value>0</value>
- <description>prefetch: exclude hardware prefetch</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>L2_M_LINES_OUT</name>
- <description>number of modified lines removed from L2</description>
- <value>39</value>
- <minimum>500</minimum>
- <unit-mask>
- <type>bitmask</type>
- <default>112</default>
- <mask>
- <value>192</value>
- <description>core: all cores</description>
- </mask>
- <mask>
- <value>64</value>
- <description>core: this core</description>
- </mask>
- <mask>
- <value>48</value>
- <description>prefetch: all inclusive</description>
- </mask>
- <mask>
- <value>16</value>
- <description>prefetch: Hardware prefetch only</description>
- </mask>
- <mask>
- <value>0</value>
- <description>prefetch: exclude hardware prefetch</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>L2_IFETCH</name>
- <description>number of L2 cacheable instruction fetches</description>
- <value>40</value>
- <minimum>500</minimum>
- <unit-mask>
- <type>bitmask</type>
- <default>79</default>
- <mask>
- <value>192</value>
- <description>core: all cores</description>
- </mask>
- <mask>
- <value>64</value>
- <description>core: this core</description>
- </mask>
- <mask>
- <value>8</value>
- <description>(M)ESI: Modified</description>
- </mask>
- <mask>
- <value>4</value>
- <description>M(E)SI: Exclusive</description>
- </mask>
- <mask>
- <value>2</value>
- <description>ME(S)I: Shared</description>
- </mask>
- <mask>
- <value>1</value>
- <description>MES(I): Invalid</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>L2_LD</name>
- <description>number of L2 data loads</description>
- <value>41</value>
- <minimum>500</minimum>
- <unit-mask>
- <type>bitmask</type>
- <default>127</default>
- <mask>
- <value>192</value>
- <description>core: all cores</description>
- </mask>
- <mask>
- <value>64</value>
- <description>core: this core</description>
- </mask>
- <mask>
- <value>48</value>
- <description>prefetch: all inclusive</description>
- </mask>
- <mask>
- <value>16</value>
- <description>prefetch: Hardware prefetch only</description>
- </mask>
- <mask>
- <value>0</value>
- <description>prefetch: exclude hardware prefetch</description>
- </mask>
- <mask>
- <value>8</value>
- <description>(M)ESI: Modified</description>
- </mask>
- <mask>
- <value>4</value>
- <description>M(E)SI: Exclusive</description>
- </mask>
- <mask>
- <value>2</value>
- <description>ME(S)I: Shared</description>
- </mask>
- <mask>
- <value>1</value>
- <description>MES(I): Invalid</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>L2_ST</name>
- <description>number of L2 data stores</description>
- <value>42</value>
- <minimum>500</minimum>
- <unit-mask>
- <type>bitmask</type>
- <default>79</default>
- <mask>
- <value>192</value>
- <description>core: all cores</description>
- </mask>
- <mask>
- <value>64</value>
- <description>core: this core</description>
- </mask>
- <mask>
- <value>8</value>
- <description>(M)ESI: Modified</description>
- </mask>
- <mask>
- <value>4</value>
- <description>M(E)SI: Exclusive</description>
- </mask>
- <mask>
- <value>2</value>
- <description>ME(S)I: Shared</description>
- </mask>
- <mask>
- <value>1</value>
- <description>MES(I): Invalid</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>L2_LOCK</name>
- <description>number of locked L2 data accesses</description>
- <value>43</value>
- <minimum>500</minimum>
- <unit-mask>
- <type>bitmask</type>
- <default>79</default>
- <mask>
- <value>192</value>
- <description>core: all cores</description>
- </mask>
- <mask>
- <value>64</value>
- <description>core: this core</description>
- </mask>
- <mask>
- <value>8</value>
- <description>(M)ESI: Modified</description>
- </mask>
- <mask>
- <value>4</value>
- <description>M(E)SI: Exclusive</description>
- </mask>
- <mask>
- <value>2</value>
- <description>ME(S)I: Shared</description>
- </mask>
- <mask>
- <value>1</value>
- <description>MES(I): Invalid</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>L2_REJECT_BUSQ</name>
- <description>Rejected L2 cache requests</description>
- <value>48</value>
- <minimum>500</minimum>
- <unit-mask>
- <type>bitmask</type>
- <default>127</default>
- <mask>
- <value>192</value>
- <description>core: all cores</description>
- </mask>
- <mask>
- <value>64</value>
- <description>core: this core</description>
- </mask>
- <mask>
- <value>48</value>
- <description>prefetch: all inclusive</description>
- </mask>
- <mask>
- <value>16</value>
- <description>prefetch: Hardware prefetch only</description>
- </mask>
- <mask>
- <value>0</value>
- <description>prefetch: exclude hardware prefetch</description>
- </mask>
- <mask>
- <value>8</value>
- <description>(M)ESI: Modified</description>
- </mask>
- <mask>
- <value>4</value>
- <description>M(E)SI: Exclusive</description>
- </mask>
- <mask>
- <value>2</value>
- <description>ME(S)I: Shared</description>
- </mask>
- <mask>
- <value>1</value>
- <description>MES(I): Invalid</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>L2_NO_REQ</name>
- <description>Cycles no L2 cache requests are pending</description>
- <value>50</value>
- <minimum>500</minimum>
- <unit-mask>
- <type>exclusive</type>
- <default>64</default>
- <mask>
- <value>192</value>
- <description>All cores</description>
- </mask>
- <mask>
- <value>64</value>
- <description>This core</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>EIST_TRANS_ALL</name>
- <description>Intel(tm) Enhanced SpeedStep(r) Technology transitions</description>
- <value>58</value>
- <minimum>500</minimum>
- <unit-mask>
- <type>mandatory</type>
- <default>0</default>
- <mask>
- <value>0</value>
- <description>No unit mask</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>THERMAL_TRIP</name>
- <description>Number of thermal trips</description>
- <value>59</value>
- <minimum>500</minimum>
- <unit-mask>
- <type>mandatory</type>
- <default>192</default>
- <mask>
- <value>192</value>
- <description>No unit mask</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>L1D_CACHE_LD</name>
- <description>L1 cacheable data read operations</description>
- <value>64</value>
- <minimum>500</minimum>
- <unit-mask>
- <type>bitmask</type>
- <default>15</default>
- <mask>
- <value>8</value>
- <description>(M)ESI: Modified</description>
- </mask>
- <mask>
- <value>4</value>
- <description>M(E)SI: Exclusive</description>
- </mask>
- <mask>
- <value>2</value>
- <description>ME(S)I: Shared</description>
- </mask>
- <mask>
- <value>1</value>
- <description>MES(I): Invalid</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>L1D_CACHE_ST</name>
- <description>L1 cacheable data write operations</description>
- <value>65</value>
- <minimum>500</minimum>
- <unit-mask>
- <type>bitmask</type>
- <default>15</default>
- <mask>
- <value>8</value>
- <description>(M)ESI: Modified</description>
- </mask>
- <mask>
- <value>4</value>
- <description>M(E)SI: Exclusive</description>
- </mask>
- <mask>
- <value>2</value>
- <description>ME(S)I: Shared</description>
- </mask>
- <mask>
- <value>1</value>
- <description>MES(I): Invalid</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>L1D_CACHE_LOCK</name>
- <description>L1 cacheable lock read operations</description>
- <value>66</value>
- <minimum>500</minimum>
- <unit-mask>
- <type>bitmask</type>
- <default>15</default>
- <mask>
- <value>8</value>
- <description>(M)ESI: Modified</description>
- </mask>
- <mask>
- <value>4</value>
- <description>M(E)SI: Exclusive</description>
- </mask>
- <mask>
- <value>2</value>
- <description>ME(S)I: Shared</description>
- </mask>
- <mask>
- <value>1</value>
- <description>MES(I): Invalid</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>L1D_CACHE_LOCK_DURATION</name>
- <description>Duration of L1 data cacheable locked operations</description>
- <value>66</value>
- <minimum>500</minimum>
- <unit-mask>
- <type>mandatory</type>
- <default>16</default>
- <mask>
- <value>16</value>
- <description>No unit mask</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>L1D_ALL_REF</name>
- <description>All references to the L1 data cache</description>
- <value>67</value>
- <minimum>500</minimum>
- <unit-mask>
- <type>mandatory</type>
- <default>16</default>
- <mask>
- <value>16</value>
- <description>No unit mask</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>L1D_ALL_CACHE_REF</name>
- <description>L1 data cacheable reads and writes</description>
- <value>67</value>
- <minimum>500</minimum>
- <unit-mask>
- <type>mandatory</type>
- <default>2</default>
- <mask>
- <value>2</value>
- <description>No unit mask</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>L1D_REPL</name>
- <description>Cache lines allocated in the L1 data cache</description>
- <value>69</value>
- <minimum>500</minimum>
- <unit-mask>
- <type>mandatory</type>
- <default>15</default>
- <mask>
- <value>15</value>
- <description>No unit mask</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>L1D_M_REPL</name>
- <description>Modified cache lines allocated in the L1 data cache</description>
- <value>70</value>
- <minimum>500</minimum>
- <unit-mask>
- <type>mandatory</type>
- <default>0</default>
- <mask>
- <value>0</value>
- <description>No unit mask</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>L1D_M_EVICT</name>
- <description>Modified cache lines evicted from the L1 data cache</description>
- <value>71</value>
- <minimum>500</minimum>
- <unit-mask>
- <type>mandatory</type>
- <default>0</default>
- <mask>
- <value>0</value>
- <description>No unit mask</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>L1D_PEND_MISS</name>
- <description>Total number of outstanding L1 data cache misses at any cycle</description>
- <value>72</value>
- <minimum>500</minimum>
- <unit-mask>
- <type>mandatory</type>
- <default>0</default>
- <mask>
- <value>0</value>
- <description>No unit mask</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>L1D_SPLIT</name>
- <description>Cache line split load/stores</description>
- <value>73</value>
- <minimum>500</minimum>
- <unit-mask>
- <type>exclusive</type>
- <default>1</default>
- <mask>
- <value>1</value>
- <description>split loads</description>
- </mask>
- <mask>
- <value>2</value>
- <description>split stores</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>SSE_PREF_MISS</name>
- <description>SSE instructions that missed all caches</description>
- <value>75</value>
- <minimum>500</minimum>
- <unit-mask>
- <type>exclusive</type>
- <default>0</default>
- <mask>
- <value>0</value>
- <description>PREFETCHNTA</description>
- </mask>
- <mask>
- <value>1</value>
- <description>PREFETCHT0</description>
- </mask>
- <mask>
- <value>2</value>
- <description>PREFETCHT1/PREFETCHT2</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>LOAD_HIT_PRE</name>
- <description>Load operations conflicting with a software prefetch to the same address</description>
- <value>76</value>
- <minimum>500</minimum>
- <unit-mask>
- <type>mandatory</type>
- <default>0</default>
- <mask>
- <value>0</value>
- <description>No unit mask</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>L1D_PREFETCH</name>
- <description>L1 data cache prefetch requests</description>
- <value>78</value>
- <minimum>500</minimum>
- <unit-mask>
- <type>mandatory</type>
- <default>16</default>
- <mask>
- <value>16</value>
- <description>No unit mask</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>BUS_REQ_OUTSTANDING</name>
- <description>Outstanding cacheable data read bus requests duration</description>
- <value>96</value>
- <minimum>500</minimum>
- <unit-mask>
- <type>bitmask</type>
- <default>64</default>
- <mask>
- <value>192</value>
- <description>core: all cores</description>
- </mask>
- <mask>
- <value>64</value>
- <description>core: this core</description>
- </mask>
- <mask>
- <value>0</value>
- <description>bus: this agent</description>
- </mask>
- <mask>
- <value>32</value>
- <description>bus: include all agents</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>BUS_BNR_DRV</name>
- <description>Number of Bus Not Ready signals asserted</description>
- <value>97</value>
- <minimum>500</minimum>
- <unit-mask>
- <type>exclusive</type>
- <default>0</default>
- <mask>
- <value>0</value>
- <description>this agent</description>
- </mask>
- <mask>
- <value>32</value>
- <description>include all agents</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>BUS_DRDY_CLOCKS</name>
- <description>Bus cycles when data is sent on the bus</description>
- <value>98</value>
- <minimum>500</minimum>
- <unit-mask>
- <type>exclusive</type>
- <default>0</default>
- <mask>
- <value>0</value>
- <description>this agent</description>
- </mask>
- <mask>
- <value>32</value>
- <description>include all agents</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>BUS_LOCK_CLOCKS</name>
- <description>Bus cycles when a LOCK signal is asserted</description>
- <value>99</value>
- <minimum>500</minimum>
- <unit-mask>
- <type>bitmask</type>
- <default>64</default>
- <mask>
- <value>192</value>
- <description>core: all cores</description>
- </mask>
- <mask>
- <value>64</value>
- <description>core: this core</description>
- </mask>
- <mask>
- <value>0</value>
- <description>bus: this agent</description>
- </mask>
- <mask>
- <value>32</value>
- <description>bus: include all agents</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>BUS_DATA_RCV</name>
- <description>Bus cycles while processor receives data</description>
- <value>100</value>
- <minimum>500</minimum>
- <unit-mask>
- <type>bitmask</type>
- <default>64</default>
- <mask>
- <value>192</value>
- <description>core: all cores</description>
- </mask>
- <mask>
- <value>64</value>
- <description>core: this core</description>
- </mask>
- <mask>
- <value>0</value>
- <description>bus: this agent</description>
- </mask>
- <mask>
- <value>32</value>
- <description>bus: include all agents</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>BUS_TRAN_BRD</name>
- <description>Burst read bus transactions</description>
- <value>101</value>
- <minimum>500</minimum>
- <unit-mask>
- <type>bitmask</type>
- <default>64</default>
- <mask>
- <value>192</value>
- <description>core: all cores</description>
- </mask>
- <mask>
- <value>64</value>
- <description>core: this core</description>
- </mask>
- <mask>
- <value>0</value>
- <description>bus: this agent</description>
- </mask>
- <mask>
- <value>32</value>
- <description>bus: include all agents</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>BUS_TRAN_RFO</name>
- <description>number of completed read for ownership transactions</description>
- <value>102</value>
- <minimum>500</minimum>
- <unit-mask>
- <type>bitmask</type>
- <default>64</default>
- <mask>
- <value>192</value>
- <description>core: all cores</description>
- </mask>
- <mask>
- <value>64</value>
- <description>core: this core</description>
- </mask>
- <mask>
- <value>0</value>
- <description>bus: this agent</description>
- </mask>
- <mask>
- <value>32</value>
- <description>bus: include all agents</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>BUS_TRAN_WB</name>
- <description>number of explicit writeback bus transactions</description>
- <value>103</value>
- <minimum>500</minimum>
- <unit-mask>
- <type>bitmask</type>
- <default>64</default>
- <mask>
- <value>192</value>
- <description>core: all cores</description>
- </mask>
- <mask>
- <value>64</value>
- <description>core: this core</description>
- </mask>
- <mask>
- <value>0</value>
- <description>bus: this agent</description>
- </mask>
- <mask>
- <value>32</value>
- <description>bus: include all agents</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>BUS_TRAN_IFETCH</name>
- <description>number of instruction fetch transactions</description>
- <value>104</value>
- <minimum>500</minimum>
- <unit-mask>
- <type>bitmask</type>
- <default>64</default>
- <mask>
- <value>192</value>
- <description>core: all cores</description>
- </mask>
- <mask>
- <value>64</value>
- <description>core: this core</description>
- </mask>
- <mask>
- <value>0</value>
- <description>bus: this agent</description>
- </mask>
- <mask>
- <value>32</value>
- <description>bus: include all agents</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>BUS_TRAN_INVAL</name>
- <description>number of invalidate transactions</description>
- <value>105</value>
- <minimum>500</minimum>
- <unit-mask>
- <type>bitmask</type>
- <default>64</default>
- <mask>
- <value>192</value>
- <description>core: all cores</description>
- </mask>
- <mask>
- <value>64</value>
- <description>core: this core</description>
- </mask>
- <mask>
- <value>0</value>
- <description>bus: this agent</description>
- </mask>
- <mask>
- <value>32</value>
- <description>bus: include all agents</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>BUS_TRAN_PWR</name>
- <description>number of partial write bus transactions</description>
- <value>106</value>
- <minimum>500</minimum>
- <unit-mask>
- <type>bitmask</type>
- <default>64</default>
- <mask>
- <value>192</value>
- <description>core: all cores</description>
- </mask>
- <mask>
- <value>64</value>
- <description>core: this core</description>
- </mask>
- <mask>
- <value>0</value>
- <description>bus: this agent</description>
- </mask>
- <mask>
- <value>32</value>
- <description>bus: include all agents</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>BUS_TRANS_P</name>
- <description>number of partial bus transactions</description>
- <value>107</value>
- <minimum>500</minimum>
- <unit-mask>
- <type>bitmask</type>
- <default>64</default>
- <mask>
- <value>192</value>
- <description>core: all cores</description>
- </mask>
- <mask>
- <value>64</value>
- <description>core: this core</description>
- </mask>
- <mask>
- <value>0</value>
- <description>bus: this agent</description>
- </mask>
- <mask>
- <value>32</value>
- <description>bus: include all agents</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>BUS_TRANS_IO</name>
- <description>number of I/O bus transactions</description>
- <value>108</value>
- <minimum>500</minimum>
- <unit-mask>
- <type>bitmask</type>
- <default>64</default>
- <mask>
- <value>192</value>
- <description>core: all cores</description>
- </mask>
- <mask>
- <value>64</value>
- <description>core: this core</description>
- </mask>
- <mask>
- <value>0</value>
- <description>bus: this agent</description>
- </mask>
- <mask>
- <value>32</value>
- <description>bus: include all agents</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>BUS_TRANS_DEF</name>
- <description>number of completed defer transactions</description>
- <value>109</value>
- <minimum>500</minimum>
- <unit-mask>
- <type>bitmask</type>
- <default>64</default>
- <mask>
- <value>192</value>
- <description>core: all cores</description>
- </mask>
- <mask>
- <value>64</value>
- <description>core: this core</description>
- </mask>
- <mask>
- <value>0</value>
- <description>bus: this agent</description>
- </mask>
- <mask>
- <value>32</value>
- <description>bus: include all agents</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>BUS_TRAN_BURST</name>
- <description>number of completed burst transactions</description>
- <value>110</value>
- <minimum>500</minimum>
- <unit-mask>
- <type>bitmask</type>
- <default>64</default>
- <mask>
- <value>192</value>
- <description>core: all cores</description>
- </mask>
- <mask>
- <value>64</value>
- <description>core: this core</description>
- </mask>
- <mask>
- <value>0</value>
- <description>bus: this agent</description>
- </mask>
- <mask>
- <value>32</value>
- <description>bus: include all agents</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>BUS_TRAN_MEM</name>
- <description>number of completed memory transactions</description>
- <value>111</value>
- <minimum>500</minimum>
- <unit-mask>
- <type>bitmask</type>
- <default>64</default>
- <mask>
- <value>192</value>
- <description>core: all cores</description>
- </mask>
- <mask>
- <value>64</value>
- <description>core: this core</description>
- </mask>
- <mask>
- <value>0</value>
- <description>bus: this agent</description>
- </mask>
- <mask>
- <value>32</value>
- <description>bus: include all agents</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>BUS_TRAN_ANY</name>
- <description>number of any completed bus transactions</description>
- <value>112</value>
- <minimum>500</minimum>
- <unit-mask>
- <type>bitmask</type>
- <default>64</default>
- <mask>
- <value>192</value>
- <description>core: all cores</description>
- </mask>
- <mask>
- <value>64</value>
- <description>core: this core</description>
- </mask>
- <mask>
- <value>0</value>
- <description>bus: this agent</description>
- </mask>
- <mask>
- <value>32</value>
- <description>bus: include all agents</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>EXT_SNOOP</name>
- <description>External snoops</description>
- <value>119</value>
- <minimum>500</minimum>
- <unit-mask>
- <type>bitmask</type>
- <default>11</default>
- <mask>
- <value>0</value>
- <description>bus: this agent</description>
- </mask>
- <mask>
- <value>32</value>
- <description>bus: include all agents</description>
- </mask>
- <mask>
- <value>8</value>
- <description>snoop: HITM snoops</description>
- </mask>
- <mask>
- <value>2</value>
- <description>snoop: HIT snoops</description>
- </mask>
- <mask>
- <value>1</value>
- <description>snoop: CLEAN snoops</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>CMP_SNOOP</name>
- <description>L1 data cache is snooped by other core</description>
- <value>120</value>
- <minimum>500</minimum>
- <unit-mask>
- <type>bitmask</type>
- <default>64</default>
- <mask>
- <value>192</value>
- <description>core: all cores</description>
- </mask>
- <mask>
- <value>64</value>
- <description>core: this core</description>
- </mask>
- <mask>
- <value>1</value>
- <description>snoop: CMP2I snoops</description>
- </mask>
- <mask>
- <value>2</value>
- <description>snoop: CMP2S snoops</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>BUS_HIT_DRV</name>
- <description>HIT signal asserted</description>
- <value>122</value>
- <minimum>500</minimum>
- <unit-mask>
- <type>exclusive</type>
- <default>0</default>
- <mask>
- <value>0</value>
- <description>this agent</description>
- </mask>
- <mask>
- <value>32</value>
- <description>include all agents</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>BUS_HITM_DRV</name>
- <description>HITM signal asserted</description>
- <value>123</value>
- <minimum>500</minimum>
- <unit-mask>
- <type>exclusive</type>
- <default>0</default>
- <mask>
- <value>0</value>
- <description>this agent</description>
- </mask>
- <mask>
- <value>32</value>
- <description>include all agents</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>BUSQ_EMPTY</name>
- <description>Bus queue is empty</description>
- <value>125</value>
- <minimum>500</minimum>
- <unit-mask>
- <type>exclusive</type>
- <default>64</default>
- <mask>
- <value>192</value>
- <description>All cores</description>
- </mask>
- <mask>
- <value>64</value>
- <description>This core</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>SNOOP_STALL_DRV</name>
- <description>Bus stalled for snoops</description>
- <value>126</value>
- <minimum>500</minimum>
- <unit-mask>
- <type>bitmask</type>
- <default>64</default>
- <mask>
- <value>192</value>
- <description>core: all cores</description>
- </mask>
- <mask>
- <value>64</value>
- <description>core: this core</description>
- </mask>
- <mask>
- <value>0</value>
- <description>bus: this agent</description>
- </mask>
- <mask>
- <value>32</value>
- <description>bus: include all agents</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>BUS_IO_WAIT</name>
- <description>IO requests waiting in the bus queue</description>
- <value>127</value>
- <minimum>500</minimum>
- <unit-mask>
- <type>exclusive</type>
- <default>64</default>
- <mask>
- <value>192</value>
- <description>All cores</description>
- </mask>
- <mask>
- <value>64</value>
- <description>This core</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>L1I_READS</name>
- <description>number of instruction fetches</description>
- <value>128</value>
- <minimum>500</minimum>
- <unit-mask>
- <type>mandatory</type>
- <default>0</default>
- <mask>
- <value>0</value>
- <description>No unit mask</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>L1I_MISSES</name>
- <description>number of instruction fetch misses</description>
- <value>129</value>
- <minimum>500</minimum>
- <unit-mask>
- <type>mandatory</type>
- <default>0</default>
- <mask>
- <value>0</value>
- <description>No unit mask</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>ITLB</name>
- <description>number of ITLB misses</description>
- <value>130</value>
- <minimum>500</minimum>
- <unit-mask>
- <type>bitmask</type>
- <default>18</default>
- <mask>
- <value>2</value>
- <description>ITLB small page misses</description>
- </mask>
- <mask>
- <value>16</value>
- <description>ITLB large page misses</description>
- </mask>
- <mask>
- <value>64</value>
- <description>ITLB flushes</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>INST_QUEUE_FULL</name>
- <description>cycles during which the instruction queue is full</description>
- <value>131</value>
- <minimum>500</minimum>
- <unit-mask>
- <type>mandatory</type>
- <default>2</default>
- <mask>
- <value>2</value>
- <description>No unit mask</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>IFU_MEM_STALL</name>
- <description>cycles instruction fetch pipe is stalled</description>
- <value>134</value>
- <minimum>500</minimum>
- <unit-mask>
- <type>mandatory</type>
- <default>0</default>
- <mask>
- <value>0</value>
- <description>No unit mask</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>ILD_STALL</name>
- <description>cycles instruction length decoder is stalled</description>
- <value>135</value>
- <minimum>500</minimum>
- <unit-mask>
- <type>mandatory</type>
- <default>0</default>
- <mask>
- <value>0</value>
- <description>No unit mask</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>BR_INST_EXEC</name>
- <description>Branch instructions executed (not necessarily retired)</description>
- <value>136</value>
- <minimum>3000</minimum>
- <unit-mask>
- <type>mandatory</type>
- <default>0</default>
- <mask>
- <value>0</value>
- <description>No unit mask</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>BR_MISSP_EXEC</name>
- <description>Branch instructions executed that were mispredicted at execution</description>
- <value>137</value>
- <minimum>3000</minimum>
- <unit-mask>
- <type>mandatory</type>
- <default>0</default>
- <mask>
- <value>0</value>
- <description>No unit mask</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>BR_BAC_MISSP_EXEC</name>
- <description>Branch instructions executed that were mispredicted at Front End (BAC)</description>
- <value>138</value>
- <minimum>3000</minimum>
- <unit-mask>
- <type>mandatory</type>
- <default>0</default>
- <mask>
- <value>0</value>
- <description>No unit mask</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>BR_CND_EXEC</name>
- <description>Conditional Branch instructions executed</description>
- <value>139</value>
- <minimum>3000</minimum>
- <unit-mask>
- <type>mandatory</type>
- <default>0</default>
- <mask>
- <value>0</value>
- <description>No unit mask</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>BR_CND_MISSP_EXEC</name>
- <description>Conditional Branch instructions executed that were mispredicted</description>
- <value>140</value>
- <minimum>3000</minimum>
- <unit-mask>
- <type>mandatory</type>
- <default>0</default>
- <mask>
- <value>0</value>
- <description>No unit mask</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>BR_IND_EXEC</name>
- <description>Indirect Branch instructions executed</description>
- <value>141</value>
- <minimum>3000</minimum>
- <unit-mask>
- <type>mandatory</type>
- <default>0</default>
- <mask>
- <value>0</value>
- <description>No unit mask</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>BR_IND_MISSP_EXEC</name>
- <description>Indirect Branch instructions executed that were mispredicted</description>
- <value>142</value>
- <minimum>3000</minimum>
- <unit-mask>
- <type>mandatory</type>
- <default>0</default>
- <mask>
- <value>0</value>
- <description>No unit mask</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>BR_RET_EXEC</name>
- <description>Return Branch instructions executed</description>
- <value>143</value>
- <minimum>3000</minimum>
- <unit-mask>
- <type>mandatory</type>
- <default>0</default>
- <mask>
- <value>0</value>
- <description>No unit mask</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>BR_RET_MISSP_EXEC</name>
- <description>Return Branch instructions executed that were mispredicted at Execution</description>
- <value>144</value>
- <minimum>3000</minimum>
- <unit-mask>
- <type>mandatory</type>
- <default>0</default>
- <mask>
- <value>0</value>
- <description>No unit mask</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>BR_RET_BAC_MISSP_EXEC</name>
- <description>Branch instructions executed that were mispredicted at Front End (BAC)</description>
- <value>145</value>
- <minimum>3000</minimum>
- <unit-mask>
- <type>mandatory</type>
- <default>0</default>
- <mask>
- <value>0</value>
- <description>No unit mask</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>BR_CALL_EXEC</name>
- <description>CALL instruction executed</description>
- <value>146</value>
- <minimum>3000</minimum>
- <unit-mask>
- <type>mandatory</type>
- <default>0</default>
- <mask>
- <value>0</value>
- <description>No unit mask</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>BR_CALL_MISSP_EXEC</name>
- <description>CALL instruction executed and miss predicted</description>
- <value>147</value>
- <minimum>3000</minimum>
- <unit-mask>
- <type>mandatory</type>
- <default>0</default>
- <mask>
- <value>0</value>
- <description>No unit mask</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>BR_IND_CALL_EXEC</name>
- <description>Indirect CALL instruction executed</description>
- <value>148</value>
- <minimum>3000</minimum>
- <unit-mask>
- <type>mandatory</type>
- <default>0</default>
- <mask>
- <value>0</value>
- <description>No unit mask</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>BR_TKN_BUBBLE_1</name>
- <description>Branch predicted taken with bubble 1</description>
- <value>151</value>
- <minimum>3000</minimum>
- <unit-mask>
- <type>mandatory</type>
- <default>0</default>
- <mask>
- <value>0</value>
- <description>No unit mask</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>BR_TKN_BUBBLE_2</name>
- <description>Branch predicted taken with bubble 2</description>
- <value>152</value>
- <minimum>3000</minimum>
- <unit-mask>
- <type>mandatory</type>
- <default>0</default>
- <mask>
- <value>0</value>
- <description>No unit mask</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>RS_UOPS_DISPATCHED</name>
- <description>Micro-ops dispatched for execution</description>
- <value>160</value>
- <minimum>1000</minimum>
- <unit-mask>
- <type>mandatory</type>
- <default>0</default>
- <mask>
- <value>0</value>
- <description>No unit mask</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>RS_UOPS_DISPATCHED_NONE</name>
- <description>No Micro-ops dispatched for execution</description>
- <value>25165984</value>
- <minimum>1000</minimum>
- <unit-mask>
- <type>mandatory</type>
- <default>0</default>
- <mask>
- <value>0</value>
- <description>No unit mask</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>MACRO_INSTS</name>
- <description>instructions decoded</description>
- <value>170</value>
- <minimum>500</minimum>
- <unit-mask>
- <type>bitmask</type>
- <default>9</default>
- <mask>
- <value>1</value>
- <description>Instructions decoded</description>
- </mask>
- <mask>
- <value>8</value>
- <description>CISC Instructions decoded</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>ESP</name>
- <description>ESP register events</description>
- <value>171</value>
- <minimum>500</minimum>
- <unit-mask>
- <type>bitmask</type>
- <default>1</default>
- <mask>
- <value>1</value>
- <description>ESP register content synchronizations</description>
- </mask>
- <mask>
- <value>2</value>
- <description>ESP register automatic additions</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>SIMD_UOPS_EXEC</name>
- <description>SIMD micro-ops executed (excluding stores)</description>
- <value>176</value>
- <minimum>500</minimum>
- <unit-mask>
- <type>mandatory</type>
- <default>0</default>
- <mask>
- <value>0</value>
- <description>No unit mask</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>SIMD_SAT_UOP_EXEC</name>
- <description>number of SIMD saturating instructions executed</description>
- <value>177</value>
- <minimum>3000</minimum>
- <unit-mask>
- <type>mandatory</type>
- <default>0</default>
- <mask>
- <value>0</value>
- <description>No unit mask</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>SIMD_UOP_TYPE_EXEC</name>
- <description>number of SIMD packing instructions</description>
- <value>179</value>
- <minimum>3000</minimum>
- <unit-mask>
- <type>bitmask</type>
- <default>63</default>
- <mask>
- <value>1</value>
- <description>SIMD packed multiplies</description>
- </mask>
- <mask>
- <value>2</value>
- <description>SIMD packed shifts</description>
- </mask>
- <mask>
- <value>4</value>
- <description>SIMD pack operations</description>
- </mask>
- <mask>
- <value>8</value>
- <description>SIMD unpack operations</description>
- </mask>
- <mask>
- <value>16</value>
- <description>SIMD packed logical</description>
- </mask>
- <mask>
- <value>32</value>
- <description>SIMD packed arithmetic</description>
- </mask>
- <mask>
- <value>63</value>
- <description>all of the above</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>INST_RETIRED</name>
- <description>number of instructions retired</description>
- <value>192</value>
- <minimum>6000</minimum>
- <unit-mask>
- <type>bitmask</type>
- <default>0</default>
- <mask>
- <value>0</value>
- <description>Any</description>
- </mask>
- <mask>
- <value>1</value>
- <description>Loads</description>
- </mask>
- <mask>
- <value>2</value>
- <description>Stores</description>
- </mask>
- <mask>
- <value>4</value>
- <description>Other</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>X87_OPS_RETIRED</name>
- <description>number of computational FP operations retired</description>
- <value>193</value>
- <minimum>500</minimum>
- <unit-mask>
- <type>exclusive</type>
- <default>254</default>
- <mask>
- <value>1</value>
- <description>FXCH instructions retired</description>
- </mask>
- <mask>
- <value>254</value>
- <description>Retired floating-point computational operations (precise)</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>UOPS_RETIRED</name>
- <description>number of UOPs retired</description>
- <value>194</value>
- <minimum>6000</minimum>
- <unit-mask>
- <type>bitmask</type>
- <default>15</default>
- <mask>
- <value>1</value>
- <description>Fused load+op or load+indirect branch retired</description>
- </mask>
- <mask>
- <value>2</value>
- <description>Fused store address + data retired</description>
- </mask>
- <mask>
- <value>4</value>
- <description>Retired instruction pairs fused into one micro-op</description>
- </mask>
- <mask>
- <value>7</value>
- <description>Fused micro-ops retired</description>
- </mask>
- <mask>
- <value>8</value>
- <description>Non-fused micro-ops retired</description>
- </mask>
- <mask>
- <value>15</value>
- <description>Micro-ops retired</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>MACHINE_NUKES_SMC</name>
- <description>number of pipeline flushing events</description>
- <value>195</value>
- <minimum>500</minimum>
- <unit-mask>
- <type>bitmask</type>
- <default>5</default>
- <mask>
- <value>1</value>
- <description>Self-Modifying Code detected</description>
- </mask>
- <mask>
- <value>4</value>
- <description>Execution pipeline restart due to memory ordering conflict or memory disambiguation misprediction</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>BR_INST_RETIRED</name>
- <description>number of branch instructions retired</description>
- <value>196</value>
- <minimum>500</minimum>
- <unit-mask>
- <type>bitmask</type>
- <default>10</default>
- <mask>
- <value>1</value>
- <description>predicted not-taken</description>
- </mask>
- <mask>
- <value>2</value>
- <description>mispredicted not-taken</description>
- </mask>
- <mask>
- <value>4</value>
- <description>predicted taken</description>
- </mask>
- <mask>
- <value>8</value>
- <description>mispredicted taken</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>BR_MISS_PRED_RETIRED</name>
- <description>number of mispredicted branches retired (precise)</description>
- <value>197</value>
- <minimum>500</minimum>
- <unit-mask>
- <type>mandatory</type>
- <default>0</default>
- <mask>
- <value>0</value>
- <description>No unit mask</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>CYCLES_INT_MASKED</name>
- <description>cycles interrupts are disabled</description>
- <value>198</value>
- <minimum>500</minimum>
- <unit-mask>
- <type>exclusive</type>
- <default>2</default>
- <mask>
- <value>1</value>
- <description>Interrupts disabled</description>
- </mask>
- <mask>
- <value>2</value>
- <description>Interrupts pending and disabled</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>SIMD_INST_RETIRED</name>
- <description>SSE/SSE2 instructions retired</description>
- <value>199</value>
- <minimum>500</minimum>
- <unit-mask>
- <type>bitmask</type>
- <default>31</default>
- <mask>
- <value>1</value>
- <description>Retired SSE packed-single instructions</description>
- </mask>
- <mask>
- <value>2</value>
- <description>Retired SSE scalar-single instructions</description>
- </mask>
- <mask>
- <value>4</value>
- <description>Retired SSE2 packed-double instructions</description>
- </mask>
- <mask>
- <value>8</value>
- <description>Retired SSE2 scalar-double instructions</description>
- </mask>
- <mask>
- <value>16</value>
- <description>Retired SSE2 vector integer instructions</description>
- </mask>
- <mask>
- <value>31</value>
- <description>Retired Streaming SIMD instructions (precise event)</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>HW_INT_RCV</name>
- <description>number of hardware interrupts received</description>
- <value>200</value>
- <minimum>500</minimum>
- <unit-mask>
- <type>mandatory</type>
- <default>0</default>
- <mask>
- <value>0</value>
- <description>No unit mask</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>ITLB_MISS_RETIRED</name>
- <description>Retired instructions that missed the ITLB</description>
- <value>201</value>
- <minimum>500</minimum>
- <unit-mask>
- <type>mandatory</type>
- <default>0</default>
- <mask>
- <value>0</value>
- <description>No unit mask</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>SIMD_COMP_INST_RETIRED</name>
- <description>Retired computational SSE/SSE2 instructions</description>
- <value>202</value>
- <minimum>500</minimum>
- <unit-mask>
- <type>bitmask</type>
- <default>15</default>
- <mask>
- <value>1</value>
- <description>Retired computational SSE packed-single instructions</description>
- </mask>
- <mask>
- <value>2</value>
- <description>Retired computational SSE scalar-single instructions</description>
- </mask>
- <mask>
- <value>4</value>
- <description>Retired computational SSE2 packed-double instructions</description>
- </mask>
- <mask>
- <value>8</value>
- <description>Retired computational SSE2 scalar-double instructions</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>MEM_LOAD_RETIRED</name>
- <description>Retired loads</description>
- <value>203</value>
- <minimum>500</minimum>
- <unit-mask>
- <type>exclusive</type>
- <default>1</default>
- <mask>
- <value>1</value>
- <description>Retired loads that miss the L1 data cache (precise event)</description>
- </mask>
- <mask>
- <value>2</value>
- <description>L1 data cache line missed by retired loads (precise event)</description>
- </mask>
- <mask>
- <value>4</value>
- <description>Retired loads that miss the L2 cache (precise event)</description>
- </mask>
- <mask>
- <value>8</value>
- <description>L2 cache line missed by retired loads (precise event)</description>
- </mask>
- <mask>
- <value>16</value>
- <description>Retired loads that miss the DTLB (precise event)</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>FP_MMX_TRANS</name>
- <description>MMX-floating point transitions</description>
- <value>204</value>
- <minimum>3000</minimum>
- <unit-mask>
- <type>bitmask</type>
- <default>3</default>
- <mask>
- <value>1</value>
- <description>float->MMX transitions</description>
- </mask>
- <mask>
- <value>2</value>
- <description>MMX->float transitions</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>MMX_ASSIST</name>
- <description>number of EMMS instructions executed</description>
- <value>205</value>
- <minimum>500</minimum>
- <unit-mask>
- <type>mandatory</type>
- <default>0</default>
- <mask>
- <value>0</value>
- <description>No unit mask</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>SIMD_INSTR_RET</name>
- <description>number of SIMD instructions retired</description>
- <value>206</value>
- <minimum>500</minimum>
- <unit-mask>
- <type>mandatory</type>
- <default>0</default>
- <mask>
- <value>0</value>
- <description>No unit mask</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>SIMD_SAT_INSTR_RET</name>
- <description>number of saturated arithmetic instructions retired</description>
- <value>207</value>
- <minimum>500</minimum>
- <unit-mask>
- <type>mandatory</type>
- <default>0</default>
- <mask>
- <value>0</value>
- <description>No unit mask</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>RAT_STALLS</name>
- <description>Partial register stall cycles</description>
- <value>210</value>
- <minimum>6000</minimum>
- <unit-mask>
- <type>bitmask</type>
- <default>15</default>
- <mask>
- <value>1</value>
- <description>ROB read port</description>
- </mask>
- <mask>
- <value>2</value>
- <description>Partial register</description>
- </mask>
- <mask>
- <value>4</value>
- <description>Flag</description>
- </mask>
- <mask>
- <value>8</value>
- <description>FPU status word</description>
- </mask>
- <mask>
- <value>15</value>
- <description>All RAT</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>SEG_RENAME_STALLS</name>
- <description>Segment rename stalls</description>
- <value>212</value>
- <minimum>500</minimum>
- <unit-mask>
- <type>bitmask</type>
- <default>15</default>
- <mask>
- <value>1</value>
- <description>ES</description>
- </mask>
- <mask>
- <value>2</value>
- <description>DS</description>
- </mask>
- <mask>
- <value>4</value>
- <description>FS</description>
- </mask>
- <mask>
- <value>8</value>
- <description>GS</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>SEG_RENAMES</name>
- <description>Segment renames</description>
- <value>213</value>
- <minimum>500</minimum>
- <unit-mask>
- <type>bitmask</type>
- <default>15</default>
- <mask>
- <value>1</value>
- <description>ES</description>
- </mask>
- <mask>
- <value>2</value>
- <description>DS</description>
- </mask>
- <mask>
- <value>4</value>
- <description>FS</description>
- </mask>
- <mask>
- <value>8</value>
- <description>GS</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>RESOURCE_STALLS</name>
- <description>Cycles during which resource stalls occur</description>
- <value>220</value>
- <minimum>3000</minimum>
- <unit-mask>
- <type>bitmask</type>
- <default>15</default>
- <mask>
- <value>1</value>
- <description>when the ROB is full</description>
- </mask>
- <mask>
- <value>2</value>
- <description>during which the RS is full</description>
- </mask>
- <mask>
- <value>4</value>
- <description>during which the pipeline has exceeded the load or store limit or is waiting to commit all stores</description>
- </mask>
- <mask>
- <value>8</value>
- <description>due to FPU control word write</description>
- </mask>
- <mask>
- <value>16</value>
- <description>due to branch misprediction</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>BR_INST_DECODED</name>
- <description>number of branch instructions decoded</description>
- <value>224</value>
- <minimum>500</minimum>
- <unit-mask>
- <type>mandatory</type>
- <default>0</default>
- <mask>
- <value>0</value>
- <description>No unit mask</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>BR_BOGUS</name>
- <description>number of bogus branches</description>
- <value>228</value>
- <minimum>500</minimum>
- <unit-mask>
- <type>mandatory</type>
- <default>0</default>
- <mask>
- <value>0</value>
- <description>No unit mask</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>BACLEARS</name>
- <description>number of times BACLEAR is asserted</description>
- <value>230</value>
- <minimum>500</minimum>
- <unit-mask>
- <type>mandatory</type>
- <default>0</default>
- <mask>
- <value>0</value>
- <description>No unit mask</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>PREF_RQSTS_UP</name>
- <description>Number of upward prefetches issued</description>
- <value>240</value>
- <minimum>3000</minimum>
- <unit-mask>
- <type>mandatory</type>
- <default>0</default>
- <mask>
- <value>0</value>
- <description>No unit mask</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>PREF_RQSTS_DN</name>
- <description>Number of downward prefetches issued</description>
- <value>248</value>
- <minimum>3000</minimum>
- <unit-mask>
- <type>mandatory</type>
- <default>0</default>
- <mask>
- <value>0</value>
- <description>No unit mask</description>
- </mask>
- </unit-mask>
- </event>
- </event-list>
- <event-list counter="1">
- <event>
- <name>CPU_CLK_UNHALTED</name>
- <description>Clock cycles when not halted</description>
- <value>60</value>
- <minimum>6000</minimum>
- <unit-mask>
- <type>exclusive</type>
- <default>0</default>
- <mask>
- <value>0</value>
- <description>Unhalted core cycles</description>
- </mask>
- <mask>
- <value>1</value>
- <description>Unhalted bus cycles</description>
- </mask>
- <mask>
- <value>2</value>
- <description>Unhalted bus cycles of this core while the other core is halted</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>INST_RETIRED_ANY_P</name>
- <description>number of instructions retired</description>
- <value>192</value>
- <minimum>6000</minimum>
- <unit-mask>
- <type>mandatory</type>
- <default>0</default>
- <mask>
- <value>0</value>
- <description>No unit mask</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>L2_RQSTS</name>
- <description>number of L2 cache requests</description>
- <value>46</value>
- <minimum>500</minimum>
- <unit-mask>
- <type>bitmask</type>
- <default>127</default>
- <mask>
- <value>192</value>
- <description>core: all cores</description>
- </mask>
- <mask>
- <value>64</value>
- <description>core: this core</description>
- </mask>
- <mask>
- <value>48</value>
- <description>prefetch: all inclusive</description>
- </mask>
- <mask>
- <value>16</value>
- <description>prefetch: Hardware prefetch only</description>
- </mask>
- <mask>
- <value>0</value>
- <description>prefetch: exclude hardware prefetch</description>
- </mask>
- <mask>
- <value>8</value>
- <description>(M)ESI: Modified</description>
- </mask>
- <mask>
- <value>4</value>
- <description>M(E)SI: Exclusive</description>
- </mask>
- <mask>
- <value>2</value>
- <description>ME(S)I: Shared</description>
- </mask>
- <mask>
- <value>1</value>
- <description>MES(I): Invalid</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>LLC_MISSES</name>
- <description>L2 cache demand requests from this core that missed the L2</description>
- <value>46</value>
- <minimum>6000</minimum>
- <unit-mask>
- <type>mandatory</type>
- <default>65</default>
- <mask>
- <value>65</value>
- <description>No unit mask</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>LLC_REFS</name>
- <description>L2 cache demand requests from this core</description>
- <value>46</value>
- <minimum>6000</minimum>
- <unit-mask>
- <type>mandatory</type>
- <default>79</default>
- <mask>
- <value>79</value>
- <description>No unit mask</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>LOAD_BLOCK</name>
- <description>events pertaining to loads</description>
- <value>3</value>
- <minimum>500</minimum>
- <unit-mask>
- <type>bitmask</type>
- <default>62</default>
- <mask>
- <value>2</value>
- <description>STA Loads blocked by a preceding store with unknown address.</description>
- </mask>
- <mask>
- <value>4</value>
- <description>STD Loads blocked by a preceding store with unknown data.</description>
- </mask>
- <mask>
- <value>8</value>
- <description>OVERLAP_STORE Loads that partially overlap an earlier store, or 4K aliased with a previous store.</description>
- </mask>
- <mask>
- <value>16</value>
- <description>UNTIL_RETIRE Loads blocked until retirement.</description>
- </mask>
- <mask>
- <value>32</value>
- <description>L1D Loads blocked by the L1 data cache.</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>STORE_BLOCK</name>
- <description>events pertaining to stores</description>
- <value>4</value>
- <minimum>500</minimum>
- <unit-mask>
- <type>bitmask</type>
- <default>11</default>
- <mask>
- <value>1</value>
- <description>SB_DRAIN_CYCLES Cycles while stores are blocked due to store buffer drain.</description>
- </mask>
- <mask>
- <value>2</value>
- <description>ORDER Cycles while store is waiting for a preceding store to be globally observed.</description>
- </mask>
- <mask>
- <value>8</value>
- <description>NOOP A store is blocked due to a conflict with an external or internal snoop.</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>MISALIGN_MEM_REF</name>
- <description>number of misaligned data memory references</description>
- <value>5</value>
- <minimum>500</minimum>
- <unit-mask>
- <type>mandatory</type>
- <default>0</default>
- <mask>
- <value>0</value>
- <description>No unit mask</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>SEGMENT_REG_LOADS</name>
- <description>number of segment register loads</description>
- <value>6</value>
- <minimum>500</minimum>
- <unit-mask>
- <type>mandatory</type>
- <default>0</default>
- <mask>
- <value>0</value>
- <description>No unit mask</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>SSE_PRE_EXEC</name>
- <description>number of SSE pre-fetch/weakly ordered insns retired</description>
- <value>7</value>
- <minimum>500</minimum>
- <unit-mask>
- <type>exclusive</type>
- <default>0</default>
- <mask>
- <value>0</value>
- <description>prefetch NTA instructions executed.</description>
- </mask>
- <mask>
- <value>1</value>
- <description>prefetch T1 instructions executed.</description>
- </mask>
- <mask>
- <value>2</value>
- <description>prefetch T1 and T2 instructions executed.</description>
- </mask>
- <mask>
- <value>3</value>
- <description>SSE weakly-ordered stores</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>DTLB_MISSES</name>
- <description>DTLB miss events</description>
- <value>8</value>
- <minimum>500</minimum>
- <unit-mask>
- <type>bitmask</type>
- <default>15</default>
- <mask>
- <value>1</value>
- <description>ANY Memory accesses that missed the DTLB.</description>
- </mask>
- <mask>
- <value>2</value>
- <description>MISS_LD DTLB misses due to load operations.</description>
- </mask>
- <mask>
- <value>4</value>
- <description>L0_MISS_LD L0 DTLB misses due to load operations.</description>
- </mask>
- <mask>
- <value>8</value>
- <description>MISS_ST TLB misses due to store operations.</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>MEMORY_DISAMBIGUATION</name>
- <description>Memory disambiguation reset cycles.</description>
- <value>9</value>
- <minimum>1000</minimum>
- <unit-mask>
- <type>exclusive</type>
- <default>1</default>
- <mask>
- <value>1</value>
- <description>RESET Memory disambiguation reset cycles.</description>
- </mask>
- <mask>
- <value>2</value>
- <description>SUCCESS Number of loads that were successfully disambiguated.</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>PAGE_WALKS</name>
- <description>Page table walk events</description>
- <value>12</value>
- <minimum>500</minimum>
- <unit-mask>
- <type>exclusive</type>
- <default>2</default>
- <mask>
- <value>1</value>
- <description>COUNT Number of page-walks executed.</description>
- </mask>
- <mask>
- <value>2</value>
- <description>CYCLES Duration of page-walks in core cycles.</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>FLOPS</name>
- <description>number of FP computational micro-ops executed</description>
- <value>16</value>
- <minimum>3000</minimum>
- <unit-mask>
- <type>mandatory</type>
- <default>0</default>
- <mask>
- <value>0</value>
- <description>No unit mask</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>FP_ASSIST</name>
- <description>number of FP assists</description>
- <value>17</value>
- <minimum>500</minimum>
- <unit-mask>
- <type>mandatory</type>
- <default>0</default>
- <mask>
- <value>0</value>
- <description>No unit mask</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>MUL</name>
- <description>number of multiplies</description>
- <value>18</value>
- <minimum>1000</minimum>
- <unit-mask>
- <type>mandatory</type>
- <default>0</default>
- <mask>
- <value>0</value>
- <description>No unit mask</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>DIV</name>
- <description>number of divides</description>
- <value>19</value>
- <minimum>500</minimum>
- <unit-mask>
- <type>mandatory</type>
- <default>0</default>
- <mask>
- <value>0</value>
- <description>No unit mask</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>CYCLES_DIV_BUSY</name>
- <description>cycles divider is busy</description>
- <value>20</value>
- <minimum>1000</minimum>
- <unit-mask>
- <type>mandatory</type>
- <default>0</default>
- <mask>
- <value>0</value>
- <description>No unit mask</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>IDLE_DURING_DIV</name>
- <description>cycles divider is busy and all other execution units are idle.</description>
- <value>24</value>
- <minimum>1000</minimum>
- <unit-mask>
- <type>mandatory</type>
- <default>0</default>
- <mask>
- <value>0</value>
- <description>No unit mask</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>DELAYED_BYPASS</name>
- <description>Delayed bypass events</description>
- <value>25</value>
- <minimum>1000</minimum>
- <unit-mask>
- <type>exclusive</type>
- <default>0</default>
- <mask>
- <value>0</value>
- <description>FP Delayed bypass to FP operation.</description>
- </mask>
- <mask>
- <value>1</value>
- <description>SIMD Delayed bypass to SIMD operation.</description>
- </mask>
- <mask>
- <value>2</value>
- <description>LOAD Delayed bypass to load operation.</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>L2_ADS</name>
- <description>Cycles the L2 address bus is in use.</description>
- <value>33</value>
- <minimum>500</minimum>
- <unit-mask>
- <type>exclusive</type>
- <default>64</default>
- <mask>
- <value>192</value>
- <description>All cores</description>
- </mask>
- <mask>
- <value>64</value>
- <description>This core</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>L2_DBUS_BUSY_RD</name>
- <description>Cycles the L2 transfers data to the core.</description>
- <value>35</value>
- <minimum>500</minimum>
- <unit-mask>
- <type>exclusive</type>
- <default>64</default>
- <mask>
- <value>192</value>
- <description>All cores</description>
- </mask>
- <mask>
- <value>64</value>
- <description>This core</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>L2_LINES_IN</name>
- <description>number of allocated lines in L2</description>
- <value>36</value>
- <minimum>500</minimum>
- <unit-mask>
- <type>bitmask</type>
- <default>112</default>
- <mask>
- <value>192</value>
- <description>core: all cores</description>
- </mask>
- <mask>
- <value>64</value>
- <description>core: this core</description>
- </mask>
- <mask>
- <value>48</value>
- <description>prefetch: all inclusive</description>
- </mask>
- <mask>
- <value>16</value>
- <description>prefetch: Hardware prefetch only</description>
- </mask>
- <mask>
- <value>0</value>
- <description>prefetch: exclude hardware prefetch</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>L2_M_LINES_IN</name>
- <description>number of modified lines allocated in L2</description>
- <value>37</value>
- <minimum>500</minimum>
- <unit-mask>
- <type>exclusive</type>
- <default>64</default>
- <mask>
- <value>192</value>
- <description>All cores</description>
- </mask>
- <mask>
- <value>64</value>
- <description>This core</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>L2_LINES_OUT</name>
- <description>number of recovered lines from L2</description>
- <value>38</value>
- <minimum>500</minimum>
- <unit-mask>
- <type>bitmask</type>
- <default>112</default>
- <mask>
- <value>192</value>
- <description>core: all cores</description>
- </mask>
- <mask>
- <value>64</value>
- <description>core: this core</description>
- </mask>
- <mask>
- <value>48</value>
- <description>prefetch: all inclusive</description>
- </mask>
- <mask>
- <value>16</value>
- <description>prefetch: Hardware prefetch only</description>
- </mask>
- <mask>
- <value>0</value>
- <description>prefetch: exclude hardware prefetch</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>L2_M_LINES_OUT</name>
- <description>number of modified lines removed from L2</description>
- <value>39</value>
- <minimum>500</minimum>
- <unit-mask>
- <type>bitmask</type>
- <default>112</default>
- <mask>
- <value>192</value>
- <description>core: all cores</description>
- </mask>
- <mask>
- <value>64</value>
- <description>core: this core</description>
- </mask>
- <mask>
- <value>48</value>
- <description>prefetch: all inclusive</description>
- </mask>
- <mask>
- <value>16</value>
- <description>prefetch: Hardware prefetch only</description>
- </mask>
- <mask>
- <value>0</value>
- <description>prefetch: exclude hardware prefetch</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>L2_IFETCH</name>
- <description>number of L2 cacheable instruction fetches</description>
- <value>40</value>
- <minimum>500</minimum>
- <unit-mask>
- <type>bitmask</type>
- <default>79</default>
- <mask>
- <value>192</value>
- <description>core: all cores</description>
- </mask>
- <mask>
- <value>64</value>
- <description>core: this core</description>
- </mask>
- <mask>
- <value>8</value>
- <description>(M)ESI: Modified</description>
- </mask>
- <mask>
- <value>4</value>
- <description>M(E)SI: Exclusive</description>
- </mask>
- <mask>
- <value>2</value>
- <description>ME(S)I: Shared</description>
- </mask>
- <mask>
- <value>1</value>
- <description>MES(I): Invalid</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>L2_LD</name>
- <description>number of L2 data loads</description>
- <value>41</value>
- <minimum>500</minimum>
- <unit-mask>
- <type>bitmask</type>
- <default>127</default>
- <mask>
- <value>192</value>
- <description>core: all cores</description>
- </mask>
- <mask>
- <value>64</value>
- <description>core: this core</description>
- </mask>
- <mask>
- <value>48</value>
- <description>prefetch: all inclusive</description>
- </mask>
- <mask>
- <value>16</value>
- <description>prefetch: Hardware prefetch only</description>
- </mask>
- <mask>
- <value>0</value>
- <description>prefetch: exclude hardware prefetch</description>
- </mask>
- <mask>
- <value>8</value>
- <description>(M)ESI: Modified</description>
- </mask>
- <mask>
- <value>4</value>
- <description>M(E)SI: Exclusive</description>
- </mask>
- <mask>
- <value>2</value>
- <description>ME(S)I: Shared</description>
- </mask>
- <mask>
- <value>1</value>
- <description>MES(I): Invalid</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>L2_ST</name>
- <description>number of L2 data stores</description>
- <value>42</value>
- <minimum>500</minimum>
- <unit-mask>
- <type>bitmask</type>
- <default>79</default>
- <mask>
- <value>192</value>
- <description>core: all cores</description>
- </mask>
- <mask>
- <value>64</value>
- <description>core: this core</description>
- </mask>
- <mask>
- <value>8</value>
- <description>(M)ESI: Modified</description>
- </mask>
- <mask>
- <value>4</value>
- <description>M(E)SI: Exclusive</description>
- </mask>
- <mask>
- <value>2</value>
- <description>ME(S)I: Shared</description>
- </mask>
- <mask>
- <value>1</value>
- <description>MES(I): Invalid</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>L2_LOCK</name>
- <description>number of locked L2 data accesses</description>
- <value>43</value>
- <minimum>500</minimum>
- <unit-mask>
- <type>bitmask</type>
- <default>79</default>
- <mask>
- <value>192</value>
- <description>core: all cores</description>
- </mask>
- <mask>
- <value>64</value>
- <description>core: this core</description>
- </mask>
- <mask>
- <value>8</value>
- <description>(M)ESI: Modified</description>
- </mask>
- <mask>
- <value>4</value>
- <description>M(E)SI: Exclusive</description>
- </mask>
- <mask>
- <value>2</value>
- <description>ME(S)I: Shared</description>
- </mask>
- <mask>
- <value>1</value>
- <description>MES(I): Invalid</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>L2_REJECT_BUSQ</name>
- <description>Rejected L2 cache requests</description>
- <value>48</value>
- <minimum>500</minimum>
- <unit-mask>
- <type>bitmask</type>
- <default>127</default>
- <mask>
- <value>192</value>
- <description>core: all cores</description>
- </mask>
- <mask>
- <value>64</value>
- <description>core: this core</description>
- </mask>
- <mask>
- <value>48</value>
- <description>prefetch: all inclusive</description>
- </mask>
- <mask>
- <value>16</value>
- <description>prefetch: Hardware prefetch only</description>
- </mask>
- <mask>
- <value>0</value>
- <description>prefetch: exclude hardware prefetch</description>
- </mask>
- <mask>
- <value>8</value>
- <description>(M)ESI: Modified</description>
- </mask>
- <mask>
- <value>4</value>
- <description>M(E)SI: Exclusive</description>
- </mask>
- <mask>
- <value>2</value>
- <description>ME(S)I: Shared</description>
- </mask>
- <mask>
- <value>1</value>
- <description>MES(I): Invalid</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>L2_NO_REQ</name>
- <description>Cycles no L2 cache requests are pending</description>
- <value>50</value>
- <minimum>500</minimum>
- <unit-mask>
- <type>exclusive</type>
- <default>64</default>
- <mask>
- <value>192</value>
- <description>All cores</description>
- </mask>
- <mask>
- <value>64</value>
- <description>This core</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>EIST_TRANS_ALL</name>
- <description>Intel(tm) Enhanced SpeedStep(r) Technology transitions</description>
- <value>58</value>
- <minimum>500</minimum>
- <unit-mask>
- <type>mandatory</type>
- <default>0</default>
- <mask>
- <value>0</value>
- <description>No unit mask</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>THERMAL_TRIP</name>
- <description>Number of thermal trips</description>
- <value>59</value>
- <minimum>500</minimum>
- <unit-mask>
- <type>mandatory</type>
- <default>192</default>
- <mask>
- <value>192</value>
- <description>No unit mask</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>L1D_CACHE_LD</name>
- <description>L1 cacheable data read operations</description>
- <value>64</value>
- <minimum>500</minimum>
- <unit-mask>
- <type>bitmask</type>
- <default>15</default>
- <mask>
- <value>8</value>
- <description>(M)ESI: Modified</description>
- </mask>
- <mask>
- <value>4</value>
- <description>M(E)SI: Exclusive</description>
- </mask>
- <mask>
- <value>2</value>
- <description>ME(S)I: Shared</description>
- </mask>
- <mask>
- <value>1</value>
- <description>MES(I): Invalid</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>L1D_CACHE_ST</name>
- <description>L1 cacheable data write operations</description>
- <value>65</value>
- <minimum>500</minimum>
- <unit-mask>
- <type>bitmask</type>
- <default>15</default>
- <mask>
- <value>8</value>
- <description>(M)ESI: Modified</description>
- </mask>
- <mask>
- <value>4</value>
- <description>M(E)SI: Exclusive</description>
- </mask>
- <mask>
- <value>2</value>
- <description>ME(S)I: Shared</description>
- </mask>
- <mask>
- <value>1</value>
- <description>MES(I): Invalid</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>L1D_CACHE_LOCK</name>
- <description>L1 cacheable lock read operations</description>
- <value>66</value>
- <minimum>500</minimum>
- <unit-mask>
- <type>bitmask</type>
- <default>15</default>
- <mask>
- <value>8</value>
- <description>(M)ESI: Modified</description>
- </mask>
- <mask>
- <value>4</value>
- <description>M(E)SI: Exclusive</description>
- </mask>
- <mask>
- <value>2</value>
- <description>ME(S)I: Shared</description>
- </mask>
- <mask>
- <value>1</value>
- <description>MES(I): Invalid</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>L1D_CACHE_LOCK_DURATION</name>
- <description>Duration of L1 data cacheable locked operations</description>
- <value>66</value>
- <minimum>500</minimum>
- <unit-mask>
- <type>mandatory</type>
- <default>16</default>
- <mask>
- <value>16</value>
- <description>No unit mask</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>L1D_ALL_REF</name>
- <description>All references to the L1 data cache</description>
- <value>67</value>
- <minimum>500</minimum>
- <unit-mask>
- <type>mandatory</type>
- <default>16</default>
- <mask>
- <value>16</value>
- <description>No unit mask</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>L1D_ALL_CACHE_REF</name>
- <description>L1 data cacheable reads and writes</description>
- <value>67</value>
- <minimum>500</minimum>
- <unit-mask>
- <type>mandatory</type>
- <default>2</default>
- <mask>
- <value>2</value>
- <description>No unit mask</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>L1D_REPL</name>
- <description>Cache lines allocated in the L1 data cache</description>
- <value>69</value>
- <minimum>500</minimum>
- <unit-mask>
- <type>mandatory</type>
- <default>15</default>
- <mask>
- <value>15</value>
- <description>No unit mask</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>L1D_M_REPL</name>
- <description>Modified cache lines allocated in the L1 data cache</description>
- <value>70</value>
- <minimum>500</minimum>
- <unit-mask>
- <type>mandatory</type>
- <default>0</default>
- <mask>
- <value>0</value>
- <description>No unit mask</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>L1D_M_EVICT</name>
- <description>Modified cache lines evicted from the L1 data cache</description>
- <value>71</value>
- <minimum>500</minimum>
- <unit-mask>
- <type>mandatory</type>
- <default>0</default>
- <mask>
- <value>0</value>
- <description>No unit mask</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>L1D_PEND_MISS</name>
- <description>Total number of outstanding L1 data cache misses at any cycle</description>
- <value>72</value>
- <minimum>500</minimum>
- <unit-mask>
- <type>mandatory</type>
- <default>0</default>
- <mask>
- <value>0</value>
- <description>No unit mask</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>L1D_SPLIT</name>
- <description>Cache line split load/stores</description>
- <value>73</value>
- <minimum>500</minimum>
- <unit-mask>
- <type>exclusive</type>
- <default>1</default>
- <mask>
- <value>1</value>
- <description>split loads</description>
- </mask>
- <mask>
- <value>2</value>
- <description>split stores</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>SSE_PREF_MISS</name>
- <description>SSE instructions that missed all caches</description>
- <value>75</value>
- <minimum>500</minimum>
- <unit-mask>
- <type>exclusive</type>
- <default>0</default>
- <mask>
- <value>0</value>
- <description>PREFETCHNTA</description>
- </mask>
- <mask>
- <value>1</value>
- <description>PREFETCHT0</description>
- </mask>
- <mask>
- <value>2</value>
- <description>PREFETCHT1/PREFETCHT2</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>LOAD_HIT_PRE</name>
- <description>Load operations conflicting with a software prefetch to the same address</description>
- <value>76</value>
- <minimum>500</minimum>
- <unit-mask>
- <type>mandatory</type>
- <default>0</default>
- <mask>
- <value>0</value>
- <description>No unit mask</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>L1D_PREFETCH</name>
- <description>L1 data cache prefetch requests</description>
- <value>78</value>
- <minimum>500</minimum>
- <unit-mask>
- <type>mandatory</type>
- <default>16</default>
- <mask>
- <value>16</value>
- <description>No unit mask</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>BUS_REQ_OUTSTANDING</name>
- <description>Outstanding cacheable data read bus requests duration</description>
- <value>96</value>
- <minimum>500</minimum>
- <unit-mask>
- <type>bitmask</type>
- <default>64</default>
- <mask>
- <value>192</value>
- <description>core: all cores</description>
- </mask>
- <mask>
- <value>64</value>
- <description>core: this core</description>
- </mask>
- <mask>
- <value>0</value>
- <description>bus: this agent</description>
- </mask>
- <mask>
- <value>32</value>
- <description>bus: include all agents</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>BUS_BNR_DRV</name>
- <description>Number of Bus Not Ready signals asserted</description>
- <value>97</value>
- <minimum>500</minimum>
- <unit-mask>
- <type>exclusive</type>
- <default>0</default>
- <mask>
- <value>0</value>
- <description>this agent</description>
- </mask>
- <mask>
- <value>32</value>
- <description>include all agents</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>BUS_DRDY_CLOCKS</name>
- <description>Bus cycles when data is sent on the bus</description>
- <value>98</value>
- <minimum>500</minimum>
- <unit-mask>
- <type>exclusive</type>
- <default>0</default>
- <mask>
- <value>0</value>
- <description>this agent</description>
- </mask>
- <mask>
- <value>32</value>
- <description>include all agents</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>BUS_LOCK_CLOCKS</name>
- <description>Bus cycles when a LOCK signal is asserted</description>
- <value>99</value>
- <minimum>500</minimum>
- <unit-mask>
- <type>bitmask</type>
- <default>64</default>
- <mask>
- <value>192</value>
- <description>core: all cores</description>
- </mask>
- <mask>
- <value>64</value>
- <description>core: this core</description>
- </mask>
- <mask>
- <value>0</value>
- <description>bus: this agent</description>
- </mask>
- <mask>
- <value>32</value>
- <description>bus: include all agents</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>BUS_DATA_RCV</name>
- <description>Bus cycles while processor receives data</description>
- <value>100</value>
- <minimum>500</minimum>
- <unit-mask>
- <type>bitmask</type>
- <default>64</default>
- <mask>
- <value>192</value>
- <description>core: all cores</description>
- </mask>
- <mask>
- <value>64</value>
- <description>core: this core</description>
- </mask>
- <mask>
- <value>0</value>
- <description>bus: this agent</description>
- </mask>
- <mask>
- <value>32</value>
- <description>bus: include all agents</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>BUS_TRAN_BRD</name>
- <description>Burst read bus transactions</description>
- <value>101</value>
- <minimum>500</minimum>
- <unit-mask>
- <type>bitmask</type>
- <default>64</default>
- <mask>
- <value>192</value>
- <description>core: all cores</description>
- </mask>
- <mask>
- <value>64</value>
- <description>core: this core</description>
- </mask>
- <mask>
- <value>0</value>
- <description>bus: this agent</description>
- </mask>
- <mask>
- <value>32</value>
- <description>bus: include all agents</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>BUS_TRAN_RFO</name>
- <description>number of completed read for ownership transactions</description>
- <value>102</value>
- <minimum>500</minimum>
- <unit-mask>
- <type>bitmask</type>
- <default>64</default>
- <mask>
- <value>192</value>
- <description>core: all cores</description>
- </mask>
- <mask>
- <value>64</value>
- <description>core: this core</description>
- </mask>
- <mask>
- <value>0</value>
- <description>bus: this agent</description>
- </mask>
- <mask>
- <value>32</value>
- <description>bus: include all agents</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>BUS_TRAN_WB</name>
- <description>number of explicit writeback bus transactions</description>
- <value>103</value>
- <minimum>500</minimum>
- <unit-mask>
- <type>bitmask</type>
- <default>64</default>
- <mask>
- <value>192</value>
- <description>core: all cores</description>
- </mask>
- <mask>
- <value>64</value>
- <description>core: this core</description>
- </mask>
- <mask>
- <value>0</value>
- <description>bus: this agent</description>
- </mask>
- <mask>
- <value>32</value>
- <description>bus: include all agents</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>BUS_TRAN_IFETCH</name>
- <description>number of instruction fetch transactions</description>
- <value>104</value>
- <minimum>500</minimum>
- <unit-mask>
- <type>bitmask</type>
- <default>64</default>
- <mask>
- <value>192</value>
- <description>core: all cores</description>
- </mask>
- <mask>
- <value>64</value>
- <description>core: this core</description>
- </mask>
- <mask>
- <value>0</value>
- <description>bus: this agent</description>
- </mask>
- <mask>
- <value>32</value>
- <description>bus: include all agents</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>BUS_TRAN_INVAL</name>
- <description>number of invalidate transactions</description>
- <value>105</value>
- <minimum>500</minimum>
- <unit-mask>
- <type>bitmask</type>
- <default>64</default>
- <mask>
- <value>192</value>
- <description>core: all cores</description>
- </mask>
- <mask>
- <value>64</value>
- <description>core: this core</description>
- </mask>
- <mask>
- <value>0</value>
- <description>bus: this agent</description>
- </mask>
- <mask>
- <value>32</value>
- <description>bus: include all agents</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>BUS_TRAN_PWR</name>
- <description>number of partial write bus transactions</description>
- <value>106</value>
- <minimum>500</minimum>
- <unit-mask>
- <type>bitmask</type>
- <default>64</default>
- <mask>
- <value>192</value>
- <description>core: all cores</description>
- </mask>
- <mask>
- <value>64</value>
- <description>core: this core</description>
- </mask>
- <mask>
- <value>0</value>
- <description>bus: this agent</description>
- </mask>
- <mask>
- <value>32</value>
- <description>bus: include all agents</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>BUS_TRANS_P</name>
- <description>number of partial bus transactions</description>
- <value>107</value>
- <minimum>500</minimum>
- <unit-mask>
- <type>bitmask</type>
- <default>64</default>
- <mask>
- <value>192</value>
- <description>core: all cores</description>
- </mask>
- <mask>
- <value>64</value>
- <description>core: this core</description>
- </mask>
- <mask>
- <value>0</value>
- <description>bus: this agent</description>
- </mask>
- <mask>
- <value>32</value>
- <description>bus: include all agents</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>BUS_TRANS_IO</name>
- <description>number of I/O bus transactions</description>
- <value>108</value>
- <minimum>500</minimum>
- <unit-mask>
- <type>bitmask</type>
- <default>64</default>
- <mask>
- <value>192</value>
- <description>core: all cores</description>
- </mask>
- <mask>
- <value>64</value>
- <description>core: this core</description>
- </mask>
- <mask>
- <value>0</value>
- <description>bus: this agent</description>
- </mask>
- <mask>
- <value>32</value>
- <description>bus: include all agents</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>BUS_TRANS_DEF</name>
- <description>number of completed defer transactions</description>
- <value>109</value>
- <minimum>500</minimum>
- <unit-mask>
- <type>bitmask</type>
- <default>64</default>
- <mask>
- <value>192</value>
- <description>core: all cores</description>
- </mask>
- <mask>
- <value>64</value>
- <description>core: this core</description>
- </mask>
- <mask>
- <value>0</value>
- <description>bus: this agent</description>
- </mask>
- <mask>
- <value>32</value>
- <description>bus: include all agents</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>BUS_TRAN_BURST</name>
- <description>number of completed burst transactions</description>
- <value>110</value>
- <minimum>500</minimum>
- <unit-mask>
- <type>bitmask</type>
- <default>64</default>
- <mask>
- <value>192</value>
- <description>core: all cores</description>
- </mask>
- <mask>
- <value>64</value>
- <description>core: this core</description>
- </mask>
- <mask>
- <value>0</value>
- <description>bus: this agent</description>
- </mask>
- <mask>
- <value>32</value>
- <description>bus: include all agents</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>BUS_TRAN_MEM</name>
- <description>number of completed memory transactions</description>
- <value>111</value>
- <minimum>500</minimum>
- <unit-mask>
- <type>bitmask</type>
- <default>64</default>
- <mask>
- <value>192</value>
- <description>core: all cores</description>
- </mask>
- <mask>
- <value>64</value>
- <description>core: this core</description>
- </mask>
- <mask>
- <value>0</value>
- <description>bus: this agent</description>
- </mask>
- <mask>
- <value>32</value>
- <description>bus: include all agents</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>BUS_TRAN_ANY</name>
- <description>number of any completed bus transactions</description>
- <value>112</value>
- <minimum>500</minimum>
- <unit-mask>
- <type>bitmask</type>
- <default>64</default>
- <mask>
- <value>192</value>
- <description>core: all cores</description>
- </mask>
- <mask>
- <value>64</value>
- <description>core: this core</description>
- </mask>
- <mask>
- <value>0</value>
- <description>bus: this agent</description>
- </mask>
- <mask>
- <value>32</value>
- <description>bus: include all agents</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>EXT_SNOOP</name>
- <description>External snoops</description>
- <value>119</value>
- <minimum>500</minimum>
- <unit-mask>
- <type>bitmask</type>
- <default>11</default>
- <mask>
- <value>0</value>
- <description>bus: this agent</description>
- </mask>
- <mask>
- <value>32</value>
- <description>bus: include all agents</description>
- </mask>
- <mask>
- <value>8</value>
- <description>snoop: HITM snoops</description>
- </mask>
- <mask>
- <value>2</value>
- <description>snoop: HIT snoops</description>
- </mask>
- <mask>
- <value>1</value>
- <description>snoop: CLEAN snoops</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>CMP_SNOOP</name>
- <description>L1 data cache is snooped by other core</description>
- <value>120</value>
- <minimum>500</minimum>
- <unit-mask>
- <type>bitmask</type>
- <default>64</default>
- <mask>
- <value>192</value>
- <description>core: all cores</description>
- </mask>
- <mask>
- <value>64</value>
- <description>core: this core</description>
- </mask>
- <mask>
- <value>1</value>
- <description>snoop: CMP2I snoops</description>
- </mask>
- <mask>
- <value>2</value>
- <description>snoop: CMP2S snoops</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>BUS_HIT_DRV</name>
- <description>HIT signal asserted</description>
- <value>122</value>
- <minimum>500</minimum>
- <unit-mask>
- <type>exclusive</type>
- <default>0</default>
- <mask>
- <value>0</value>
- <description>this agent</description>
- </mask>
- <mask>
- <value>32</value>
- <description>include all agents</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>BUS_HITM_DRV</name>
- <description>HITM signal asserted</description>
- <value>123</value>
- <minimum>500</minimum>
- <unit-mask>
- <type>exclusive</type>
- <default>0</default>
- <mask>
- <value>0</value>
- <description>this agent</description>
- </mask>
- <mask>
- <value>32</value>
- <description>include all agents</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>BUSQ_EMPTY</name>
- <description>Bus queue is empty</description>
- <value>125</value>
- <minimum>500</minimum>
- <unit-mask>
- <type>exclusive</type>
- <default>64</default>
- <mask>
- <value>192</value>
- <description>All cores</description>
- </mask>
- <mask>
- <value>64</value>
- <description>This core</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>SNOOP_STALL_DRV</name>
- <description>Bus stalled for snoops</description>
- <value>126</value>
- <minimum>500</minimum>
- <unit-mask>
- <type>bitmask</type>
- <default>64</default>
- <mask>
- <value>192</value>
- <description>core: all cores</description>
- </mask>
- <mask>
- <value>64</value>
- <description>core: this core</description>
- </mask>
- <mask>
- <value>0</value>
- <description>bus: this agent</description>
- </mask>
- <mask>
- <value>32</value>
- <description>bus: include all agents</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>BUS_IO_WAIT</name>
- <description>IO requests waiting in the bus queue</description>
- <value>127</value>
- <minimum>500</minimum>
- <unit-mask>
- <type>exclusive</type>
- <default>64</default>
- <mask>
- <value>192</value>
- <description>All cores</description>
- </mask>
- <mask>
- <value>64</value>
- <description>This core</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>L1I_READS</name>
- <description>number of instruction fetches</description>
- <value>128</value>
- <minimum>500</minimum>
- <unit-mask>
- <type>mandatory</type>
- <default>0</default>
- <mask>
- <value>0</value>
- <description>No unit mask</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>L1I_MISSES</name>
- <description>number of instruction fetch misses</description>
- <value>129</value>
- <minimum>500</minimum>
- <unit-mask>
- <type>mandatory</type>
- <default>0</default>
- <mask>
- <value>0</value>
- <description>No unit mask</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>ITLB</name>
- <description>number of ITLB misses</description>
- <value>130</value>
- <minimum>500</minimum>
- <unit-mask>
- <type>bitmask</type>
- <default>18</default>
- <mask>
- <value>2</value>
- <description>ITLB small page misses</description>
- </mask>
- <mask>
- <value>16</value>
- <description>ITLB large page misses</description>
- </mask>
- <mask>
- <value>64</value>
- <description>ITLB flushes</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>INST_QUEUE_FULL</name>
- <description>cycles during which the instruction queue is full</description>
- <value>131</value>
- <minimum>500</minimum>
- <unit-mask>
- <type>mandatory</type>
- <default>2</default>
- <mask>
- <value>2</value>
- <description>No unit mask</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>IFU_MEM_STALL</name>
- <description>cycles instruction fetch pipe is stalled</description>
- <value>134</value>
- <minimum>500</minimum>
- <unit-mask>
- <type>mandatory</type>
- <default>0</default>
- <mask>
- <value>0</value>
- <description>No unit mask</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>ILD_STALL</name>
- <description>cycles instruction length decoder is stalled</description>
- <value>135</value>
- <minimum>500</minimum>
- <unit-mask>
- <type>mandatory</type>
- <default>0</default>
- <mask>
- <value>0</value>
- <description>No unit mask</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>BR_INST_EXEC</name>
- <description>Branch instructions executed (not necessarily retired)</description>
- <value>136</value>
- <minimum>3000</minimum>
- <unit-mask>
- <type>mandatory</type>
- <default>0</default>
- <mask>
- <value>0</value>
- <description>No unit mask</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>BR_MISSP_EXEC</name>
- <description>Branch instructions executed that were mispredicted at execution</description>
- <value>137</value>
- <minimum>3000</minimum>
- <unit-mask>
- <type>mandatory</type>
- <default>0</default>
- <mask>
- <value>0</value>
- <description>No unit mask</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>BR_BAC_MISSP_EXEC</name>
- <description>Branch instructions executed that were mispredicted at Front End (BAC)</description>
- <value>138</value>
- <minimum>3000</minimum>
- <unit-mask>
- <type>mandatory</type>
- <default>0</default>
- <mask>
- <value>0</value>
- <description>No unit mask</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>BR_CND_EXEC</name>
- <description>Conditional Branch instructions executed</description>
- <value>139</value>
- <minimum>3000</minimum>
- <unit-mask>
- <type>mandatory</type>
- <default>0</default>
- <mask>
- <value>0</value>
- <description>No unit mask</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>BR_CND_MISSP_EXEC</name>
- <description>Conditional Branch instructions executed that were mispredicted</description>
- <value>140</value>
- <minimum>3000</minimum>
- <unit-mask>
- <type>mandatory</type>
- <default>0</default>
- <mask>
- <value>0</value>
- <description>No unit mask</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>BR_IND_EXEC</name>
- <description>Indirect Branch instructions executed</description>
- <value>141</value>
- <minimum>3000</minimum>
- <unit-mask>
- <type>mandatory</type>
- <default>0</default>
- <mask>
- <value>0</value>
- <description>No unit mask</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>BR_IND_MISSP_EXEC</name>
- <description>Indirect Branch instructions executed that were mispredicted</description>
- <value>142</value>
- <minimum>3000</minimum>
- <unit-mask>
- <type>mandatory</type>
- <default>0</default>
- <mask>
- <value>0</value>
- <description>No unit mask</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>BR_RET_EXEC</name>
- <description>Return Branch instructions executed</description>
- <value>143</value>
- <minimum>3000</minimum>
- <unit-mask>
- <type>mandatory</type>
- <default>0</default>
- <mask>
- <value>0</value>
- <description>No unit mask</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>BR_RET_MISSP_EXEC</name>
- <description>Return Branch instructions executed that were mispredicted at Execution</description>
- <value>144</value>
- <minimum>3000</minimum>
- <unit-mask>
- <type>mandatory</type>
- <default>0</default>
- <mask>
- <value>0</value>
- <description>No unit mask</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>BR_RET_BAC_MISSP_EXEC</name>
- <description>Branch instructions executed that were mispredicted at Front End (BAC)</description>
- <value>145</value>
- <minimum>3000</minimum>
- <unit-mask>
- <type>mandatory</type>
- <default>0</default>
- <mask>
- <value>0</value>
- <description>No unit mask</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>BR_CALL_EXEC</name>
- <description>CALL instruction executed</description>
- <value>146</value>
- <minimum>3000</minimum>
- <unit-mask>
- <type>mandatory</type>
- <default>0</default>
- <mask>
- <value>0</value>
- <description>No unit mask</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>BR_CALL_MISSP_EXEC</name>
- <description>CALL instruction executed and miss predicted</description>
- <value>147</value>
- <minimum>3000</minimum>
- <unit-mask>
- <type>mandatory</type>
- <default>0</default>
- <mask>
- <value>0</value>
- <description>No unit mask</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>BR_IND_CALL_EXEC</name>
- <description>Indirect CALL instruction executed</description>
- <value>148</value>
- <minimum>3000</minimum>
- <unit-mask>
- <type>mandatory</type>
- <default>0</default>
- <mask>
- <value>0</value>
- <description>No unit mask</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>BR_TKN_BUBBLE_1</name>
- <description>Branch predicted taken with bubble 1</description>
- <value>151</value>
- <minimum>3000</minimum>
- <unit-mask>
- <type>mandatory</type>
- <default>0</default>
- <mask>
- <value>0</value>
- <description>No unit mask</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>BR_TKN_BUBBLE_2</name>
- <description>Branch predicted taken with bubble 2</description>
- <value>152</value>
- <minimum>3000</minimum>
- <unit-mask>
- <type>mandatory</type>
- <default>0</default>
- <mask>
- <value>0</value>
- <description>No unit mask</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>RS_UOPS_DISPATCHED</name>
- <description>Micro-ops dispatched for execution</description>
- <value>160</value>
- <minimum>1000</minimum>
- <unit-mask>
- <type>mandatory</type>
- <default>0</default>
- <mask>
- <value>0</value>
- <description>No unit mask</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>RS_UOPS_DISPATCHED_NONE</name>
- <description>No Micro-ops dispatched for execution</description>
- <value>25165984</value>
- <minimum>1000</minimum>
- <unit-mask>
- <type>mandatory</type>
- <default>0</default>
- <mask>
- <value>0</value>
- <description>No unit mask</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>MACRO_INSTS</name>
- <description>instructions decoded</description>
- <value>170</value>
- <minimum>500</minimum>
- <unit-mask>
- <type>bitmask</type>
- <default>9</default>
- <mask>
- <value>1</value>
- <description>Instructions decoded</description>
- </mask>
- <mask>
- <value>8</value>
- <description>CISC Instructions decoded</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>ESP</name>
- <description>ESP register events</description>
- <value>171</value>
- <minimum>500</minimum>
- <unit-mask>
- <type>bitmask</type>
- <default>1</default>
- <mask>
- <value>1</value>
- <description>ESP register content synchronizations</description>
- </mask>
- <mask>
- <value>2</value>
- <description>ESP register automatic additions</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>SIMD_UOPS_EXEC</name>
- <description>SIMD micro-ops executed (excluding stores)</description>
- <value>176</value>
- <minimum>500</minimum>
- <unit-mask>
- <type>mandatory</type>
- <default>0</default>
- <mask>
- <value>0</value>
- <description>No unit mask</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>SIMD_SAT_UOP_EXEC</name>
- <description>number of SIMD saturating instructions executed</description>
- <value>177</value>
- <minimum>3000</minimum>
- <unit-mask>
- <type>mandatory</type>
- <default>0</default>
- <mask>
- <value>0</value>
- <description>No unit mask</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>SIMD_UOP_TYPE_EXEC</name>
- <description>number of SIMD packing instructions</description>
- <value>179</value>
- <minimum>3000</minimum>
- <unit-mask>
- <type>bitmask</type>
- <default>63</default>
- <mask>
- <value>1</value>
- <description>SIMD packed multiplies</description>
- </mask>
- <mask>
- <value>2</value>
- <description>SIMD packed shifts</description>
- </mask>
- <mask>
- <value>4</value>
- <description>SIMD pack operations</description>
- </mask>
- <mask>
- <value>8</value>
- <description>SIMD unpack operations</description>
- </mask>
- <mask>
- <value>16</value>
- <description>SIMD packed logical</description>
- </mask>
- <mask>
- <value>32</value>
- <description>SIMD packed arithmetic</description>
- </mask>
- <mask>
- <value>63</value>
- <description>all of the above</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>INST_RETIRED</name>
- <description>number of instructions retired</description>
- <value>192</value>
- <minimum>6000</minimum>
- <unit-mask>
- <type>bitmask</type>
- <default>0</default>
- <mask>
- <value>0</value>
- <description>Any</description>
- </mask>
- <mask>
- <value>1</value>
- <description>Loads</description>
- </mask>
- <mask>
- <value>2</value>
- <description>Stores</description>
- </mask>
- <mask>
- <value>4</value>
- <description>Other</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>X87_OPS_RETIRED</name>
- <description>number of computational FP operations retired</description>
- <value>193</value>
- <minimum>500</minimum>
- <unit-mask>
- <type>exclusive</type>
- <default>254</default>
- <mask>
- <value>1</value>
- <description>FXCH instructions retired</description>
- </mask>
- <mask>
- <value>254</value>
- <description>Retired floating-point computational operations (precise)</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>UOPS_RETIRED</name>
- <description>number of UOPs retired</description>
- <value>194</value>
- <minimum>6000</minimum>
- <unit-mask>
- <type>bitmask</type>
- <default>15</default>
- <mask>
- <value>1</value>
- <description>Fused load+op or load+indirect branch retired</description>
- </mask>
- <mask>
- <value>2</value>
- <description>Fused store address + data retired</description>
- </mask>
- <mask>
- <value>4</value>
- <description>Retired instruction pairs fused into one micro-op</description>
- </mask>
- <mask>
- <value>7</value>
- <description>Fused micro-ops retired</description>
- </mask>
- <mask>
- <value>8</value>
- <description>Non-fused micro-ops retired</description>
- </mask>
- <mask>
- <value>15</value>
- <description>Micro-ops retired</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>MACHINE_NUKES_SMC</name>
- <description>number of pipeline flushing events</description>
- <value>195</value>
- <minimum>500</minimum>
- <unit-mask>
- <type>bitmask</type>
- <default>5</default>
- <mask>
- <value>1</value>
- <description>Self-Modifying Code detected</description>
- </mask>
- <mask>
- <value>4</value>
- <description>Execution pipeline restart due to memory ordering conflict or memory disambiguation misprediction</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>BR_INST_RETIRED</name>
- <description>number of branch instructions retired</description>
- <value>196</value>
- <minimum>500</minimum>
- <unit-mask>
- <type>bitmask</type>
- <default>10</default>
- <mask>
- <value>1</value>
- <description>predicted not-taken</description>
- </mask>
- <mask>
- <value>2</value>
- <description>mispredicted not-taken</description>
- </mask>
- <mask>
- <value>4</value>
- <description>predicted taken</description>
- </mask>
- <mask>
- <value>8</value>
- <description>mispredicted taken</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>BR_MISS_PRED_RETIRED</name>
- <description>number of mispredicted branches retired (precise)</description>
- <value>197</value>
- <minimum>500</minimum>
- <unit-mask>
- <type>mandatory</type>
- <default>0</default>
- <mask>
- <value>0</value>
- <description>No unit mask</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>CYCLES_INT_MASKED</name>
- <description>cycles interrupts are disabled</description>
- <value>198</value>
- <minimum>500</minimum>
- <unit-mask>
- <type>exclusive</type>
- <default>2</default>
- <mask>
- <value>1</value>
- <description>Interrupts disabled</description>
- </mask>
- <mask>
- <value>2</value>
- <description>Interrupts pending and disabled</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>SIMD_INST_RETIRED</name>
- <description>SSE/SSE2 instructions retired</description>
- <value>199</value>
- <minimum>500</minimum>
- <unit-mask>
- <type>bitmask</type>
- <default>31</default>
- <mask>
- <value>1</value>
- <description>Retired SSE packed-single instructions</description>
- </mask>
- <mask>
- <value>2</value>
- <description>Retired SSE scalar-single instructions</description>
- </mask>
- <mask>
- <value>4</value>
- <description>Retired SSE2 packed-double instructions</description>
- </mask>
- <mask>
- <value>8</value>
- <description>Retired SSE2 scalar-double instructions</description>
- </mask>
- <mask>
- <value>16</value>
- <description>Retired SSE2 vector integer instructions</description>
- </mask>
- <mask>
- <value>31</value>
- <description>Retired Streaming SIMD instructions (precise event)</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>HW_INT_RCV</name>
- <description>number of hardware interrupts received</description>
- <value>200</value>
- <minimum>500</minimum>
- <unit-mask>
- <type>mandatory</type>
- <default>0</default>
- <mask>
- <value>0</value>
- <description>No unit mask</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>SIMD_COMP_INST_RETIRED</name>
- <description>Retired computational SSE/SSE2 instructions</description>
- <value>202</value>
- <minimum>500</minimum>
- <unit-mask>
- <type>bitmask</type>
- <default>15</default>
- <mask>
- <value>1</value>
- <description>Retired computational SSE packed-single instructions</description>
- </mask>
- <mask>
- <value>2</value>
- <description>Retired computational SSE scalar-single instructions</description>
- </mask>
- <mask>
- <value>4</value>
- <description>Retired computational SSE2 packed-double instructions</description>
- </mask>
- <mask>
- <value>8</value>
- <description>Retired computational SSE2 scalar-double instructions</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>FP_MMX_TRANS</name>
- <description>MMX-floating point transitions</description>
- <value>204</value>
- <minimum>3000</minimum>
- <unit-mask>
- <type>bitmask</type>
- <default>3</default>
- <mask>
- <value>1</value>
- <description>float->MMX transitions</description>
- </mask>
- <mask>
- <value>2</value>
- <description>MMX->float transitions</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>MMX_ASSIST</name>
- <description>number of EMMS instructions executed</description>
- <value>205</value>
- <minimum>500</minimum>
- <unit-mask>
- <type>mandatory</type>
- <default>0</default>
- <mask>
- <value>0</value>
- <description>No unit mask</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>SIMD_INSTR_RET</name>
- <description>number of SIMD instructions retired</description>
- <value>206</value>
- <minimum>500</minimum>
- <unit-mask>
- <type>mandatory</type>
- <default>0</default>
- <mask>
- <value>0</value>
- <description>No unit mask</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>SIMD_SAT_INSTR_RET</name>
- <description>number of saturated arithmetic instructions retired</description>
- <value>207</value>
- <minimum>500</minimum>
- <unit-mask>
- <type>mandatory</type>
- <default>0</default>
- <mask>
- <value>0</value>
- <description>No unit mask</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>RAT_STALLS</name>
- <description>Partial register stall cycles</description>
- <value>210</value>
- <minimum>6000</minimum>
- <unit-mask>
- <type>bitmask</type>
- <default>15</default>
- <mask>
- <value>1</value>
- <description>ROB read port</description>
- </mask>
- <mask>
- <value>2</value>
- <description>Partial register</description>
- </mask>
- <mask>
- <value>4</value>
- <description>Flag</description>
- </mask>
- <mask>
- <value>8</value>
- <description>FPU status word</description>
- </mask>
- <mask>
- <value>15</value>
- <description>All RAT</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>SEG_RENAME_STALLS</name>
- <description>Segment rename stalls</description>
- <value>212</value>
- <minimum>500</minimum>
- <unit-mask>
- <type>bitmask</type>
- <default>15</default>
- <mask>
- <value>1</value>
- <description>ES</description>
- </mask>
- <mask>
- <value>2</value>
- <description>DS</description>
- </mask>
- <mask>
- <value>4</value>
- <description>FS</description>
- </mask>
- <mask>
- <value>8</value>
- <description>GS</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>SEG_RENAMES</name>
- <description>Segment renames</description>
- <value>213</value>
- <minimum>500</minimum>
- <unit-mask>
- <type>bitmask</type>
- <default>15</default>
- <mask>
- <value>1</value>
- <description>ES</description>
- </mask>
- <mask>
- <value>2</value>
- <description>DS</description>
- </mask>
- <mask>
- <value>4</value>
- <description>FS</description>
- </mask>
- <mask>
- <value>8</value>
- <description>GS</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>RESOURCE_STALLS</name>
- <description>Cycles during which resource stalls occur</description>
- <value>220</value>
- <minimum>3000</minimum>
- <unit-mask>
- <type>bitmask</type>
- <default>15</default>
- <mask>
- <value>1</value>
- <description>when the ROB is full</description>
- </mask>
- <mask>
- <value>2</value>
- <description>during which the RS is full</description>
- </mask>
- <mask>
- <value>4</value>
- <description>during which the pipeline has exceeded the load or store limit or is waiting to commit all stores</description>
- </mask>
- <mask>
- <value>8</value>
- <description>due to FPU control word write</description>
- </mask>
- <mask>
- <value>16</value>
- <description>due to branch misprediction</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>BR_INST_DECODED</name>
- <description>number of branch instructions decoded</description>
- <value>224</value>
- <minimum>500</minimum>
- <unit-mask>
- <type>mandatory</type>
- <default>0</default>
- <mask>
- <value>0</value>
- <description>No unit mask</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>BR_BOGUS</name>
- <description>number of bogus branches</description>
- <value>228</value>
- <minimum>500</minimum>
- <unit-mask>
- <type>mandatory</type>
- <default>0</default>
- <mask>
- <value>0</value>
- <description>No unit mask</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>BACLEARS</name>
- <description>number of times BACLEAR is asserted</description>
- <value>230</value>
- <minimum>500</minimum>
- <unit-mask>
- <type>mandatory</type>
- <default>0</default>
- <mask>
- <value>0</value>
- <description>No unit mask</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>PREF_RQSTS_UP</name>
- <description>Number of upward prefetches issued</description>
- <value>240</value>
- <minimum>3000</minimum>
- <unit-mask>
- <type>mandatory</type>
- <default>0</default>
- <mask>
- <value>0</value>
- <description>No unit mask</description>
- </mask>
- </unit-mask>
- </event>
- <event>
- <name>PREF_RQSTS_DN</name>
- <description>Number of downward prefetches issued</description>
- <value>248</value>
- <minimum>3000</minimum>
- <unit-mask>
- <type>mandatory</type>
- <default>0</default>
- <mask>
- <value>0</value>
- <description>No unit mask</description>
- </mask>
- </unit-mask>
- </event>
- </event-list>
-</info>
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core.tests/resources/test_info_pre_parse_raw.xml b/oprofile/org.eclipse.linuxtools.oprofile.core.tests/resources/test_info_pre_parse_raw.xml
deleted file mode 100644
index 7d38fdb4f6f3b6533095f3b0ebd02ece782518cd..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.core.tests/resources/test_info_pre_parse_raw.xml
+++ /dev/null
@@ -1,638 +0,0 @@
-<help_events>
-<header title="oprofile: available events for CPU type "Core 2"
-
-" schemaversion="1.0" doc="See Intel Architecture Developer's Manual Volume 3B, Appendix A and
-Intel Architecture Optimization Reference Manual (730795-001)
-
-"/>
-<event event_name="CPU_CLK_UNHALTED" desc="Clock cycles when not halted" counter_mask="3" min_count="6000">
-<unit_masks default="0">
-<unit_mask mask="0" desc="Unhalted core cycles"/>
-<unit_mask mask="1" desc="Unhalted bus cycles"/>
-<unit_mask mask="2" desc="Unhalted bus cycles of this core while the other core is halted"/>
-</unit_masks>
-</event>
-<event event_name="INST_RETIRED_ANY_P" desc="number of instructions retired" counter_mask="3" min_count="6000"/>
-<event event_name="L2_RQSTS" desc="number of L2 cache requests" counter_mask="3" min_count="500">
-<unit_masks default="127">
-<unit_mask mask="192" desc="core: all cores"/>
-<unit_mask mask="64" desc="core: this core"/>
-<unit_mask mask="48" desc="prefetch: all inclusive"/>
-<unit_mask mask="16" desc="prefetch: Hardware prefetch only"/>
-<unit_mask mask="0" desc="prefetch: exclude hardware prefetch"/>
-<unit_mask mask="8" desc="(M)ESI: Modified"/>
-<unit_mask mask="4" desc="M(E)SI: Exclusive"/>
-<unit_mask mask="2" desc="ME(S)I: Shared"/>
-<unit_mask mask="1" desc="MES(I): Invalid"/>
-</unit_masks>
-</event>
-<event event_name="LLC_MISSES" desc="L2 cache demand requests from this core that missed the L2" counter_mask="3" min_count="6000">
-<unit_masks default="65">
-<unit_mask mask="65" desc="No unit mask"/>
-</unit_masks>
-</event>
-<event event_name="LLC_REFS" desc="L2 cache demand requests from this core" counter_mask="3" min_count="6000">
-<unit_masks default="79">
-<unit_mask mask="79" desc="No unit mask"/>
-</unit_masks>
-</event>
-<event event_name="LOAD_BLOCK" desc="events pertaining to loads" counter_mask="3" min_count="500">
-<unit_masks default="62">
-<unit_mask mask="2" desc="STA Loads blocked by a preceding store with unknown address."/>
-<unit_mask mask="4" desc="STD Loads blocked by a preceding store with unknown data."/>
-<unit_mask mask="8" desc="OVERLAP_STORE Loads that partially overlap an earlier store, or 4K aliased with a previous store."/>
-<unit_mask mask="16" desc="UNTIL_RETIRE Loads blocked until retirement."/>
-<unit_mask mask="32" desc="L1D Loads blocked by the L1 data cache."/>
-</unit_masks>
-</event>
-<event event_name="STORE_BLOCK" desc="events pertaining to stores" counter_mask="3" min_count="500">
-<unit_masks default="11">
-<unit_mask mask="1" desc="SB_DRAIN_CYCLES Cycles while stores are blocked due to store buffer drain."/>
-<unit_mask mask="2" desc="ORDER Cycles while store is waiting for a preceding store to be globally observed."/>
-<unit_mask mask="8" desc="NOOP A store is blocked due to a conflict with an external or internal snoop."/>
-</unit_masks>
-</event>
-<event event_name="MISALIGN_MEM_REF" desc="number of misaligned data memory references" counter_mask="3" min_count="500"/>
-<event event_name="SEGMENT_REG_LOADS" desc="number of segment register loads" counter_mask="3" min_count="500"/>
-<event event_name="SSE_PRE_EXEC" desc="number of SSE pre-fetch/weakly ordered insns retired" counter_mask="3" min_count="500">
-<unit_masks default="0">
-<unit_mask mask="0" desc="prefetch NTA instructions executed."/>
-<unit_mask mask="1" desc="prefetch T1 instructions executed."/>
-<unit_mask mask="2" desc="prefetch T1 and T2 instructions executed."/>
-<unit_mask mask="3" desc="SSE weakly-ordered stores"/>
-</unit_masks>
-</event>
-<event event_name="DTLB_MISSES" desc="DTLB miss events" counter_mask="3" min_count="500">
-<unit_masks default="15">
-<unit_mask mask="1" desc="ANY Memory accesses that missed the DTLB."/>
-<unit_mask mask="2" desc="MISS_LD DTLB misses due to load operations."/>
-<unit_mask mask="4" desc="L0_MISS_LD L0 DTLB misses due to load operations."/>
-<unit_mask mask="8" desc="MISS_ST TLB misses due to store operations."/>
-</unit_masks>
-</event>
-<event event_name="MEMORY_DISAMBIGUATION" desc="Memory disambiguation reset cycles." counter_mask="3" min_count="1000">
-<unit_masks default="1">
-<unit_mask mask="1" desc="RESET Memory disambiguation reset cycles."/>
-<unit_mask mask="2" desc="SUCCESS Number of loads that were successfully disambiguated."/>
-</unit_masks>
-</event>
-<event event_name="PAGE_WALKS" desc="Page table walk events" counter_mask="3" min_count="500">
-<unit_masks default="2">
-<unit_mask mask="1" desc="COUNT Number of page-walks executed."/>
-<unit_mask mask="2" desc="CYCLES Duration of page-walks in core cycles."/>
-</unit_masks>
-</event>
-<event event_name="FLOPS" desc="number of FP computational micro-ops executed" counter_mask="3" min_count="3000"/>
-<event event_name="FP_ASSIST" desc="number of FP assists" counter_mask="3" min_count="500"/>
-<event event_name="MUL" desc="number of multiplies" counter_mask="3" min_count="1000"/>
-<event event_name="DIV" desc="number of divides" counter_mask="3" min_count="500"/>
-<event event_name="CYCLES_DIV_BUSY" desc="cycles divider is busy" counter_mask="3" min_count="1000"/>
-<event event_name="IDLE_DURING_DIV" desc="cycles divider is busy and all other execution units are idle." counter_mask="3" min_count="1000"/>
-<event event_name="DELAYED_BYPASS" desc="Delayed bypass events" counter_mask="3" min_count="1000">
-<unit_masks default="0">
-<unit_mask mask="0" desc="FP Delayed bypass to FP operation."/>
-<unit_mask mask="1" desc="SIMD Delayed bypass to SIMD operation."/>
-<unit_mask mask="2" desc="LOAD Delayed bypass to load operation."/>
-</unit_masks>
-</event>
-<event event_name="L2_ADS" desc="Cycles the L2 address bus is in use." counter_mask="3" min_count="500">
-<unit_masks default="64">
-<unit_mask mask="192" desc="All cores"/>
-<unit_mask mask="64" desc="This core"/>
-</unit_masks>
-</event>
-<event event_name="L2_DBUS_BUSY_RD" desc="Cycles the L2 transfers data to the core." counter_mask="3" min_count="500">
-<unit_masks default="64">
-<unit_mask mask="192" desc="All cores"/>
-<unit_mask mask="64" desc="This core"/>
-</unit_masks>
-</event>
-<event event_name="L2_LINES_IN" desc="number of allocated lines in L2" counter_mask="3" min_count="500">
-<unit_masks default="112">
-<unit_mask mask="192" desc="core: all cores"/>
-<unit_mask mask="64" desc="core: this core"/>
-<unit_mask mask="48" desc="prefetch: all inclusive"/>
-<unit_mask mask="16" desc="prefetch: Hardware prefetch only"/>
-<unit_mask mask="0" desc="prefetch: exclude hardware prefetch"/>
-</unit_masks>
-</event>
-<event event_name="L2_M_LINES_IN" desc="number of modified lines allocated in L2" counter_mask="3" min_count="500">
-<unit_masks default="64">
-<unit_mask mask="192" desc="All cores"/>
-<unit_mask mask="64" desc="This core"/>
-</unit_masks>
-</event>
-<event event_name="L2_LINES_OUT" desc="number of recovered lines from L2" counter_mask="3" min_count="500">
-<unit_masks default="112">
-<unit_mask mask="192" desc="core: all cores"/>
-<unit_mask mask="64" desc="core: this core"/>
-<unit_mask mask="48" desc="prefetch: all inclusive"/>
-<unit_mask mask="16" desc="prefetch: Hardware prefetch only"/>
-<unit_mask mask="0" desc="prefetch: exclude hardware prefetch"/>
-</unit_masks>
-</event>
-<event event_name="L2_M_LINES_OUT" desc="number of modified lines removed from L2" counter_mask="3" min_count="500">
-<unit_masks default="112">
-<unit_mask mask="192" desc="core: all cores"/>
-<unit_mask mask="64" desc="core: this core"/>
-<unit_mask mask="48" desc="prefetch: all inclusive"/>
-<unit_mask mask="16" desc="prefetch: Hardware prefetch only"/>
-<unit_mask mask="0" desc="prefetch: exclude hardware prefetch"/>
-</unit_masks>
-</event>
-<event event_name="L2_IFETCH" desc="number of L2 cacheable instruction fetches" counter_mask="3" min_count="500">
-<unit_masks default="79">
-<unit_mask mask="192" desc="core: all cores"/>
-<unit_mask mask="64" desc="core: this core"/>
-<unit_mask mask="8" desc="(M)ESI: Modified"/>
-<unit_mask mask="4" desc="M(E)SI: Exclusive"/>
-<unit_mask mask="2" desc="ME(S)I: Shared"/>
-<unit_mask mask="1" desc="MES(I): Invalid"/>
-</unit_masks>
-</event>
-<event event_name="L2_LD" desc="number of L2 data loads" counter_mask="3" min_count="500">
-<unit_masks default="127">
-<unit_mask mask="192" desc="core: all cores"/>
-<unit_mask mask="64" desc="core: this core"/>
-<unit_mask mask="48" desc="prefetch: all inclusive"/>
-<unit_mask mask="16" desc="prefetch: Hardware prefetch only"/>
-<unit_mask mask="0" desc="prefetch: exclude hardware prefetch"/>
-<unit_mask mask="8" desc="(M)ESI: Modified"/>
-<unit_mask mask="4" desc="M(E)SI: Exclusive"/>
-<unit_mask mask="2" desc="ME(S)I: Shared"/>
-<unit_mask mask="1" desc="MES(I): Invalid"/>
-</unit_masks>
-</event>
-<event event_name="L2_ST" desc="number of L2 data stores" counter_mask="3" min_count="500">
-<unit_masks default="79">
-<unit_mask mask="192" desc="core: all cores"/>
-<unit_mask mask="64" desc="core: this core"/>
-<unit_mask mask="8" desc="(M)ESI: Modified"/>
-<unit_mask mask="4" desc="M(E)SI: Exclusive"/>
-<unit_mask mask="2" desc="ME(S)I: Shared"/>
-<unit_mask mask="1" desc="MES(I): Invalid"/>
-</unit_masks>
-</event>
-<event event_name="L2_LOCK" desc="number of locked L2 data accesses" counter_mask="3" min_count="500">
-<unit_masks default="79">
-<unit_mask mask="192" desc="core: all cores"/>
-<unit_mask mask="64" desc="core: this core"/>
-<unit_mask mask="8" desc="(M)ESI: Modified"/>
-<unit_mask mask="4" desc="M(E)SI: Exclusive"/>
-<unit_mask mask="2" desc="ME(S)I: Shared"/>
-<unit_mask mask="1" desc="MES(I): Invalid"/>
-</unit_masks>
-</event>
-<event event_name="L2_REJECT_BUSQ" desc="Rejected L2 cache requests" counter_mask="3" min_count="500">
-<unit_masks default="127">
-<unit_mask mask="192" desc="core: all cores"/>
-<unit_mask mask="64" desc="core: this core"/>
-<unit_mask mask="48" desc="prefetch: all inclusive"/>
-<unit_mask mask="16" desc="prefetch: Hardware prefetch only"/>
-<unit_mask mask="0" desc="prefetch: exclude hardware prefetch"/>
-<unit_mask mask="8" desc="(M)ESI: Modified"/>
-<unit_mask mask="4" desc="M(E)SI: Exclusive"/>
-<unit_mask mask="2" desc="ME(S)I: Shared"/>
-<unit_mask mask="1" desc="MES(I): Invalid"/>
-</unit_masks>
-</event>
-<event event_name="L2_NO_REQ" desc="Cycles no L2 cache requests are pending" counter_mask="3" min_count="500">
-<unit_masks default="64">
-<unit_mask mask="192" desc="All cores"/>
-<unit_mask mask="64" desc="This core"/>
-</unit_masks>
-</event>
-<event event_name="EIST_TRANS_ALL" desc="Intel(tm) Enhanced SpeedStep(r) Technology transitions" counter_mask="3" min_count="500"/>
-<event event_name="THERMAL_TRIP" desc="Number of thermal trips" counter_mask="3" min_count="500">
-<unit_masks default="192">
-<unit_mask mask="192" desc="No unit mask"/>
-</unit_masks>
-</event>
-<event event_name="L1D_CACHE_LD" desc="L1 cacheable data read operations" counter_mask="3" min_count="500">
-<unit_masks default="15">
-<unit_mask mask="8" desc="(M)ESI: Modified"/>
-<unit_mask mask="4" desc="M(E)SI: Exclusive"/>
-<unit_mask mask="2" desc="ME(S)I: Shared"/>
-<unit_mask mask="1" desc="MES(I): Invalid"/>
-</unit_masks>
-</event>
-<event event_name="L1D_CACHE_ST" desc="L1 cacheable data write operations" counter_mask="3" min_count="500">
-<unit_masks default="15">
-<unit_mask mask="8" desc="(M)ESI: Modified"/>
-<unit_mask mask="4" desc="M(E)SI: Exclusive"/>
-<unit_mask mask="2" desc="ME(S)I: Shared"/>
-<unit_mask mask="1" desc="MES(I): Invalid"/>
-</unit_masks>
-</event>
-<event event_name="L1D_CACHE_LOCK" desc="L1 cacheable lock read operations" counter_mask="3" min_count="500">
-<unit_masks default="15">
-<unit_mask mask="8" desc="(M)ESI: Modified"/>
-<unit_mask mask="4" desc="M(E)SI: Exclusive"/>
-<unit_mask mask="2" desc="ME(S)I: Shared"/>
-<unit_mask mask="1" desc="MES(I): Invalid"/>
-</unit_masks>
-</event>
-<event event_name="L1D_CACHE_LOCK_DURATION" desc="Duration of L1 data cacheable locked operations" counter_mask="3" min_count="500">
-<unit_masks default="16">
-<unit_mask mask="16" desc="No unit mask"/>
-</unit_masks>
-</event>
-<event event_name="L1D_ALL_REF" desc="All references to the L1 data cache" counter_mask="3" min_count="500">
-<unit_masks default="16">
-<unit_mask mask="16" desc="No unit mask"/>
-</unit_masks>
-</event>
-<event event_name="L1D_ALL_CACHE_REF" desc="L1 data cacheable reads and writes" counter_mask="3" min_count="500">
-<unit_masks default="2">
-<unit_mask mask="2" desc="No unit mask"/>
-</unit_masks>
-</event>
-<event event_name="L1D_REPL" desc="Cache lines allocated in the L1 data cache" counter_mask="3" min_count="500">
-<unit_masks default="15">
-<unit_mask mask="15" desc="No unit mask"/>
-</unit_masks>
-</event>
-<event event_name="L1D_M_REPL" desc="Modified cache lines allocated in the L1 data cache" counter_mask="3" min_count="500"/>
-<event event_name="L1D_M_EVICT" desc="Modified cache lines evicted from the L1 data cache" counter_mask="3" min_count="500"/>
-<event event_name="L1D_PEND_MISS" desc="Total number of outstanding L1 data cache misses at any cycle" counter_mask="3" min_count="500"/>
-<event event_name="L1D_SPLIT" desc="Cache line split load/stores" counter_mask="3" min_count="500">
-<unit_masks default="1">
-<unit_mask mask="1" desc="split loads"/>
-<unit_mask mask="2" desc="split stores"/>
-</unit_masks>
-</event>
-<event event_name="SSE_PREF_MISS" desc="SSE instructions that missed all caches" counter_mask="3" min_count="500">
-<unit_masks default="0">
-<unit_mask mask="0" desc="PREFETCHNTA"/>
-<unit_mask mask="1" desc="PREFETCHT0"/>
-<unit_mask mask="2" desc="PREFETCHT1/PREFETCHT2"/>
-</unit_masks>
-</event>
-<event event_name="LOAD_HIT_PRE" desc="Load operations conflicting with a software prefetch to the same address" counter_mask="3" min_count="500"/>
-<event event_name="L1D_PREFETCH" desc="L1 data cache prefetch requests" counter_mask="3" min_count="500">
-<unit_masks default="16">
-<unit_mask mask="16" desc="No unit mask"/>
-</unit_masks>
-</event>
-<event event_name="BUS_REQ_OUTSTANDING" desc="Outstanding cacheable data read bus requests duration" counter_mask="3" min_count="500">
-<unit_masks default="64">
-<unit_mask mask="192" desc="core: all cores"/>
-<unit_mask mask="64" desc="core: this core"/>
-<unit_mask mask="0" desc="bus: this agent"/>
-<unit_mask mask="32" desc="bus: include all agents"/>
-</unit_masks>
-</event>
-<event event_name="BUS_BNR_DRV" desc="Number of Bus Not Ready signals asserted" counter_mask="3" min_count="500">
-<unit_masks default="0">
-<unit_mask mask="0" desc="this agent"/>
-<unit_mask mask="32" desc="include all agents"/>
-</unit_masks>
-</event>
-<event event_name="BUS_DRDY_CLOCKS" desc="Bus cycles when data is sent on the bus" counter_mask="3" min_count="500">
-<unit_masks default="0">
-<unit_mask mask="0" desc="this agent"/>
-<unit_mask mask="32" desc="include all agents"/>
-</unit_masks>
-</event>
-<event event_name="BUS_LOCK_CLOCKS" desc="Bus cycles when a LOCK signal is asserted" counter_mask="3" min_count="500">
-<unit_masks default="64">
-<unit_mask mask="192" desc="core: all cores"/>
-<unit_mask mask="64" desc="core: this core"/>
-<unit_mask mask="0" desc="bus: this agent"/>
-<unit_mask mask="32" desc="bus: include all agents"/>
-</unit_masks>
-</event>
-<event event_name="BUS_DATA_RCV" desc="Bus cycles while processor receives data" counter_mask="3" min_count="500">
-<unit_masks default="64">
-<unit_mask mask="192" desc="core: all cores"/>
-<unit_mask mask="64" desc="core: this core"/>
-<unit_mask mask="0" desc="bus: this agent"/>
-<unit_mask mask="32" desc="bus: include all agents"/>
-</unit_masks>
-</event>
-<event event_name="BUS_TRAN_BRD" desc="Burst read bus transactions" counter_mask="3" min_count="500">
-<unit_masks default="64">
-<unit_mask mask="192" desc="core: all cores"/>
-<unit_mask mask="64" desc="core: this core"/>
-<unit_mask mask="0" desc="bus: this agent"/>
-<unit_mask mask="32" desc="bus: include all agents"/>
-</unit_masks>
-</event>
-<event event_name="BUS_TRAN_RFO" desc="number of completed read for ownership transactions" counter_mask="3" min_count="500">
-<unit_masks default="64">
-<unit_mask mask="192" desc="core: all cores"/>
-<unit_mask mask="64" desc="core: this core"/>
-<unit_mask mask="0" desc="bus: this agent"/>
-<unit_mask mask="32" desc="bus: include all agents"/>
-</unit_masks>
-</event>
-<event event_name="BUS_TRAN_WB" desc="number of explicit writeback bus transactions" counter_mask="3" min_count="500">
-<unit_masks default="64">
-<unit_mask mask="192" desc="core: all cores"/>
-<unit_mask mask="64" desc="core: this core"/>
-<unit_mask mask="0" desc="bus: this agent"/>
-<unit_mask mask="32" desc="bus: include all agents"/>
-</unit_masks>
-</event>
-<event event_name="BUS_TRAN_IFETCH" desc="number of instruction fetch transactions" counter_mask="3" min_count="500">
-<unit_masks default="64">
-<unit_mask mask="192" desc="core: all cores"/>
-<unit_mask mask="64" desc="core: this core"/>
-<unit_mask mask="0" desc="bus: this agent"/>
-<unit_mask mask="32" desc="bus: include all agents"/>
-</unit_masks>
-</event>
-<event event_name="BUS_TRAN_INVAL" desc="number of invalidate transactions" counter_mask="3" min_count="500">
-<unit_masks default="64">
-<unit_mask mask="192" desc="core: all cores"/>
-<unit_mask mask="64" desc="core: this core"/>
-<unit_mask mask="0" desc="bus: this agent"/>
-<unit_mask mask="32" desc="bus: include all agents"/>
-</unit_masks>
-</event>
-<event event_name="BUS_TRAN_PWR" desc="number of partial write bus transactions" counter_mask="3" min_count="500">
-<unit_masks default="64">
-<unit_mask mask="192" desc="core: all cores"/>
-<unit_mask mask="64" desc="core: this core"/>
-<unit_mask mask="0" desc="bus: this agent"/>
-<unit_mask mask="32" desc="bus: include all agents"/>
-</unit_masks>
-</event>
-<event event_name="BUS_TRANS_P" desc="number of partial bus transactions" counter_mask="3" min_count="500">
-<unit_masks default="64">
-<unit_mask mask="192" desc="core: all cores"/>
-<unit_mask mask="64" desc="core: this core"/>
-<unit_mask mask="0" desc="bus: this agent"/>
-<unit_mask mask="32" desc="bus: include all agents"/>
-</unit_masks>
-</event>
-<event event_name="BUS_TRANS_IO" desc="number of I/O bus transactions" counter_mask="3" min_count="500">
-<unit_masks default="64">
-<unit_mask mask="192" desc="core: all cores"/>
-<unit_mask mask="64" desc="core: this core"/>
-<unit_mask mask="0" desc="bus: this agent"/>
-<unit_mask mask="32" desc="bus: include all agents"/>
-</unit_masks>
-</event>
-<event event_name="BUS_TRANS_DEF" desc="number of completed defer transactions" counter_mask="3" min_count="500">
-<unit_masks default="64">
-<unit_mask mask="192" desc="core: all cores"/>
-<unit_mask mask="64" desc="core: this core"/>
-<unit_mask mask="0" desc="bus: this agent"/>
-<unit_mask mask="32" desc="bus: include all agents"/>
-</unit_masks>
-</event>
-<event event_name="BUS_TRAN_BURST" desc="number of completed burst transactions" counter_mask="3" min_count="500">
-<unit_masks default="64">
-<unit_mask mask="192" desc="core: all cores"/>
-<unit_mask mask="64" desc="core: this core"/>
-<unit_mask mask="0" desc="bus: this agent"/>
-<unit_mask mask="32" desc="bus: include all agents"/>
-</unit_masks>
-</event>
-<event event_name="BUS_TRAN_MEM" desc="number of completed memory transactions" counter_mask="3" min_count="500">
-<unit_masks default="64">
-<unit_mask mask="192" desc="core: all cores"/>
-<unit_mask mask="64" desc="core: this core"/>
-<unit_mask mask="0" desc="bus: this agent"/>
-<unit_mask mask="32" desc="bus: include all agents"/>
-</unit_masks>
-</event>
-<event event_name="BUS_TRAN_ANY" desc="number of any completed bus transactions" counter_mask="3" min_count="500">
-<unit_masks default="64">
-<unit_mask mask="192" desc="core: all cores"/>
-<unit_mask mask="64" desc="core: this core"/>
-<unit_mask mask="0" desc="bus: this agent"/>
-<unit_mask mask="32" desc="bus: include all agents"/>
-</unit_masks>
-</event>
-<event event_name="EXT_SNOOP" desc="External snoops" counter_mask="3" min_count="500">
-<unit_masks default="11">
-<unit_mask mask="0" desc="bus: this agent"/>
-<unit_mask mask="32" desc="bus: include all agents"/>
-<unit_mask mask="8" desc="snoop: HITM snoops"/>
-<unit_mask mask="2" desc="snoop: HIT snoops"/>
-<unit_mask mask="1" desc="snoop: CLEAN snoops"/>
-</unit_masks>
-</event>
-<event event_name="CMP_SNOOP" desc="L1 data cache is snooped by other core" counter_mask="3" min_count="500">
-<unit_masks default="64">
-<unit_mask mask="192" desc="core: all cores"/>
-<unit_mask mask="64" desc="core: this core"/>
-<unit_mask mask="1" desc="snoop: CMP2I snoops"/>
-<unit_mask mask="2" desc="snoop: CMP2S snoops"/>
-</unit_masks>
-</event>
-<event event_name="BUS_HIT_DRV" desc="HIT signal asserted" counter_mask="3" min_count="500">
-<unit_masks default="0">
-<unit_mask mask="0" desc="this agent"/>
-<unit_mask mask="32" desc="include all agents"/>
-</unit_masks>
-</event>
-<event event_name="BUS_HITM_DRV" desc="HITM signal asserted" counter_mask="3" min_count="500">
-<unit_masks default="0">
-<unit_mask mask="0" desc="this agent"/>
-<unit_mask mask="32" desc="include all agents"/>
-</unit_masks>
-</event>
-<event event_name="BUSQ_EMPTY" desc="Bus queue is empty" counter_mask="3" min_count="500">
-<unit_masks default="64">
-<unit_mask mask="192" desc="All cores"/>
-<unit_mask mask="64" desc="This core"/>
-</unit_masks>
-</event>
-<event event_name="SNOOP_STALL_DRV" desc="Bus stalled for snoops" counter_mask="3" min_count="500">
-<unit_masks default="64">
-<unit_mask mask="192" desc="core: all cores"/>
-<unit_mask mask="64" desc="core: this core"/>
-<unit_mask mask="0" desc="bus: this agent"/>
-<unit_mask mask="32" desc="bus: include all agents"/>
-</unit_masks>
-</event>
-<event event_name="BUS_IO_WAIT" desc="IO requests waiting in the bus queue" counter_mask="3" min_count="500">
-<unit_masks default="64">
-<unit_mask mask="192" desc="All cores"/>
-<unit_mask mask="64" desc="This core"/>
-</unit_masks>
-</event>
-<event event_name="L1I_READS" desc="number of instruction fetches" counter_mask="3" min_count="500"/>
-<event event_name="L1I_MISSES" desc="number of instruction fetch misses" counter_mask="3" min_count="500"/>
-<event event_name="ITLB" desc="number of ITLB misses" counter_mask="3" min_count="500">
-<unit_masks default="18">
-<unit_mask mask="2" desc="ITLB small page misses"/>
-<unit_mask mask="16" desc="ITLB large page misses"/>
-<unit_mask mask="64" desc="ITLB flushes"/>
-</unit_masks>
-</event>
-<event event_name="INST_QUEUE_FULL" desc="cycles during which the instruction queue is full" counter_mask="3" min_count="500">
-<unit_masks default="2">
-<unit_mask mask="2" desc="No unit mask"/>
-</unit_masks>
-</event>
-<event event_name="IFU_MEM_STALL" desc="cycles instruction fetch pipe is stalled" counter_mask="3" min_count="500"/>
-<event event_name="ILD_STALL" desc="cycles instruction length decoder is stalled" counter_mask="3" min_count="500"/>
-<event event_name="BR_INST_EXEC" desc="Branch instructions executed (not necessarily retired)" counter_mask="3" min_count="3000"/>
-<event event_name="BR_MISSP_EXEC" desc="Branch instructions executed that were mispredicted at execution" counter_mask="3" min_count="3000"/>
-<event event_name="BR_BAC_MISSP_EXEC" desc="Branch instructions executed that were mispredicted at Front End (BAC)" counter_mask="3" min_count="3000"/>
-<event event_name="BR_CND_EXEC" desc="Conditional Branch instructions executed" counter_mask="3" min_count="3000"/>
-<event event_name="BR_CND_MISSP_EXEC" desc="Conditional Branch instructions executed that were mispredicted" counter_mask="3" min_count="3000"/>
-<event event_name="BR_IND_EXEC" desc="Indirect Branch instructions executed" counter_mask="3" min_count="3000"/>
-<event event_name="BR_IND_MISSP_EXEC" desc="Indirect Branch instructions executed that were mispredicted" counter_mask="3" min_count="3000"/>
-<event event_name="BR_RET_EXEC" desc="Return Branch instructions executed" counter_mask="3" min_count="3000"/>
-<event event_name="BR_RET_MISSP_EXEC" desc="Return Branch instructions executed that were mispredicted at Execution" counter_mask="3" min_count="3000"/>
-<event event_name="BR_RET_BAC_MISSP_EXEC" desc="Branch instructions executed that were mispredicted at Front End (BAC)" counter_mask="3" min_count="3000"/>
-<event event_name="BR_CALL_EXEC" desc="CALL instruction executed" counter_mask="3" min_count="3000"/>
-<event event_name="BR_CALL_MISSP_EXEC" desc="CALL instruction executed and miss predicted" counter_mask="3" min_count="3000"/>
-<event event_name="BR_IND_CALL_EXEC" desc="Indirect CALL instruction executed" counter_mask="3" min_count="3000"/>
-<event event_name="BR_TKN_BUBBLE_1" desc="Branch predicted taken with bubble 1" counter_mask="3" min_count="3000"/>
-<event event_name="BR_TKN_BUBBLE_2" desc="Branch predicted taken with bubble 2" counter_mask="3" min_count="3000"/>
-<event event_name="RS_UOPS_DISPATCHED" desc="Micro-ops dispatched for execution" counter_mask="3" min_count="1000"/>
-<event event_name="RS_UOPS_DISPATCHED_NONE" desc="No Micro-ops dispatched for execution" counter_mask="3" min_count="1000"/>
-<event event_name="MACRO_INSTS" desc="instructions decoded" counter_mask="3" min_count="500">
-<unit_masks default="9">
-<unit_mask mask="1" desc="Instructions decoded"/>
-<unit_mask mask="8" desc="CISC Instructions decoded"/>
-</unit_masks>
-</event>
-<event event_name="ESP" desc="ESP register events" counter_mask="3" min_count="500">
-<unit_masks default="1">
-<unit_mask mask="1" desc="ESP register content synchronizations"/>
-<unit_mask mask="2" desc="ESP register automatic additions"/>
-</unit_masks>
-</event>
-<event event_name="SIMD_UOPS_EXEC" desc="SIMD micro-ops executed (excluding stores)" counter_mask="3" min_count="500"/>
-<event event_name="SIMD_SAT_UOP_EXEC" desc="number of SIMD saturating instructions executed" counter_mask="3" min_count="3000"/>
-<event event_name="SIMD_UOP_TYPE_EXEC" desc="number of SIMD packing instructions" counter_mask="3" min_count="3000">
-<unit_masks default="63">
-<unit_mask mask="1" desc="SIMD packed multiplies"/>
-<unit_mask mask="2" desc="SIMD packed shifts"/>
-<unit_mask mask="4" desc="SIMD pack operations"/>
-<unit_mask mask="8" desc="SIMD unpack operations"/>
-<unit_mask mask="16" desc="SIMD packed logical"/>
-<unit_mask mask="32" desc="SIMD packed arithmetic"/>
-<unit_mask mask="63" desc="all of the above"/>
-</unit_masks>
-</event>
-<event event_name="INST_RETIRED" desc="number of instructions retired" counter_mask="3" min_count="6000">
-<unit_masks default="0">
-<unit_mask mask="0" desc="Any"/>
-<unit_mask mask="1" desc="Loads"/>
-<unit_mask mask="2" desc="Stores"/>
-<unit_mask mask="4" desc="Other"/>
-</unit_masks>
-</event>
-<event event_name="X87_OPS_RETIRED" desc="number of computational FP operations retired" counter_mask="3" min_count="500">
-<unit_masks default="254">
-<unit_mask mask="1" desc="FXCH instructions retired"/>
-<unit_mask mask="254" desc="Retired floating-point computational operations (precise)"/>
-</unit_masks>
-</event>
-<event event_name="UOPS_RETIRED" desc="number of UOPs retired" counter_mask="3" min_count="6000">
-<unit_masks default="15">
-<unit_mask mask="1" desc="Fused load+op or load+indirect branch retired"/>
-<unit_mask mask="2" desc="Fused store address + data retired"/>
-<unit_mask mask="4" desc="Retired instruction pairs fused into one micro-op"/>
-<unit_mask mask="7" desc="Fused micro-ops retired"/>
-<unit_mask mask="8" desc="Non-fused micro-ops retired"/>
-<unit_mask mask="15" desc="Micro-ops retired"/>
-</unit_masks>
-</event>
-<event event_name="MACHINE_NUKES_SMC" desc="number of pipeline flushing events" counter_mask="3" min_count="500">
-<unit_masks default="5">
-<unit_mask mask="1" desc="Self-Modifying Code detected"/>
-<unit_mask mask="4" desc="Execution pipeline restart due to memory ordering conflict or memory disambiguation misprediction"/>
-</unit_masks>
-</event>
-<event event_name="BR_INST_RETIRED" desc="number of branch instructions retired" counter_mask="3" min_count="500">
-<unit_masks default="10">
-<unit_mask mask="1" desc="predicted not-taken"/>
-<unit_mask mask="2" desc="mispredicted not-taken"/>
-<unit_mask mask="4" desc="predicted taken"/>
-<unit_mask mask="8" desc="mispredicted taken"/>
-</unit_masks>
-</event>
-<event event_name="BR_MISS_PRED_RETIRED" desc="number of mispredicted branches retired (precise)" counter_mask="3" min_count="500"/>
-<event event_name="CYCLES_INT_MASKED" desc="cycles interrupts are disabled" counter_mask="3" min_count="500">
-<unit_masks default="2">
-<unit_mask mask="1" desc="Interrupts disabled"/>
-<unit_mask mask="2" desc="Interrupts pending and disabled"/>
-</unit_masks>
-</event>
-<event event_name="SIMD_INST_RETIRED" desc="SSE/SSE2 instructions retired" counter_mask="3" min_count="500">
-<unit_masks default="31">
-<unit_mask mask="1" desc="Retired SSE packed-single instructions"/>
-<unit_mask mask="2" desc="Retired SSE scalar-single instructions"/>
-<unit_mask mask="4" desc="Retired SSE2 packed-double instructions"/>
-<unit_mask mask="8" desc="Retired SSE2 scalar-double instructions"/>
-<unit_mask mask="16" desc="Retired SSE2 vector integer instructions"/>
-<unit_mask mask="31" desc="Retired Streaming SIMD instructions (precise event)"/>
-</unit_masks>
-</event>
-<event event_name="HW_INT_RCV" desc="number of hardware interrupts received" counter_mask="3" min_count="500"/>
-<event event_name="ITLB_MISS_RETIRED" desc="Retired instructions that missed the ITLB" counter_mask="1" min_count="500"/>
-<event event_name="SIMD_COMP_INST_RETIRED" desc="Retired computational SSE/SSE2 instructions" counter_mask="3" min_count="500">
-<unit_masks default="15">
-<unit_mask mask="1" desc="Retired computational SSE packed-single instructions"/>
-<unit_mask mask="2" desc="Retired computational SSE scalar-single instructions"/>
-<unit_mask mask="4" desc="Retired computational SSE2 packed-double instructions"/>
-<unit_mask mask="8" desc="Retired computational SSE2 scalar-double instructions"/>
-</unit_masks>
-</event>
-<event event_name="MEM_LOAD_RETIRED" desc="Retired loads" counter_mask="1" min_count="500">
-<unit_masks default="1">
-<unit_mask mask="1" desc="Retired loads that miss the L1 data cache (precise event)"/>
-<unit_mask mask="2" desc="L1 data cache line missed by retired loads (precise event)"/>
-<unit_mask mask="4" desc="Retired loads that miss the L2 cache (precise event)"/>
-<unit_mask mask="8" desc="L2 cache line missed by retired loads (precise event)"/>
-<unit_mask mask="16" desc="Retired loads that miss the DTLB (precise event)"/>
-</unit_masks>
-</event>
-<event event_name="FP_MMX_TRANS" desc="MMX-floating point transitions" counter_mask="3" min_count="3000">
-<unit_masks default="3">
-<unit_mask mask="1" desc="float->MMX transitions"/>
-<unit_mask mask="2" desc="MMX->float transitions"/>
-</unit_masks>
-</event>
-<event event_name="MMX_ASSIST" desc="number of EMMS instructions executed" counter_mask="3" min_count="500"/>
-<event event_name="SIMD_INSTR_RET" desc="number of SIMD instructions retired" counter_mask="3" min_count="500"/>
-<event event_name="SIMD_SAT_INSTR_RET" desc="number of saturated arithmetic instructions retired" counter_mask="3" min_count="500"/>
-<event event_name="RAT_STALLS" desc="Partial register stall cycles" counter_mask="3" min_count="6000">
-<unit_masks default="15">
-<unit_mask mask="1" desc="ROB read port"/>
-<unit_mask mask="2" desc="Partial register"/>
-<unit_mask mask="4" desc="Flag"/>
-<unit_mask mask="8" desc="FPU status word"/>
-<unit_mask mask="15" desc="All RAT"/>
-</unit_masks>
-</event>
-<event event_name="SEG_RENAME_STALLS" desc="Segment rename stalls" counter_mask="3" min_count="500">
-<unit_masks default="15">
-<unit_mask mask="1" desc="ES"/>
-<unit_mask mask="2" desc="DS"/>
-<unit_mask mask="4" desc="FS"/>
-<unit_mask mask="8" desc="GS"/>
-</unit_masks>
-</event>
-<event event_name="SEG_RENAMES" desc="Segment renames" counter_mask="3" min_count="500">
-<unit_masks default="15">
-<unit_mask mask="1" desc="ES"/>
-<unit_mask mask="2" desc="DS"/>
-<unit_mask mask="4" desc="FS"/>
-<unit_mask mask="8" desc="GS"/>
-</unit_masks>
-</event>
-<event event_name="RESOURCE_STALLS" desc="Cycles during which resource stalls occur" counter_mask="3" min_count="3000">
-<unit_masks default="15">
-<unit_mask mask="1" desc="when the ROB is full"/>
-<unit_mask mask="2" desc="during which the RS is full"/>
-<unit_mask mask="4" desc="during which the pipeline has exceeded the load or store limit or is waiting to commit all stores"/>
-<unit_mask mask="8" desc="due to FPU control word write"/>
-<unit_mask mask="16" desc="due to branch misprediction"/>
-</unit_masks>
-</event>
-<event event_name="BR_INST_DECODED" desc="number of branch instructions decoded" counter_mask="3" min_count="500"/>
-<event event_name="BR_BOGUS" desc="number of bogus branches" counter_mask="3" min_count="500"/>
-<event event_name="BACLEARS" desc="number of times BACLEAR is asserted" counter_mask="3" min_count="500"/>
-<event event_name="PREF_RQSTS_UP" desc="Number of upward prefetches issued" counter_mask="3" min_count="3000"/>
-<event event_name="PREF_RQSTS_DN" desc="Number of downward prefetches issued" counter_mask="3" min_count="3000"/>
-</help_events>
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core.tests/resources/test_model-data.xml b/oprofile/org.eclipse.linuxtools.oprofile.core.tests/resources/test_model-data.xml
deleted file mode 100644
index 7a0341ce1c51608e5aec9139bcc6d395c4275a97..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.core.tests/resources/test_model-data.xml
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<model-data>
- <image name="/test/path/for/image" count="205000">
- <symbols>
- <symbol name="TestFunction1(int)" file="/test/path/for/src/image.cpp" line="1" count="180000">
- <sample>
- <count>130000</count>
- <file>/test/path/for/src/image.cpp</file>
- <line>42</line>
- </sample>
- <sample>
- <count>40000</count>
- <file>/test/path/for/src/image.cpp</file>
- <line>36</line>
- </sample>
- <sample>
- <count>9999</count>
- <file>/test/path/for/src/image.cpp</file>
- <line>31</line>
- </sample>
- <sample>
- <count>1</count>
- <file>/test/path/for/src/image.cpp</file>
- <line>39</line>
- </sample>
- </symbol>
- <symbol name="TestFunction2(int, int)" file="/test/path/for/src/image2.cpp" line="50" count="20000">
- <sample>
- <count>19998</count>
- <file>/test/path/for/src/image2.cpp</file>
- <line>94</line>
- </sample>
- <sample>
- <count>1</count>
- <file>/test/path/for/src/image2.cpp</file>
- <line>12</line>
- </sample>
- <sample>
- <count>1</count>
- <file>/test/path/for/src/image2.cpp</file>
- <line>55</line>
- </sample>
- </symbol>
- </symbols>
- <dependent count="5000">
- <image name="/no-vmlinux" count="4400">
- </image>
- <image name="/lib64/ld-2.9.so" count="300">
- <symbols>
- <symbol name="do_lookup_x" file="dl-lookup.c" line="0" count="299">
- <sample>
- <count>299</count>
- <file>dl-lookup.c</file>
- <line>0</line>
- </sample>
- </symbol>
- <symbol name="_dl_unload_cache" file="rawmemchr.c" line="0" count="1">
- <sample>
- <count>1</count>
- <file>rawmemchr.c</file>
- <line>0</line>
- </sample>
- </symbol>
- </symbols>
- </image>
- <image name="/usr/lib64/libstdc++.so.6.0.10" count="160">
- </image>
- <image name="/lib64/libc-2.9.so" count="140">
- <symbols>
- <symbol name="_IO_new_file_seekoff" file="" line="0" count="100">
- <sample>
- <count>100</count>
- <file></file>
- <line>0</line>
- </sample>
- </symbol>
- <symbol name="bool std::operator!=<char, std::char_traits<char>, std::allocator<char> >(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, char const*)" file="" line="0" count="40">
- <sample>
- <count>40</count>
- <file></file>
- <line>0</line>
- </sample>
- </symbol>
- </symbols>
- </image>
- </dependent>
- </image>
-</model-data>
\ No newline at end of file
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core.tests/resources/test_model-data_expected.xml b/oprofile/org.eclipse.linuxtools.oprofile.core.tests/resources/test_model-data_expected.xml
deleted file mode 100644
index 4bf16276771baedc38d3113c5a7ea460a595e589..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.core.tests/resources/test_model-data_expected.xml
+++ /dev/null
@@ -1,403 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<model-data>
- <image name="/home/rgrunber/runtime-EclipseApplication/archer/gdb/gdb" count="176">
- <symbols>
- <symbol name="d_demangle" file="??" count="26">
- <sample>
- <count>26</count>
- <line>0</line>
- </sample>
- </symbol>
- <symbol name="gnu_special" file="??" count="9">
- <sample>
- <count>9</count>
- <line>0</line>
- </sample>
- </symbol>
- <symbol name="htab_hash_string" file="??" count="9">
- <sample>
- <count>9</count>
- <line>0</line>
- </sample>
- </symbol>
- <symbol name="add_minsym_to_hash_table" file="??" count="7">
- <sample>
- <count>7</count>
- <line>0</line>
- </sample>
- </symbol>
- <symbol name="bfd_elf_string_from_elf_section" file="??" count="7">
- <sample>
- <count>7</count>
- <line>0</line>
- </sample>
- </symbol>
- <symbol name="internal_cplus_demangle" file="??" count="7">
- <sample>
- <count>7</count>
- <line>0</line>
- </sample>
- </symbol>
- <symbol name="bfd_elf32_swap_symbol_in" file="??" count="6">
- <sample>
- <count>6</count>
- <line>0</line>
- </sample>
- </symbol>
- <symbol name="eq_demangled_name_entry" file="??" count="6">
- <sample>
- <count>6</count>
- <line>0</line>
- </sample>
- </symbol>
- <symbol name="find_methods" file="??" count="6">
- <sample>
- <count>6</count>
- <line>0</line>
- </sample>
- </symbol>
- <symbol name="prim_record_minimal_symbol_full" file="??" count="6">
- <sample>
- <count>6</count>
- <line>0</line>
- </sample>
- </symbol>
- <symbol name="symbol_set_names" file="??" count="6">
- <sample>
- <count>6</count>
- <line>0</line>
- </sample>
- </symbol>
- <symbol name="bfd_elf32_slurp_symbol_table" file="??" count="5">
- <sample>
- <count>5</count>
- <line>0</line>
- </sample>
- </symbol>
- <symbol name="cplus_demangle" file="??" count="4">
- <sample>
- <count>4</count>
- <line>0</line>
- </sample>
- </symbol>
- <symbol name="htab_find_slot_with_hash" file="??" count="4">
- <sample>
- <count>4</count>
- <line>0</line>
- </sample>
- </symbol>
- <symbol name="compare_minimal_symbols" file="??" count="3">
- <sample>
- <count>3</count>
- <line>0</line>
- </sample>
- </symbol>
- <symbol name="d_demangle_callback" file="??" count="3">
- <sample>
- <count>3</count>
- <line>0</line>
- </sample>
- </symbol>
- <symbol name="elf_symtab_read" file="??" count="3">
- <sample>
- <count>3</count>
- <line>0</line>
- </sample>
- </symbol>
- <symbol name="obsavestring" file="??" count="3">
- <sample>
- <count>3</count>
- <line>0</line>
- </sample>
- </symbol>
- <symbol name="bfd_bread" file="??" count="2">
- <sample>
- <count>2</count>
- <line>0</line>
- </sample>
- </symbol>
- <symbol name="bfd_getl16" file="??" count="2">
- <sample>
- <count>2</count>
- <line>0</line>
- </sample>
- </symbol>
- <symbol name="bfd_section_from_elf_index" file="??" count="2">
- <sample>
- <count>2</count>
- <line>0</line>
- </sample>
- </symbol>
- <symbol name="find_pc_partial_function" file="??" count="2">
- <sample>
- <count>2</count>
- <line>0</line>
- </sample>
- </symbol>
- <symbol name="get_objfile_arch" file="??" count="2">
- <sample>
- <count>2</count>
- <line>0</line>
- </sample>
- </symbol>
- <symbol name="htab_expand" file="??" count="2">
- <sample>
- <count>2</count>
- <line>0</line>
- </sample>
- </symbol>
- <symbol name="regcache_raw_supply" file="??" count="2">
- <sample>
- <count>2</count>
- <line>0</line>
- </sample>
- </symbol>
- <symbol name="symbol_init_language_specific" file="??" count="2">
- <sample>
- <count>2</count>
- <line>0</line>
- </sample>
- </symbol>
- <symbol name="_initialize_mi_cmds" file="??" count="1">
- <sample>
- <count>1</count>
- <line>0</line>
- </sample>
- </symbol>
- <symbol name="add_cmd" file="??" count="1">
- <sample>
- <count>1</count>
- <line>0</line>
- </sample>
- </symbol>
- <symbol name="allocate_bp_location" file="??" count="1">
- <sample>
- <count>1</count>
- <line>0</line>
- </sample>
- </symbol>
- <symbol name="bfd_elf32_object_p" file="??" count="1">
- <sample>
- <count>1</count>
- <line>0</line>
- </sample>
- </symbol>
- <symbol name="bfd_getl32" file="??" count="1">
- <sample>
- <count>1</count>
- <line>0</line>
- </sample>
- </symbol>
- <symbol name="bfd_section_hash_newfunc" file="??" count="1">
- <sample>
- <count>1</count>
- <line>0</line>
- </sample>
- </symbol>
- <symbol name="build_minimal_symbol_hash_tables" file="??" count="1">
- <sample>
- <count>1</count>
- <line>0</line>
- </sample>
- </symbol>
- <symbol name="core_addr_identity" file="??" count="1">
- <sample>
- <count>1</count>
- <line>0</line>
- </sample>
- </symbol>
- <symbol name="cpname_lex" file="??" count="1">
- <sample>
- <count>1</count>
- <line>0</line>
- </sample>
- </symbol>
- <symbol name="dwarf2_frame_cache" file="??" count="1">
- <sample>
- <count>1</count>
- <line>0</line>
- </sample>
- </symbol>
- <symbol name="exceptions_state_mc_action_iter_1" file="??" count="1">
- <sample>
- <count>1</count>
- <line>0</line>
- </sample>
- </symbol>
- <symbol name="find_and_open_source" file="??" count="1">
- <sample>
- <count>1</count>
- <line>0</line>
- </sample>
- </symbol>
- <symbol name="find_charset_names" file="??" count="1">
- <sample>
- <count>1</count>
- <line>0</line>
- </sample>
- </symbol>
- <symbol name="find_function_start_sal" file="??" count="1">
- <sample>
- <count>1</count>
- <line>0</line>
- </sample>
- </symbol>
- <symbol name="find_pc_section" file="??" count="1">
- <sample>
- <count>1</count>
- <line>0</line>
- </sample>
- </symbol>
- <symbol name="forget_types" file="??" count="1">
- <sample>
- <count>1</count>
- <line>0</line>
- </sample>
- </symbol>
- <symbol name="gdbarch_has_global_breakpoints" file="??" count="1">
- <sample>
- <count>1</count>
- <line>0</line>
- </sample>
- </symbol>
- <symbol name="gdbarch_smash_text_address" file="??" count="1">
- <sample>
- <count>1</count>
- <line>0</line>
- </sample>
- </symbol>
- <symbol name="hex_string" file="??" count="1">
- <sample>
- <count>1</count>
- <line>0</line>
- </sample>
- </symbol>
- <symbol name="htab_find_slot" file="??" count="1">
- <sample>
- <count>1</count>
- <line>0</line>
- </sample>
- </symbol>
- <symbol name="htab_find_with_hash" file="??" count="1">
- <sample>
- <count>1</count>
- <line>0</line>
- </sample>
- </symbol>
- <symbol name="linux_nat_wait" file="??" count="1">
- <sample>
- <count>1</count>
- <line>0</line>
- </sample>
- </symbol>
- <symbol name="linux_nat_xfer_partial" file="??" count="1">
- <sample>
- <count>1</count>
- <line>0</line>
- </sample>
- </symbol>
- <symbol name="lookup_minimal_symbol_by_pc_section_1" file="??" count="1">
- <sample>
- <count>1</count>
- <line>0</line>
- </sample>
- </symbol>
- <symbol name="lookup_minimal_symbol_text" file="??" count="1">
- <sample>
- <count>1</count>
- <line>0</line>
- </sample>
- </symbol>
- <symbol name="make_cleanup" file="??" count="1">
- <sample>
- <count>1</count>
- <line>0</line>
- </sample>
- </symbol>
- <symbol name="objc_demangle" file="??" count="1">
- <sample>
- <count>1</count>
- <line>0</line>
- </sample>
- </symbol>
- <symbol name="prefixify_expression" file="??" count="1">
- <sample>
- <count>1</count>
- <line>0</line>
- </sample>
- </symbol>
- <symbol name="process_next_line" file="??" count="1">
- <sample>
- <count>1</count>
- <line>0</line>
- </sample>
- </symbol>
- <symbol name="qsort_cmp" file="??" count="1">
- <sample>
- <count>1</count>
- <line>0</line>
- </sample>
- </symbol>
- <symbol name="read_psymtabs_with_filename" file="??" count="1">
- <sample>
- <count>1</count>
- <line>0</line>
- </sample>
- </symbol>
- <symbol name="symbol_natural_name" file="??" count="1">
- <sample>
- <count>1</count>
- <line>0</line>
- </sample>
- </symbol>
- <symbol name="symbol_set_demangled_name" file="??" count="1">
- <sample>
- <count>1</count>
- <line>0</line>
- </sample>
- </symbol>
- <symbol name="target_read_memory" file="??" count="1">
- <sample>
- <count>1</count>
- <line>0</line>
- </sample>
- </symbol>
- <symbol name="target_xfer_partial" file="??" count="1">
- <sample>
- <count>1</count>
- <line>0</line>
- </sample>
- </symbol>
- <symbol name="tdesc_gdb_type" file="??" count="1">
- <sample>
- <count>1</count>
- <line>0</line>
- </sample>
- </symbol>
- <symbol name="tilde_expand" file="??" count="1">
- <sample>
- <count>1</count>
- <line>0</line>
- </sample>
- </symbol>
- <symbol name="update_global_location_list" file="??" count="1">
- <sample>
- <count>1</count>
- <line>0</line>
- </sample>
- </symbol>
- <symbol name="update_solib_list" file="??" count="1">
- <sample>
- <count>1</count>
- <line>0</line>
- </sample>
- </symbol>
- <symbol name="xmalloc" file="??" count="1">
- <sample>
- <count>1</count>
- <line>0</line>
- </sample>
- </symbol>
- </symbols>
- </image>
-</model-data>
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core.tests/resources/test_model-data_multiple_image.xml b/oprofile/org.eclipse.linuxtools.oprofile.core.tests/resources/test_model-data_multiple_image.xml
deleted file mode 100644
index 485a22971814a21d59fbfdcce2e31b349c9420a9..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.core.tests/resources/test_model-data_multiple_image.xml
+++ /dev/null
@@ -1,239 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<model-data>
- <image name="/no-vmlinux" count="6844">
- </image>
- <image name="/bin/grep" count="2">
- </image>
- <image name="/bin/gawk" count="8">
- </image>
- <image name="/bin/bash" count="142">
- </image>
- <image name="/lib64/libgobject-2.0.so.0.1800.3" count="61">
- </image>
- <image name="/lib64/libgio-2.0.so.0.1800.3" count="2">
- </image>
- <image name="/lib64/libdl-2.9.so" count="2">
- <symbols>
- <symbol name="__do_global_dtors_aux" file="crtstuff.c" count="2" line="0">
- <sample>
- <count>2</count>
- <line>0</line>
- </sample>
- </symbol>
- </symbols>
- </image>
- <image name="/lib64/ld-2.9.so" count="36">
- <symbols>
- <symbol name="_dl_start" file="rtld.c" count="1" line="0">
- <sample>
- <count>1</count>
- <line>0</line>
- </sample>
- </symbol>
- <symbol name="dl_main" file="rtld.c" count="3" line="0">
- <sample>
- <count>3</count>
- <file>rtld.c</file>
- <line>0</line>
- </sample>
- </symbol>
- <symbol name="init_tls" file="rtld.c" count="1" line="0">
- <sample>
- <count>1</count>
- <file>rtld.c</file>
- <line>0</line>
- </sample>
- </symbol>
- <symbol name="open_verify" file="dl-load.c" count="2" line="0">
- <sample>
- <count>2</count>
- <file>dl-load.c</file>
- <line>0</line>
- </sample>
- </symbol>
- <symbol name="_dl_setup_hash" file="rawmemchr.c" count="1" line="0">
- <sample>
- <count>1</count>
- <file>rawmemchr.c</file>
- <line>0</line>
- </sample>
- </symbol>
- <symbol name="_dl_init_internal" file="rawmemchr.c" count="1" line="0">
- <sample>
- <count>1</count>
- <file>rawmemchr.c</file>
- <line>0</line>
- </sample>
- </symbol>
- <symbol name="_dl_important_hwcaps" file="rawmemchr.c" count="2" line="0">
- <sample>
- <count>2</count>
- <file>rawmemchr.c</file>
- <line>0</line>
- </sample>
- </symbol>
- <symbol name="munmap" file="rawmemchr.c" count="1" line="0">
- <sample>
- <count>1</count>
- <file>rawmemchr.c</file>
- <line>0</line>
- </sample>
- </symbol>
- <symbol name="_dl_load_cache_lookup" file="rawmemchr.c" count="1" line="0">
- <sample>
- <count>1</count>
- <file>rawmemchr.c</file>
- <line>0</line>
- </sample>
- </symbol>
- <symbol name="_dl_fini" file="rawmemchr.c" count="2" line="0">
- <sample>
- <count>2</count>
- <file>rawmemchr.c</file>
- <line>0</line>
- </sample>
- </symbol>
- <symbol name="__GI_memset" file="rawmemchr.c" count="1" line="0">
- <sample>
- <count>1</count>
- <file>rawmemchr.c</file>
- <line>0</line>
- </sample>
- </symbol>
- <symbol name="_dl_init_paths" file="rawmemchr.c" count="3" line="0">
- <sample>
- <count>3</count>
- <file>rawmemchr.c</file>
- <line>0</line>
- </sample>
- </symbol>
- <symbol name="__brk" file="rawmemchr.c" count="1" line="0">
- <sample>
- <count>1</count>
- <file>rawmemchr.c</file>
- <line>0</line>
- </sample>
- </symbol>
- <symbol name="_dl_name_match_p" file="rawmemchr.c" count="1" line="0">
- <sample>
- <count>1</count>
- <file>rawmemchr.c</file>
- <line>0</line>
- </sample>
- </symbol>
- <symbol name="index" file="rawmemchr.c" count="2" line="0">
- <sample>
- <count>2</count>
- <file>rawmemchr.c</file>
- <line>0</line>
- </sample>
- </symbol>
- <symbol name="_dl_resolve_conflicts" file="rawmemchr.c" count="1" line="0">
- <sample>
- <count>1</count>
- <file>rawmemchr.c</file>
- <line>0</line>
- </sample>
- </symbol>
- <symbol name="_dl_cache_libcmp" file="rawmemchr.c" count="2" line="0">
- <sample>
- <count>2</count>
- <file>rawmemchr.c</file>
- <line>0</line>
- </sample>
- </symbol>
- <symbol name="strcmp" file="rawmemchr.c" count="2" line="0">
- <sample>
- <count>2</count>
- <file>rawmemchr.c</file>
- <line>0</line>
- </sample>
- </symbol>
- <symbol name="_dl_start_user" file="rawmemchr.c" count="1" line="0">
- <sample>
- <count>1</count>
- <file>rawmemchr.c</file>
- <line>0</line>
- </sample>
- </symbol>
- <symbol name="strlen" file="rawmemchr.c" count="1" line="0">
- <sample>
- <count>1</count>
- <file>rawmemchr.c</file>
- <line>0</line>
- </sample>
- </symbol>
- <symbol name="_dl_sort_fini" file="rawmemchr.c" count="1" line="0">
- <sample>
- <count>1</count>
- <file>rawmemchr.c</file>
- <line>0</line>
- </sample>
- </symbol>
- <symbol name="_dl_map_object_deps" file="rawmemchr.c" count="4" line="0">
- <sample>
- <count>4</count>
- <file>rawmemchr.c</file>
- <line>0</line>
- </sample>
- </symbol>
- <symbol name="__libc_memalign" file="" count="1" line="0">
- <sample>
- <count>1</count>
- <file></file>
- <line>0</line>
- </sample>
- </symbol>
- </symbols>
- </image>
- <image name="/lib64/libdbus-1.so.3.4.0" count="10">
- </image>
- <image name="/lib64/libfuse.so.2.7.4" count="1">
- </image>
- <image name="/lib64/libm-2.9.so" count="2">
- <symbols>
- <symbol name="__dubsin" file="interp.c" count="2" line="0">
- <sample>
- <count>2</count>
- <line>0</line>
- </sample>
- </symbol>
- </symbols>
- </image>
- <image name="/lib64/libglib-2.0.so.0.1800.3" count="107">
- </image>
- <image name="/lib64/libgthread-2.0.so.0.1800.3" count="3">
- </image>
- <image name="/usr/bin/which" count="1">
- </image>
- <image name="/usr/bin/compiz" count="21">
- </image>
- <image name="/usr/bin/Xorg" count="154">
- <dependent count="6">
- <image name="[vdso]" count="6">
- </image>
- </dependent>
- </image>
- <image name="/usr/bin/ophelp" count="11">
- </image>
- <image name="/usr/bin/qemu-kvm" count="142">
- <dependent count="1">
- <image name="[vdso]" count="1">
- </image>
- </dependent>
- </image>
- <image name="/usr/bin/oprofiled" count="26">
- </image>
- <image name="/usr/sbin/libvirtd" count="3">
- </image>
- <image name="/usr/libexec/multiload-applet-2" count="1">
- </image>
- <image name="/usr/lib/jvm/java-1.6.0-openjdk-1.6.0.0.x86_64/jre/lib/amd64/server/libjvm.so" count="7">
- </image>
- <image name="/usr/lib64/libgtk-x11-2.0.so.0.1400.5" count="22">
- </image>
- <image name="/usr/lib64/libpangocairo-1.0.so.0.2203.0" count="4">
- </image>
- <image name="/usr/lib64/libXrender.so.1.3.0" count="2">
- </image>
-</model-data>
\ No newline at end of file
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core.tests/resources/test_model-data_raw.xml b/oprofile/org.eclipse.linuxtools.oprofile.core.tests/resources/test_model-data_raw.xml
deleted file mode 100644
index 4bb28843278286a91ef958e3405f3a5af0543b79..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.core.tests/resources/test_model-data_raw.xml
+++ /dev/null
@@ -1,1175 +0,0 @@
-<?xml version="1.0" ?>
-<profile schemaversion="3.0" cputype="i386"
- processor="core_2"
- mhz="1995.00"
- title="opreport -X --details event:CPU_CLK_UNHALTED ">
-<options session="event:CPU_CLK_UNHALTED" details="true"/>
-<setup>
-<eventsetup id="0" eventname="CPU_CLK_UNHALTED" unitmask="0" setupcount="100000"/>
-</setup>
-
-<binary name="/home/rgrunber/runtime-EclipseApplication/archer/gdb/gdb">
-<count>
-176</count>
-<symbol idref="0" detaillo="0" detailhi="11">
-<count>
-26</count>
-</symbol>
-<symbol idref="1" detaillo="0" detailhi="5">
-<count>
-9</count>
-</symbol>
-<symbol idref="2" detaillo="0" detailhi="5">
-<count>
-9</count>
-</symbol>
-<symbol idref="3" detaillo="0" detailhi="4">
-<count>
-7</count>
-</symbol>
-<symbol idref="4" detaillo="0" detailhi="6">
-<count>
-7</count>
-</symbol>
-<symbol idref="5" detaillo="0" detailhi="5">
-<count>
-7</count>
-</symbol>
-<symbol idref="6" detaillo="0" detailhi="4">
-<count>
-6</count>
-</symbol>
-<symbol idref="7" detaillo="0" detailhi="3">
-<count>
-6</count>
-</symbol>
-<symbol idref="8" detaillo="0" detailhi="2">
-<count>
-6</count>
-</symbol>
-<symbol idref="9" detaillo="0" detailhi="4">
-<count>
-6</count>
-</symbol>
-<symbol idref="10" detaillo="0" detailhi="5">
-<count>
-6</count>
-</symbol>
-<symbol idref="11" detaillo="0" detailhi="4">
-<count>
-5</count>
-</symbol>
-<symbol idref="12" detaillo="0" detailhi="2">
-<count>
-4</count>
-</symbol>
-<symbol idref="13" detaillo="0" detailhi="1">
-<count>
-4</count>
-</symbol>
-<symbol idref="14" detaillo="0" detailhi="2">
-<count>
-3</count>
-</symbol>
-<symbol idref="15" detaillo="0" detailhi="1">
-<count>
-3</count>
-</symbol>
-<symbol idref="16" detaillo="0" detailhi="2">
-<count>
-3</count>
-</symbol>
-<symbol idref="17" detaillo="0" detailhi="1">
-<count>
-3</count>
-</symbol>
-<symbol idref="18" detaillo="0" detailhi="1">
-<count>
-2</count>
-</symbol>
-<symbol idref="19" detaillo="0" detailhi="1">
-<count>
-2</count>
-</symbol>
-<symbol idref="20" detaillo="0" detailhi="0">
-<count>
-2</count>
-</symbol>
-<symbol idref="21" detaillo="0" detailhi="1">
-<count>
-2</count>
-</symbol>
-<symbol idref="22" detaillo="0" detailhi="1">
-<count>
-2</count>
-</symbol>
-<symbol idref="23" detaillo="0" detailhi="1">
-<count>
-2</count>
-</symbol>
-<symbol idref="24" detaillo="0" detailhi="1">
-<count>
-2</count>
-</symbol>
-<symbol idref="25" detaillo="0" detailhi="1">
-<count>
-2</count>
-</symbol>
-<symbol idref="26" detaillo="0" detailhi="0">
-<count>
-1</count>
-</symbol>
-<symbol idref="27" detaillo="0" detailhi="0">
-<count>
-1</count>
-</symbol>
-<symbol idref="28" detaillo="0" detailhi="0">
-<count>
-1</count>
-</symbol>
-<symbol idref="29" detaillo="0" detailhi="0">
-<count>
-1</count>
-</symbol>
-<symbol idref="30" detaillo="0" detailhi="0">
-<count>
-1</count>
-</symbol>
-<symbol idref="31" detaillo="0" detailhi="0">
-<count>
-1</count>
-</symbol>
-<symbol idref="32" detaillo="0" detailhi="0">
-<count>
-1</count>
-</symbol>
-<symbol idref="33" detaillo="0" detailhi="0">
-<count>
-1</count>
-</symbol>
-<symbol idref="34" detaillo="0" detailhi="0">
-<count>
-1</count>
-</symbol>
-<symbol idref="35" detaillo="0" detailhi="0">
-<count>
-1</count>
-</symbol>
-<symbol idref="36" detaillo="0" detailhi="0">
-<count>
-1</count>
-</symbol>
-<symbol idref="37" detaillo="0" detailhi="0">
-<count>
-1</count>
-</symbol>
-<symbol idref="38" detaillo="0" detailhi="0">
-<count>
-1</count>
-</symbol>
-<symbol idref="39" detaillo="0" detailhi="0">
-<count>
-1</count>
-</symbol>
-<symbol idref="40" detaillo="0" detailhi="0">
-<count>
-1</count>
-</symbol>
-<symbol idref="41" detaillo="0" detailhi="0">
-<count>
-1</count>
-</symbol>
-<symbol idref="42" detaillo="0" detailhi="0">
-<count>
-1</count>
-</symbol>
-<symbol idref="43" detaillo="0" detailhi="0">
-<count>
-1</count>
-</symbol>
-<symbol idref="44" detaillo="0" detailhi="0">
-<count>
-1</count>
-</symbol>
-<symbol idref="45" detaillo="0" detailhi="0">
-<count>
-1</count>
-</symbol>
-<symbol idref="46" detaillo="0" detailhi="0">
-<count>
-1</count>
-</symbol>
-<symbol idref="47" detaillo="0" detailhi="0">
-<count>
-1</count>
-</symbol>
-<symbol idref="48" detaillo="0" detailhi="0">
-<count>
-1</count>
-</symbol>
-<symbol idref="49" detaillo="0" detailhi="0">
-<count>
-1</count>
-</symbol>
-<symbol idref="50" detaillo="0" detailhi="0">
-<count>
-1</count>
-</symbol>
-<symbol idref="51" detaillo="0" detailhi="0">
-<count>
-1</count>
-</symbol>
-<symbol idref="52" detaillo="0" detailhi="0">
-<count>
-1</count>
-</symbol>
-<symbol idref="53" detaillo="0" detailhi="0">
-<count>
-1</count>
-</symbol>
-<symbol idref="54" detaillo="0" detailhi="0">
-<count>
-1</count>
-</symbol>
-<symbol idref="55" detaillo="0" detailhi="0">
-<count>
-1</count>
-</symbol>
-<symbol idref="56" detaillo="0" detailhi="0">
-<count>
-1</count>
-</symbol>
-<symbol idref="57" detaillo="0" detailhi="0">
-<count>
-1</count>
-</symbol>
-<symbol idref="58" detaillo="0" detailhi="0">
-<count>
-1</count>
-</symbol>
-<symbol idref="59" detaillo="0" detailhi="0">
-<count>
-1</count>
-</symbol>
-<symbol idref="60" detaillo="0" detailhi="0">
-<count>
-1</count>
-</symbol>
-<symbol idref="61" detaillo="0" detailhi="0">
-<count>
-1</count>
-</symbol>
-<symbol idref="62" detaillo="0" detailhi="0">
-<count>
-1</count>
-</symbol>
-<symbol idref="63" detaillo="0" detailhi="0">
-<count>
-1</count>
-</symbol>
-<symbol idref="64" detaillo="0" detailhi="0">
-<count>
-1</count>
-</symbol>
-<symbol idref="65" detaillo="0" detailhi="0">
-<count>
-1</count>
-</symbol>
-</binary>
-<symboltable>
-<symboldata id="0" name="d_demangle" startingaddr="081b6710"/>
-<symboldata id="1" name="gnu_special" startingaddr="08292fe0"/>
-<symboldata id="2" name="htab_hash_string" startingaddr="08299e60"/>
-<symboldata id="3" name="add_minsym_to_hash_table" startingaddr="08051e70"/>
-<symboldata id="4" name="bfd_elf_string_from_elf_section" startingaddr="082523a0"/>
-<symboldata id="5" name="internal_cplus_demangle" startingaddr="0828f4e0"/>
-<symboldata id="6" name="bfd_elf32_swap_symbol_in" startingaddr="08245720"/>
-<symboldata id="7" name="eq_demangled_name_entry" startingaddr="08119ef0"/>
-<symboldata id="8" name="find_methods" startingaddr="081b9210"/>
-<symboldata id="9" name="prim_record_minimal_symbol_full" startingaddr="080528c0"/>
-<symboldata id="10" name="symbol_set_names" startingaddr="0811e9a0"/>
-<symboldata id="11" name="bfd_elf32_slurp_symbol_table" startingaddr="08247200"/>
-<symboldata id="12" name="cplus_demangle" startingaddr="0828fb80"/>
-<symboldata id="13" name="htab_find_slot_with_hash" startingaddr="0829a6b0"/>
-<symboldata id="14" name="compare_minimal_symbols" startingaddr="08051f10"/>
-<symboldata id="15" name="d_demangle_callback" startingaddr="082979a0"/>
-<symboldata id="16" name="elf_symtab_read" startingaddr="080d6430"/>
-<symboldata id="17" name="obsavestring" startingaddr="08124690"/>
-<symboldata id="18" name="bfd_bread" startingaddr="0822cf20"/>
-<symboldata id="19" name="bfd_getl16" startingaddr="082319c0"/>
-<symboldata id="20" name="bfd_section_from_elf_index" startingaddr="08248ac0"/>
-<symboldata id="21" name="find_pc_partial_function" startingaddr="080e23a0"/>
-<symboldata id="22" name="get_objfile_arch" startingaddr="0804e9c0"/>
-<symboldata id="23" name="htab_expand" startingaddr="0829a430"/>
-<symboldata id="24" name="regcache_raw_supply" startingaddr="080f6bd0"/>
-<symboldata id="25" name="symbol_init_language_specific" startingaddr="0811ef90"/>
-<symboldata id="26" name="_initialize_mi_cmds" startingaddr="080c3230"/>
-<symboldata id="27" name="add_cmd" startingaddr="080bada0"/>
-<symboldata id="28" name="allocate_bp_location" startingaddr="080e74b0"/>
-<symboldata id="29" name="bfd_elf32_object_p" startingaddr="08247bb0"/>
-<symboldata id="30" name="bfd_getl32" startingaddr="08231a90"/>
-<symboldata id="31" name="bfd_section_hash_newfunc" startingaddr="08234570"/>
-<symboldata id="32" name="build_minimal_symbol_hash_tables" startingaddr="08052c80"/>
-<symboldata id="33" name="core_addr_identity" startingaddr="08159a80"/>
-<symboldata id="34" name="cpname_lex" startingaddr="080d7930"/>
-<symboldata id="35" name="dwarf2_frame_cache" startingaddr="081a1d30"/>
-<symboldata id="36" name="exceptions_state_mc_action_iter_1" startingaddr="08146080"/>
-<symboldata id="37" name="find_and_open_source" startingaddr="080fc770"/>
-<symboldata id="38" name="find_charset_names" startingaddr="080f9910"/>
-<symboldata id="39" name="find_function_start_sal" startingaddr="0811c7c0"/>
-<symboldata id="40" name="find_pc_section" startingaddr="0804f550"/>
-<symboldata id="41" name="forget_types" startingaddr="0828e8f0"/>
-<symboldata id="42" name="gdbarch_has_global_breakpoints" startingaddr="08151110"/>
-<symboldata id="43" name="gdbarch_smash_text_address" startingaddr="08153650"/>
-<symboldata id="44" name="hex_string" startingaddr="080584e0"/>
-<symboldata id="45" name="htab_find_slot" startingaddr="0829a920"/>
-<symboldata id="46" name="htab_find_with_hash" startingaddr="08299c60"/>
-<symboldata id="47" name="linux_nat_wait" startingaddr="080936b0"/>
-<symboldata id="48" name="linux_nat_xfer_partial" startingaddr="0808e2c0"/>
-<symboldata id="49" name="lookup_minimal_symbol_by_pc_section_1" startingaddr="080523a0"/>
-<symboldata id="50" name="lookup_minimal_symbol_text" startingaddr="080521c0"/>
-<symboldata id="51" name="make_cleanup" startingaddr="08059c50"/>
-<symboldata id="52" name="objc_demangle" startingaddr="081b9bf0"/>
-<symboldata id="53" name="prefixify_expression" startingaddr="0816d860"/>
-<symboldata id="54" name="process_next_line" startingaddr="080bbf70"/>
-<symboldata id="55" name="qsort_cmp" startingaddr="0804ed20"/>
-<symboldata id="56" name="read_psymtabs_with_filename" startingaddr="081207f0"/>
-<symboldata id="57" name="symbol_natural_name" startingaddr="0811d140"/>
-<symboldata id="58" name="symbol_set_demangled_name" startingaddr="0811e880"/>
-<symboldata id="59" name="target_read_memory" startingaddr="08169560"/>
-<symboldata id="60" name="target_xfer_partial" startingaddr="08168120"/>
-<symboldata id="61" name="tdesc_gdb_type" startingaddr="081e99e0"/>
-<symboldata id="62" name="tilde_expand" startingaddr="082249b0"/>
-<symboldata id="63" name="update_global_location_list" startingaddr="080ee430"/>
-<symboldata id="64" name="update_solib_list" startingaddr="08063670"/>
-<symboldata id="65" name="xmalloc" startingaddr="08058f80"/>
-</symboltable>
-<detailtable>
-<symboldetails id="0">
-<detaildata id="0" vmaoffset="081b6718">
-<count class="">
-1</count>
-</detaildata>
-<detaildata id="1" vmaoffset="081b6734">
-<count class="">
-4</count>
-</detaildata>
-<detaildata id="2" vmaoffset="081b677a">
-<count class="">
-1</count>
-</detaildata>
-<detaildata id="3" vmaoffset="081b683d">
-<count class="">
-1</count>
-</detaildata>
-<detaildata id="4" vmaoffset="081b6846">
-<count class="">
-3</count>
-</detaildata>
-<detaildata id="5" vmaoffset="081b6858">
-<count class="">
-1</count>
-</detaildata>
-<detaildata id="6" vmaoffset="081b685a">
-<count class="">
-3</count>
-</detaildata>
-<detaildata id="7" vmaoffset="081b686e">
-<count class="">
-2</count>
-</detaildata>
-<detaildata id="8" vmaoffset="081b6880">
-<count class="">
-1</count>
-</detaildata>
-<detaildata id="9" vmaoffset="081b6882">
-<count class="">
-5</count>
-</detaildata>
-<detaildata id="10" vmaoffset="081b6896">
-<count class="">
-3</count>
-</detaildata>
-<detaildata id="11" vmaoffset="081b69e3">
-<count class="">
-1</count>
-</detaildata>
-</symboldetails>
-<symboldetails id="1">
-<detaildata id="0" vmaoffset="08293009">
-<count class="">
-1</count>
-</detaildata>
-<detaildata id="1" vmaoffset="0829300b">
-<count class="">
-3</count>
-</detaildata>
-<detaildata id="2" vmaoffset="0829301f">
-<count class="">
-2</count>
-</detaildata>
-<detaildata id="3" vmaoffset="08293080">
-<count class="">
-1</count>
-</detaildata>
-<detaildata id="4" vmaoffset="08293088">
-<count class="">
-1</count>
-</detaildata>
-<detaildata id="5" vmaoffset="08293093">
-<count class="">
-1</count>
-</detaildata>
-</symboldetails>
-<symboldetails id="2">
-<detaildata id="0" vmaoffset="08299e61">
-<count class="">
-1</count>
-</detaildata>
-<detaildata id="1" vmaoffset="08299e6b">
-<count class="">
-2</count>
-</detaildata>
-<detaildata id="2" vmaoffset="08299e78">
-<count class="">
-1</count>
-</detaildata>
-<detaildata id="3" vmaoffset="08299e7b">
-<count class="">
-2</count>
-</detaildata>
-<detaildata id="4" vmaoffset="08299e82">
-<count class="">
-2</count>
-</detaildata>
-<detaildata id="5" vmaoffset="08299e8d">
-<count class="">
-1</count>
-</detaildata>
-</symboldetails>
-<symboldetails id="3">
-<detaildata id="0" vmaoffset="08051e91">
-<count class="">
-1</count>
-</detaildata>
-<detaildata id="1" vmaoffset="08051e98">
-<count class="">
-1</count>
-</detaildata>
-<detaildata id="2" vmaoffset="08051e9b">
-<count class="">
-1</count>
-</detaildata>
-<detaildata id="3" vmaoffset="08051ea5">
-<count class="">
-3</count>
-</detaildata>
-<detaildata id="4" vmaoffset="08051ebb">
-<count class="">
-1</count>
-</detaildata>
-</symboldetails>
-<symboldetails id="4">
-<detaildata id="0" vmaoffset="082523a0">
-<count class="">
-1</count>
-</detaildata>
-<detaildata id="1" vmaoffset="082523a8">
-<count class="">
-1</count>
-</detaildata>
-<detaildata id="2" vmaoffset="082523b7">
-<count class="">
-1</count>
-</detaildata>
-<detaildata id="3" vmaoffset="082523d0">
-<count class="">
-1</count>
-</detaildata>
-<detaildata id="4" vmaoffset="082523f2">
-<count class="">
-1</count>
-</detaildata>
-<detaildata id="5" vmaoffset="08252406">
-<count class="">
-1</count>
-</detaildata>
-<detaildata id="6" vmaoffset="0825240a">
-<count class="">
-1</count>
-</detaildata>
-</symboldetails>
-<symboldetails id="5">
-<detaildata id="0" vmaoffset="0828f555">
-<count class="">
-1</count>
-</detaildata>
-<detaildata id="1" vmaoffset="0828f5a6">
-<count class="">
-2</count>
-</detaildata>
-<detaildata id="2" vmaoffset="0828f5c0">
-<count class="">
-1</count>
-</detaildata>
-<detaildata id="3" vmaoffset="0828f62a">
-<count class="">
-1</count>
-</detaildata>
-<detaildata id="4" vmaoffset="0828f746">
-<count class="">
-1</count>
-</detaildata>
-<detaildata id="5" vmaoffset="0828f8d9">
-<count class="">
-1</count>
-</detaildata>
-</symboldetails>
-<symboldetails id="6">
-<detaildata id="0" vmaoffset="08245720">
-<count class="">
-1</count>
-</detaildata>
-<detaildata id="1" vmaoffset="08245735">
-<count class="">
-2</count>
-</detaildata>
-<detaildata id="2" vmaoffset="08245770">
-<count class="">
-1</count>
-</detaildata>
-<detaildata id="3" vmaoffset="0824578d">
-<count class="">
-1</count>
-</detaildata>
-<detaildata id="4" vmaoffset="082457c4">
-<count class="">
-1</count>
-</detaildata>
-</symboldetails>
-<symboldetails id="7">
-<detaildata id="0" vmaoffset="08119ef1">
-<count class="">
-3</count>
-</detaildata>
-<detaildata id="1" vmaoffset="08119ef6">
-<count class="">
-1</count>
-</detaildata>
-<detaildata id="2" vmaoffset="08119f04">
-<count class="">
-1</count>
-</detaildata>
-<detaildata id="3" vmaoffset="08119f0c">
-<count class="">
-1</count>
-</detaildata>
-</symboldetails>
-<symboldetails id="8">
-<detaildata id="0" vmaoffset="081b92d0">
-<count class="">
-1</count>
-</detaildata>
-<detaildata id="1" vmaoffset="081b92ec">
-<count class="">
-4</count>
-</detaildata>
-<detaildata id="2" vmaoffset="081b9303">
-<count class="">
-1</count>
-</detaildata>
-</symboldetails>
-<symboldetails id="9">
-<detaildata id="0" vmaoffset="0805290c">
-<count class="">
-1</count>
-</detaildata>
-<detaildata id="1" vmaoffset="0805297a">
-<count class="">
-2</count>
-</detaildata>
-<detaildata id="2" vmaoffset="080529b1">
-<count class="">
-1</count>
-</detaildata>
-<detaildata id="3" vmaoffset="080529ed">
-<count class="">
-1</count>
-</detaildata>
-<detaildata id="4" vmaoffset="08052a08">
-<count class="">
-1</count>
-</detaildata>
-</symboldetails>
-<symboldetails id="10">
-<detaildata id="0" vmaoffset="0811eb7c">
-<count class="">
-1</count>
-</detaildata>
-<detaildata id="1" vmaoffset="0811ec36">
-<count class="">
-1</count>
-</detaildata>
-<detaildata id="2" vmaoffset="0811eca6">
-<count class="">
-1</count>
-</detaildata>
-<detaildata id="3" vmaoffset="0811ed34">
-<count class="">
-1</count>
-</detaildata>
-<detaildata id="4" vmaoffset="0811ed61">
-<count class="">
-1</count>
-</detaildata>
-<detaildata id="5" vmaoffset="0811ed64">
-<count class="">
-1</count>
-</detaildata>
-</symboldetails>
-<symboldetails id="11">
-<detaildata id="0" vmaoffset="08247485">
-<count class="">
-1</count>
-</detaildata>
-<detaildata id="1" vmaoffset="082475ae">
-<count class="">
-1</count>
-</detaildata>
-<detaildata id="2" vmaoffset="082475b2">
-<count class="">
-1</count>
-</detaildata>
-<detaildata id="3" vmaoffset="082475cf">
-<count class="">
-1</count>
-</detaildata>
-<detaildata id="4" vmaoffset="08247657">
-<count class="">
-1</count>
-</detaildata>
-</symboldetails>
-<symboldetails id="12">
-<detaildata id="0" vmaoffset="0828fbb6">
-<count class="">
-2</count>
-</detaildata>
-<detaildata id="1" vmaoffset="0828fbc7">
-<count class="">
-1</count>
-</detaildata>
-<detaildata id="2" vmaoffset="0828fc2d">
-<count class="">
-1</count>
-</detaildata>
-</symboldetails>
-<symboldetails id="13">
-<detaildata id="0" vmaoffset="0829a6e3">
-<count class="">
-2</count>
-</detaildata>
-<detaildata id="1" vmaoffset="0829a718">
-<count class="">
-2</count>
-</detaildata>
-</symboldetails>
-<symboldetails id="14">
-<detaildata id="0" vmaoffset="08051f10">
-<count class="">
-1</count>
-</detaildata>
-<detaildata id="1" vmaoffset="08051f19">
-<count class="">
-1</count>
-</detaildata>
-<detaildata id="2" vmaoffset="08051f46">
-<count class="">
-1</count>
-</detaildata>
-</symboldetails>
-<symboldetails id="15">
-<detaildata id="0" vmaoffset="082979c8">
-<count class="">
-2</count>
-</detaildata>
-<detaildata id="1" vmaoffset="08297acd">
-<count class="">
-1</count>
-</detaildata>
-</symboldetails>
-<symboldetails id="16">
-<detaildata id="0" vmaoffset="080d6629">
-<count class="">
-1</count>
-</detaildata>
-<detaildata id="1" vmaoffset="080d66a4">
-<count class="">
-1</count>
-</detaildata>
-<detaildata id="2" vmaoffset="080d67cd">
-<count class="">
-1</count>
-</detaildata>
-</symboldetails>
-<symboldetails id="17">
-<detaildata id="0" vmaoffset="081246d8">
-<count class="">
-2</count>
-</detaildata>
-<detaildata id="1" vmaoffset="081246f3">
-<count class="">
-1</count>
-</detaildata>
-</symboldetails>
-<symboldetails id="18">
-<detaildata id="0" vmaoffset="0822cf21">
-<count class="">
-1</count>
-</detaildata>
-<detaildata id="1" vmaoffset="0822cf35">
-<count class="">
-1</count>
-</detaildata>
-</symboldetails>
-<symboldetails id="19">
-<detaildata id="0" vmaoffset="082319c0">
-<count class="">
-1</count>
-</detaildata>
-<detaildata id="1" vmaoffset="082319d1">
-<count class="">
-1</count>
-</detaildata>
-</symboldetails>
-<symboldetails id="20">
-<detaildata id="0" vmaoffset="08248ad6">
-<count class="">
-2</count>
-</detaildata>
-</symboldetails>
-<symboldetails id="21">
-<detaildata id="0" vmaoffset="080e23a1">
-<count class="">
-1</count>
-</detaildata>
-<detaildata id="1" vmaoffset="080e2502">
-<count class="">
-1</count>
-</detaildata>
-</symboldetails>
-<symboldetails id="22">
-<detaildata id="0" vmaoffset="0804e9c0">
-<count class="">
-1</count>
-</detaildata>
-<detaildata id="1" vmaoffset="0804e9c6">
-<count class="">
-1</count>
-</detaildata>
-</symboldetails>
-<symboldetails id="23">
-<detaildata id="0" vmaoffset="0829a541">
-<count class="">
-1</count>
-</detaildata>
-<detaildata id="1" vmaoffset="0829a568">
-<count class="">
-1</count>
-</detaildata>
-</symboldetails>
-<symboldetails id="24">
-<detaildata id="0" vmaoffset="080f6bf9">
-<count class="">
-1</count>
-</detaildata>
-<detaildata id="1" vmaoffset="080f6c3b">
-<count class="">
-1</count>
-</detaildata>
-</symboldetails>
-<symboldetails id="25">
-<detaildata id="0" vmaoffset="0811ef90">
-<count class="">
-1</count>
-</detaildata>
-<detaildata id="1" vmaoffset="0811efa1">
-<count class="">
-1</count>
-</detaildata>
-</symboldetails>
-<symboldetails id="26">
-<detaildata id="0" vmaoffset="080c3230">
-<count class="">
-1</count>
-</detaildata>
-</symboldetails>
-<symboldetails id="27">
-<detaildata id="0" vmaoffset="080baf11">
-<count class="">
-1</count>
-</detaildata>
-</symboldetails>
-<symboldetails id="28">
-<detaildata id="0" vmaoffset="080e74d5">
-<count class="">
-1</count>
-</detaildata>
-</symboldetails>
-<symboldetails id="29">
-<detaildata id="0" vmaoffset="08247fa4">
-<count class="">
-1</count>
-</detaildata>
-</symboldetails>
-<symboldetails id="30">
-<detaildata id="0" vmaoffset="08231a90">
-<count class="">
-1</count>
-</detaildata>
-</symboldetails>
-<symboldetails id="31">
-<detaildata id="0" vmaoffset="082345ab">
-<count class="">
-1</count>
-</detaildata>
-</symboldetails>
-<symboldetails id="32">
-<detaildata id="0" vmaoffset="08052c9b">
-<count class="">
-1</count>
-</detaildata>
-</symboldetails>
-<symboldetails id="33">
-<detaildata id="0" vmaoffset="08159a87">
-<count class="">
-1</count>
-</detaildata>
-</symboldetails>
-<symboldetails id="34">
-<detaildata id="0" vmaoffset="080d8487">
-<count class="">
-1</count>
-</detaildata>
-</symboldetails>
-<symboldetails id="35">
-<detaildata id="0" vmaoffset="081a205c">
-<count class="">
-1</count>
-</detaildata>
-</symboldetails>
-<symboldetails id="36">
-<detaildata id="0" vmaoffset="08146081">
-<count class="">
-1</count>
-</detaildata>
-</symboldetails>
-<symboldetails id="37">
-<detaildata id="0" vmaoffset="080fc7c2">
-<count class="">
-1</count>
-</detaildata>
-</symboldetails>
-<symboldetails id="38">
-<detaildata id="0" vmaoffset="080f9b7b">
-<count class="">
-1</count>
-</detaildata>
-</symboldetails>
-<symboldetails id="39">
-<detaildata id="0" vmaoffset="0811c876">
-<count class="">
-1</count>
-</detaildata>
-</symboldetails>
-<symboldetails id="40">
-<detaildata id="0" vmaoffset="0804f551">
-<count class="">
-1</count>
-</detaildata>
-</symboldetails>
-<symboldetails id="41">
-<detaildata id="0" vmaoffset="0828e8f7">
-<count class="">
-1</count>
-</detaildata>
-</symboldetails>
-<symboldetails id="42">
-<detaildata id="0" vmaoffset="08151111">
-<count class="">
-1</count>
-</detaildata>
-</symboldetails>
-<symboldetails id="43">
-<detaildata id="0" vmaoffset="08153650">
-<count class="">
-1</count>
-</detaildata>
-</symboldetails>
-<symboldetails id="44">
-<detaildata id="0" vmaoffset="08058550">
-<count class="">
-1</count>
-</detaildata>
-</symboldetails>
-<symboldetails id="45">
-<detaildata id="0" vmaoffset="0829a926">
-<count class="">
-1</count>
-</detaildata>
-</symboldetails>
-<symboldetails id="46">
-<detaildata id="0" vmaoffset="08299d55">
-<count class="">
-1</count>
-</detaildata>
-</symboldetails>
-<symboldetails id="47">
-<detaildata id="0" vmaoffset="080939f9">
-<count class="">
-1</count>
-</detaildata>
-</symboldetails>
-<symboldetails id="48">
-<detaildata id="0" vmaoffset="0808e43a">
-<count class="">
-1</count>
-</detaildata>
-</symboldetails>
-<symboldetails id="49">
-<detaildata id="0" vmaoffset="08052535">
-<count class="">
-1</count>
-</detaildata>
-</symboldetails>
-<symboldetails id="50">
-<detaildata id="0" vmaoffset="08052282">
-<count class="">
-1</count>
-</detaildata>
-</symboldetails>
-<symboldetails id="51">
-<detaildata id="0" vmaoffset="08059c50">
-<count class="">
-1</count>
-</detaildata>
-</symboldetails>
-<symboldetails id="52">
-<detaildata id="0" vmaoffset="081b9bfc">
-<count class="">
-1</count>
-</detaildata>
-</symboldetails>
-<symboldetails id="53">
-<detaildata id="0" vmaoffset="0816d881">
-<count class="">
-1</count>
-</detaildata>
-</symboldetails>
-<symboldetails id="54">
-<detaildata id="0" vmaoffset="080bc25e">
-<count class="">
-1</count>
-</detaildata>
-</symboldetails>
-<symboldetails id="55">
-<detaildata id="0" vmaoffset="0804ed5d">
-<count class="">
-1</count>
-</detaildata>
-</symboldetails>
-<symboldetails id="56">
-<detaildata id="0" vmaoffset="08120812">
-<count class="">
-1</count>
-</detaildata>
-</symboldetails>
-<symboldetails id="57">
-<detaildata id="0" vmaoffset="0811d15e">
-<count class="">
-1</count>
-</detaildata>
-</symboldetails>
-<symboldetails id="58">
-<detaildata id="0" vmaoffset="0811e88c">
-<count class="">
-1</count>
-</detaildata>
-</symboldetails>
-<symboldetails id="59">
-<detaildata id="0" vmaoffset="081695c1">
-<count class="">
-1</count>
-</detaildata>
-</symboldetails>
-<symboldetails id="60">
-<detaildata id="0" vmaoffset="081685fb">
-<count class="">
-1</count>
-</detaildata>
-</symboldetails>
-<symboldetails id="61">
-<detaildata id="0" vmaoffset="081e99f7">
-<count class="">
-1</count>
-</detaildata>
-</symboldetails>
-<symboldetails id="62">
-<detaildata id="0" vmaoffset="08224a47">
-<count class="">
-1</count>
-</detaildata>
-</symboldetails>
-<symboldetails id="63">
-<detaildata id="0" vmaoffset="080ee8e5">
-<count class="">
-1</count>
-</detaildata>
-</symboldetails>
-<symboldetails id="64">
-<detaildata id="0" vmaoffset="08063775">
-<count class="">
-1</count>
-</detaildata>
-</symboldetails>
-<symboldetails id="65">
-<detaildata id="0" vmaoffset="08058f9c">
-<count class="">
-1</count>
-</detaildata>
-</symboldetails>
-</detailtable>
-<bytestable>
-<bytes id="0">
-5531C089E557565383EC6C8B5D0885DB0F8403010000BFC00E3108B90700000089DEF3A60F846E0100008D45BCC7442410806E0508C744240C808F0508C744240800000000C744240400000000890424E8674CE9FF803B5F0F845A010000BFCE0E3108B90800000089DEF3A60F85B60000008D730831DB8D55BC89F0E87FF7FFFF85C00F840F0200008B45C88D50013955CC0F8248010000C600288B45C883C00180FB018945C80F84530100008D50023955CC0F82AF010000C600298B45C8C64001008B4DC483C00239C80F84B70100008B55D48B5DC001D0F7D221D08B55CC89C629DE8945C889D729DF39FE0F8FBD00000089C28955C4890C24E870660E008D55BCC7442404000000008914248945B4E88653E9FF8B45B483C46C5B5E5F5DC38DB42600000000BFD70E3108B90700000089DEF3A60F8494000000BFDF0E3108B90700000089DEF3A60F8480000000BFE70E3108B90A00000089DEF3A60F8454010000BFF20E3108B90A00000089DEF3A60F8440010000BFFD0E3108B90D00000089DEF3A60F85440100008D730D31DBE9E1FEFFFF6690C70424C70E3108E8CC650E0083C46C5B5E5F5DC38D7426008955C8E93DFFFFFF807B01440F859CFEFFFF8D7302BB01000000E9A8FEFFFF908D730731DBE99DFEFFFF8DB6000000008D45BC890424C744240401000000E8D94CE9FF8B45C8E99DFEFFFF908D742600803E460F85A4FEFFFF83C601EB1E669066C7002C208345C8028D55BC89F0E8EDF6FFFFBB0200000085C0746C0FB6063C5A0F849100000084C00F848900000080FB0174D58B45C88D50023955CC73C18D55BCC744240402000000891424E86A4CE9FF8B45C8EBA9908D45BC890424C744240402000000E8514CE9FF8B45C8E936FEFFFF908D742600804DE402E940FEFFFF8DB426000000008D7DBCC744240400000000893C24E8F151E9FF31C0E967FEFFFF8DB6000000008D730A31DBE9B5FDFFFF8DB6000000008B45C8E9DDFDFFFF8D55BCC744240400000000891424E8B951E9FF31C0E92FFEFFFF909090909090</bytes>
-<bytes id="1">
-5589E557565383EC7C8B1A89459C8955A4894DA0803B5F0F8493000000BFD0F93708B90800000089DEF3A60F8487010000BFD9F93708B90300000089DEF3A6755F0FB64303BEDDF937083C690F94C23C660F85F10100008B55A48D430489020FB643043C510F84350300003C740F84FD0200003C4B0F84250300008B4DA08B55A48B459CE8A7DAFFFF89C385DB74138B55A48B028038000F84DB0300008D760031DB83C47C89D85B5E5F5DC38D7426008D43018945940FB67301C70424083C3A0889F20FBEFA897C2404E89D81DBFF85C0740A807B025F0F84AB03000089F03C5F0F847901000089F280FA760F8446020000897C2404C7042401FA3708E86A81DBFF85C00F8413FFFFFFC7442404083C3A08891C24E8328DDBFF85C08945980F84F8FEFFFF8B45948B55A489020FB643013C510F84170300003C740F84870200003C4B0F84070300008B45A4E80FB1FFFF85C089C30F8845FFFFFF8B45A48B10891424895590E81187DBFF8B559039C30F8F2AFFFFFF83FB0A7E1ABF18F93708B90800000089D6F3A6750A807A094E0F84B60300008B45A089D989DEE88FB9FFFF8B45A403308930BB01000000E94A0200008DB6000000008B55A483C308891A89D0E899B0FFFF83F8FF89C60F84CEFEFFFF8B45A48B1083C20189108B459CE81CC3FFFF85C089C30F84B2FEFFFFF7DE897424088D75B6C7442404F4053808893424E8B57DDBFF8B45A089F2E83FBDFFFF8B45A089DAE835BDFFFF891C24E88983DBFF8B55A48B1A891C24E84C86DBFF01C38B45A48918BB01000000E961FEFFFF8DB4260000000084D20F8450FEFFFFBEF1F93708E9FDFDFFFF8DB600000000807B02760F8588FEFFFF807B03740F85A9FDFFFF807B045F0F859FFDFFFF8B45A48D730589306690BB0100000089DF8B5DA48DB6000000000FB60684C00F84940200003C510F84450200003C740F84F50100003C4B0F84350200000FB6C0F6840080253808040F8544020000C7442404083C3A08893424E8408CDBFF8945A48B4DA489F28B45A0E844B8FFFF8B75A403338933C7442404083C3A08893424E8498BDBFF85C0742639C60F8591FDFFFF8B459CBA06CC2B08F60004B8ED142E080F45D08B45A0E826BCFFFF8303018B33E964FFFFFF8D742600807B02740F85B0FDFFFF0FBE4303C70424083C3A0889442404E8167FDBFF85C00F84BFFCFFFF8B55A48D73048932E91DFFFFFF908D7426008B4DA08B55A48B459CC744240801000000C744240401000000C7042400000000E82BCEFFFF89C3E9EFFCFFFF8D7426008B4DA08B55A48B459CC744240401000000C7042400000000E883D3FFFF89C3E9C7FCFFFF8D7426008B4DA08B55A48B459CC744240801000000C744240401000000C7042400000000E8D3CDFFFF89C385DB0F84ABFCFFFF8B55A48B323B75980F859BFCFFFF8B45A483C601BA06CC2B0889308B459CF60004B8ED142E080F45D08B45A0E828BBFFFF8B55A48B3A893C24E84784DBFF89FA89C689C18B45A0E8EDB6FFFF8B45A40130E955FCFFFF8D76008B4DA08B55A48B459CC744240401000000C7042400000000E8D3D2FFFF89C3E97BFFFFFF8D7426008B45A089F2E8CEBAFFFFE91BFCFFFF908B45A483C3038B559C8918BB0100000083422C01E901FCFFFF8DB426000000008B4DA089DA8B459CC744240801000000C744240401000000C7042400000000E8F4CCFFFF89C78B33C7442404083C3A08893424E86C89DBFF85FF0F851BFEFFFF89FBE9B3FBFFFF908B4DA089DA8B459CC744240401000000C7042400000000E834D2FFFF89C7EBBE89D8E849ADFFFF8B338934248945A4E85883DBFF3945A40F8EB2FDFFFFBF01000000E9BCFDFFFF8B45A0BA3AF9370889FBE80ABAFFFFE957FBFFFF0FB642083A420A0F853DFCFFFF0FBEC089442404C70424083C3A08E8017DDBFF8B559085C00F841FFCFFFF8B45A0BA9AF9370889DEE8CBB9FFFF8B55A403328932C7442404083C3A08893424E8B088DBFF894598E904FCFFFF8DB6000000008DBF00000000</bytes>
-<bytes id="2">
-5531C089E58B4D080FB61184D2741D83C1018DB6000000006BC0430FB6D28D44108F0FB61183C10184D275EC5DC36690</bytes>
-<bytes id="3">
-5589E556538B5D088B432085C074095B5E5DC3908D7426008B1331C931F60FB60284C0743A8D76006BC9430FBEC083C2018D4C018F0FB60284C075EC89C8BA6F452101F7E289C829D0D1E801C2C1EA0A69D2F707000029D18D348D000000008B4D0C01F18B0189432089195B5E5DC390</bytes>
-<bytes id="4">
-55B812C42B0889E583EC68895DF48B5D108975F88B7508897DFC8B7D0C85DB750F8B5DF48B75F88B7DFC89EC5DC366908B86A00000008B504085D2750B31C0EBE08DB4260000000039785876F08D0CBA8B018B50308945C485D20F849F0000008B45C48B481839CB730A8B55C489D8034230EBAD8B86A00000008B15E02E3A088B403C8955E039C774628B55C48B128955E48B55E48944240489342489542408E85BFFFFFF89C78B45C48B4818894DD4C744240805000000C7442404ECF53608C7042471632B08E89091DFFF8B4DD4897C2410895C240889742404894C240C890424FF55E031C0E935FFFFFF8B55C4BFABED36088B1239DA8955E47595EBAE89C28B40108B52148945D88B45C48955DC8B40188945E083C00183F8017646894DD489442404893424E8230DFEFF8B4DD485C08945E474288B45D88B55DC894DD4C744240C000000008944240489542408893424E8F8B0FDFF8B4DD485C074168B09894DC48B45C4C740300000000031C0E9ACFEFFFF8B55E08B45E4894DD48974240889542404890424E8F2A9FDFF8B4DD43945E0742AE82598FDFF8B4DD483F801740FC7042411000000E821A2FDFF8B4DD48B11C74218000000008955C4EBA48B45E48B55E0C60410008B018B55E4895030E989FEFFFF89F68DBC2700000000</bytes>
-<bytes id="5">
-5589E583EC68895DF489C385D28975F8897DFC8B40288B4B2C8B7B308955D48945C48B4338894DC8897DCCC7432C000000008945D0C7432800000000C7433800000000C7433C000000008955C0752931C08B55C48B7DCC8B4DC88953288B55D0897B30894B2C8953388B5DF48B75F88B7DFC89EC5DC36690803A0074D2C745E000000000C745DC00000000C745D800000000F703000300000F85420100008914248955BCE8D3C2DBFF8B55BC83F8068945B40F86A8010000BF11F93708B90600000089D6F3A60F848C020000BF9D292B08B90600000089D6F3A60F8478020000837DB40A0F8676010000BF18F93708B90800000089D6F3A60F85620100000FBE4208C70424083C3A088955BC89442404E857BCDBFF8B55BC85C00F84430400000FB6003A420A0F84D50300008D7426008B55C0908D742600C74424045F000000891424E824BCDBFF85C089C6745C8078015F8D500175E180385F7526B95F00000031D2EB088D76000FB64C100183C20180F95F74F383FA027E088D7402FE85F674288B533085D20F84430100000FB6160FB6C2F6840080253808040F850F02000080FA740F8406020000837B2802740831F6837B2C0275618B55D48D45D8E88DF8FFFF8B75D4893424E8AEC1DBFF8D14068955D4BE01000000EB1F908D7426008D55D489D88D4DD8E81339000085C089C60F84960400008B55D4803A000F85950000008B432883F8020F84A1000000837B2C020F841F010000837B3C010F844D01000089D8E836F2FFFF85F675128D45D8E89AF1FFFF31C0E914FEFFFF8D76008D45D8B901000000BA12C42B08E8DEF3FFFF8B45D8E9F7FDFFFF8DB600000000F703003800000F84C4FEFFFFBF21F93708B90700000089D6F3A60F853801000083C2078955C08955D4C7432C02000000E99BFEFFFF8D76008D55D489D88D4DD8E85B2F000089C6E957FFFFFF8D742600BA229B2C088D45D8E853F7FFFFC7432800000000E95AFFFFFF8DB426000000003975C00F84080100008B03F6C408740A807E02700F8450010000F6C42074140FB646023C740F848E0000003C700F84E50100003975C00F845F010000807E02000F8494FEFFFF8D55D489D88D4DD8893424E83AFBFFFF89C685F60F84D3FEFFFFE9C2FEFFFF8D7600BA409B2C088D45D8E8CBF6FFFFC7432C00000000E9D2FEFFFF8DB4260000000083C2068955C08955D4C7433C01000000E9C3FDFFFF8D7600BA49F937088D45D8E893F6FFFFC7433C00000000E99AFEFFFF807E036D0F8570FFFFFF8B55C0891424E8DEBFDBFF8D4DD8890C248D55D489C189D8E8B01D00008B55D4E91CFEFFFFBF29F93708B90700000089D6F3A60F8564FDFFFF83C2078955C08955D4C7432802000000E94FFDFFFF8B7DC08B4DC00FB6570283C1020FB6C20FB784008025380889C783E704751880FA51741380FA74740E80FA4B740980FA480F85C1FEFFFF8B03F6C41C740885FF0F8544010000F6C43C750483432801894DD489CAE99AFDFFFF807E03740F85A6FEFFFF8B7DC031C083C9FF8D55D4F2AE8D45D889042489D8F7D183E901E8FD1C00008B55D4E969FDFFFF8B7DC00FB657020FB6C2F6840080253808040F8589FEFFFF80FA740F8480FEFFFFF703003C00000F8503010000803E5F750E8B45C083C00180385F74F88945C08B45C0C74424045EDA3008890424E8EEC0DBFF85C00F84E4FCFFFF807802000F84DAFCFFFF8904248D55D489D88D4DD8E880F9FFFF89C6E941FEFFFF900FB646033C730F849FFEFFFF3C740F8507FEFFFFE992FEFFFF0FB642093C4474353C490F851FFCFFFF83C20B89D88955D48D4DD8C74328020000008D55D4E8D535000085C00F857DFEFFFF8B4DD4894DC0E9F2FBFFFF83C20B89D88955D48D4DD8C7432C020000008D55D4E8A835000085C00F8550FEFFFF8B55D48955C0E9C5FBFFFF8D45D4894DD4E8EAE7FFFF8B55D48D45D8E8CFF4FFFF8B55D431C083C9FF89D7F2AEF7D18D540AFF8955D4E939FCFFFFC744240808000000C744240431F93708893C24E849C3DBFF85C00F85DDFEFFFF89F883C0088945E40FB657088D7DE484D2743089F8E88BE7FFFF83F8FF0F84BAFEFFFF0345E48945E40FB61080FA5F75DE8078015F75DC8D50028955E40FB65002EBCC8B45D489F789DE8D50088955D40FB6400884C074668D45D4E845E7FFFF83F8FF89C3744E8B55D48914248955BCE84CBDDBFF8B55BC39C37F3989D98D45D8E81FF3FFFF035DD4895DD40FB6033C5F75C1807B015F75BFBA06CC2B088D45D8E8AFF3FFFF8B45D48D50028955D40FB64002EB9F89F389FEE91FFEFFFFBA3AF9370889F38D45D8E8C8F3FFFFE923FDFFFF8B55D48955C0E906FAFFFF908DB42600000000</bytes>
-<bytes id="6">
-5589E557565383EC2C8B7D088B750C8B5D148B47088B90A80100000FB69280010000893424C0EA078855E4FF504C0FB655E484D2894308745F8B47088D5604891424FF505089038B47088D5608891424FF504C8943040FB6460C88430C0FB6460D83C60E88430D8B4708893424FF50583DFFFF0000894310742E3DFFFE0000BA0100000076082D0000010089431083C42C89D05B5E5F5DC38B47088D5604891424FF504C8903EB9F8B451031D285C074DD8B55108B4708891424FF504CBA0100000089431083C42C89D05B5E5F5DC390</bytes>
-<bytes id="7">
-5589E583EC188B450C8B00894424048B45088B00890424E89020F3FFC985C00F94C00FB6C0C38D76008DBC2700000000</bytes>
-<bytes id="8">
-5589E557565383EC6C8945C08B4514894DB48855BFC645E70085C0C745E000000000C745DC00000000C745D8000000000F84360400008B7D1885FF0F84E70300008B75C0C745C40000000085F6740C8B55C08B42048B400C8945C4A1B0D63B08C745B000000000C745B8000000008B782085FF0F84190100008DB42600000000A158703B08893C2489442404E89F59E9FF85C08945CC740A8B1885DB0F84E60000008B9F80000000C745C8000000008B0B85C90F84FA000000897DD4EB3D6690A158D63B0885C07402FFD0891C24E85D3EF6FF85C089C674150FB6003C2B74043C2D750A807E015B0F842201000083C3288B3B85FF0F84B50000008B75D4893424E8AA56E9FF8B157CD63B0885D28945D08B7B0474AAE8C5DEE9FFEBA38D76008B4F3C8B473889CA29C283FA030F8E850200008B573483C00489473839D00F849E0200008B5F4401D8F7D321D889CB89C62B5F302B773089473839DE0F8F4E02000089C18B75C8A158703B08894F3489328954240889442404893C24E81F59E9FF8DB426000000008B3F85FF0F85EEFEFFFF8B5DB88B75188B4D148B45B08919890683C46C5B5E5F5DC38DB6000000008B7DD48B75CC85F60F8462FFFFFF8B45CC8B55C8391074C0C744240805000000C7442404AACA2A08C7042400000000E80822E9FFC7442410CF123108C744240C08153108C744240401050000C704249512310889442408E8E4ECE9FF8D7426008B45D0897C2404C7442408E0DD3B08890424E8D9A3F9FF89C78B45C085C074408B55C43B3A0F82B3FEFFFF3B7A040F83AAFEFFFFEB2A66908D041285D2B9000400000F44C1A350703B0889442404A154703B08890424E8B5FAE9FFA354703B08893424E8D423E9FF8B1550703B0883C00139D073C3A154703B0889742404890424E86624E9FF8D45D8894424108D45E789442404A154703B088D55DC8D4DE08954240C894C2408890424E881F9FFFF85C00F8427FEFFFF8345C801807DBF00740D0FB645BF3845E70F8510FEFFFF8B4DB485C974228B45E085C00F84FEFDFFFF8B55B489442404891424E88D2AE9FF85C00F85E7FDFFFF8B550885D274228B45DC85C00F84D5FDFFFF8B4D0889442404890C24E8642AE9FF85C00F85BEFDFFFF8B450C85C074228B45D885C00F84ACFDFFFF894424048B450C890424E83B2AE9FF85C00F8595FDFFFF893C24E84F91F2FF85C089C70F8480000000890424E8BD3BF6FF893424894424048945ACE80A2AE9FF8B55AC85C0757A837D100074138B55B08B4D108B75B88D04918B108914B189388345B8018345B001E93FFDFFFF90894F38E9ACFDFFFF8D472C890424C744240404000000E80120E9FF8B47388B57348B4F3C83C00439D08947380F8562FDFFFF804F5402E959FDFFFF837D100074098B4DB88B7510891C8E8345B801E9EBFCFFFF8974240889542404C7042434193108E8F91AEAFF837D100074DD8B45B88B5510891C82EBD2C744240805000000C7442404AACA2A08C7042400000000E8A81FE9FFC7442410C0123108C744240C08153108C744240489040000C704249512310889442408E884EAE9FFC744240805000000C7442404AACA2A08C7042400000000E8641FE9FFC7442410B1C82E08C744240C08153108C744240488040000C704249512310889442408E840EAE9FF</bytes>
-<bytes id="9">
-5589E557565383EC3C8B5D20837D18060F84320100008B45080FB6108B4D248B412085C00F84560100008B40080FBE40180FBED239C20F8434010000837D18060F84BA0100008B359C3F3A0883FE7F0F844B0100008B3D983F3A088D04B6C1E0038945E48D04078D50048945E08914248955DCC744240400000000E850C60C008B4DE48B55DCC6443910018B4D24891424894C24108B4D10894C240C8B4D0C894C24088B4D08894C2404E831C00C008B551485DB8B45E08950088B551C8B4DE4C74014000000006689543912742C8B55248B82744000008B927840000039D0720EEB17908D74260083C00C39D0730B391875F58D14B68944D7148D04B60FB65D188D14C78D4A10806111FC8D4204C7421800000000C7422400000000C74228000000008B552483059C3F3A08018305A03F3A08018382884000000188591083C43C5B5E5F5DC366908B4D080FB61180FA670F85C5FEFFFF8B7508BF8AD52A08B90E000000F3A6756C31C0EBD28D74260083450801836D0C01E9BFFEFFFF8D7600A1B0D63B088B401C85C0740B8B402085C00F8593FEFFFF31C0E993FEFFFF6690C7442404DC13000031F6C7042401000000E84A640000C7059C3F3A080000000089C7A1983F3A088907893D983F3A08E987FEFFFF8B4508C744240498D52A088855DC890424E8F294FFFF0FB655DC85C00F8526FEFFFF31C0E941FFFFFF8D76008B7508BFA7D52A08B90E000000F3A60F8531FEFFFF31C0E922FFFFFF8D742600</bytes>
-<bytes id="10">
-5589E557565383EC6C8B75088B55108B5D180FB6460C3C0B0F84AA0000008B4B6485C90F845F0400003C060F84DF0100008B4D0C89D7803C11000F8530010000894DC8C745CC000000008D45E0C744240801000000894424048B4364894DE0894DBC890424E816BF17008B4DBC89C28B0085C00F84370100008B55CC03108916807804007522895C2408893424C744240400000000E846FEFFFF8D65F45B5E5F5DC38DB60000000083C004895C240889342489442404E825FEFFFF8D65F45B5E5F5DC3908D7426008B7D1485FF0F84D50000008B4B3C8D7A018B4338894DD029C139CF0F8FE703000001F88B7B3489433839F8897DD40F842C0400008B4B4401C8F7D121C88B4DD089C72B7B30894338897DD089CF2B7B30397DD00F8F4701000089C18B45D4894B348B4D0C8955B8890689542408894C2404890424E82BCDF2FF8B068B55B8C6041000893424C744240800000000C744240400000000E87EFDFFFF8D65F45B5E5F5DC38DB6000000008D421F83E0F029C48B450C8D4C242783E1F0890C24894DBC8954240889442404E8D7CCF2FF8B4DBCC6043900E99FFEFFFF8DB426000000008B450C8906EB9B900FB6460C84C00F85B4000000C6460C018B45C88955B8894DBCC744240400000000890424E877B009008B55B88B4DBC85C08945C40F84F9010000C6460C058B45C48955B8894DBC890424E8BDCCF2FF8B4DBC8B55B88945C8E9AF0000008D76008D422783E0F029C48D4C242783E1F08D4108C70123234A418D7A08C74104564124248945C88B450C895424088955B8894DBC894424048B45C8890424E81BCCF2FF8B55B88B4DBCC6440A0800C745CC08000000E9E2FDFFFF894B38E9B3FEFFFF3C010F8448FFFFFF3C050F8440FFFFFFC645C4003C030F84EC000000807DC4000F85E20000003C060F84F60200003C010F840A0100003C040F8402010000C745C800000000C745C4000000003B4D0C0F85330100008B451485C00F85280100008B7DC88B433883C705897DC88B7B3C897DD029C7397DC80F8F4B0200008B7B340345C839F8894338897DD40F84C20200008B7B4401F8F7D721F88B7DD0894338897DC089C72B7B30897DD08B7DC02B7B30397DD00F8FEE0100008945C08B45D48B7DC08902897B3489088B7DC485FF0F84B30100008B4DC48955B8894C24048B0283C004890424E810CCF2FF8B7DC4893C24E87981F3FF8B55B88B02E908FDFFFF8DB426000000008B45C88955B8894DBCC74424040B000000890424E84F0E17008B55B88B4DBC85C08945C40F8433020000C6460C03E943FEFFFF908D7426008B45C88955B8894DBCC744240400000000890424E8A77909008B55B88B4DBC85C08945C40F84D4FEFFFFC6460C04E90BFEFFFF0FB6460C3C010F9445C4E992FEFFFF8DB6000000008B45C88D7C38068B4338897DC08B7B3C897DD029C7397DC00F8F520100008B7B340345C039F88945D48943380F84A20100008B45D40343448945B48B4344F7D02145B48B45B48943382B43308945C08B45D02B43303945C00F8FB20000008B45B48945D08B45D0893A8955B88943348B45C88D4407058907894C24048B028B00890424E8ECCAF2FF8B55B8E9B2FEFFFF8955B8C7442414806E0508C7442410C08E0508C744240C00000000C7442408F09E1108C744240460E81108C7042400010000E851B417008B55B88943640FB6460CE95BFBFFFF66908D432C8904248955B8897C2404E85AC7F2FF8B4B3C8B43388B55B8894DD0E9F6FBFFFF908D7426008B02C64004008B02E974FBFFFF8D76008B45D0894338E949FFFFFF908D7426008B45C0894338E90AFEFFFF908D742600804B5402E9CBFBFFFF8DB426000000008B45C88955B8894DBC894424048D432C890424E8ECC6F2FF8B7B3C8B43388B4DBC8B55B8897DD0E989FDFFFF8D7426008B45C08955B8894DBC894424048D432C890424E8BCC6F2FF8B7B3C8B43388B4DBC8B55B8897DD0E982FEFFFF8B45C88955B8894DBCC744240407000000890424E8330C17008B55B88B4DBC85C08945C47424C6460C06E92BFCFFFF804B5402E935FDFFFF804B5402E955FEFFFF0FB6460CE9B8FCFFFF0FB6460CE9B7FCFFFF89F68DBC2700000000</bytes>
-<bytes id="11">
-5589E557565383EC6C8B4D108B5D0C85C90F85C90000008B550831F68B82A000000083C0648945D48B55088B4DD48B42088B79188B80A8010000C1EF0485FF8945C80F851401000031F631C9C745D000000000C745CC000000008B45C88B503085D274198B45CC894DB0897C2408894424048B4508890424FFD28B4DB085DB742585F67E1B8B55CC31C08DB60000000089148383C00183C23439F075F38D1CB3C703000000008B5DD085DB74118B55D0894DB0891424E8D142E0FF8B4DB085C974108B45D43948307408890C24E8BA42E0FF83C46C89F05B5E5F5DC38D7426008B4D088B81A00000008B904C0200008DB0000100008BB8500200008D88680100008975D431F685D20F45F185FF75418B905402000085D20F840BFFFFFF8BB8C402000085FF0F85FDFEFFFF8B4508C744240400000000890424E842B2000085C00F85E2FEFFFF83CEFFEB87908D7426008B88C002000085C975B5EBCF8B45D48B5508C744241800000000C744241400000000C744241000000000C744240C00000000897C240889442404891424E89E3D000085C089C174AE6BC734894DB0894424048B4508890424E813BFFEFF8B4DB085C08945CC0F844703000085F674598B5618D1EA39FA8955D00F848D0200008B45088B35E02E3A088B50048975C4C744240805000000C744240464EA36088955ACC7042471632B08E8FF41E0FF8B75D08B55AC897C240C8974240889542404890424FF55C48B4DB0C745D000000000C745C4000000008D04BF31F68D04818D51148945C08955BC8B45BC3945C08B55CC0F8614FEFFFF897DBC8B7D0889C6895DB489D3894DB866908B168D43188953188B56048950048B56088950088B560C89500C8B5610893B8950108B55D4C744240C0000000089742408893C2489542404E87BC700008943048B068943088B461085C00F851B010000C74310C02F3A08F647344274098B43108B401C2943080FB6460C89C2C0EA0480FA010F84310100000F830D010000834B0C010FB6460C669083E00F83F80A7710FF248500EB3608814B0C0401000066908B551085D27407814B0C008000008B45C485C074228B55C48D45E689442408893C2489542404E86D1400000FB745E68345C402668943308B4DC88B412C85C07409895C2404893C24FFD083C61483C3343975C00F8707FFFFFF89DA8B4DB889D68B5DB42B75CC897D088B7DBCC1FE0269F6C54EECC4E9E8FCFFFF814B0C00004000E97AFFFFFF814B0C00001000E96EFFFFFF814B0C00000800E962FFFFFF814B0C00000400E956FFFFFF814B0C04400000E94AFFFFFF834B0C08E941FFFFFF814B0C00000100E935FFFFFF83F8F10F848400000083F8F275618B4604C74310002F3A08894308E9CCFEFFFF80FA02743A80FA0A0F85EFFEFFFF814B0C000080000FB6460CE9DFFEFFFF8B561083FAF20F84D3FEFFFF85D20F84CBFEFFFF834B0C020FB6460CE9BEFEFFFF814B0C800000000FB6460CE9AEFEFFFF89442404893C24E882140000B980303A0885C00F44C1894310E95FFEFFFFC7431080303A08E953FEFFFFC744240C000000008B56148B4610894DB0895424088B550889442404891424E8705FFEFF8B4DB085C0757B8B4618894DB0890424E8DBAEFEFF8B4DB085C08945D074428B46188B5508894424048B45D0894DB089542408890424E86558FEFF8B4DB03B461875288B45D08B75D0C745C40000000083C00285F60F4445C48945C4E945FDFFFF837E1800751B31C0EBB7837DD00074118B55D0894DB0891424E88D3EE0FF8B4DB08B75D4394E300F8438FCFFFF890C2483CEFFE8733EE0FFE9B4FBFFFF6690</bytes>
-<bytes id="12">
-5589E581EC98000000833D043C3A08FF895DF48B55088975F88B5D0C897DFC0F84B30000008D759431C0B91500000089F766F7C304FFF3AB89D8895D9474398B4D94F6C5417548F6C104756C6685C90F88A300000089F0E804F9FFFF89C789F0E8EBEDFFFF89F88B5DF48B75F88B7DFC89EC5DC38D742600A1043C3A082504FF000009D88945948B4D94F6C54174B889142489558489442404E8428000008B558485C089C775BE8B4D94F6C5407498EBB48DB42600000000891424895584E8FD7F00008B558485C089C775998B4D94E978FFFFFF8D742600891424E820D200008B5DF48B75F889C789F88B7DFC89EC5DC38DB42600000000895C2404891424E8ECE7FFFF8B5DF48B75F889C789F88B7DFC89EC5DC38D7426008DBC2700000000</bytes>
-<bytes id="13">
-5589E557565383EC4C8B7508837D14018B46108945E00F846C0100008B4E388B451089CFC1E704894DDC8D8FE0203808F761048B490C8945D08B45108955D429D0D1E88D1C108B5510D3EB0FAF9FE02038088B7E0C83461C0129DA89D38D14950000000001D78B0785C00F84DF00000083F80174238B4D0C8955CC890424894C2404FF56048B55CC85C00F85B00000008B463831FF8945DC8B55DC8B4510C1E20489D181C1E02038088955D0F761088B490C8945C08B45108955C48B55C483C0018945DC8B451029D0D1E801D0D3E88B4DD08B91E020380883EA020FAFC28B56202945DC8D742600035DDC83C20189562089D82B45E0395DE00F46D88D049D000000008945E403460C8B0885C9744983F901741C8B550C890C2489542404FF560485C0755389F88B562089C7EBBA669085FF0F45C789C7EBAF8DB426000000008B7E0C01D783C44C89F85B5E5F5DC331FF8DB426000000008B451485C0745185FF7459836E180189F8C7070000000083C44C5B5E5F5DC3908B7DE4037E0C83C44C5B5E89F85F5DC38D14408B4614C1E00239C20F8783FEFFFF89F0E8E0FBFFFF85C0740C8B56108955E0E96DFEFFFF9031FF83C44C89F85B5E5F5DC38D3C9D0000000083461401037E0CE976FFFFFF90</bytes>
-<bytes id="14">
-5589E583EC088B450C8B55088B4804394A04721C77228B128B0085D20F95C185C0751D31C084C9740C8DB42600000000B8FFFFFFFFC9C390B801000000C9C39084C974F489450C895508C9E93CA0FFFF</bytes>
-<bytes id="15">
-5589E557565389C383EC6C8955A4894DA080385F0F842E010000BF18F93708B90800000089DEF3A6752E0FB643083C5F74083C2E0F85FE0000000FB643093C490F94C20F859F010000807B0A5F0F84A5010000908D74260031F631C0F645A4100F84C7000000891C2489E7E84C3EDBFF895DB4895DC0C745C800000000C745D400000000C745DC000000008D14038955B88B55A48945D8C745E000000000C745E4000000008955BC8D1400C1E0028955CC8D141083C01E8D14951E00000083E0F083E2F029D48D54241F29C48D44241F83E2F083E0F083FE018955C48945D00F84D300000073798D45B4890424E85EC7FFFF89C3F645A401740C8B45C08038000F85D200000085DB0F84CA0000008B45088944240C8B45A0895C2404894424088B55A4891424E865FDFFFF89FC8D65F45B5E5F5DC38D76003C240F8518FFFFFFE9F5FEFFFF8D76008078015ABE010000000F85C3FEFFFFE90AFFFFFF8D74260083FE03778283C30B895DC0891C24E8493DDBFF89DA89C18D45B4E841C0FFFF31D283FE020F95C283C23CC704240000000089C18D45B4E8A5BFFFFF8B75C089342489C3E8143DDBFF01C68975C0E942FFFFFF8DB6000000008D45B4C744240401000000890424E8D5DEFFFF89C3E922FFFFFF8DB60000000031C089FCE94CFFFFFF8DB426000000003C440F8568FEFFFFE954FEFFFF8D760089D6C1E61FC1FE1F83C603E95EFEFFFF908DB42600000000</bytes>
-<bytes id="16">
-5589E557565383EC6C8B7D088955D8894DE48945E0890424E87385F7FF8B55E08B4DE485C98945D08B45E08B804C4000008945CC8B42208B40748945C00F8EED00000083C22C31DB8955B8C745C412C42B08C745BC00000000C745D400000000EB128DB60000000083C301395DE40F8EBC0000008B349F8B460485C074EA80380074E58B4DE08B41208B500889742404890424FF921801000085C00F85970000008B56108B420883F8FF0F84270500008B4DE0837DD8018B895C4000008B0481894DB48945DC0F849C0000008B460CF6C4400F84B00000008B4DD485C9740F8B4DCC8B55D48B41208942048951208B560483C3018914248955ACE82D53F7FF8B4DB88B55AC894C240889142489442404E84BE10400395DE48975BCC745D4000000008945C40F8F49FFFFFF908D74260083C46C5B5E5F5DC38B45D0890424E84D94070085C00F841DFFFFFF8B55E08B4DD08974240889542404890C24E84FAD0700E902FFFFFF669081FAC02F3A080F849C0100008B45C085C00F85E9FEFFFFE948FFFFFF8D742600F6C4010F85D7FEFFFFA8830F84CFFEFFFF8B4A1C894DC88B4E08014DC881FA80303A080F841F0200008B4A14894DA48B4DC8034DDCF745A400040000894DB48B4DC80F444DB4F645A410894DC80F8494010000A8820F84BA0100008B4E04C745B001000000894DB48B45B48955AC890424E82E52F7FF8B4DE08B55AC894C240C8B4DC8895424088B55B0890C248B4D0C8954240489C28B45B4E84AFDFFFF85C08945DC0F8437FEFFFF837DD80289F00F84DB01000085C074098B401C8B55DC8942148B4DDC8B45C48B55D0894118894C240889742404891424E87AC80700837DB0010F85F8FDFFFF837DD8020F85EEFDFFFF8B4E04890C24894DB4E8A451F7FF83F8040F8ED7FDFFFF8D50FC8B45B4C744240493992C088955AC01D0890424E8C058F7FF8B55AC85C00F85B1FDFFFF8B45E08B4DC88944240C8B4610890C24B901000000C744240405000000894424088B45B4E890FCFFFF85C00F8480FDFFFF8B4DDC8B51148B4DD08950148B55C48950188944240889742404890C24E8D6C70700E959FDFFFF90F6460C080F845AFEFFFF8B4E088B55E085C98B4220894DDC0F843AFDFFFF8B506485D20F842FFDFFFF895DC889CB8B4DB48DB42600000000F642140174128B421C39C3720B03422439C30F828A0100008B520C85D275E18B5DC8E9F9FCFFFFF645A4010F84EFFCFFFFA8820F849F000000F645A4020F84170100008B4604C745B0020000008945B4E953FEFFFF8B4E04894DB40FB60980F92E884DDC7409A801741280F924750D8B45B48078014C0F84A4FCFFFFC745B006000000E920FEFFFF837DD8020F84FE0000008B4628050001000083F8020F87DB0000008B0485B4992C0883F8048945B00F842D0300008B4E04894DB480392E0F845BFCFFFF8B45DC0145C8E9D8FDFFFF8B4614E91DFEFFFFA8010F848C0000008B4604C7042470992C088955AC894424048945B4E82B57F7FF8B55AC85C00F85090100008B4DE08B896C400000894DB0837DB0000F885D010000837DD4000F84E20100008B4DB08B45D483C104833C88000F858C0100008B56108B421C03460881FA80303A088B75DC8B55D48D34300F45C689048AE9C6FBFFFF8B4E04C745B003000000894DB4E93CFDFFFF8B4E04C745B000000000894DB4E92AFDFFFF8B4E04C745B004000000894DB4E918FDFFFF8B4604C745B0040000008945B4E906FDFFFF8B42088B5DC8894DB483F8FF8945C80F84370200008B76048955AC893424E81F4FF7FF8B55AC8B4DE0C744240405000000895424088B55B4894C240C8B4DDC8945B08B45C8030C8289F08B55B0890C248B4D0CE82EFAFFFF85C00F841EFBFFFF8B55C4895018E913FBFFFF8B45B4C7042479992C088955AC89442404E80156F7FF8B55AC85C00F854B0100008B4DE08B896840000083F9FF894DB00F85CDFEFFFFC744240805000000C744240450D52A08C7042400000000E8254CF7FFC7442404B3010000C7042466992C0889442408E81117F8FF8B4DA483E10283F90119C9F7D183C108894DB0E919FCFFFFC744240805000000C744240410CE2A08C7042400000000E8D94BF7FFC74424040A010000C7042466992C0889442408E8C516F8FF8B10894DA8C744240805000000C74424040C982C088955ACC7042400000000E89D4BF7FF8B55ACC70424E0B839088954240889442404E80AD7F7FF8B4DA8E931FEFFFF8B45E08B886C4000003988684000000F4D88684000008B807040000039C10F4CC88D148D14000000894DA88914248955ACE8CC24F8FF8B55ACC744240400000000895424088945D4890424E86E48F7FF8B4DA88B45D4837DBC0089480C0F84B90000008B55BC8B4DD48B42048901E9ABFDFFFF8B45B4C7042484992C088955AC89442404E89554F7FF8B55AC85C00F85DDFEFFFF8B4DE08B897040000083F9FF894DB00F8561FDFFFFC744240805000000C7442404A8972C08C7042400000000E8B94AF7FFC7442404B5010000C7042466992C0889442408E8A515F8FF8B46048945B4E9BAFAFFFFC744240805000000C744240410CE2A08C7042400000000E87A4AF7FFC744240430010000C7042466992C0889442408E86615F8FF8B5604C744240805000000C7442404CC972C08C70424000000008955ACE8404AF7FF8B55ACC70424E0B839088954240889442404E8ADD5F7FFE9C4FCFFFF908DB42600000000</bytes>
-<bytes id="17">
-5589E557565383EC3C8B5D108B750C8B4B108B530C8D7E0189C829D039C77F688B430801FA89530C39C2747A8B7B1801FAF7D721FA89D72B7B0489530C897DE489CF2B7B04397DE47F3689D1894B088B5D0801F3395D0874168B550889C189DF0FB61A83C201881983C10139D775F1C604300083C43C5B5E5F5DC3908D742600894B0CEBC78D7600897C2404891C24E8B86EF2FF8B530C8B43088B4B1001FA39C289530C7586804B2802EB808D742600</bytes>
-<bytes id="18">
-5589E583EC38895DF48B5D108975F88B4D0C897DFC8B838400000085C074288B400431D28B731C8B7B208945E489C801F011FA83FA00765083FF0077553B75E473508B4DE429F18B531031F631FF31C085D274218B4508894C2408C744240C00000000891C2489442404FF1283F8FF740A89C631FF01731C117B208B5DF48B75F88B7DFC89EC5DC33B45E476BA83FF0076AB8B5DF431C08B75F88B7DFC89EC5DC3EB0D90909090909090909090909090</bytes>
-<bytes id="19">
-5589E58B55085D0FB642010FB612C1E00809D0C38DB6000000008DBF00000000</bytes>
-<bytes id="20">
-5589E58B45088B550C8B88A000000031C039515876098B41408B04908B402C5DC3EB0D90909090909090909090909090</bytes>
-<bytes id="21">
-5589E557565383EC3C8B4508890424E89C1B040085C089C30F84CC0200008B4508895C2404890424E8130404003B05C4773A088945E0720C3B05C8773A080F82B40100008B55E0895C2404891424E80D04F7FF89C6A1B0D63B088B782085FF0F8406010000895DE48B5DE0EB0D8D76008B3F85FF0F84EE0000008B874040000085C074EC8B40248B55E4C744241000000000895C2408897424048954240C893C24FF503C85C074C88B5DE48B45E0895C2404890424E816FFFFFF85C00F84A900000085F60F84160200008B50048B0A3B4E040F82930000008B52048B00890DC4773A08891DCC773A088915C8773A08A3D0773A088B751085F674218B4508895C2404890424E8F601040085C00F850E010000A1C4773A088B551089028B4D0C85C9740AA1D0773A088B550C89028B5514B80100000085D274268B4508895C2404890424E8B801040085C00F85F0000000A1C8773A088B55148902B80100000083C43C5B5E5F5DC3908B5DE485DB0F843201000085F60F842A0100008B068B7E04891DCC773A08A3D0773A088B4614893DC4773A0885C075788B4E288D562885C90F8456010000895DE48D465089FB66908B7A0439FB740C8B52103B56100F84AD0000008B0889C283C02885C975E28B5DE48B0B8B53048B411C8BB25C4000008B5108034124030496A3C8773A08E902FFFFFF8DB6000000003B1DCC773A080F8540FEFFFFE9EBFEFFFF8DB4260000000001F8A3C8773A08E9D8FEFFFF8D742600A1C4773A08895C2404890424E8AF0104008B55108902E9E1FEFFFF908D742600A1C8773A08895C240483E801890424E88C0104008B551483C001890283C43CB8010000005B5E5F5DC38DB4260000000085C98B5DE40F8456FFFFFF8B138B4B048B422403421C8B895C4000008B520803049139F80F864EFFFFFF893DC8773A08E94FFEFFFF8B550C85D274098B550CC702000000008B451085C074098B4510C700000000008B7D1431C085FF0F848DFEFFFF8B5514C70200000000E97FFEFFFF8B50048B0AE9EEFDFFFF8B5508891424E8BBCEF6FF89C3E922FDFFFF8B0B8B53048B41248BB25C4000008B510803411C030496E9D0FEFFFF908DB42600000000</bytes>
-<bytes id="22">
-5589E58B45085D8B4024C3908D742600</bytes>
-<bytes id="23">
-5589E557565383EC5C8945E08B55E08B400C8B5A108945C88B72388D0C9889D08B52142B5018894DD48D041239C30F8285010000C1E20339DA0F82710100008B55E08B423085C00F848A010000C744240804000000895C24048B522C891424FFD089C231C085D20F84340100008B4DE08B41182941148B45C889510C895910897138C74118000000008945E4EB1266908345E4048B55E43955D40F86EA0000008B55E48B1283FA018955DC76E38B4DE0891424FF118B55E08945D88B4238C1E0048D98E02038088B80E02038088B4B0C8945D08B45D8F76304894DCC8945C08B45D88955C48B55C429D0D1E88D04028B55D8D3E88B4DE00FAF45D08B491029C28B45E08955B4894DB08B700C8D3C968B0F85C9746083F9010F84FD0000008B45D8F763088B7DD80FB64DCC8B5DD88945C08B45B429D7D1EF01D783C301D3EF8B4DD08955C48B55B083E9020FAFF929FBEB0F8DB60000000083F9010F84BA00000001D889C129D139C20F46C18D3C868B0F85C975E38345E4048B45DC8B55E43955D489070F8716FFFFFF8B4DE08B412885C0745C8B55C8891424FFD0B80100000083C45C5B5E5F5DC38DB4260000000083FB200F8686FEFFFFE882FBFFFF8B55E089C6C1E0048B98E02038088B423085C00F8576FEFFFF8B55E0C744240404000000891C24FF522489C2E974FEFFFF908B4DE0B8010000008B513485D274A28B45C8894424048B412C890424FFD283C45CB8010000005B5E5F5DC3E80C09DBFF</bytes>
-<bytes id="24">
-5589E583EC38895DF48B5D088975F88B4D10897DFC8B750C85DB0F84EE00000085F678628B033B70047D5B8B7B1085FF0F85940000008B781C8B40208B53080314B785C98B04B0742789442408894C2404891424E8E34BF5FF8B430CC60430018B5DF48B75F88B7DFC89EC5DC38D760089442408C744240400000000891424E8E846F5FFEBD3C744240805000000C7442404AACA2A08C7042400000000E88A49F5FFC7442410007A2D08C744240C487F2D08C744240474030000C70424E57D2D0889442408E86614F6FFC744240805000000C7442404AACA2A08C7042400000000E84649F5FFC7442410F07D2D08C744240C487F2D08C744240475030000C70424E57D2D0889442408E82214F6FFC744240805000000C7442404AACA2A08C7042400000000E80249F5FFC7442410D47D2D08C744240C487F2D08C744240473030000C70424E57D2D0889442408E8DE13F6FF8DB426000000008DBC2700000000</bytes>
-<bytes id="25">
-5589E583EC188B550C8B4D0889D088510C8D50FD80FA0176173C0674133C05740F3C07740BC7410800000000C9C36690C744240800000000C744240400000000890C24E8A8F8FFFFC9C38DB600000000</bytes>
-<bytes id="26">
-5589E5575383EC10C704248C030000E83C5DF9FFB9E300000089C2A348733A0889D731C0F3ABA180D5390885C0741FBB80D539088D742600E8E3FEFFFF8B1085D27530891883C3108B0385C075EAC70520DB3B0800000000C70524DB3B0800000000C70528DB3B080000000083C4105B5F5DC38B1BC744240805000000C7442404D8572C08C7042400000000E83B83F8FF895C240CC7442404D1000000C70424FE572C0889442408E8234EF9FF8D7600</bytes>
-<bytes id="27">
-5589E557565383EC2C8B75088B7D18C7042474000000E8C5E1F9FF89FA89C38D482C8D4064894424088D4330894424048D436089042489F0E8B3FEFFFF85C089436C740E8D7426008958688B407085C075F68B432C85C074038958608B436085C0740389582C8B433085C074038958648B436485C074038958308B1785D2741D8B4204897424048955E0890424E86A11F9FF8B55E085C00F88B30000008913891F8B450CBA30970B088973048B7510C7431400000000C743200000000089430831C085F60F45C289430C8B4510C7432800000000C7433400000000C74338000000008943108B4514C74344009C1108C7432400000000C7433C0000000089431889D8C6434000C6434100C7434800000000C7434C00000000C7435000000000C7435400000000C7435800000000C7435C00000000C7436800000000C743700000000083C42C5B5E5F5DC38DB600000000895DE489D3EB16908B470489742404890424E89510F9FF85C07F0889FB8B3B85FF75E589DA8B5DE4893B891AE920FFFFFFEB0D90909090909090909090909090</bytes>
-<bytes id="28">
-5589E583EC18C7042478000000895DF889C3897DFCE8B61AF7FFB91E00000089C231C089D7F3AB895A08C6421101837B04187634C744240805000000C74424047A642D08C7042400000000E8FC40F6FFC744240403150000C7042465612D0889442408E8E80BF7FF8B4304FF2485806D2D088DB6000000008B5DF889D08B7DFCC742040200000089EC5DC3908D7426008B5DF889D08B7DFCC742040300000089EC5DC3908D7426008B5DF889D08B7DFCC742040100000089EC5DC3908D7426008B5DF889D08B7DFCC742040000000089EC5DC38DB6000000008DBC2700000000</bytes>
-<bytes id="29">
-5589E557565381EC2C0100008B5D088DBD6CFFFFFFC78500FFFFFF00000000C744240434000000895C2408893C24E83D53FEFF83F8340F851402000080BD6CFFFFFF7F742BC7042403000000E86F4BFEFF8B8500FFFFFF31F685C00F85CF01000081C42C01000089F05B5E5F5DC3669080BD6DFFFFFF4575CC80BD6EFFFFFF4C75C380BD6FFFFFFF4675BA80BD72FFFFFF0175B180BD70FFFFFF0175A80FB68571FFFFFF3C010F84BC0100003C0275958B43088B700C85F6758B8D8500FFFFFF89442404891C24E87447FEFF85C074818B7308891C24FF567885C00F8470FFFFFF8B93A000000089D889D18995F4FEFFFF899500FFFFFF89FAE8E2E0FFFF8B8DF4FEFFFF0FB749246683F90466898DF0FEFFFF0F842CFFFFFF8B95F4FEFFFF8B421885C0750A6683F9010F8415FFFFFF8B8DF4FEFFFF83793428740B8B493885C90F85FEFEFFFF85C075118B85F4FEFFFF8B503885D20F85E9FEFFFF8B43088B80A80100008985ECFEFFFF89C28B805C01000080780A200F85C8FEFFFF8B8DF4FEFFFF8B42040FB7792639F80F84EE0000008B925401000085D2740839D70F84DC0000008B8DECFEFFFF8B915801000085D2740839D70F84C400000085C00F8581FEFFFFA1E8313A088B1085D27516E9AC0000008D74260083C0048B1085D20F849B000000837A040575ED8B92A80100008B8A5C01000080790A2075DB3B7A040F843FFEFFFF8B8A5401000085C9740839CF0F842DFEFFFF8B925801000085D274B639D775B2E91AFEFFFF908D7426008D8500FFFFFF89442404891C24E86E45FEFF81C42C01000089F05B5E5F5DC390E85B3FFEFF83F8010F85E7FDFFFF6690E9ECFDFFFF8D76008B430883780C010F8445FEFFFFE9CBFDFFFF8DB6000000006683BDF0FEFFFF020F84720200006683BDF0FEFFFF030F84CC0300008B85F4FEFFFF8B403085C07407814B34000100008B95ECFEFFFFC7442408000000008B02891C2489442404E8343DFEFF85C00F85540100008B8DECFEFFFF8B790485FF0F856CFDFFFF8B85F4FEFFFF8B781885FF0F851A0200008B95F4FEFFFF8B423885C00F856E0300008B95F4FEFFFF8B7A3C85FF0F852DFDFFFF8BBBA00000008B8DF4FEFFFF8B413085C00F85F5050000C74744000000008B8DF4FEFFFF8B793C85FF745D8B511885D274568B83A00000008B405883F801763189B5F0FEFFFFBF0100000089C68D7600897C2404891C24E8DCD1000085C00F84D5FCFFFF83C70139FE77E58BB5F0FEFFFF891C24E88FBA000085C00F84ACFCFFFF8DB426000000008B95ECFEFFFF8B422885C0740D891C24FFD085C00F848BFCFFFF8B8DF4FEFFFF8B4110891C2489442404E8813EFEFF8B7B6485FF7515E90D010000908D7426008B7F0C85FF0F84FD0000008B87880000008B500483FA04740583FA0975E28B402085C074DB89442404891C24E8FF0A000085C074CBF640152074C5814F1400200000EBBC8D7426008B85ECFEFFFF8B480485C90F84ACFEFFFF8B95F4FEFFFF8B40080FB67A0739C70F8497FEFFFF85C00F85EFFBFFFF8B15E8313A088B0285C07513E97EFEFFFF9083C2048B0285C00F8470FEFFFF39C674EF8378040575E98B48083B4E0875E18B480C3B4E0C75D98B80A80100003B780875CE8B8DF4FEFFFF0FB74926394804898DE8FEFFFF0F8492FBFFFF8B885401000085C9898DF0FEFFFF740C398DE8FEFFFF0F8476FBFFFF8B805801000085C0748F3985E8FEFFFF7587E95FFBFFFF66908D8500FFFFFF89442404891C24E89642FEFFE962FBFFFF90834B3402E993FDFFFF8DB4260000000089FAC1FA1FC744240C00000000897C240489542408891C24E81355FEFF85C00F851CFBFFFF8D4DA0895C2408C744240428000000898DF0FEFFFF890C24E81E4EFEFF83F8280F85F6FAFFFF8B95F0FEFFFF89D88D8D38FFFFFFE8D2D6FFFF8B85F4FEFFFF8B503885D275178B8550FFFFFF8B95F4FEFFFF85C08942380F84B3FAFFFF8B8DF4FEFFFF81793CFFFF00000F844A0400008B85F4FEFFFF817830FFFF00000F84450400008B8DF4FEFFFF8B413883F8010F84AB0000003DC44EEC040F8770FAFFFF8D04808D44C7D83B41180F8660FAFFFF89C2C1FA1FC744240C000000008944240489542408891C24E83E54FEFF85C00F8547FAFFFF8B8DF0FEFFFF895C2408C744240428000000890C24E84C4DFEFF83F8280F8524FAFFFF8B95F4FEFFFFC744240C000000008B4218891C2483C02889C1C1F91F89442404894C2408E8EA53FEFF85C00F8498FCFFFFE9EEF9FFFF908D742600834B34408D742600E927FCFFFF6BC034891C2489442404E8BCAFFEFF85C089C70F84C3F9FFFF8B8DF4FEFFFF8B4938898DE8FEFFFF8B83A00000008948588B93A000000089C8C1E00289442404891C248995E0FEFFFFE87DAFFEFF8B95E0FEFFFF8942408B83A00000008B404085C00F8474F9FFFF8B8538FFFFFF89078B853CFFFFFF8947048B8540FFFFFF8947088B8544FFFFFF89470C8B8548FFFFFF8947108B854CFFFFFF8947148B8550FFFFFF8947188B8554FFFFFF89471C8B8558FFFFFF8947208B855CFFFFFF8947248B8560FFFFFF8947288B8564FFFFFF89472C8B8568FFFFFF8947308B8DE8FEFFFF85C9743189B5F0FEFFFF8BB5E8FEFFFF89F931C0908D7426008B93A00000008B5240890C8283C00183C13439C677EA8BB5F0FEFFFF8B95F4FEFFFF8B423883F8010F8607010000B80100000083C7348D4DA089B5E4FEFFFF89C6898DF0FEFFFF908B85F0FEFFFF895C2408C744240428000000890424E89E4BFEFF83F8280F8576F8FFFF8B95F0FEFFFF89D889F9E856D4FFFF8B471C3985E8FEFFFF77298B95ECFEFFFF837A043E0F8740F8FFFF8B5204FF24952CEB3608902D00FF000083F8010F8727F8FFFF8B4708A8400F85E70000008B570483FA040F84DB00000083FA090F84D20000008B571885D27443A802743F837F040874398B8DECFEFFFF31D28B470C2B47101B57148B4910C744240C0000000089042489542404894C2408E8F52B060009C27409816334FFFEFFFF66908B95F4FEFFFF83C60183C7348B423839F00F8719FFFFFF8BB5E4FEFFFF85C00F845AFAFFFF8B8DF4FEFFFF8BBBA00000008B413C3B47580F8259FAFFFFA1E02E3A08C7413C000000008B7B04C744240805000000C7442404A0EA36088985F0FEFFFFC7042471632B08E85631E0FF897C2404890424FF95F0FEFFFF8BBBA0000000E910FAFFFF66908B95E8FEFFFF3B57200F871FFFFFFFE921F7FFFFC1E00589442404891C24E80DADFEFF8947448B83A00000008B484485C90F840AF7FFFF8B85F4FEFFFFC744240C000000008B4014C744240800000000891C2489442404E8D450FEFF85C00F85DDF6FFFF8B95F4FEFFFF8B83A00000008B52308B404485D20F84A8F9FFFF89B5F0FEFFFF31FF89C6EB098DB60000000083C6208D4DC8895C2408C744240420000000890C24E8B649FEFF83F8200F858EF6FFFF8D45C883C7018974240889442404891C24E847D4FFFF8B95F4FEFFFF397A3077BC8BB5F0FEFFFFE947F9FFFF8B8554FFFFFF89413CE9A8FBFFFF8B8558FFFFFF85C00F84ADFBFFFF8B95F4FEFFFF894230E99FFBFFFF90909090909090</bytes>
-<bytes id="30">
-5589E58B5508530FB642010FB64A020FB61A0FB65203C1E008C1E11009C809D8C1E21809D05B5DC3908DB42600000000</bytes>
-<bytes id="31">
-5589E583EC188B5508895DF88B5D0C897DFC85D2743A8B4510891424895C240489442408E85717000085C089C2740E8D580CB92900000031C089DFF3AB8B5DF889D08B7DFC89EC5DC38DB42600000000C7442404B0000000891C24E8B016000085C089C275B0EBD5908DB42600000000</bytes>
-<bytes id="32">
-5589E557565389C383EC2C31C08D7600C784838800000000000000C78483642000000000000083C0013DF707000075E08BBB840000008BB38000000085FF7E478D8388000000895DE489C3EB068D760083C628C7462000000000895C2404893424E88AF1FFFFC7462400000000893424E84BBB0C003B0674078B462485C0740F83EF0185FF7FC983C42C5B5E5F5DC3893424E829BB0C00890424E801FFFFFF89C1B86F452101F7E189C829D0D1E88D0402C1E80A69C0F707000029C189C88B4DE405180800008B54810489562489748104EBAD8DB6000000008DBC2700000000</bytes>
-<bytes id="33">
-5589E58B450C5DC3908DB42600000000</bytes>
-<bytes id="34">
-5589E557565383EC2CA11C763A088945E489C18B55E4890D20763A080FB6023C7E0FBED0766283FA240F85290500008B55E431DB8D74260083C3010FBE041A8D0C1A0FB6F0F68436802538088C75E983F85F74E483F82474DF8D43FD83F80D890D1C763A080F86250800008B45E489DAE87BFCFFFFBA04010000A3D8DB3B08E9CC0000008D7426000FB6D8FF249D009C2C088DB6000000008B75E48B4DE40FB65E0183C10180FB2E0F84CE0A000083EB3080FB090F87C600000083FA2D89C10F844307000083FA308B5DE40F84CF0400000FB60B31FF31D231F68845E0EB1F9085FF751E80F945740580F9657514BA01000000BE0100000083C3010FB60B85D274DE85F6750980F92E0F84A105000085D20F84B90400000FB643FF3C4574083C650F85A904000080F92B740A80F92D900F859A040000BA01000000EBBB8D76008B45E483C001A31C763A08908D7426008D65F489D05B5E5F5DC38DB6000000008B5DE48B4DE40FB6430183C1013C3D0F84730600003C260F84A60A00008D7600890D1C763A0889D08D65F45B5E5F5DC38B45E48B5DE483C001807B013D0F84E5050000908D742600A31C763A088D65F489D05B5E5F5DC3908B1528763A0885D20F84240A0000BA0D010000EB838D76008B45E48B4DE483C0018079013D75C989C8BA2A01000083C002A31C763A08C705D8DB3B08A40D2B08E953FFFFFF8D76008B4DE483C101890D1C763A08894DE4E9FFFDFFFF8D74260031D2E931FFFFFF908B75E48B4DE40FB6460183C1013C3D0F84730500003C7C0F8543FFFFFF8B45E4BA28010000C705D8DB3B08BE0D2B0883C002A31C763A08E9F4FEFFFF8D7426008B45E48B75E483C001807E013D0F8535FFFFFF89F0BA2201000083C002A31C763A08C705D8DB3B08C10D2B08E9BFFEFFFF8DB426000000008B75E4BF0C9A2C08B915000000F3A60F8593FEFFFF8B45E4BA1500000083C015A31C763A08B80C9A2C08E829FAFFFFBA04010000A3D8DB3B08E97AFEFFFF66908B5DE48B4DE40FB6430183C1013C3D0F84DB0400003C2B0F858BFEFFFF8B45E4BA31010000C705D8DB3B084227310883C002A31C763A08E93CFEFFFF8D7426008B45E48B75E483C001807E013D0F857DFEFFFF89F0BA2201000083C002A31C763A08C705D8DB3B089B0D2B08E907FEFFFF8DB426000000008B45E48B5DE483C001A31C763A080FBE530189D883C002A31C763A0883FA5C0F843709000083FA270F84B20400000FB61083C001A31C763A0880FA270F84A80900008B0D28763A0885C90F8526FEFFFFA120763A08BA0D010000C70528763A08F1992C08A324763A08E992FDFFFF66908B4DE48B5DE483C101894DE00FB65B0180FB3D885DDC0F848C030000807DDC2D0F841E080000807DDC3E0F84CB0800008B75E4BF229A2C08B904000000F3A60F856B0900008B45E4BA2701000083C004A31C763A08E936FDFFFF8DB6000000008B4DE483C101E955FDFFFF908D7426008B75E48B4DE40FB6460183C1013C3E0F84550700003C3D0F8533FDFFFF8B45E4BA2C010000C705D8DB3B08B50D2B0883C002A31C763A08E9E4FCFFFF8D7426008B45E48B4DE483C0018079013D0F8525FDFFFF89C8BA2B01000083C002A31C763A08C705D8DB3B08A70D2B08E9AFFCFFFF8DB426000000008B45E48B4DE483C0018079013D0F85EDFCFFFF89C8BA2201000083C002A31C763A08C705D8DB3B089E0D2B08E977FCFFFF8DB426000000008B5DE48B4DE40FB6430183C1013C3C0F84CD0600003C3D0F8583FCFFFF8B45E4BA2D010000C705D8DB3B08AE0D2B0883C002A31C763A08E934FCFFFF8D7426008B45E48B5DE483C001807B013A0F8575FCFFFF89D8BA0B01000083C002A31C763A08C705D8DB3B0806CC2B08E9FFFBFFFF8DB4260000000083FA5F0F84CEFAFFFF81E2FF000000F6841280253808880F85BAFAFFFFA128763A0885C00F8544FCFFFF890D24763A08BA0D010000C70528763A087D9A2C08E9B4FBFFFF8D7426000FB6530180FA58740980FA780F85A50200008B5DE4BF010000008B55E483C3020FB64A02E90DFBFFFF8DB426000000000FB6C9F68409802538088C0F8517FBFFFF0FB645E089D92B4DE43C2D0F84260200008B45E489CFC745DC350000008945E085D20F85CF00000085F60F85C700000085FFC745E4000000000F8E220600008B4DE08D47FF31F6C745E40000000001F90FB651FF8D780180FA4C740580FA6C757E89C783C60183E90183E80185FF7FE085F60F84E905000083FE010F842F060000B8419A2C08E8C4F6FFFF89C6B84A9A2C08E8B8F6FFFF8B55E485D289FA0F44F08B45E0E866F6FFFF89F289C18B45DCE8CAF6FFFFBA02010000A3D8DB3B08891D1C763A08E9A5FAFFFF908D74260066BE0100E93FFAFFFF8DB4260000000080FA55740580FA75758789C78345E401E972FFFFFF8D76008B55E00FB6443AFF0FB680802738083C660F84230600003C6C0F842F0600000FB6D0F6841280253808040F85580500003C2E0F84500500008D411F8B75E483E0F029C48D5C241B83E3F0894C2408894DD889742404891C24E8A737F7FF8B4DD8C6040B008B0D28763A0885C90F857CFAFFFFA120763A08BA0D010000C70528763A08549A2C08A324763A08E9E8F9FFFF8B45E4BA22010000C705D8DB3B08980D2B0883C002A31C763A08E9C9F9FFFF9089D8BA2201000083C002A31C763A08C705D8DB3B08A10D2B08E9AAF9FFFF669089F0BA2201000083C002A31C763A08C705D8DB3B08BB0D2B08E98AF9FFFF669089D8BA2201000083C002A31C763A08C705D8DB3B08910D2B08E96AF9FFFF669089D8BA2201000083C002A31C763A08C705D8DB3B08B80D2B08E94AF9FFFF66908B5DE483C301E9BEF8FFFF908D7426008B45E48D79FFC745DC3600000083C0018945E0E9D1FDFFFF8B1D28763A0885DB0F8588F9FFFF890D24763A0866BA0D01C70528763A08D8992C08E9F9F8FFFF80FA54741C80FA74741780FA64741231FF80FA448B5DE40F8562F8FFFF8D7426008B5DE431FF8B75E483C3020FB64E02E94AF8FFFF8D742600FF2485FC9D2C088B75E4B910000000BFC5DF2D08BA12010000F3A60F97C10F92C038C10F85B2F7FFFFE992F8FFFF8B75E4BF8F9A2C08B918000000F3A60F85CD0500008B45E4BA2601000083C018A31C763A08E968F8FFFF8B75E4B90B000000BFA89A2C08BA11010000F3A60F97C10F92C038C10F8561F7FFFFE941F8FFFF8B75E4BFB49A2C08B91A000000F3A60F85A30500008B45E4BA25010000C705D8DB3B081100000083C01AA31C763A08E90DF8FFFF8B75E4BFE89A2C08B90D000000F3A60F85B00500008B45E4BA25010000C705D8DB3B080C00000083C00DA31C763A08E9D9F7FFFF8B75E4BF969B2C08B911000000F3A60F85070400008B45E4BA25010000C705D8DB3B081000000083C011A31C763A08E9A5F7FFFF8B75E4BF6B9B2C08B913000000F3A60F85FA0300008B45E4BA25010000C705D8DB3B081300000083C013A31C763A08E971F7FFFF8B75E4BF229B2C08B91D000000F3A60F85560500008B45E48B5DE4C705D8DB3B083C00000083C01DA31C763A080FB6531D89C384D20F84B60600008DB6000000000FB6CAF68409802538088C750F80FA5F740A80FA24740580FA2E750A83C3010FB61384D275DA89DA29C2E8A1F2FFFFBA25010000891D1C763A08A3D8DB3B08E9ECF6FFFF8B75E4B904000000BF21883008BA1E010000F3A60F97C10F92C038C10F84CAF6FFFF8B75E4B904000000BF7F9B2C08B21BF3A60F97C10F92C038C10F84ABF6FFFF8B75E4C744240804000000C7442404B19B2C08893424E8EC39F7FFBA2001000085C00F8483F6FFFFC744240804000000C7442404849B2C08893424E8C739F7FFBA0801000085C00F845EF6FFFFC744240804000000C74424043C9A2C08893424E8A239F7FFBA1501000085C00F8439F6FFFFC744240804000000C74424048D642C08893424E87D39F7FFBA2301000085C00F852FF5FFFFE90FF6FFFF8DB426000000008B75E4BF899B2C08B908000000F3A60F85610400008B45E4BA25010000C705D8DB3B080A00000083C008A31C763A08E9D4F5FFFF807E022E0F85FAF5FFFF89F0BA1C01000083C003A31C763A08E9B6F5FFFF89F083C002807E023D0F844D010000A31C763A08BA2E010000C705D8DB3B08ABCB2A08E98EF5FFFF89D883C002807B023D0F8409010000A31C763A08BA2F010000C705D8DB3B08B10D2B08E966F5FFFF890D24763A08BA0D010000C70528763A08639A2C08E94CF5FFFF8B45E4BA30010000C705D8DB3B086186320883C002A31C763A08E92DF5FFFF8B45E4BA29010000C705D8DB3B08AA0D2B0883C002A31C763A08E90EF5FFFFB87A492B08E8E4F0FFFF89C6B883492B08E8D8F0FFFFE91BFAFFFF8D7600B82C9A2C08E8C6F0FFFF89C68B45E089FAE87AF0FFFF89F289C18B45DCE8DEF0FFFFBA03010000A3D8DB3B08E90FFAFFFFB8339A2C08E895F0FFFF89C6B83C9A2C08E889F0FFFFE9CCF9FFFFE84FF2FFFFA11C763A08E9C3F6FFFF8B45E4BA33010000C705D8DB3B0813052B0883C002A31C763A08E976F4FFFF83C001BA22010000A31C763A08C705D8DB3B08AD0D2B08E95AF4FFFF83C001BA22010000A31C763A08C705D8DB3B08B40D2B08E93EF4FFFFB857272B0883EF01E811F0FFFF89C6E946FFFFFFB8279A2C0883EF01E8FDEFFFFF89C6E932FFFFFF89C28B45E42B55E4E8A9EFFFFF89C3B8B19B2C08E8DDEFFFFF89D989C2B835000000E8FFEFFFFFBA02010000A3D8DB3B08E9E0F3FFFF0FB65DDC83EB3080FB090F863AF3FFFF8B75E0BA2D00000089351C763A08E9BDF3FFFF8B75E4B907000000BF1A9B2C08BA21010000F3A60F97C10F92C038C10F85B6F2FFFFE996F3FFFF8B75E4B905000000BF9B642C08BA24010000F3A60F97C10F92C038C10F8474F3FFFF8B4DE4C744240805000000C7442404B3F93708890C24E8B536F7FFBA0601000085C00F844CF3FFFF8B75E4C744240805000000C744240424112C08893424E88D36F7FFBA0701000085C00F8424F3FFFFC744240805000000C744240457272B08893424E86836F7FFBA1F01000085C00F84FFF2FFFFC744240805000000C7442404BF9B2C08893424E84336F7FFBA1601000085C00F84DAF2FFFFC744240805000000C7442404CD432E08893424E81E36F7FFBA1801000085C00F85D0F1FFFFE9B0F2FFFF8B75E4B90C000000BF9CDF2D08BA13010000F3A60F97C10F92C038C10F85A9F1FFFFE989F2FFFF8B75E4C744240818000000C7442404CF9A2C08893424E8CA35F7FF85C00F8581F1FFFF89F0BA2501000083C018A31C763A08C705D8DB3B0814000000E948F2FFFF8B45E4C744240810000000C7442404F69A2C08890424E88935F7FF85C00F85250100008B45E4BA25010000C705D8DB3B080E00000083C010A31C763A08E906F2FFFF8B75E4C74424081C000000C7442404409B2C08893424E84735F7FF85C00F852101000089F083C01CA31C763A0889C3C705D8DB3B083D0000000FB6561C84D20F84410100000FB6CAF68409802538088C751380FA5F740E80FA24740980FA2E0F8597FAFFFF83C3010FB61384D275D6E988FAFFFF8B75E4C744240815000000C7442404929B2C08893424E8D334F7FF85C0751E89F0BA2501000083C015A31C763A08C705D8DB3B080F000000E955F1FFFF8B45E4C744240803000000C744240422BD3108890424E89634F7FFBA0E01000085C00F842DF1FFFF8B55E4C744240803000000C744240483492B08891424E86E34F7FFBA1701000085C00F8520F0FFFFE900F1FFFF8B55E4C744240812000000C7442404079B2C08891424E84134F7FF85C075688B45E4BA25010000C705D8DB3B080D00000083C012A31C763A08E9C2F0FFFF8B45E4C74424080B000000C74424049C9A2C08890424E80334F7FF85C00F85EA0000008B45E4BA25010000C705D8DB3B080900000083C00BA31C763A08E980F0FFFF31D2E973F9FFFF8B4DE4C744240808000000C7442404FBE22E08890C24E8BA33F7FFBA1001000085C00F8451F0FFFF8B75E4C744240808000000C7442404BE153808893424E89233F7FFBA1D01000085C00F8429F0FFFFC744240808000000C74424048E883008893424E86D33F7FFBA0A01000085C00F8404F0FFFFC744240808000000C74424047F6F3008893424E84833F7FFBA0C01000085C00F84DFEFFFFFC744240808000000C7442404DDF83708893424E82333F7FFBA1901000085C00F85D5EEFFFFE9B5EFFFFF8B55E4C744240806000000C744240489CA2B08891424E8F632F7FFBA0F01000085C00F848DEFFFFF8B4DE4C744240806000000C74424045D9B2C08890C24E8CE32F7FFBA0501000085C00F8465EFFFFF8B75E4C744240806000000C74424046D883008893424E8A632F7FFBA1401000085C00F843DEFFFFFC744240806000000C7442404649B2C08893424E88132F7FFBA0901000085C00F8418EFFFFFC744240806000000C74424042C9A2C08893424E85C32F7FFBA1A01000085C00F850EEEFFFFE9EEEEFFFF8DB426000000008DBC2700000000</bytes>
-<bytes id="35">
-5589E557565383EC7C8904248955D48945E4E8C9C1EBFF8945DC890424E85E46FBFF89C38B45DC890424E8D145FBFF8B55D48B3285F68975E0740D8B45E083C47C5B5E5F5DC366908D1C18895DD8C7042428000000E866B8EBFF8945E08D049BC1E002890424E855B8EBFF8B4DE0894108C704246C000000E8D371EBFFB91B00000089C389C789F0F3AB895C2404C70424E0F41908E8867EEBFF8B55E48914248945C4E808C3EBFF8B55E083C2248943248D4324E8F7ECFFFF85C08945D00F84140500008B4DD08B75E08B018B50148B481889534C894B508B500C8B4810895354894B588B501C8B48208B403489535C894B608946208B4324890424E8BFA5F7FF85C00F845F0400008B4038890424E8EC80F7FF85C074688B55D08B128955CC0FB6423A3C010F84590400003C0375558B75CCBF50D53008B9050000008B762C8975C8F3A675288B45C8C74424042B0000008955C083C005890424E8BC93EAFF8B55C085C0751E8B75D08B368975CCC74368010000008B55CCEB0A908D7426008B45D08B108B4A288B7DE48B52248B45D0895C2404893C24E8D3F0FFFF8B038943288B430489432C8B43088943308B430C8943348B43108943388B431489433C8B43188943408B431C8943448B432089434889D8E8C7EEFFFF8943288B45D08B48108B500C895C2404893C24E87FF0FFFF8B431883F8010F844303000083F8027436C744240805000000C74424040FD63008C7042400000000E8AE96EAFFC7442404E2030000C704240CD5300889442408E89A61EBFF66908B7DE48B53108B4B148B431C897C24088B7DE0C744241000000000C744240C000000008B7724897424048B7720893424E883FCFFFF89078B4DD831FF31F685C97E47895DD08B5DDC8B45E089FA83C714035008A18C673B08891C248955C089442404E811D7FAFF8B4DE48B55C08974240483C601891C24894C240C89542408FF103975D87FC28B5DD08B730485F68975E40F8EA600000031C031F6895DE489C3EB2E8DB6000000008B4DE08D04BF8B51088B44821085C00F84B30100008D76008B7DE483C60183C3148B470439F07E688B7DDC89742404893C24E8693DFBFF3945D889C77EDA85C078D68B55E48B0201D88B501085D274B08B55E08D3CBF897DD0C1E7028B4DD0897DCC8B388B5208893C8A8B4DCC8B7804897C11048B7808897C11088B780C897C110C8B401089441110EB8D908D74260089FB8945E48B4DD885C90F8EE300000031C031D28945A48955A0895DDCEB15908345A0018B75D88345A4143975A00F84BC0000008B45E08B5DA40358088B4B108D71F783FE0177D88B55DC8B7DDC8B75DC8B45E48B128B7F608B765C8945B08955C889C2C1FA1F39D78975D0897DCC8955B4774C720439C673468B55D08B7DC88D34928D34B78B7E1085FF743383FF05742E83F9090F84AC0100008B0E8B45E089480C8B4E048948108B4E088948148B4E0C8948188B4E1089481CE960FFFFFF83F9090F84D70000008B45E08B55D0C7401C0300000089500C8B4DCC8948108B5DDC8B5B04895DE4E933FFFFFF8D76008B5DDC8B75E48B435C89F7C1FF1F397B607716720439F073108B138D0480837C8210010F841F0100008B45C4890424E82C4EEBFF8B4DE08B55D4890AE99AFBFFFF8DB426000000008B55E48B4DDC8B4224890C2489442404E87363EBFF897C24048B7DDC893C248945C0E8D13AFBFFC744240805000000C7442404D0D43008C704240000000089C7E8DF93EAFF8B55C0897C2408C70424E0B839088954240C89442404E8481FEBFFE9EBFDFFFF8D76008B55D089138B4DCC894B048B5DE08B7DDC8B75A48B4B088B7F04C744311003000000897DE4E956FEFFFF8DB6000000008B43108B55E489442404891424E80EF9FFFF8B73688B4DE085F68901741A2B43088901E907FDFFFF8B7DD08B17E913FCFFFF8DB6000000008B75E00343088906E9EAFCFFFFC74364010000000FB6423A3C010F8594FBFFFFC74368010000000FB6423AE984FBFFFF8B7DE0C7470401000000E9D2FEFFFF8B0E890B8B4E04894B048B4E08894B088B4E0C894B0C8B4E10894B10E9B8FDFFFFC744240805000000C7442404AACA2A08C7042400000000E8D892EAFFC744241003D63008C744240CBAD73008C7442404B9030000C704240CD5300889442408E8B45DEBFF8D742600</bytes>
-<bytes id="36">
-55B80100000089E583EC08C9E9BFFBFFFFEB0D90909090909090909090909090</bytes>
-<bytes id="37">
-5589E583EC48A144DC3B08895DF48B5D10897DFC8B7D088975F88945E48B0385C07455E8B8FAFFFF85C089C674328B03890424E8D8A6F5FF8933893424C744240400000000E852E9F4FF85C089C6781889F08B5DF48B75F88B7DFC89EC5DC3908B33EBD68D7426008B03890424E89EA6F5FFC703000000008B750C85F6744E8B450CE859FAFFFF85C089C6741389442404C70424806E0508E843D4F5FF89750C8B1544DC3B08C7442404DBB12D088914248955E0E863F2F4FF8B55E085C089C6740B3B45E474798078FF3A7473803F2F0F84F20000008B45E4895C2410C744240C00000000897C2408C744240402000000890424E8D7FAFFFF85C089C60F894DFFFFFF893C24E8D5E2190039C70F843DFFFFFF894424088B45E4895C2410C744240C00000000C744240402000000890424E89AFAFFFF89C6E913FFFFFF8D76000FB6460584C074043C3A75818914248955E0E895EFF4FF89C18B450C894DDC890424E885EFF4FF8B4DDC8B55E029D68D44012083E0F029C48D44242383E0F089742408895424048945E4890424E8AAE9F4FF8B55E48B450C01F283C6058914248955E089442404E8F0EFF4FF8B55E0033544DC3B0889142489742404E83BF3F4FFE907FFFFFF669089F8E811F9FFFF85C089C60F84FDFEFFFF8944240489F7C70424806E0508E8F5D2F5FFE9E6FEFFFF</bytes>
-<bytes id="38">
-5589E557565381EC5C040000E88F59040089C6890424E8155B0400C744240849372E08C7442404F6812D08893424E8AD590400C744240849372E08C7442404FF812D08893424E895590400C744240800000000C744240406822D08C7042402000000E8A92D1A00C745D406822D08C745D80C822D08C745DC000000008934248985C4FBFFFFE8C65704008D55E48954241CC744241800000000C744241400000000C744240806822D08C74424040A000000894424108D45D48944240C8B85C4FBFFFF890424E836211A0085C074598B85C4FBFFFF890424E8741B1A00893424E86C580400A170783A0885C0742F8B3031D231DB85F6741F908B449008890424E86CD4F5FFA170783A0885C0740F83C301391889DA77E2C7000000000081C45C0400005B5E5F5DC38B85C4FBFFFFC744240400000000890424E8431E1A0089B5BCFBFFFF8985C0FBFFFF8DB426000000008B85C0FBFFFF890424E88E1EF5FF85C00F855B0100008B85C0FBFFFFC744240400040000894424088D85D4FBFFFF890424E88618F5FF85C089C60F8431010000890424E8B41DF5FF83F80389C77EB1B80F822D0831DB669089442404893424E8C81FF5FF85C0759883C3018B049D14AF2D0885C075E28D47FE80BC05D4FBFFFF2F8D57FF0F848801000089D0C68405D4FBFFFF000FB695D4FBFFFF8D85D4FBFFFF80FA200F85830000008D9DD4FBFFFF83C3010FB61380FA2074F589D8EB119080FA2C740F83C3010FB61380FA20740484D275EC39D80F8424FFFFFFC603008895B8FBFFFF890424E833331A000FB695B8FBFFFF89C6A170783A0885C074498B78048B0839CF744039F90F83590100008D790184D28938897488080F84DFFEFFFF0FB653018D430180FA20740B89C3EB9F8DB4260000000083C0010FB61080FA2074F589C3EB89908895B8FBFFFFC744240401000000890424E8B2770C000FB695B8FBFFFFA370783A088B088B7804EB978D45E08BB5BCFBFFFF894424088B85C4FBFFFFC744240401000000890424E82C1B1A0085C00F84E2FDFFFF8B45E0A87F0F85D7FDFFFF0FB6C485C00F85CCFDFFFF8B85C4FBFFFF890424E840191A00893424E838560400A170783A0885C074258B48048B1039D1741C39D176478D4A018908C74490080000000081C45C0400005B5E5F5DC3C744240401000000890424E80A770C00A370783A088B108B4804EBC883EF0380BC3DD4FBFFFF2F0F44C7E967FEFFFFC744240805000000C7442404AACA2A08C7042400000000E85B19F5FFC74424104C082B08C744240CFCAE2D08C744240479030000C70424EC812D0889442408E837E4F5FFC744240805000000C7442404AACA2A08C7042400000000E81719F5FFC74424104C082B08C744240CFCAE2D08C74424045D030000C70424EC812D0889442408E8F3E3F5FF8D7600</bytes>
-<bytes id="39">
-5589E5565383EC508B750CC7442404000000008B5D08893424E872F2FFFF8D45B8C744240C000000008B5610895424088B56048B1289042489542404E84FF5FFFF8B45B88945D88B45BC83EC048945DC8B45C08945E08B45C48945E48B45C88945E88B45CC8945EC8B45D08945F08B45D48945F48B46048B003945E873358B15B0D63B088945E88B4610C745DC00000000C745E400000000C745EC00000000C745F000000000C745F4000000008955D88945E08B4D1085C9740B8D45D8890424E89BFBFFFF8B45D889038B45DC8943048B45E08943088B45E489430C8B45E88943108B45EC8943148B45F08943188B45F489431C8D65F889D85B5E5DC2040090</bytes>
-<bytes id="40">
-5589E557565381ECAC0000008B4508890424E859490D0085C08945BC74128B45BC81C4AC0000005B5E5F5DC38D742600A1B0D63B08E826FEFFFF8B308945B085F60F85890000008B75B08B460485C074348B7DB0C744241070EB0408C744240C040000008B5708894424048D450889042489542408E812BBFFFF85C074A08B008945BCEB998B4E0885C97492C744240805000000C7442404AACA2A08C7042400000000E804C0FFFFC7442410F0CD2A08C744240C27CF2A08C744240440050000C70424C5CA2A0889442408E8E08A0000A1B0D63B088945DCE883FDFFFF8B1885DB0F84FB0400008B55B08B4204890424E83B7800008B4DDC8B712085F6745BC745A80000000031DB8B86744000008BBE7840000039F873358B56208955E466908B108B4A2085C9740E3B4A1C74098B4DE4F6413508740F8B521481E20004000083FA0183D30083C00C39F872D38B3685F675B585DB895DA8751F8B5DB0C7430400000000C74308000000008B5DB0C70300000000E9CEFEFFFF8B45A8C1E002890424E8A99800008B75DC8B5E208945B88945A485DB745531F68DB426000000008B83744000003B837840000073388B7B208DB426000000008B108B4A2085C9740B3B4A1C7406F6473508740FF642150475098B55B88904B283C60183C00C3B837840000072D28B1B85DB75B48B7DA88B45B8C744240C20ED0408C744240804000000897C2404890424E85EB9FFFF83EF01897DD00F84BF0300008B55B831C0C745D4010000008955DCEB21908D7426008B5DDC8B55D4890B8B45E48345D4018345DC043945D00F8E9E0000008B5DB88B0C8383C0018B1C838945E48B79048B318B43048B975C400000897DD88945E08B805C4000008955848B56088B7D848945908B149703561C8B338B76088B04B08B3303461C39C275988B7DD88B877C4000003945E0740F8B55E03BBA7C4000000F857BFFFFFF8B75D88B7DE03BBE80400000740C3BB7804000000F855703000085C08B45DC0F45D98B4DE48B55D4891883C101894DE4E94EFFFFFF3945A88955C00F8F630200008B45A8D1F83B45C00F8FAA0300008B4DC0C745B400000000C745E40000000083E901894DAC908D7426008B7DAC397DE40F8DE60100008B75B88B5DE48B7DB48D1C9E8B03895DC48904BE8B45E483C0013945C08945DC0F8EB10100008B038B55DC8B0C968B308B40048B5E1C8945D0895DE08B985C4000008B46088B7DE08B148301D7897DD48B398B49048B47088B995C4000008B1C83035F1C395DD48B46240F87F90100000345E001D08B55B88945E08B45E4395DE08D4482088945D80F86490100008B55D0EB66908B4DC48B5DD88B118B0B8B328B52048B7E1C8B9A5C400000897DD08B7E088B3CBB897DE4037DD0897DD48B398B49048B5F088B815C4000008B1C988B4624035F1C395DD48945E00F87880100008B45D00345E00345E48345D80439C38945E00F83DE0000008B42248955A0894D9C8945E48B472401D8894424048B45E4890424E8CB8B0000895C24048B5DE4891C248945D0E8B98B00008B3F8B4D9C897D948B7DE08B49048945CC891C24897C2404894DC8E8998B00008B4DE4890C2489C38B45D489442404E8858B00008B55A08B368B5204C74424080500000089C7C744240470CD2A088955A0C7042400000000E8F8BBFFFF8B4DD08B55A0895C2414897C2410894C24248B4DCC8954240C8974240889442404894C24208B4DC8C70424E0B83908894C241C8B4D94894C2418E83D4700008345DC018B5DDC395DC00F8FBDFEFFFF8B75DC8345B4018975E4E90EFEFFFF8B45E43945C07E1D39F80F85480100008B4DB88B55E48B5DB48B049189049983C301895DB48B75B43975A87F3D0F85AD0100008B45B08B55A48B4DB4895004894808E912FCFFFF3945D00F85D40100008B7DB88B75D08B55C08B04B789049783C2018955C0E97AFDFFFF8B7DB889F0C1E00289442404893C24E8509400008945A4EBB0C744240805000000C7442404AACA2A08C7042400000000E8FBBAFFFFC74424103ECB2A08C744240C7ACF2A08C7442404B1040000C70424C5CA2A0889442408E8D7850000C745C000000000EB80C744240805000000C7442404AACA2A08C7042400000000E8AEBAFFFFC7442410B8CC2A08C744240C37CF2A08C7442404EB040000C70424C5CA2A0889442408E88A850000C744240805000000C7442404AACA2A08C7042400000000E86ABAFFFFC7442410F4CC2A08C744240C64CF2A08C744240454040000C70424C5CA2A0889442408E846850000C744240805000000C7442404AACA2A08C7042400000000E826BAFFFFC74424101ACB2A08C744240C7ACF2A08C7442404D8040000C70424C5CA2A0889442408E802850000C744240805000000C7442404AACA2A08C7042400000000E8E2B9FFFFC74424102CCB2A08C744240C4ACF2A08C744240495040000C70424C5CA2A0889442408E8BE840000C744240805000000C7442404AACA2A08C7042400000000E89EB9FFFFC744241057CB2A08C744240C37CF2A08C74424040E050000C70424C5CA2A0889442408E87A840000C744240805000000C7442404AACA2A08C7042400000000E85AB9FFFFC74424101ACB2A08C744240C4ACF2A08C744240490040000C70424C5CA2A0889442408E8368400008DB600000000</bytes>
-<bytes id="41">
-5589E55689C65383EC108B56208D1C95FCFFFFFFEB04669089CB85D27E2A8B460483EA018956208D4BFC8B041885C074E7890424E863CCDBFF8B4604C7041800000000EBC58D760083C4105B5E5DC390</bytes>
-<bytes id="42">
-5589E55383EC248B5D0885DB742A833DD07D3A08017E15A1A4CF3B08C74424043CEA2E08890424E8648FF0FF8B831402000083C4245B5DC3C744240805000000C7442404AACA2A08C7042400000000E898A4EFFFC7442410AF232F08C744240C442D2F08C7442404420E0000C704247D232F0889442408E8746FF0FF8D742600</bytes>
-<bytes id="43">
-5589E583EC28895DF88B5D088975FC8B750C85DB743F8B835C01000085C07479833DD07D3A08017E1BA1A4CF3B08C7442404C0F62E08890424E8126AF0FF8B835C01000089750C8B75FC895D088B5DF889EC5DFFE0C744240805000000C7442404AACA2A08C7042400000000E83B7FEFFFC7442410AF232F08C744240C43382F08C7442404A10A0000C704247D232F0889442408E8174AF0FFC744240805000000C7442404AACA2A08C7042400000000E8F77EEFFFC74424109CF62E08C744240C43382F08C7442404A20A0000C704247D232F0889442408E8D349F0FF8D7600</bytes>
-<bytes id="44">
-5589E55383EC148B1D28403A088B45088B550C83C30183FB0F891D28403A087E4FC70528403A080000000031DB8954240481C340403A08C744240808000000890424E899FDFFFF891C24C7442408B3572E08C7442404320000008944240CE8FDFCFFFF89D883C4145B5DC3908D7426006BDB32EBB88D7426008DBC2700000000</bytes>
-<bytes id="45">
-5589E583EC18895DF88B5D088975FC8B750C893424FF138B551089742404891C248954240C89442408E862FDFFFF8B5DF88B75FC89EC5DC3908DB42600000000</bytes>
-<bytes id="46">
-5589E557565383EC4C8B75088B461083461C018945C48B4638C1E0048D90E02038088B80E02038088B4A0C8955E08945DC8B4510F762048B4510894DD80FB64DD88955D429D0D1E88D1C108B4510D3EB8B560C0FAF5DDC8955D029D88B3C8289C385FF0F84B700000083FF0174398B4D0C893C24894C2404FF560485C00F859D0000008B4638C1E0048D90E02038088B80E02038088B4A0C8955E08945DC8B460C894DD88945D08B4DE08B45108B7D10F761080FB64DD88B451029D7D1EF01D783C001D3EF8B4DDC8955E48B55C483E9020FAFF98B4E2029F88945E08B45D090035DE083C101894E2089DF29D739DA0F46DF8B3C9885FF742783FF0174E28B450C8955CC893C2489442404FF56048B55CC85C0750B8B4E208B460CEBC38D760083C44C89F85B5E5F5DC38DB600000000</bytes>
-<bytes id="47">
-5589E557565381ECEC0000008B1D84513A0885DB0F8506100000FF1508DF3B0885C00F85E80F00008B0D70793A0885C90F85A20F00008B45108B15404E3A08C745E4000000008945D08B451485D28945D48B45188945D80F855B0F0000A184DC3B08890424A188DC3B0889442404A18CDC3B0889442408E8D4FC090085C00F857C0E0000B8E04E3A08E802A3FFFFA1BCDC3B088944240CA1C0DC3B0889442410A1C4DC3B08894424148B45D08904248B45D4894424048B45D889442408E84EFC090085C00F84EE0D0000C78540FFFFFFFFFFFFFFC78548FFFFFF0000000066908B45D0C745E400000000C744241000000000C744240C10A808088904248B45D4894424048B45D889442408E870B2FFFF85C00F84E011000083BD40FFFFFFFF0F845B0500008B45D08904248B45D4894424048B45D889442408E8B2FB090085C00F848A0B00008B1D84513A0885DB0F858C0A00008B45D08B55D48B4DD8E8AE8DFFFF85C089C30F84EC1600008B0D84513A0885C9740B8B501C85D20F85EF0C00008B45D0837B0C018904248B45D419D2F7D281E200000080899548FFFFFF894424048B45D889442408E842FB0900898540FFFFFF8B431C85C0750D83BBB40000000B0F84080B00008B731085F60F8514050000FF1508DF3B0885C00F847F0400008B8548FFFFFF8B752083C80183E6010F448548FFFFFF85DB89B53CFFFFFF898548FFFFFF0F85C90100008B8D48FFFFFF8D55E48B8540FFFFFFE84195FFFF85C089C70F8E27030000398540FFFFFF0F85A8140000A184513A0885C00F855E0300008D8570FFFFFF8B75E4890424897C2404E869FA09008B9574FFFFFF8B8570FFFFFF8B8D78FFFFFF83EC04E89F8CFFFF89F281E2FF00000083FA7F899544FFFFFF89C30F845E03000085C00F84A6030000893424FF15C8CE390885C00F852D03000089F083E07F740D83C001D0F884C00F8E900000008B038904248B4304894424048B430889442408E811FA0900E8BC75FFFF83F8017E6E8B038904248B4304894424048B430889442408E8EFF9090089C78B038904248B4304894424048B430889442408E8E5F9090039C70F84550900008B0D84513A0885C90F852F0700008B038904248B4304894424048B430889442408E8A7F90900E85275FFFF83F8010F8F910A00008B038904248B4304894424048B430889442408E881F90900E82C75FFFF83F8017E158B038B53048B4B08E8AA90FFFF85C00F84BA0E00008B431085C0740D83BD44FFFFFF7F0F84DE0400008B83B000000085C0740D83BD44FFFFFF7F0F84B705000089731C8B45D0C745E4000000008904248B45D4894424048B45D889442408E884F9090085C00F85FC030000FF1508DF3B0885C08D7426000F848A0200008B431C3C7F8945E4C7431C000000000F85E70600000FB6C4890424E89AF20D0089C68B038904248B4304894424048B430889442408E8C0F80900890424E83819FDFF85C00F84E41300008B532085D20F858D0600008B402C85C00F8582060000893424E8E2F5090085C00F8572060000893424E8F2F5090085C00F8562060000893424E802F6090083F8010F8551060000E8A4430600A1944F3A088B7B208B4030898544FFFFFF8B038904248B4304894424048B430889442408E84BF809008D55B889142489442404E80CF809008B45B883EC04894424048B45BC897C241089742414894424088B45C08944240CA1944F3A08890424FF9544FFFFFF8B3D84513A0885FF745885F6BFDBD92B080F85BF0500008B038904248B4304894424048B430889442408E8AF3C0D008B4B20BA14732B08897C2410C7442404188C2B0885C9B920732B080F45D18944240CA1A4CF3B0889542408890424E8AC64FCFFC7431400000000E990FBFFFF83BD40FFFFFFFF0F842B0500008B9D3CFFFFFF85DB0F84A0FCFFFF8B0D404E3A088B7D1C85C9C7070B0000000F849D0D0000A1A4CF3B08C74424046B762B08890424E85964FCFFE9830D00008D7426008B45E4E858A0FFFF897C2408C74424043C762B088944240CA1A4CF3B08890424E82B64FCFFE978FCFFFF8DB60000000089D8E84990FFFF89D8E8729FFFFFE9C0FCFFFF908D74260085C00F847C0F000089F10FB6C53D850000000F84330F000083F8050F8589FCFFFF89F0C1F81085C00F847CFCFFFF8B3D84513A0885FF0F852A0F000031C989F289D8E831E8FFFF85C00F845BFCFFFF9083BD40FFFFFFFFC745E4000000000F85BFFBFFFF818D48FFFFFF00000080E9B0FBFFFF908D742600E8EB3CFDFFE977FBFFFF8DB600000000E83B3CFDFFE96CFDFFFF8DB6000000008B45D0C744241000000000C744240C90A708088904248B45D4894424048B45D889442408E8D7ACFFFFC78548FFFFFF0100008085C089C30F84130600008B3D84513A0885FF740B8B701C85F60F85CE0900008B7310C78548FFFFFF0100008085F60F84ECFAFFFFE834410600A1944F3A088B73208B78308B038904248B4304894424048B430889442408E8E1F509008D4DAC890C2489442404E8A2F509008B45AC83EC04894424048B45B0C74424140000000089742410894424088B45B48944240CA1944F3A08890424FFD78B3D84513A0885FF0F85BE0400008B4B18C743140000000085C90F84301100008B431C8945E4C7431C00000000C744240400000000891C24E8E7F1FFFF8B731C85F674308B1584513A0885D20F85BA0800008B038904248B4304894424048B430889442408E83AF5090089F10FB6D5E8908AFFFF8B45E489431CE908FAFFFF908D7426008B038904248B4304894424048B430889442408E8F8F4090089C68B45D08904248B45D4894424048B45D889442408E8DDF4090039C60F84C9FBFFFF8B731885F60F84CA1000008B0D84513A0885C90F85D40500008B431C3C7F0F840C06000089C283E27F0F85B60400008B3D84513A0885FF0F85C3040000C7431401000000C743100000000081C3B400000089442404891C24E8083A0D00E99EF9FFFF8D760089F20FB6C683F8130F8514FBFFFF8B3D84513A0885FF0F85D20D0000C7431000000000E8883F0600A1944F3A088B7B208B70308B038904248B4304894424048B430889442408E835F409008D4D88890C2489442404E8F6F309008B458883EC04894424048B458CC744241400000000897C2410894424088B45908944240CA1944F3A08890424FFD68B3584513A0885F60F850C0D00008B5318C743140000000085D20F8520FDFFFFC744240805000000C7442404AACA2A08C7042400000000E81876FBFFC744241004762B08C744240C6A8F2B08C7442404770C0000C70424C75E2B0889442408E8F440FCFF8D74260089F20FB6C683F8020F853BFAFFFF8B3D84513A0885FF0F85600C0000C783B000000000000000E8953E0600A1944F3A088B7B208B70308B038904248B4304894424048B430889442408E842F309008D4D94890C2489442404E803F309008B459483EC04894424048B4598C744241400000000897C2410894424088B459C8944240CA1944F3A08890424FFD68B3584513A0885F60F85970B00008B7B18C743140000000085FF0F852DFCFFFFC744240805000000C7442404AACA2A08C7042400000000E82575FBFFC744241004762B08C744240C6A8F2B08C7442404950C0000C70424C75E2B0889442408E80140FCFF908B038904248B4304894424048B430889442408E858370D00C74424045A762B0889442408A1A4CF3B08890424E86F5FFCFFE99BF8FFFF669081AD48FFFFFF000000800F8973F7FFFF8BB53CFFFFFF85F60F851C0C0000C7042420523A08E8CA7EFBFFE954F7FFFF90893424E8EC75FBFF89C7E932FAFFFF908B3D70793A0885FF751083FE020F84B908000089D8E80E98FFFF8B3584513A08C743140100000085F60F85C90600008B0D70793A0885C90F84EB050000C74318000000008B45E4890424FF15C8CE390885C00F852802000083BBB40000000B0F84660200008B83B40000008B4D1C8B3D404E3A0889018B83B800000085FF8941048B83BC0000008941088B83C000000089410CC783B40000000B0000000F854D020000B8E04E3A08E8FB66FFFF8B7D1C8B0783F8020F8585060000C783C8000000FFFFFFFF8B7B088B73048B1BFF1508DF3B0885C00F8535010000FF1508DF3B0885C07415C744240400000000C7042420D31408FF1510DF3B088B5508897A0889D0897204891A8D65F45B5E5F5DC204008DB426000000008B45D08904248B45D4894424048B45D889442408E8C7350D00C7442404388A2B0889442408A1A4CF3B08890424E8DE5DFCFFE93DF5FFFF908B038904248B4304894424048B430889442408E890350D008B7320B920732B08BA14732B08C74424045C8A2B0885F60F45D18944240CA1A4CF3B0889542408890424E8915DFCFFE9F6FAFFFF8D7426008B038DBD7CFFFFFFC74314010000008904248B4304894424048B430889442408E853F00900893C2489442404E827F009008B857CFFFFFF83EC048904248B4580C744241000000000C744240C30360908894424048B458489442408E8B8A6FFFFE946F6FFFF8D760031DBE9FCF4FFFF908B451C83380B66900F845A060000E83567FFFFE9B3FEFFFF83C201D0FA84D20F8E0EF5FFFF8B3D84513A0885FF0F843DFBFFFF8B038904248B4304894424048B430889442408E8CDEF0900C7442404F08B2B0889442408A1483C3A08890424E89076FBFF8B431CE904FBFFFF8D742600A184513A0885C00F84CBFDFFFF8B038904248B4304894424048B430889442408E853340D00C74424049B762B0889442408A1A4CF3B08890424E86A5CFCFF83BBB40000000B0F859AFDFFFF8B45E48B751C89442404893424E8CB340D008B3D404E3A0885FF0F84B8FDFFFF908D742600A1A4CF3B08C7442404B2762B08890424E8235CFCFFE999FDFFFF8DB60000000089D8E8518CFFFF83BD40FFFFFFFFC745E4000000000F8518F4FFFFE954F8FFFF8B038B731C8904248B4304894424048B430889442408E8DDEE09008974240CC7442404708B2B0889442408A1483C3A08890424E89C75FBFF8B431C3C7F0F85F4F9FFFF0FB6D483FA130F843A0500008B1570793A0885D2740D83BBB40000000B0F8473060000C7431401000000E9A1F3FFFF8DB6000000008B008904248B4304894424048B430889442408E838330D0089C68B431CE86E97FFFF8974240CC74424040C8A2B0889442408A1A4CF3B08890424E8415BFCFFE9CDF2FFFF8D7426008B45D08904248B45D4894424048B45D889442408E87FEE090085C00F85F1F1FFFF8B45D08904248B45D4894424048B45D889442408E8FEED0900898540FFFFFFE9D7F1FFFF8D7600A184DC3B08890424A188DC3B0889442404A18CDC3B0889442408E8C1ED090089C3A184DC3B08890424A188DC3B0889442404A18CDC3B0889442408E8A0ED09008D55A0891424C744240C00000000895C240889442404E845ED09008B45A083EC048944240C8B45A4894424108B45A889442414A184DC3B08890424A188DC3B0889442404A18CDC3B0889442408E80E040B00A184DC3B088B1588DC3B088B0D8CDC3B08E8D890FFFFC7401801000000E9D0F0FFFF8D742600A1A4CF3B08C7442404DC752B08890424E8235AFCFFE98BF0FFFF8DB6000000008D451089442410A1BCDC3B08C744240C30E80808890424A1C0DC3B0889442404A1C4DC3B0889442408E87AA3FFFFE92BF0FFFF908D742600E8BB63FFFFE90EF0FFFF8DB6000000008B45108904248B4514894424048B451889442408E887310D00C7442404C6752B0889442408A1A4CF3B08890424E89E59FCFFE9C3EFFFFF9089F0E8A195FFFF89C68B038904248B4304894424048B430889442408E847310D008974240CC744240410762B0889442408A1A4CF3B08890424E85A59FCFF8B731CE900F7FFFF66908B008904248B4304894424048B430889442408E808310D0089C68B431CE83E95FFFF8974240CC74424040C8A2B0889442408A1A4CF3B08890424E81159FCFFC78548FFFFFF01000080E9DAF0FFFF6690A1BCDC3B08C744241000000000C744240C80C90808890424A1C0DC3B0889442404A1C4DC3B0889442408E861A2FFFFA1BCDC3B08C744241000000000C744240C20300908890424A1C0DC3B0889442404A1C4DC3B0889442408E832A2FFFF83BD40FFFFFFFF0F84E6020000A1BCDC3B08895C2410C744240CE0E70808890424A1C0DC3B0889442404A1C4DC3B0889442408E8FAA1FFFFA1BCDC3B08C744241000000000C744240CE0A60808890424A1C0DC3B0889442404A1C4DC3B0889442408E8CBA1FFFFE952F9FFFF8DB6000000008B038904248B4304894424048B430889442408E8E82F0D0089C68B45E4E81E94FFFF8974240CC74424043C8C2B0889442408A1A4CF3B08890424E8F157FCFFE9F3F8FFFF8D74260085C00F8473F9FFFF8B038904248B4304894424048B430889442408E828BCFFFF8983C8000000E95AF9FFFF908D7426008B038904248B4304894424048B430889442408E890EA0900894424048D8564FFFFFF890424E85EEA09008B1584513A0883EC0485D20F859801000089D8E8B687FFFF8B8564FFFFFFC744241000000000C744240CC0A708088904248B8568FFFFFF894424048B856CFFFFFF89442408E8D4A0FFFF85C00F8584F3FFFFC744240805000000C7442404AACA2A08C7042400000000E87C6CFBFFC7442410A88A2B08C744240C6A8F2B08C7442404580C0000C70424C75E2B0889442408E85837FCFF8B451CC7000B000000A1404E3A0885C07415A1A4CF3B08C7442404E8752B08890424E8D156FCFFB8E04E3A08E8475FFFFF8B3DC4DC3B088B35C0DC3B088B1DBCDC3B08E955F8FFFFA1BCDC3B088944240CA1C0DC3B0889442410A1C4DC3B08894424148B45108904248B4514894424048B451889442408E89CE9090085C00F8527F8FFFFE965F9FFFFC7431401000000C7431000000000E977EEFFFFC7042402000000E8D0E6090085C00F8533F7FFFF8B45D08904248B45D4894424048B45D889442408E81FE909008D55C489142489442404E8F0E809008B45C483EC048904248B45C8C744241000000000C744240C20A70808894424048B45CC89442408E8849FFFFFC783B000000000000000E9D7F6FFFF8B038904248B4304894424048B430889442408E89D2D0D00C74424045A762B0889442408A1A4CF3B08890424E8B455FCFFE932FEFFFF8B45D0C745E000000000898564FFFFFF8B45D4898568FFFFFF8B45D889856CFFFFFF8B45E489431C8B8564FFFFFFC744241000000000C744240CF0A708088904248B8568FFFFFF894424048B856CFFFFFF89442408E8E59EFFFF85C0898548FFFFFF0F84850200008B1584513A0885D20F85DD0100008B9548FFFFFF8B421C89D38945E4C7431C00000000E98AFCFFFF890424FF15C8CE390885C00F847CF9FFFF89D8E8579BFFFF85C00F846DF9FFFFA184513A08C7431C0000000085C00F8459F9FFFF89E789DEB903000000F3A5E8DBE70900C7442404A08B2B0889442408A1483C3A08890424E89E6EFBFFE92BF9FFFF31D289D8E83486FFFFBE7F05000085C00F8449EDFFFFE9EAF0FFFFA1A4CF3B0889742408C7442404808A2B08890424E88954FCFFE9B8F0FFFFC704240C000000E85843FCFF8B15CCD73B088938895008897004A3CCD73B08E9A8F0FFFF8B038904248B4304894424048B430889442408E8182C0D008B4B20BA14732B08C74424044C8B2B0885C9B920732B080F45D18944240CA1A4CF3B0889542408890424E81954FCFFE91DF4FFFF8B038904248B4304894424048B430889442408E8CC2B0D00C7442404288B2B0889442408A1A4CF3B08890424E8E353FCFFE96AF3FFFF8B038904248B4304894424048B430889442408E8962B0D008B4B20BA14732B08C7442404048B2B0885C9B920732B080F45D18944240CA1A4CF3B0889542408890424E89753FCFFE9A8F2FFFF8B038904248B4304894424048B430889442408E84A2B0D00C7442404DC8A2B0889442408A1A4CF3B08890424E86153FCFFE9F8F1FFFF89E789C6B903000000F3A5E81C2B0D00C74424047F762B0889442408A1A4CF3B08890424E83353FCFFE9F5FDFFFF8B751C833D404E3A0800C7060B0000000F8447FCFFFFE9A5EEFFFF83BD40FFFFFFFF0F844BEBFFFFC744240805000000C7442404AACA2A08C7042400000000E84668FBFFC744241022762B08C744240C598F2B08C7442404500D0000C70424C75E2B0889442408E82233FCFF8D45E0B903000000894424108D8564FFFFFF89E7C744240C30C5080889C6898534FFFFFFF3A5E8279CFFFFDB45E0DD9D48FFFFFFE8656FFBFF833D84513A0800898554FFFFFFDB8554FFFFFFDC8D48FFFFFFD9BD52FFFFFF0FB78552FFFFFFD80D14912B08B40C66898550FFFFFFD9AD50FFFFFFDB9D54FFFFFFD9AD52FFFFFF8B9554FFFFFF8955DC74258B45E083F8017E1D89442408A1A4CF3B088954240CC74424045C8C2B08890424E81252FCFF8D45DC8BB534FFFFFFB9030000008944241089E7C744240CA0C40808F3A5E87F9BFFFF85C0898548FFFFFF0F84B6FCFFFFE9A3FCFFFFC744240805000000C7442404AACA2A08C7042400000000E81C67FBFFC7442410F7722B08C744240C598F2B08C7442404F60D0000C70424C75E2B0889442408E8F831FCFFC744240805000000C7442404AACA2A08C7042400000000E8D866FBFFC74424108BB62A08C744240C598F2B08C7442404FA0C0000C70424C75E2B0889442408E8B431FCFFC744240805000000C7442404AACA2A08C7042400000000E89466FBFFC744241004762B08C744240C598F2B08C7442404260D0000C70424C75E2B0889442408E87031FCFFC744240805000000C7442404AACA2A08C7042400000000E85066FBFFC744241004762B08C744240C598F2B08C7442404620D0000C70424C75E2B0889442408E82C31FCFF8DB6000000008DBF00000000</bytes>
-<bytes id="48">
-5589E557565381EC6C0100008B7D0C8B45248B55288B5D1C83FF0D8B75208985D0FEFFFF8995D4FEFFFF0F846001000083FF020F84A7000000E8B26F0A008985CCFEFFFFA184DC3B08890424A188DC3B0889442404A18CDC3B0889442408E87D500A0085C00F85C50000008B85D0FEFFFF8B95D4FEFFFF8B4D14895C24148944241C8B4510895424208B5518894C240C89742418894424088B450889542410897C2404890424A1944F3A08FF90500100008B8DCCFEFFFF890C248985C8FEFFFF8995C4FEFFFFE8658CFCFF8B95C4FEFFFF8B85C8FEFFFF8D65F45B5E5F5DC390A1A8DC3B088944240CA1ACDC3B0889442410A1B0DC3B0889442414A184DC3B08890424A188DC3B0889442404A18CDC3B0889442408E8E64F0A0031D289C131C085C90F8411FFFFFFEBAD8DB600000000A184DC3B08890424A188DC3B0889442404A18CDC3B0889442408E8914F0A008D95D8FEFFFF89142489442404E84F4F0A008B85D8FEFFFFA384DC3B088B85DCFEFFFF83EC04A388DC3B088B85E0FEFFFFA38CDC3B08E9E1FEFFFF8DB6000000008B4D1885C90F84C3010000A184DC3B08890424A188DC3B0889442404A18CDC3B0889442408E8264F0A0085C089C70F847401000083FE000F875B01000081FB800000000F874F010000E8CECAFBFF8D9568FFFFFFC700000000008985CCFEFFFF8954240CC744240800000000897C2404C7042402420000E840CDFBFF8B8DCCFEFFFF8B1185D20F850C01000031C98D95E8FEFFFF8D8568FFFFFFE8F1FCFFFF8B85D0FEFFFF8B95D4FEFFFF01D811F283FA0077073D800000007620C785D0FEFFFF80000000299DD0FEFFFFC785D4FEFFFF0000000019B5D4FEFFFF837D140074338B95D0FEFFFF8D85E8FEFFFF8B4D148D1C18895C240489542408890C24E8B9D2FBFF8B85D0FEFFFF8B95D4FEFFFFE933FEFFFF8B95D0FEFFFF8D85E8FEFFFF8B4D188D1C18891C2489542408894C2404E886D2FBFFB9010000008D95E8FEFFFF8D8568FFFFFFE844FCFFFF8B85CCFEFFFF8D9568FFFFFFC700000000008954240CC744240800000000897C2404C7042403420000E842CCFBFF8B8DCCFEFFFF8B85D0FEFFFF8B95D4FEFFFF8339000F84B2FDFFFF8D7600B8FFFFFFFFBAFFFFFFFFE9A0FDFFFF90A184DC3B08890424A188DC3B0889442404A18CDC3B0889442408E8794D0A0089C7E966FEFFFF837D14000F8533FEFFFFC744240805000000C7442404AACA2A08C7042400000000E8B8CFFBFFC7442410CB722B08C744240C468F2B08C74424045D0F0000C70424C75E2B0889442408E8949AFCFF8D742600</bytes>
-<bytes id="49">
-5589E557565383EC6C83F9018945E419C083E0FC8955D483C00583F9018B4DD419D283E20483C2018945C885C98955CC0F84B70200008B45D431F68B400485C08945DC0F848F020000C745D8000000008B55DC8B828400000085C00F8E8F0100008B9A800000008B55E43953040F877D01000083E80131F68945E08D04808B4CC3048B45E0EB059089F989D0394DE473278D143089D7C1EF1F8D1417D1FA8D3C9239F28B7CFB0474DF3B7DE473DA394DE489D672DC8D76003945E07E3E8D50018D3492C1E603394C1E04752F8D04808D7433048D4CC354895DD0EB158D7426008B3E83C6288B1983C12839DF750A83C2013955E089D07FE88B5DD085C00F88ED00000089C28D7AFF8D04808D34C38D04BF8D0CC3895DD089D3C745E0FFFFFFFFEB258DB600000000837DE0FF756589FA895DE083EE2883EF0183EB0183E92885D20F888F000000807E1C0489FA74E48B461085C0741B8B55D4894DC489042489542404E898920C0089FA8B4DC485C074C285DB0F84B00000000FB6461C3945CC0F849A0000008B46148945B48B55B485D2749585DB0F849D0000008B45B485C00F84920000008B45B40346043945E40F82830000008B41140341043945E4737889FA83EE2883EF0183EB0183E92885D20F8971FFFFFF837DE0FF89D08B5DD075648DB4260000000085C00F89F20000008B75D88B45DC8B55D4894424048B4204890424E8F8CAFFFF85C08945DC0F84C50000008975D8E935FEFFFF908D7426000FB6411C3945C874668B56148955B4E958FFFFFF8D742600837DE0FF89DA89D08B5DD074A385C078778D04808D34C38B461485C0746A0346043945E472128B55E08D049283FAFF8D34C374848D7426008B7DD885FF0F8478FFFFFF8B55D88B42043B46040F8269FFFFFFE961FFFFFF8B46143B41148945B40F85EEFEFFFF8B56043B51040F85E2FEFFFF8B461089FA3B41100F85D4FEFFFFE976FEFFFF8D76008B55E08D04928D34C38B461485C074A0EB848DB60000000083C46C89F05B5E5F5DC36BC0288D34038B4614EBDFC744240805000000C7442404AACA2A08C7042400000000E8538FFFFFC74424107AD52A08C744240CC0D52A08C7442404E1010000C7042470D52A0889442408E82F5A0000EB0D90909090909090909090909090</bytes>
-<bytes id="50">
-5531C989E531C057565383EC2C8B5D080FB61389DE84D2743A8DB426000000006BC9430FBED283C6018D4C118F0FB61684D275EC89C8BA6F452101F7E289C829D0D1E88D0402C1E80A69C0F707000029C189C88B15B0D63B08C745E0000000008B522085D28955E40F84A80000008B750C85F60F9445DB83C02031FF8945DCEB2D8DB42600000000807DDB0075288B450C398280400000741D85FF0F94C08B55E484C08B128955E4745E85D2745A8B55E439550C75D28B45E485FF8B55DC8B7490080F94C0741BEBD58DB426000000008975E0908D74260085FF8B76200F94C075BC85F674B88B06895C2404890424E8E89CFFFF85C075E00FB6461C3C0674D03C010F44FEEBD19085FF740A83C42C89F85B5E5F5DC38B7DE0EBF1908D742600</bytes>
-<bytes id="51">
-5589E583EC188B450CC7042470433A08894424088B450889442404E8C0FEFFFFC9C38DB426000000008DBC2700000000</bytes>
-<bytes id="52">
-5589E583EC38895DF48B5D088975F8897DFC803B5F741131F689F08B5DF48B75F88B7DFC89EC5DC30FB643013C6374043C6975E3807B025F75DD31C083C9FF89DFF2AEF7D9890C24E843F3E9FF807B016989C289C60F84CA000000C6002B8D4801C6015B8D79018D43038955E4894DE089442404893C24E8A01CE9FF8B4DE08B55E48079015F750883C701803F5F74F8C74424045F000000893C248955E4E8B915E9FF8B55E485C00F849B0000008078015F8D78017479C60028C74424045F000000893C248955E4E88F15E9FF8B55E485C074758D7802C60029C640012089F829D001C3895C2404893C24E82C1CE9FFEB098DB60000000083C7010FB6073C5F74F684C0741383C7010FB60784C074093C5F75F2C6073AEBEDC6075DC6470100E9F4FEFFFFC6002D8D4801E931FFFFFFC6002089F829D08D44030289442404893C24E8D51BE9FFEBB289142431F6E83DD1E9FFE9C1FEFFFF908DB42600000000</bytes>
-<bytes id="53">
-5589E583EC28895DF48975F889C6897DFC8B780889F8C1E0048D501C83C03029C48D5C241B83E3F08954240889742404891C24E874DFEDFF89F989F289D8C7042400000000E886FEFFFF8B5DF48B75F88B7DFC89EC5DC389F68DBC2700000000</bytes>
-<bytes id="54">
-5589E557565383EC4C85C08945D48955CC894DC80F846A020000890424E8CAF8F8FF8B5DD401C3395DD473310FB643FF8D53FF3C200F851C0300008B4DD489D339D973198D7426000FB643FF8D53FF3C090F85F900000089D339D972EB8B55D489D829D083F803895DC48945D00F84FD0100008B75C885F60F841A01000039D30F8482020000803A230F8479020000837DD0040F8447020000837DD00D0F8EF3010000BF10D92B08B90E00000089D6F3A60F8411020000BF66A92E08B90800000089D6F3A60F84FD010000BFA2B62A08B90200000089D6F3A60F84E9010000837DD0050F8E87030000BFEB2D2C08B90500000089D6F3A60F841D020000BF27873208B90200000089D6F3A60F85570200008D720239F37621E85FF6F8FF8B10EB0E8DB4260000000083C60139F3760A0FBE06F64442012075EF89F2B804000000E8CBFDFFFF8B55CC8902E99A000000903C200F84FFFEFFFF8B55D40FB6023C200F85610200008B55D4EB0C908D7426000FB6023C09751183C20139D377F2E9DDFEFFFF908D7426003C2074EB8D742600E9CBFEFFFF8D76008B4DC42B4DD4894DD0C7042414000000E863CEF9FF8B55D08B4DD489C38B45CC8918C7030000000089542404890C24E8F4D8F9FF8B55CC8943048B02C7400800000000C7400C00000000C74010000000008B4D0885C9746B8D45DC89442404A130FC3908C744240806000000890424E8349F0800C744240401000000890424E830FEF8FF8B5DCC8B75088B7D0C8D7600E8039F080085C0741FE8DA9E080085C074EE897C24048B038B4004890424FFD6EBE78DB6000000008B45DC85C00F8824020000C745D4000000008B45D483C44C5B5E5F5DC38D7600BF7E6A2D08B90300000089D6F3A60F85EFFDFFFFC745D4010000008B45D483C44C5B5E5F5DC3837DD0070F8F17FEFFFF837DD0010F8F21FEFFFF837DD00A0F8424010000837DD00D0F84660100008955D4E9DBFEFFFF6690B807000000E83EFCFFFF8B55CC8902E90DFFFFFF8D742600B904000000BFF5E0300889D6F3A6C745D4020000000F97C10F92C038C10F85C8FDFFFFE95AFFFFFFC745D4030000008B45D483C44C5B5E5F5DC38D720539F37620E856F4F8FF8B10EB0D8DB60000000083C60139F3760A0FBE06F64442012075EF89F2B803000000E8C3FBFFFF8B4DCC8901E992FEFFFF3C090F84DCFCFFFF90E9F3FDFFFF8D7600837DD0078D7426000F8E27010000BF774E2C08B90800000089D6F3A60F8520FFFFFF8D720839F37620E8E6F3F8FF8B10EB0D8DB60000000083C60139F3760A0FBE06F64442012075EF89F2B805000000E853FBFFFF8B4DCC8901E922FEFFFF3C090F8497FDFFFF90E988FCFFFF8D7600BFF82D2C08B90A00000089D6F3A60F85D2FEFFFFC7042414000000E818CCF9FF8B4DCCC74004000000008901C7400801000000C70000000000C7400C00000000C7401000000000E9C5FDFFFFBF032E2C08B90D00000089D6F3A60F8586FEFFFFC7042414000000E8CCCBF9FF8B55CCC74004000000008902C7400802000000C70000000000C7400C00000000C7401000000000E979FDFFFF837DD0020F8F83FCFFFFE92BFEFFFF8B4DCC8D75DC89E78B01890424E87FAAF9FFB903000000F3A5E8639A0800837DD0060F8503FEFFFFBFF12D2C08B90600000089D6F3A60F8503FEFFFFBA12C42B08B806000000E846FAFFFF8B55CC8902E915FDFFFF8DB6000000008DBF00000000</bytes>
-<bytes id="55">
-5589E557565383EC4C8B45088B308B450C8B168B388B46048B5A088B885C4000008B1C998B4A1C8B570401CB895DE48B1F8B8A5C4000008B5B088B0C998B1F8B5B1C01D9394DE4723577453B907C400000744D3B827C400000744539D074498B0DB0D63B088B492085C9750EEB64669039CA741C8B0985C9745839C875F2B8FFFFFFFF83C44C5B5E5F5DC3908D74260083C44CB8010000005B5E5F5DC38D760031C0EBDF8D7426008B90744000008B807840000039D07713EB5C8DB60000000039D774CC83C20C39D0764B39D675F190EBACC744240805000000C7442404AACA2A08C7042400000000E8EEC7FFFFC7442410DBD92B08C744240C96CF2A08C74424043E040000C70424C5CA2A0889442408E8CA920000C744240805000000C7442404AACA2A08C7042400000000E8AAC7FFFFC7442410DBD92B08C744240C96CF2A08C74424042F040000C70424C5CA2A0889442408E8869200008DB600000000</bytes>
-<bytes id="56">
-5589E5565383EC108B45088B750C8B581485DB74238D76008B430489342489442404E885B7F2FF85C075078B4B3885C9740E8B1B85DB75E083C4105B5E5DC39089D8E839FCFFFFEBE98DB42600000000</bytes>
-<bytes id="57">
-5589E55383EC148B5D080FB6430C3C0372223C07771A891C24E882E7FFFF85C07412895D0883C4145B5DE971E7FFFF903C0B740C8B0383C4145B5DC38D742600891C24E858E7FFFF85C075D6895D0883C4145B5DE907F408008DB42600000000</bytes>
-<bytes id="58">
-5589E583EC58895DF48B5D088975F88B750C897DFC8B7D10807B0C0374128973088B5DF48B75F88B7DFC89EC5DC366908B530885D2741189328B5DF48B75F88B7DFC89EC5DC3669085FF0F84880000008B573C8B47388955E029C283FA037E548B573483C00489473839D08955D474628B57448B4DE001D0F7D221D089C22B57308947388955E089CA2B57303955E07E1F894F38894F348B4DD489CAC70100000000894B088932EB908DB4260000000089C1EBE08D472C890424C744240404000000E895CCF2FF8B4F3C8B4738894DE0EB8E804F5402EB98C744240805000000C7442404AACA2A08C7042400000000E888CCF2FFC74424106B202E08C744240C49232E08C744240461010000C7042465232E0889442408E86497F3FF8D742600</bytes>
-<bytes id="59">
-5589E5565383EC208B45088B5D10C744241400000000C744240800000000894424108B450C89DEC1FE1F895C24188944240CA1E0DD3B088974241CC744240402000000890424E875F8FFFF31D831F209C283FA0119C083C420F7D083E0055B5E5DC38DB426000000008DBC2700000000</bytes>
-<bytes id="60">
-5589E55789CF5689D65389C381EC8C0000008B4D1C8B55148B4510894DDC8B8B500100008955D48B55188945D085C98955D8894DE00F842C0700008B4D0C85C9740E8B15E4F7390885D20F845B07000083FE040F94C10F844401000083FE020F843B0100008B55D883FE03B8020000008B4DDC0F45C6897C2408894424048954241C8B55D0894C24208B4DD4891C24895424148B5508894C24188B4D0C8954240C894C2410FF55E08945E08955E48B0DE47E3A0885C975188B45E08B55E481C48C0000005B5E5F5DC38DB426000000008B55E48B45E089542404890424E8FE06EFFF8B55D88B4DDC891424894C24048945CCE8E906EFFF8B4DD0890C248945D8E8CB01EFFF8945D08B450C890424E82D02EFFF8B55088914248945B0E81F02EFFF85FFBA62242E080F44FA8B55CC8B4DB0897C24108974240C895424248B55D8894C241889442414895424208B55D08954241C8B4304C7442404D0F32F0889442408A1A4CF3B08890424E8111EEFFF8B550C8B7D0C85D20F447D0885FF0F85ED000000A1A4CF3B08C704240A00000089442404E8E8EAEEFFE91BFFFFFF8D76008B45DC0B45D8C745E000000000C745E4000000000F84F4FEFFFF8B450885C00F84FB0100008B1520793A0885D20F854D0100008B45D08945CCA1E87E3A0885C00F84EB0300008B45CC884DB0891C2489442404E8C8E0FFFF0FB64DB085C00F84C20100008B4008F64014080F84B5010000891C24E837E0FFFF8B4DDCC7442420000000008B50048954241C8B55D88B00894C24148B4D08895424108B55D4894424188B45D0890C248954240C8B550C8944240889542404E8B45AEEFF89C2C1FA1F8945E08955E4E942FEFFFF8D742600837DE4000F8C09FFFFFF0F8EC0010000A1A4CF3B0831DBC70424CE08300889442404E80931EFFF908D341FF7C60F000000751985DB7F51A1A4CF3B08C7442404AC7A2E08890424E8C41CEFFF0FB60683C301C7442404FE2C370889442408A1A4CF3B08890424E8A51CEFFF89DAC1FA1F3955E47FB30F8C98FEFFFF395DE077A8E98EFEFFFF8D7600833DE47E3A08017FA6A1A4CF3B08C744240430463108890424E86A1CEFFFE968FEFFFF908D7426008B55D0884DB08955CC891424E8FFBAFBFF89C2894424048B45D08955AC890424E83BA2FBFF0FB64DB085C00F8488FEFFFF891C24E8F7DEFFFF8B55AC89C18B02894DB08B00895424048B55D08945E0891424E849A3FBFF8B4DB08B55E0895424208B51048954241C8B118B4DDC894424088B4508C744240C00000000895424188B55D8894C24148B4D0C89042489542410894C2404E99DFEFFFF8DB6000000008B45D08945CC8B55CC884DB0891424E8ECC0FFFF8B55DC0FB64DB08945C48B40048945C88B45D80345D01355D48945E083FA008955E477078B55C839D072388B45C885C074318B55C82B55CC8955C88B55C48B421083F80274350F87BC01000085C07534C745E0FFFFFFFFC745E4FFFFFFFFE977FCFFFF8B45D88945C8EBD090837DE0000F8639FDFFFFE931FEFFFF8B550C85D275CE6690A1A8DC3B08884DB08944240CA1ACDC3B0889442410A1B0DC3B0889442414A184DC3B08890424A188DC3B0889442404A18CDC3B0889442408E80BAEFCFF85C00F8493010000C645B7008B45C8895DE089C2C1FA1F8945B88955BC8DB6000000008B55B88B4DBC8B45D0C7442408000000008954241C8B55D4894C24208B4D0889442414C744240402000000895424188B550C894C240C891C2489542410FF935001000083FA008945C80F8E990000008955A48B45C88955E48B55088B5DE08945E085D2740DA1207F3A0885C00F844C010000837DA4000F8C7AFBFFFF0F8E1E020000807DB70066900F8468FBFFFF8B4D0C85C90F845DFBFFFF8B45C48B501C85D20F854FFBFFFF83FE040F8446FBFFFFA1D8F8390885C00F8439FBFFFF8B45CC8B55C88B4D0C89442404A1FC823A088954240C894C2408890424E8D902F4FFE912FBFFFF8D7426007C0983F8000F875CFFFFFF8955AC891C24FF930C0100008B55AC85C00F8545FFFFFF8B1B85DB0F85ECFEFFFFE936FFFFFF8B55D08955CCE9EAFDFFFF83F80390743E83F8040F856DFEFFFF8B550C85D20F8462FEFFFFC744240805000000C74424049CF32F08C7042400000000E8CA2EEEFF890424E816EBEEFF8DB6000000008B450885C00F85F9FDFFFFE928FEFFFFA184DC3B08890424A188DC3B0889442404A18CDC3B0889442408E821ACFCFF890424E899CCEFFF85C00F843EFEFFFFE8DC08F4FF0FB64DB083F8FF7435C645B701E92BFEFFFF8B55BC8B4DD48B45B8895424108B55D0894C24088B4D088944240C89542404890C24E8D345F8FFE988FEFFFF8B45C48B401C85C0750D84C974BD833DD8F839080074B4837D08000F84440100008B45CC8B55C88B4D08C74424140000000089442408A1FC823A0889542410894C240C891C2489442404E88F02F4FF89C2C1FA1F8945E08955E4837DE4000F8C1EFDFFFF0F8EEC000000837D08000F8498F9FFFF833D207F3A08000F858BF9FFFF8B45C88B4DD489C2C1FA1F895424108B55D0894C24088B4D088944240C89542404890C24E82445F8FFE95DF9FFFF8DB42600000000837DC8000F864CF9FFFFE9D3FDFFFFC744240805000000C7442404AACA2A08C7042400000000E8592DEEFFC7442410D8083008C744240C500B3008C7442404BA050000C70424806A310889442408E835F8EEFF8B55DC8B45D889542404890424E82300EFFF8B55D089142489C6E806FBEEFFC744240805000000C744240468F32F08C704240000000089C3E8F42CEEFF89742408895C2404890424E838E9EEFF837DE0000F8622FCFFFFE905FFFFFF8B450C8B4DC88B55CCC7442414010000008944240CA1FC823A08894C241089542408891C2489442404E84B01F4FF89C1C1F91F8945E0894DE4E9B7FEFFFF8D7426008DBC2700000000</bytes>
-<bytes id="61">
-5589E583EC58895DF489D38975F889C6897DFC837A040B76278B0289342489442404E819FFFFFF85C00F84F9000000908B5DF48B75F88B7DFC89EC5DC38D76008B4204FF2485607831088DB600000000893424E8A815F7FF8B8098000000EBD0893424E89815F7FF8B8094000000EBC0893424E88815F7FF8B4064EBB38D7600893424E87815F7FF8B406CEBA38D7600893424E86815F7FF8B4074EB938D7600893424E85815F7FF8B407CEB838D7600893424E84815F7FF8B8084000000E96DFFFFFF908D742600893424E83015F7FF8B4068E958FFFFFF893424E82015F7FF8B4070E948FFFFFF893424E81015F7FF8B4078E938FFFFFF893424E80015F7FF8B8080000000E925FFFFFF908D742600893424E8E814F7FF8B8088000000E90DFFFFFF908D7426008B53048D42F483F8077626895424108B03C744240898753108C7442404D3020000C704247B7731088944240CE8C7E5E6FFFF248590783108C744240804000000C744240400000000893424E8481FF7FF8B78148945E08B03890424E818330B008947088B430885C0740E8B0831D231FF85C90F85EE0200008B45E0E988FEFFFFC744240C20F73908C7442408E0773108C7442404FFFFFFFF893424E8D81FF7FFE963FEFFFFC744240C00F73908C7442408C7773108C7442404FFFFFFFF893424E8B31FF7FFE93EFEFFFFC744240CF8F63908C7442408AE773108C7442404FFFFFFFF893424E88E1FF7FFE919FEFFFF8B038B7B0C890424E87C320B00897C240889342489442404E82C22F7FF8B530885D20F84F1FDFFFF8B3285F60F84E7FDFFFF895DE431FF31F689C38B4CFA08B8000000008039000F44C8894C24088B44FA0C891C2489442404E85B18F7FF8B45E48B500885D2740983C601393289F777CA89D8E9A1FDFFFF8B530889F0E867FDFFFF8B530C89542404890424E83861F7FF8B781489C68B03890424E8E9310B0089470889F0E96FFDFFFFC744240C10F73908C7442408F5773108C7442404FFFFFFFF893424E8BF1EF7FFE94AFDFFFFC744240803000000C744240400000000893424E8C21DF7FF8B78148945E48B03890424E892310B008B55E48947088B42148B500889500C8B4B0885C974638B0131D231FF85C074598975E08DB4260000000089D6C1E6048D34318B460C85C0746189C28B45E0E8AFFCFFFF89C28B46088955D8890424E83F310B008B55D8895424088B55E489442404891424E8B913F7FF8B4B0885C9740983C701393989FA77B18B530C8B5B108B45E409D30F8498FCFFFF8B75E489561089F0E98BFCFFFF8D76008B730C8975DC8B431009C60F843F01000083F8000F8CA30000000F8E930000008B45E08955D8894DD4890424E82712F7FF8B55D88B4DD48B80800000008945DCC1E2048D34118B4608890424E8A7300B008B55DC89542408894424048B45E4890424E81112F7FF8B4E1483C1012B4E1089C28B430C8955D8894DD48945DC8B45E0890424E84FD3F6FF8B55D88B4DD485C0744C8B45DCC1E0032B461029C889028B4204C1E10383E00709C8894204E91CFFFFFF837DDC040F8763FFFFFF8B75E08955D8894DD4893424E88A11F7FF8B4DD48B55D88B40788945DCE961FFFFFF8B46108902EBBA8975DC89DEC1E2048D1C108B45DC8B530CE85CFBFFFF8945E48B4308890424E8EE2F0B008B55E489542408894424048B45E0890424E86812F7FF8B55E48B4214F6400201740A8B55E08B4214804802018B460885C00F84B7FCFFFF83C701393889FA0F86AAFCFFFFEB9BC744240805000000C7442404AACA2A08C7042400000000E80817E6FFC74424100B783108C744240C3C7A3108C744240481020000C704247B77310889442408E8E4E1E6FF8D742600</bytes>
-<bytes id="62">
-5589E557565383EC4C8B4508C74424047E000000890424E88068E2FF85C00F84F10200008B5508891424E87D6EE2FF83C0108945CC890424E89345E3FF8945C8C745DC00000000908B7D088B15B82A3A08893C248955D4E8506EE2FF8945C00FB6073C7E0F840E02000084C00F84060200008B55D48B45C085D28945D089C3746A85C07E668B55D4C745D8000000008B128955C48B7DC485FF0F84210200008B45080345D88B75D48B5DC48945E4EB0E8B5E0483C60485DB0F8402020000891C24E8E66DE2FF895C24048944240889C78B45E4890424E85173E2FF85C075D18B55D88D7C3AFF897DD089FB8B55D00355DC3955CC8955D80F8E960100008B55088B45C80345DC895C240889542404890424E8E667E2FF8B3DBC2A3A08035D08891C24895DE0897DDCE87F6DE2FF85C08945D40F8EC6010000C745E40000000089DF803B2F0F84B40100008B75DC85F60F84CB0000008B45DC8B1885DB0F84BE00000089C6EB1066908B5E0483C60485DB0F84AA000000891C24E82E6DE2FF895C2404893C2489442408E89E72E2FF85C075D68B5DE485DB0F84B40000008B45E483C001890424E82544E3FF8B7DE4897C240889C68B45E089342489442404E83967E2FFC6043E00893424E851FCFFFF89342489C3E8036AE2FF891C24E8CB6CE2FF8B55D801C23955CC8955DC0F8EE60000008B55E08B45C80355E40345D8895C2404895508890424E84F6DE2FF891C24E8C769E2FFE92EFEFFFF8DB6000000008345E4018B55E43955D40F8E62FFFFFF8B55E08B45E48B7DE0037DE4803C022F0F8504FFFFFF8B5DE485DB0F854CFFFFFF8B4DD085C90F8541FFFFFF8B45C88B7DD8C60438008B45C883C44C5B5E5F5DC38DB42600000000C745D0000000008B55D031DB0355DC3955CC8955D80F8F6AFEFFFF8B45D08B7DCC8D7C381489F883C001894424048B45C8897DCC890424E8CC42E3FF8945C8E941FEFFFF8D7426008345D8018B7DD8397DC00F8FC4FDFFFF8B5DC0E913FEFFFF8B7DCC8D7C071489F883C001894424048B45C8897DCC890424E88A42E3FF8945C8E9F4FEFFFF8B4DD0C745E40000000085C90F858DFEFFFFE947FFFFFF8B7D0831C083C9FFF2AE894DCCF755CC8B45CC890424E8A042E3FF8945C8E908FDFFFF9090909090909090</bytes>
-<bytes id="63">
-5589E557565383EC6C8B1508783A088945B4A104783A08C70508783A0800000000C70504783A08000000008955C48945D089442404C70424806E0508E8DFB7F6FF8B0D2CDC3B0885C98945C00F848F0600008B1508783A088B411485C0740A908B0083C20185C075F78B0985C975E9891508783A08C1E202891424E8D0AAF6FF8B0D2CDC3B0885C9A304783A08741F908B511485D2740C9089108B1283C00485D275F58B0985C975E7A104783A088B1508783A08890424C744240C902D0E08C74424080400000089542404E8BCCBF5FF8B0D04783A088B1508783A08C7050C783A0800000000C70510783A0800000000894DC889CB8D049139C18945D40F839900000089C88B0985C90F848D0000008B710431FF895DBC31DBC745CC000000008955B885F675549080791200744D8B514C85D28955CC74438B71388B511C39D60F87FC05000089D129F139CB0F42D90375CC39D60F86C306000029D639F7731B83C0043B45D4731D8B0885C90F847F04000089F78B710485F674AD83C00489FE3B45D472E3895DCC8B45CC8B5DBC8B55B8893510783A08A30C783A088B4DD08B45C48D048139C18945CC0F83CE020000C1E2028B4DD0031504783A0839D38B3173288B0B8B7E1C3B791C7717E9B70100008DB426000000008B0B39791C0F83A501000083C30439D372EEC745D400000000807E12000F84250100008B4DD485C90F85220200008B46088B400483F8140F95C183F8050F95C00FB6C085C80F84B801000039D30F83B00100008B3B8B471C3B461C0F85A2010000895DC8EB296690A108783A0883C304C1E002030504783A0839C30F837F0100008B3B8B471C3B461C0F857101000089F289F8E82070FFFF85C074CC8B4608C64713008B400483E80683F80277188B47088B400483E80683F8020F87FD0400008B462489472439FE749E8B470885C0749783780801759183780C01748B807F11007485F74710FF0000FF0F8578FFFFFF8B57188B521885D20F856AFFFFFF8B400483E81583F8020F865BFFFFFF8B46348B5DC8C64712018947348B46388947388B463C89473C8B46408947408B46448947448B46488947488B464C89474C8B46508947508D74260031D28B4DD485C9753E85D274338B1570793A0885D274298B46088B400483F8140F95C231C983F8050F95C185D1741183E80683F8020F875B020000908D74260089F0E829A2FFFF8345D0048B45CC3945D00F83F80000008B1508783A08E92EFEFFFF8DB6000000008B411C895DC839F88945D40F8551FEFFFF39CE742B8B45C88B7DD4EB128D76008B083B791C0F8537FEFFFF39CE741183C00439D072EA6690E925FEFFFF8D7600C745D401000000E91DFEFFFF8D7426008B5DC889F0E81EF8FFFFBA0100000085C00F8433FFFFFF8B46088B7810C744240805000000C744240498582D08C7042400000000E8BBCDF5FF897C2404890424E803C1F6FFBA01000000E9FBFEFFFF908B460885C074068378080174088B4004E9CFFDFFFF83780C0174F2807E110074ECF74610FF0000FF75E38B4E188379180075DA8B40048D48EB83F9020F87B6FEFFFFE99DFDFFFF8B1504783A088955C88B1508783A088B5DC8C745E400000000C745E000000000C745DC000000008D049339C3C745D8000000000F83E00000008B3385F60F84D60000008B7E088B470883F8020F84AF00000085C00F84A700000083F8030F849E000000807E11000F8494000000807E10000F858A0000008B4F0483F9140F9545D483F905894DD00F95C10FB6C9894DCC0FB64DD4854DCC74688B4DD083E91583F902765D83F8040F840E010000837DD0060F84B0010000837DD0070F84BC010000837DD0080F84BD0100008B55E48D4DE485D27419A120793A0885C00F84560100008B46283B42280F844A0100008931C64613008B1508783A088DB426000000008D04950000000083C304030504783A0839C30F8220FFFFFFA154E039083DD9702D080F84DD0000003DD4702D080F84C50000008B45C0890424E81286F6FF83C46C5B5E5F5DC3E845460500C74608000000008D444003894674A1D4773A0885C0743C8B48048B1039D1743339CA0F83F60100008D4A01890889749008E976FDFFFF895DCC8B4DCC8B5DBC8B55B8893510783A08890D0C783A08E98EFBFFFFC744240401000000890424E822290D00A3D4773A088B108B4804EBB1807E12000F85E8FEFFFFC744240805000000C7442404C0582D08C7042400000000E87CCBF5FFC7442404F9240000C7042465612D0889442408E86896F6FF833D70793A08000F842EFFFFFF837DB4000F8424FFFFFFE89C65F7FF85C07515A1D0F63908890424E84B26060085C00F8406FFFFFFE8CEF6FFFFE9FCFEFFFF89F0894DB0E8DF6BFFFF8B4DB085C00F84A1FEFFFFC64613018B018B40088378080474378B1508783A08E99AFEFFFF8B55E08D4DE0E95FFEFFFF8B1508783A08E989F9FFFF8B55D88D4DD8E949FEFFFF8B55DC8D4DDCE93EFEFFFF807E120074C3837F080474BDC744240805000000C7442404F8582D08C7042400000000E8A2CAF5FFC744240413250000C7042465612D0889442408E88E95F6FF895DCC891D0C783A08893D10783A08C744240805000000C7442404AACA2A08C7042400000000E85FCAF5FFC74424105B6A2D08C744240C00722D08C7442404DE230000C7042465612D0889442408E83B95F6FFC744240805000000C7442404AACA2A08C7042400000000E81BCAF5FFC744241070582D08C744240CDC712D08C74424047A240000C7042465612D0889442408E8F794F6FFC744240805000000C7442404AACA2A08C7042400000000E8D7C9F5FFC74424104C082B08C744240C4B722D08C7442404D3240000C7042465612D0889442408E8B394F6FF895DCC891D0C783A08893D10783A08C744240805000000C7442404AACA2A08C7042400000000E884C9F5FFC7442410706A2D08C744240C00722D08C7442404E5230000C7042465612D0889442408E86094F6FF</bytes>
-<bytes id="64">
-5589E557565383EC5C8945D4A190443A0889442404A1D0F63908890424E84EC00E008B008945C0FF50148945E4E8EE20100085C00F8542020000A1B0D63B088B782C83C02C8945C485FF0F84810000008B5DE485DB0F84200100008D47088D75E4897DD089F78B75C08945C8EB2066908B55D0895C2404891424FFD085C0752B8B0385C00F84EE00000089DF89C38B462C85C075DB8D4308894424048B45C8890424E88588FEFF85C075D585DB89FE8B7DD00F84C30000008B038906891C24E8BCFEFFFF897DC48B3F85FF0F857FFFFFFF8B45E485C00F84440100008B55C489028B45E485C08945CC0F8431010000C745BC00000000C745B8000000008D7600A1B0D63B088B55CC8982080400008D45D889442404A130FC3908C744240802000000890424E816290E00C744240401000000890424E81288FEFF8B5DCC83C308E8EB280E0085C07477E8C2280E0085C074EE8B45CCE846FBFFFF85C075EB8B75BC8B55BC85F60F44D38955BC8345B801EBD78DB6000000008B7DD0893C24E88DDCFEFF8B078B55C489028B871404000085C0740AF64008080F84D10000008B870C040000890424E894AAFEFF893C24E8CCFDFFFF8B45C48B38E98AFEFFFF66908B45D885C078618B45CC890424E87EDCFEFF8B55CC8B1285D28955CC0F851EFFFFFF837DB8010F841A0100007E32C744240805000000C744240434182B08C7042400000000E8827DFEFF8B55BC895424088B55B889042489542404E89078FFFF83C45C5B5E5F5DC3C744240805000000C7442404A0172B08C7042400000000E8487DFEFF894424108B45D8894424048B45DC894424088B45E08944240CA1A0CF3B08890424E866220E00E958FFFFFF890424E849CAFEFFE922FFFFFFA1A8DC3B088944240CA1ACDC3B0889442410A1B0DC3B0889442414A184DC3B08890424A188DC3B0889442404A18CDC3B0889442408E89AFA0C0085C00F857CFDFFFFE85D150000837830000F846DFDFFFFA1B0D63B0883781C000F8563FDFFFF8B55C08D45D4C744240C06000000C744240870172B08894424048B4218890424E84F280E00E934FDFFFFC744240805000000C7442404D0172B08C7042400000000E86A7CFEFF8B55BC89542404890424E87F77FFFFE9EAFEFFFF8D76008DBC2700000000</bytes>
-<bytes id="65">
-55B80100000089E55383EC148B5D0885DB0F44D8891C24E8802BFFFF85C0740683C4145B5DC3891C24E862FEFFFF6690</bytes>
-</bytestable>
-</profile>
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core.tests/resources/test_sessions.xml b/oprofile/org.eclipse.linuxtools.oprofile.core.tests/resources/test_sessions.xml
deleted file mode 100644
index 6640df7459ae02b58274c77db41e16c3c48f98e5..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.core.tests/resources/test_sessions.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<sessions>
- <!-- <event name="BR_INST_EXEC">
- <session name="current">
- </session>
- </event>
- <event name="CPU_CLK_UNHALTED">
- <session name="saved">
- </session>
- </event>
- <event name="UOPS_RETIRED">
- <session name="current">
- </session>
- <session name=""<>&'">
- </session>
- </event> -->
- <session name="current">
- <event name="BR_INST_EXEC"/>
- <event name="UOPS_RETIRED"/>
- </session>
-
- <session name="saved">
- <event name="CPU_CLK_UNHALTED"/>
- </session>
-
- <session name=""<>&'">
- <event name="UOPS_RETIRED"/>
- </session>
-</sessions>
-
\ No newline at end of file
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core.tests/src/org/eclipse/linuxtools/oprofile/core/tests/AllCoreTests.java b/oprofile/org.eclipse.linuxtools.oprofile.core.tests/src/org/eclipse/linuxtools/oprofile/core/tests/AllCoreTests.java
deleted file mode 100644
index 81cb51cf3fee3c02f3714d0d5970a965722fa7f9..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.core.tests/src/org/eclipse/linuxtools/oprofile/core/tests/AllCoreTests.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2018 Red Hat, Inc.
- *
- * This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License 2.0
- * which is available at https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- * Kent Sebastian <ksebasti@redhat.com> - initial API and implementation
- *******************************************************************************/
-package org.eclipse.linuxtools.oprofile.core.tests;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
-
-@RunWith(Suite.class)
-@Suite.SuiteClasses({ TestModelDataParse.class, TestModelDataPreParse.class, TestSessionsParse.class,
- TestCheckEventsParse.class, TestCheckEventsPreParse.class, TestInfoParse.class, TestDataModel.class })
-public class AllCoreTests {
-}
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core.tests/src/org/eclipse/linuxtools/oprofile/core/tests/TestCheckEventsParse.java b/oprofile/org.eclipse.linuxtools.oprofile.core.tests/src/org/eclipse/linuxtools/oprofile/core/tests/TestCheckEventsParse.java
deleted file mode 100644
index 6323630314b1b69e1b12f9b32043369b5c240435..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.core.tests/src/org/eclipse/linuxtools/oprofile/core/tests/TestCheckEventsParse.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2018 Red Hat, Inc.
- *
- * This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License 2.0
- * which is available at https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- * Kent Sebastian <ksebasti@redhat.com> - initial API and implementation
- *******************************************************************************/
-package org.eclipse.linuxtools.oprofile.core.tests;
-
-import static org.junit.Assert.assertEquals;
-
-import java.io.FileReader;
-
-import javax.xml.parsers.SAXParserFactory;
-
-import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.linuxtools.internal.oprofile.core.opxml.OprofileSAXHandler;
-import org.eclipse.linuxtools.internal.oprofile.core.opxml.checkevent.CheckEventsProcessor;
-import org.junit.Before;
-import org.junit.Test;
-import org.osgi.framework.FrameworkUtil;
-import org.xml.sax.InputSource;
-import org.xml.sax.XMLReader;
-
-public class TestCheckEventsParse {
- private static final String REL_PATH_TO_TEST_XML_OK = "resources/test_check-event_ok.xml"; //$NON-NLS-1$
- private static final String REL_PATH_TO_TEST_XML_INVALID_UMASK = "resources/test_check-event_invalid_umask.xml"; //$NON-NLS-1$
- private static final String REL_PATH_TO_TEST_XML_INVALID_COUNTER = "resources/test_check-event_invalid_counter.xml"; //$NON-NLS-1$
- private int[] test_ok, test_invalid_umask, test_invalid_counter;
-
- @Before
- public void setUp() throws Exception {
- test_ok = new int[1];
- setUpHelper(REL_PATH_TO_TEST_XML_OK, test_ok);
- test_invalid_umask = new int[1];
- setUpHelper(REL_PATH_TO_TEST_XML_INVALID_UMASK, test_invalid_umask);
- test_invalid_counter = new int[1];
- setUpHelper(REL_PATH_TO_TEST_XML_INVALID_COUNTER, test_invalid_counter);
- }
-
- //helper
- private void setUpHelper(String fileToParse, final int[] resultArray) throws Exception {
- /* this code mostly taken from OpxmlRunner */
- XMLReader reader = null;
- OprofileSAXHandler handler = OprofileSAXHandler.getInstance(resultArray);
-
- // Create XMLReader
- SAXParserFactory factory = SAXParserFactory.newInstance();
- reader = factory.newSAXParser().getXMLReader();
-
- // Set content/error handlers
- reader.setContentHandler(handler);
- reader.setErrorHandler(handler);
-
- String filePath = FileLocator.toFileURL(FileLocator.find(FrameworkUtil.getBundle(this.getClass()), new Path(fileToParse), null)).getFile();
- reader.parse(new InputSource(new FileReader(filePath)));
- }
-
- @Test
- public void testParse() {
- assertEquals(CheckEventsProcessor.EVENT_OK, test_ok[0]);
- assertEquals(CheckEventsProcessor.INVALID_UMASK, test_invalid_umask[0]);
- assertEquals(CheckEventsProcessor.INVALID_COUNTER, test_invalid_counter[0]);
- }
-}
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core.tests/src/org/eclipse/linuxtools/oprofile/core/tests/TestCheckEventsPreParse.java b/oprofile/org.eclipse.linuxtools.oprofile.core.tests/src/org/eclipse/linuxtools/oprofile/core/tests/TestCheckEventsPreParse.java
deleted file mode 100644
index b930e8a9010257961b1a81e0e819d203d63f1135..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.core.tests/src/org/eclipse/linuxtools/oprofile/core/tests/TestCheckEventsPreParse.java
+++ /dev/null
@@ -1,179 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010, 2018 Red Hat, Inc.
- *
- * This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License 2.0
- * which is available at https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- * Red Hat - initial API and implementation
- *******************************************************************************/
-package org.eclipse.linuxtools.oprofile.core.tests;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
-
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileReader;
-import java.io.IOException;
-import java.net.URL;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-
-import org.eclipse.core.filesystem.EFS;
-import org.eclipse.core.filesystem.IFileStore;
-import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.linuxtools.internal.oprofile.core.opxml.checkevent.CheckEventAdapter;
-import org.eclipse.linuxtools.internal.oprofile.core.opxml.info.InfoAdapter;
-import org.junit.Before;
-import org.junit.Test;
-import org.osgi.framework.FrameworkUtil;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.xml.sax.SAXException;
-
-/**
- * Test cases for checking the validity of the info parsed from oprofile
- * that is modified to mimic the format expected by the SAX parser.
- * The oprofile module must be loaded and the driver interface must be
- * available. ie. run opcontrol --init
- */
-public class TestCheckEventsPreParse {
-
- private static final String REL_PATH_TO_CHECKEVENT_BAD_UMASK = "resources/test_check-event_invalid_umask.xml";
- private static final String REL_PATH_TO_INFO_PRE_PARSE_RAW = "resources/test_info_pre_parse_raw.xml";
-
- // the values are checked for validity in the order they
- // appear here (ctr, event, umask)
- private String ctr;
- private String umask;
- private CheckEventAdapter cea;
-
- /**
- * Set the counter, existing event and its default unit mask.
- */
- @Before
- public void setUp (){
- String devOprofileAbsFilePath = null;
- Path devOprofilePath = new Path("resources/dev/oprofile/");
- URL devOprofileURL = FileLocator.find(FrameworkUtil.getBundle(this.getClass()), devOprofilePath , null);
- try {
- devOprofileAbsFilePath = FileLocator.toFileURL(devOprofileURL).getFile();
- } catch (IOException e) {
- fail("Failed to convert the resource file's path.");
- }
- InfoAdapter.setOprofileDir(devOprofileAbsFilePath);
-
- File devFile = new File(InfoAdapter.DEV_OPROFILE + "0");
- if (devFile.exists()){
- ctr = "0";
- }
- File cpuFile = new File(InfoAdapter.CPUTYPE);
-
- try (BufferedReader bi = new BufferedReader(new FileReader(cpuFile))) {
- String cpuType = bi.readLine();
- File opArchEvents = new File(InfoAdapter.OP_SHARE + cpuType + "/"
- + InfoAdapter.EVENTS);
- File opArchUnitMasks = new File(InfoAdapter.OP_SHARE + cpuType
- + "/" + InfoAdapter.UNIT_MASKS);
-
- try (BufferedReader eventReader = new BufferedReader(
- new FileReader(opArchEvents))) {
- String line;
- while ((line = eventReader.readLine()) != null) {
- // find the first event and use it
- if (line.contains("name:")) {
- int start = line.indexOf("name:") + 5;
- int end = line.indexOf(" ", start);
-
- // get the string that references the unit mask type
- start = line.indexOf("um:") + 3;
- end = line.indexOf(" ", start);
- String um = line.substring(start, end);
-
- try (BufferedReader unitMaskReader = new BufferedReader(
- new FileReader(opArchUnitMasks))) {
- while ((line = unitMaskReader.readLine()) != null) {
- if (line.contains("name:" + um + " ")) {
- start = line.indexOf("default:") + 8;
- String unitMaskDef = line.substring(start);
- // convert from hex. to dec.
- unitMaskDef = unitMaskDef.replaceFirst(
- "0x", "");
- umask = String.valueOf(Integer.parseInt(
- unitMaskDef, 16));
- break;
- }
- }
- }
- break;
- }
- }
- }
- } catch (IOException e) {
- }
- }
-
- @Test
- public void testBadUnitMask (){
- umask = "999";
- assertValidity(REL_PATH_TO_CHECKEVENT_BAD_UMASK);
- }
-
- public void assertValidity (String path){
- IFileStore fileStore = null;
- String infoAbsFilePath = null;
-
- Path infoFilePath = new Path(REL_PATH_TO_INFO_PRE_PARSE_RAW);
- URL infoFileURL = FileLocator.find(FrameworkUtil.getBundle(this.getClass()), infoFilePath, null);
- try {
- infoAbsFilePath = FileLocator.toFileURL(infoFileURL).getFile();
- fileStore = EFS.getLocalFileSystem().getStore(new Path(infoAbsFilePath));
- } catch (IOException e) {
- fail("Failed to convert the resource file's path.");
- }
-
- InfoAdapter ia = new InfoAdapter(fileStore);
- ia.process();
-
- cea = new CheckEventAdapter(ctr, "CPU_CLK_UNHALTED", umask);
- cea.process();
- Document actualDocument = cea.getDocument();
- Element actualRoot = (Element) actualDocument.getElementsByTagName(CheckEventAdapter.CHECK_EVENTS).item(0);
-
- Path filePath = new Path(path);
- URL fileURL = FileLocator.find(FrameworkUtil.getBundle(this.getClass()), filePath, null);
- Element expectedRoot = null;
- try {
- String absFilePath = FileLocator.toFileURL(fileURL).getFile();
- File file = new File (absFilePath);
- FileInputStream inp = new FileInputStream(file);
- DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
- DocumentBuilder builder;
- builder = factory.newDocumentBuilder();
- Document expectedDocument = builder.parse(inp);
- expectedRoot = (Element) expectedDocument.getElementsByTagName(CheckEventAdapter.CHECK_EVENTS).item(0);
-
- } catch (FileNotFoundException e) {
- fail("File was not found.");
- } catch (IOException e) {
- fail("Failed to convert the resource file's path.");
- } catch (SAXException e) {
- fail("Failed to parse the XML.");
- } catch (ParserConfigurationException e) {
- fail("Failed to create a document builder.");
- }
-
- Element expectedResultTag = (Element) expectedRoot.getElementsByTagName(CheckEventAdapter.RESULT).item(0);
- Element actualResultTag = (Element) actualRoot.getElementsByTagName(CheckEventAdapter.RESULT).item(0);
- assertEquals(expectedResultTag.getTextContent(), actualResultTag.getTextContent());
- }
-}
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core.tests/src/org/eclipse/linuxtools/oprofile/core/tests/TestDataModel.java b/oprofile/org.eclipse.linuxtools.oprofile.core.tests/src/org/eclipse/linuxtools/oprofile/core/tests/TestDataModel.java
deleted file mode 100644
index f5f906cca9770aee56aa2608e7b70861ab483c41..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.core.tests/src/org/eclipse/linuxtools/oprofile/core/tests/TestDataModel.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2018 Red Hat, Inc.
- *
- * This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License 2.0
- * which is available at https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- * Kent Sebastian <ksebasti@redhat.com> - initial API and implementation
- *******************************************************************************/
-package org.eclipse.linuxtools.oprofile.core.tests;
-
-import static org.junit.Assert.assertEquals;
-
-import org.eclipse.linuxtools.internal.oprofile.core.model.OpModelEvent;
-import org.eclipse.linuxtools.internal.oprofile.core.model.OpModelImage;
-import org.eclipse.linuxtools.internal.oprofile.core.model.OpModelSession;
-import org.eclipse.linuxtools.oprofile.tests.TestingOpModelRoot;
-import org.junit.Before;
-import org.junit.Test;
-
-public class TestDataModel {
- private TestingOpModelRoot _testRoot;
-
- @Before
- public void setUp() {
- _testRoot = new TestingOpModelRoot();
- _testRoot.refreshModel();
- }
-
- @Test
- public void testParse() {
- OpModelSession[] sessions = _testRoot.getSessions();
- assertEquals(3, sessions.length);
- assertEquals(TestingOpModelRoot.NAME_E1, sessions[0].getName());
- assertEquals(TestingOpModelRoot.NAME_E2, sessions[1].getName());
-
- OpModelEvent[] e1_sessions = sessions[0].getEvents(), e2_sessions = sessions[1].getEvents();
- assertEquals(1, e1_sessions.length);
- assertEquals(4, e2_sessions.length);
-
- assertEquals(205000, e1_sessions[0].getCount());
- assertEquals(205000, e2_sessions[0].getCount());
- assertEquals(200000, e2_sessions[1].getCount());
- assertEquals(OpModelImage.IMAGE_PARSE_ERROR, e2_sessions[2].getCount());
- assertEquals(0, e2_sessions[3].getCount());
-
- assertEquals(TestingOpModelRoot.NAME_E1_S1, e1_sessions[0].getName());
- assertEquals(TestingOpModelRoot.NAME_E2_S1, e2_sessions[0].getName());
- assertEquals(TestingOpModelRoot.NAME_E2_S2, e2_sessions[1].getName());
- assertEquals(TestingOpModelRoot.NAME_E2_S3, e2_sessions[2].getName());
- assertEquals(TestingOpModelRoot.NAME_E2_S4, e2_sessions[3].getName());
-
- //further image parsing is tested in the TestModelDataParse testParse
- }
-
- @Test
- public void testStringOutput() {
- assertEquals(TestingOpModelRoot.ROOT_OUTPUT, _testRoot.toString());
- }
-}
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core.tests/src/org/eclipse/linuxtools/oprofile/core/tests/TestInfoParse.java b/oprofile/org.eclipse.linuxtools.oprofile.core.tests/src/org/eclipse/linuxtools/oprofile/core/tests/TestInfoParse.java
deleted file mode 100644
index 4910a365964107d1b5bfa41677463ed830b98348..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.core.tests/src/org/eclipse/linuxtools/oprofile/core/tests/TestInfoParse.java
+++ /dev/null
@@ -1,417 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2018 Red Hat, Inc.
- *
- * This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License 2.0
- * which is available at https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- * Kent Sebastian <ksebasti@redhat.com> - initial API and implementation
- *******************************************************************************/
-package org.eclipse.linuxtools.oprofile.core.tests;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-
-import java.io.FileReader;
-
-import javax.xml.parsers.SAXParserFactory;
-
-import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.linuxtools.internal.oprofile.core.daemon.OpEvent;
-import org.eclipse.linuxtools.internal.oprofile.core.daemon.OpInfo;
-import org.eclipse.linuxtools.internal.oprofile.core.daemon.OpUnitMask;
-import org.eclipse.linuxtools.internal.oprofile.core.opxml.OprofileSAXHandler;
-import org.junit.Before;
-import org.junit.Test;
-import org.osgi.framework.FrameworkUtil;
-import org.xml.sax.InputSource;
-import org.xml.sax.XMLReader;
-
-public class TestInfoParse {
- private static final String REL_PATH_TO_TEST_XML = "resources/test_info.xml"; //$NON-NLS-1$
- private static final String REL_PATH_TO_TEST_XML_0CTR = "resources/test_info_0ctrs.xml"; //$NON-NLS-1$
-
- private OpInfo info;
- private OpInfo info_0ctr;
-
- @Before
- public void setUp() throws Exception {
- /* this code mostly taken from OpxmlRunner */
- XMLReader reader = null;
- info = new OpInfo();
- OprofileSAXHandler handler = OprofileSAXHandler.getInstance(info);
-
- // Create XMLReader
- SAXParserFactory factory = SAXParserFactory.newInstance();
- reader = factory.newSAXParser().getXMLReader();
-
- // Set content/error handlers
- reader.setContentHandler(handler);
- reader.setErrorHandler(handler);
-
- String filePath = FileLocator.toFileURL(FileLocator.find(FrameworkUtil.getBundle(this.getClass()), new Path(REL_PATH_TO_TEST_XML), null)).getFile();
- reader.parse(new InputSource(new FileReader(filePath)));
-
- info_0ctr = new OpInfo();
- handler = OprofileSAXHandler.getInstance(info_0ctr);
-
- // Set content/error handlers
- reader.setContentHandler(handler);
- reader.setErrorHandler(handler);
-
- filePath = FileLocator.toFileURL(FileLocator.find(FrameworkUtil.getBundle(this.getClass()), new Path(REL_PATH_TO_TEST_XML_0CTR), null)).getFile();
- reader.parse(new InputSource(new FileReader(filePath)));
- }
-
- @Test
- public void testParse() {
- assertEquals("/var/lib/oprofile/samples/", info.getDefault(OpInfo.DEFAULT_SAMPLE_DIR)); //$NON-NLS-1$
- assertEquals("/var/lib/oprofile/lock", info.getDefault(OpInfo.DEFAULT_LOCK_FILE)); //$NON-NLS-1$
- assertEquals("/var/lib/oprofile/samples/oprofiled.log", info.getDefault(OpInfo.DEFAULT_LOG_FILE)); //$NON-NLS-1$
- assertEquals("/var/lib/oprofile/complete_dump", info.getDefault(OpInfo.DEFAULT_DUMP_STATUS)); //$NON-NLS-1$
- assertTrue(info.getTimerMode());
-
- assertEquals(800, info.getCPUSpeed(),0);
- assertEquals(2, info.getNrCounters());
-
- OpEvent[] ctr0_events = info.getEvents(0), ctr1_events = info.getEvents(1);
- assertEquals(3, ctr0_events.length);
- assertEquals(3, ctr1_events.length);
-
- OpEvent ctr0_e1 = ctr0_events[0], ctr0_e2 = ctr0_events[1], ctr0_e3 = ctr0_events[2],
- ctr1_e1 = ctr1_events[0], ctr1_e2 = ctr1_events[1], ctr1_e3 = ctr1_events[2];
- //events must be ordered alphabetically
- assertEquals(6000, ctr0_e1.getMinCount());
- assertEquals("CPU_CLK_UNHALTED", ctr0_e1.getText()); //$NON-NLS-1$
- assertEquals("Clock cycles when not halted", ctr0_e1.getTextDescription()); //$NON-NLS-1$
- assertEquals(500, ctr0_e2.getMinCount());
- assertEquals("DTLB_MISSES", ctr0_e2.getText()); //$NON-NLS-1$
- assertEquals("DTLB miss events", ctr0_e2.getTextDescription()); //$NON-NLS-1$
- assertEquals(6000, ctr0_e3.getMinCount());
- assertEquals("INST_RETIRED_ANY_P", ctr0_e3.getText()); //$NON-NLS-1$
- assertEquals("number of instructions retired", ctr0_e3.getTextDescription()); //$NON-NLS-1$
- assertEquals(500, ctr1_e1.getMinCount());
- assertEquals("EIST_TRANS_ALL", ctr1_e1.getText()); //$NON-NLS-1$
- assertEquals("Intel(tm) Enhanced SpeedStep(r) Technology transitions", ctr1_e1.getTextDescription()); //$NON-NLS-1$
- assertEquals(500, ctr1_e2.getMinCount());
- assertEquals("L2_LINES_OUT", ctr1_e2.getText()); //$NON-NLS-1$
- assertEquals("number of recovered lines from L2", ctr1_e2.getTextDescription()); //$NON-NLS-1$
- assertEquals(500, ctr1_e3.getMinCount());
- assertEquals("L2_M_LINES_IN", ctr1_e3.getText()); //$NON-NLS-1$
- assertEquals("number of modified lines allocated in L2", ctr1_e3.getTextDescription()); //$NON-NLS-1$
-
- OpUnitMask ctr0_e1_mask = ctr0_e1.getUnitMask(), ctr0_e2_mask = ctr0_e2.getUnitMask(),
- ctr0_e3_mask = ctr0_e3.getUnitMask(), ctr1_e1_mask = ctr1_e1.getUnitMask(),
- ctr1_e2_mask = ctr1_e2.getUnitMask(), ctr1_e3_mask = ctr1_e3.getUnitMask();
-
- assertEquals(0, ctr0_e1_mask.getMaskValue());
- assertEquals(OpUnitMask.EXCLUSIVE, ctr0_e1_mask.getType());
- assertEquals(3, ctr0_e1_mask.getNumMasks());
- assertEquals(0, ctr0_e1_mask.getMaskFromIndex(0));
- assertEquals("Unhalted core cycles", ctr0_e1_mask.getText(0)); //$NON-NLS-1$
- assertEquals(1, ctr0_e1_mask.getMaskFromIndex(1));
- assertEquals("Unhalted bus cycles", ctr0_e1_mask.getText(1)); //$NON-NLS-1$
- assertEquals(2, ctr0_e1_mask.getMaskFromIndex(2));
- assertEquals("Unhalted bus cycles of this core while the other core is halted", ctr0_e1_mask.getText(2)); //$NON-NLS-1$
-
- assertEquals(15, ctr0_e2_mask.getMaskValue());
- assertEquals(OpUnitMask.BITMASK, ctr0_e2_mask.getType());
- assertEquals(4, ctr0_e2_mask.getNumMasks());
- assertEquals(1, ctr0_e2_mask.getMaskFromIndex(0));
- assertEquals("ANY\tMemory accesses that missed the DTLB.", ctr0_e2_mask.getText(0)); //$NON-NLS-1$
- assertEquals(2, ctr0_e2_mask.getMaskFromIndex(1));
- assertEquals("MISS_LD\tDTLB misses due to load operations.", ctr0_e2_mask.getText(1)); //$NON-NLS-1$
- assertEquals(4, ctr0_e2_mask.getMaskFromIndex(2));
- assertEquals("L0_MISS_LD L0 DTLB misses due to load operations.", ctr0_e2_mask.getText(2)); //$NON-NLS-1$
- assertEquals(8, ctr0_e2_mask.getMaskFromIndex(3));
- assertEquals("MISS_ST\tTLB misses due to store operations.", ctr0_e2_mask.getText(3)); //$NON-NLS-1$
-
- assertEquals(0, ctr0_e3_mask.getMaskValue());
- assertEquals(OpUnitMask.MANDATORY, ctr0_e3_mask.getType());
- assertEquals(1, ctr0_e3_mask.getNumMasks());
- assertEquals(0, ctr0_e3_mask.getMaskFromIndex(0));
- assertEquals("No unit mask", ctr0_e3_mask.getText(0)); //$NON-NLS-1$
-
- assertEquals(1, ctr1_e1_mask.getMaskValue());
- assertEquals(OpUnitMask.INVALID, ctr1_e1_mask.getType());
- assertEquals(1, ctr1_e1_mask.getNumMasks());
- assertEquals(-1, ctr1_e1_mask.getMaskFromIndex(0)); //-1 because of invalid mask type
- assertEquals("No unit mask", ctr1_e1_mask.getText(0)); //$NON-NLS-1$
-
- assertEquals(112, ctr1_e2_mask.getMaskValue());
- assertEquals(OpUnitMask.BITMASK, ctr1_e2_mask.getType());
- assertEquals(5, ctr1_e2_mask.getNumMasks());
- assertEquals(192, ctr1_e2_mask.getMaskFromIndex(0));
- assertEquals("core: all cores", ctr1_e2_mask.getText(0)); //$NON-NLS-1$
- assertEquals(64, ctr1_e2_mask.getMaskFromIndex(1));
- assertEquals("core: this core", ctr1_e2_mask.getText(1)); //$NON-NLS-1$
- assertEquals(48, ctr1_e2_mask.getMaskFromIndex(2));
- assertEquals("prefetch: all inclusive", ctr1_e2_mask.getText(2)); //$NON-NLS-1$
- assertEquals(16, ctr1_e2_mask.getMaskFromIndex(3));
- assertEquals("prefetch: Hardware prefetch only", ctr1_e2_mask.getText(3)); //$NON-NLS-1$
- assertEquals(0, ctr1_e2_mask.getMaskFromIndex(4));
- assertEquals("prefetch: exclude hardware prefetch", ctr1_e2_mask.getText(4)); //$NON-NLS-1$
-
- assertEquals(64, ctr1_e3_mask.getMaskValue());
- assertEquals(OpUnitMask.EXCLUSIVE, ctr1_e3_mask.getType());
- assertEquals(2, ctr1_e3_mask.getNumMasks());
- assertEquals(192, ctr1_e3_mask.getMaskFromIndex(0));
- assertEquals("All cores", ctr1_e3_mask.getText(0)); //$NON-NLS-1$
- assertEquals(64, ctr1_e3_mask.getMaskFromIndex(1));
- assertEquals("This core", ctr1_e3_mask.getText(1)); //$NON-NLS-1$
-
- assertNull(ctr0_e1_mask.getText(-1));
-
- assertEquals(0, info_0ctr.getNrCounters());
- }
-
- @Test
- public void testUnitMask() {
- //test types of masks setting/unsetting
- OpUnitMask mask_bit1 = info.getEvents(0)[1].getUnitMask(),
-// mask_bit2 = info.getEvents(1)[1].getUnitMask(),
- mask_exl = info.getEvents(0)[0].getUnitMask(),
- mask_mand = info.getEvents(0)[2].getUnitMask(),
- mask_invalid = info.getEvents(1)[0].getUnitMask();
-
- //bitmask 1 test -- bitmasks all mutually exclusive
- assertEquals(15, mask_bit1.getMaskValue());
- mask_bit1.setMaskValue(0);
- mask_bit1.setMaskFromIndex(0);
- assertEquals(true, mask_bit1.isMaskSetFromIndex(0));
- assertEquals(false, mask_bit1.isMaskSetFromIndex(1));
- assertEquals(false, mask_bit1.isMaskSetFromIndex(2));
- assertEquals(false, mask_bit1.isMaskSetFromIndex(3));
- assertEquals(1, mask_bit1.getMaskValue());
-
- mask_bit1.setMaskFromIndex(1);
- assertEquals(true, mask_bit1.isMaskSetFromIndex(0));
- assertEquals(true, mask_bit1.isMaskSetFromIndex(1));
- assertEquals(false, mask_bit1.isMaskSetFromIndex(2));
- assertEquals(false, mask_bit1.isMaskSetFromIndex(3));
- assertEquals(3, mask_bit1.getMaskValue());
-
- mask_bit1.setMaskFromIndex(2);
- assertEquals(true, mask_bit1.isMaskSetFromIndex(0));
- assertEquals(true, mask_bit1.isMaskSetFromIndex(1));
- assertEquals(true, mask_bit1.isMaskSetFromIndex(2));
- assertEquals(false, mask_bit1.isMaskSetFromIndex(3));
- assertEquals(7, mask_bit1.getMaskValue());
-
- mask_bit1.setMaskFromIndex(3);
- assertEquals(true, mask_bit1.isMaskSetFromIndex(0));
- assertEquals(true, mask_bit1.isMaskSetFromIndex(1));
- assertEquals(true, mask_bit1.isMaskSetFromIndex(2));
- assertEquals(true, mask_bit1.isMaskSetFromIndex(3));
- assertEquals(15, mask_bit1.getMaskValue());
-
- mask_bit1.unSetMaskFromIndex(1);
- assertEquals(true, mask_bit1.isMaskSetFromIndex(0));
- assertEquals(false, mask_bit1.isMaskSetFromIndex(1));
- assertEquals(true, mask_bit1.isMaskSetFromIndex(2));
- assertEquals(true, mask_bit1.isMaskSetFromIndex(3));
-
- mask_bit1.unSetMaskFromIndex(2);
- assertEquals(true, mask_bit1.isMaskSetFromIndex(0));
- assertEquals(false, mask_bit1.isMaskSetFromIndex(1));
- assertEquals(false, mask_bit1.isMaskSetFromIndex(2));
- assertEquals(true, mask_bit1.isMaskSetFromIndex(3));
-
- mask_bit1.unSetMaskFromIndex(3);
- assertEquals(true, mask_bit1.isMaskSetFromIndex(0));
- assertEquals(false, mask_bit1.isMaskSetFromIndex(1));
- assertEquals(false, mask_bit1.isMaskSetFromIndex(2));
- assertEquals(false, mask_bit1.isMaskSetFromIndex(3));
-
- mask_bit1.setMaskFromIndex(2);
- assertEquals(true, mask_bit1.isMaskSetFromIndex(0));
- assertEquals(false, mask_bit1.isMaskSetFromIndex(1));
- assertEquals(true, mask_bit1.isMaskSetFromIndex(2));
- assertEquals(false, mask_bit1.isMaskSetFromIndex(3));
- assertEquals(5, mask_bit1.getMaskValue());
-
- mask_bit1.unSetMaskFromIndex(1);
- assertEquals(true, mask_bit1.isMaskSetFromIndex(0));
- assertEquals(false, mask_bit1.isMaskSetFromIndex(1));
- assertEquals(true, mask_bit1.isMaskSetFromIndex(2));
- assertEquals(false, mask_bit1.isMaskSetFromIndex(3));
-
- mask_bit1.unSetMaskFromIndex(3);
- assertEquals(true, mask_bit1.isMaskSetFromIndex(0));
- assertEquals(false, mask_bit1.isMaskSetFromIndex(1));
- assertEquals(true, mask_bit1.isMaskSetFromIndex(2));
- assertEquals(false, mask_bit1.isMaskSetFromIndex(3));
- assertEquals(5, mask_bit1.getMaskValue());
-
- mask_bit1.setMaskFromIndex(2);
- assertEquals(true, mask_bit1.isMaskSetFromIndex(0));
- assertEquals(false, mask_bit1.isMaskSetFromIndex(1));
- assertEquals(true, mask_bit1.isMaskSetFromIndex(2));
- assertEquals(false, mask_bit1.isMaskSetFromIndex(3));
- assertEquals(5, mask_bit1.getMaskValue());
-
- mask_bit1.setMaskValue(OpUnitMask.SET_DEFAULT_MASK);
- assertEquals(15, mask_bit1.getMaskValue());
-
- //bitmask 2 test -- bitmasks overlap
- /* bug related to overlapping bitmasks eclipse bz 261917 */
-// assertEquals(112, mask_bit2.getMaskValue());
-// mask_bit2.setMaskValue(0);
-// mask_bit2.setMaskFromIndex(0);
-// assertEquals(true, mask_bit2.isMaskSetFromIndex(0));
-// assertEquals(false, mask_bit2.isMaskSetFromIndex(1));
-// assertEquals(false, mask_bit2.isMaskSetFromIndex(2));
-// assertEquals(false, mask_bit2.isMaskSetFromIndex(3));
-// assertEquals(false, mask_bit2.isMaskSetFromIndex(4));
-//// assertEquals(192, mask_bit2.getMaskValue());
-//
-// mask_bit2.setMaskFromIndex(1);
-// assertEquals(true, mask_bit2.isMaskSetFromIndex(0));
-// assertEquals(true, mask_bit2.isMaskSetFromIndex(1));
-// assertEquals(false, mask_bit2.isMaskSetFromIndex(2));
-// assertEquals(false, mask_bit2.isMaskSetFromIndex(3));
-// assertEquals(false, mask_bit2.isMaskSetFromIndex(4));
-//// assertEquals(3, mask_bit2.getMaskValue());
-//
-// mask_bit2.setMaskFromIndex(2);
-// assertEquals(true, mask_bit2.isMaskSetFromIndex(0));
-// assertEquals(true, mask_bit2.isMaskSetFromIndex(1));
-// assertEquals(true, mask_bit2.isMaskSetFromIndex(2));
-// assertEquals(false, mask_bit2.isMaskSetFromIndex(3));
-// assertEquals(false, mask_bit2.isMaskSetFromIndex(4));
-//// assertEquals(7, mask_bit2.getMaskValue());
-//
-// mask_bit2.setMaskFromIndex(3);
-// assertEquals(true, mask_bit2.isMaskSetFromIndex(0));
-// assertEquals(true, mask_bit2.isMaskSetFromIndex(1));
-// assertEquals(true, mask_bit2.isMaskSetFromIndex(2));
-// assertEquals(true, mask_bit2.isMaskSetFromIndex(3));
-// assertEquals(false, mask_bit2.isMaskSetFromIndex(4));
-//// assertEquals(15, mask_bit2.getMaskValue());
-//
-// mask_bit2.setMaskFromIndex(4);
-// assertEquals(true, mask_bit2.isMaskSetFromIndex(0));
-// assertEquals(true, mask_bit2.isMaskSetFromIndex(1));
-// assertEquals(true, mask_bit2.isMaskSetFromIndex(2));
-// assertEquals(true, mask_bit2.isMaskSetFromIndex(3));
-// assertEquals(true, mask_bit2.isMaskSetFromIndex(4));
-//// assertEquals(15, mask_bit2.getMaskValue());
-//
-// mask_bit2.unSetMaskFromIndex(1);
-// assertEquals(true, mask_bit2.isMaskSetFromIndex(0));
-// assertEquals(false, mask_bit2.isMaskSetFromIndex(1));
-// assertEquals(true, mask_bit2.isMaskSetFromIndex(2));
-// assertEquals(true, mask_bit2.isMaskSetFromIndex(3));
-// assertEquals(true, mask_bit2.isMaskSetFromIndex(4));
-//
-// mask_bit2.unSetMaskFromIndex(2);
-// assertEquals(true, mask_bit2.isMaskSetFromIndex(0));
-// assertEquals(false, mask_bit2.isMaskSetFromIndex(1));
-// assertEquals(false, mask_bit2.isMaskSetFromIndex(2));
-// assertEquals(true, mask_bit2.isMaskSetFromIndex(3));
-// assertEquals(true, mask_bit2.isMaskSetFromIndex(4));
-//
-// mask_bit2.unSetMaskFromIndex(3);
-// assertEquals(true, mask_bit2.isMaskSetFromIndex(0));
-// assertEquals(false, mask_bit2.isMaskSetFromIndex(1));
-// assertEquals(false, mask_bit2.isMaskSetFromIndex(2));
-// assertEquals(false, mask_bit2.isMaskSetFromIndex(3));
-// assertEquals(true, mask_bit2.isMaskSetFromIndex(4));
-//
-// mask_bit2.unSetMaskFromIndex(4);
-// assertEquals(true, mask_bit2.isMaskSetFromIndex(0));
-// assertEquals(false, mask_bit2.isMaskSetFromIndex(1));
-// assertEquals(false, mask_bit2.isMaskSetFromIndex(2));
-// assertEquals(false, mask_bit2.isMaskSetFromIndex(3));
-// assertEquals(false, mask_bit2.isMaskSetFromIndex(4));
-//
-// mask_bit2.setMaskFromIndex(2);
-// assertEquals(true, mask_bit2.isMaskSetFromIndex(0));
-// assertEquals(false, mask_bit2.isMaskSetFromIndex(1));
-// assertEquals(true, mask_bit2.isMaskSetFromIndex(2));
-// assertEquals(false, mask_bit2.isMaskSetFromIndex(3));
-// assertEquals(false, mask_bit2.isMaskSetFromIndex(4));
-//// assertEquals(5, mask_bit2.getMaskValue());
-//
-// mask_bit2.unSetMaskFromIndex(1);
-// assertEquals(true, mask_bit2.isMaskSetFromIndex(0));
-// assertEquals(false, mask_bit2.isMaskSetFromIndex(1));
-// assertEquals(true, mask_bit2.isMaskSetFromIndex(2));
-// assertEquals(false, mask_bit2.isMaskSetFromIndex(3));
-// assertEquals(false, mask_bit2.isMaskSetFromIndex(4));
-//
-// mask_bit2.unSetMaskFromIndex(3);
-// assertEquals(true, mask_bit2.isMaskSetFromIndex(0));
-// assertEquals(false, mask_bit2.isMaskSetFromIndex(1));
-// assertEquals(true, mask_bit2.isMaskSetFromIndex(2));
-// assertEquals(false, mask_bit2.isMaskSetFromIndex(3));
-// assertEquals(false, mask_bit2.isMaskSetFromIndex(4));
-//// assertEquals(5, mask_bit2.getMaskValue());
-//
-// mask_bit2.setMaskFromIndex(2);
-// assertEquals(true, mask_bit2.isMaskSetFromIndex(0));
-// assertEquals(false, mask_bit2.isMaskSetFromIndex(1));
-// assertEquals(true, mask_bit2.isMaskSetFromIndex(2));
-// assertEquals(false, mask_bit2.isMaskSetFromIndex(3));
-// assertEquals(false, mask_bit2.isMaskSetFromIndex(4));
-//// assertEquals(5, mask_bit2.getMaskValue());
-//
-// mask_bit2.setMaskValue(OpUnitMask.SET_DEFAULT_MASK);
-// assertEquals(112, mask_bit2.getMaskValue());
-
-
- //exclusive test
- assertEquals(0, mask_exl.getMaskValue());
- assertEquals(true, mask_exl.isMaskSetFromIndex(0));
- assertEquals(false, mask_exl.isMaskSetFromIndex(1));
- assertEquals(false, mask_exl.isMaskSetFromIndex(2));
- mask_exl.setMaskFromIndex(1);
- assertEquals(false, mask_exl.isMaskSetFromIndex(0));
- assertEquals(1, mask_exl.getMaskValue());
- mask_exl.unSetMaskFromIndex(1);
- assertEquals(1, mask_exl.getMaskValue());
- mask_exl.setMaskFromIndex(2);
- assertEquals(2, mask_exl.getMaskValue());
- mask_exl.setDefaultMaskValue();
- assertEquals(0, mask_exl.getMaskValue());
-
-
- //mandatory test
- assertEquals(0, mask_mand.getMaskValue());
- assertEquals(false, mask_mand.isMaskSetFromIndex(0));
- mask_mand.setMaskFromIndex(0);
- assertEquals(0, mask_mand.getMaskValue());
- mask_mand.unSetMaskFromIndex(0);
- assertEquals(0, mask_mand.getMaskValue());
- mask_mand.setMaskValue(10);
- mask_mand.setDefaultMaskValue();
- assertEquals(0, mask_mand.getMaskValue());
-
- //invalid test
- assertEquals(1, mask_invalid.getMaskValue());
- assertEquals(false, mask_invalid.isMaskSetFromIndex(0));
- mask_invalid.setMaskFromIndex(0);
- assertEquals(1, mask_invalid.getMaskValue());
- mask_invalid.unSetMaskFromIndex(0);
- assertEquals(1, mask_invalid.getMaskValue());
- mask_invalid.setMaskValue(0);
- mask_invalid.setDefaultMaskValue();
- assertEquals(1, mask_invalid.getMaskValue());
- }
-
- @Test
- public void testInfo() {
- OpEvent[] result = info.getEvents(-1);
- assertEquals(0, result.length);
-
- assertNull(info.findEvent("doesnt exist")); //$NON-NLS-1$
-
- OpEvent event = info.findEvent("CPU_CLK_UNHALTED"); //$NON-NLS-1$
- assertEquals("CPU_CLK_UNHALTED", event.getText()); //$NON-NLS-1$
- }
-}
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core.tests/src/org/eclipse/linuxtools/oprofile/core/tests/TestModelDataParse.java b/oprofile/org.eclipse.linuxtools.oprofile.core.tests/src/org/eclipse/linuxtools/oprofile/core/tests/TestModelDataParse.java
deleted file mode 100644
index 8352d81997f3c01cd5430bd1bf8efdcb5e48aaa3..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.core.tests/src/org/eclipse/linuxtools/oprofile/core/tests/TestModelDataParse.java
+++ /dev/null
@@ -1,184 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2018 Red Hat, Inc.
- *
- * This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License 2.0
- * which is available at https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- * Kent Sebastian <ksebasti@redhat.com> - initial API and implementation
- *******************************************************************************/
-package org.eclipse.linuxtools.oprofile.core.tests;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-
-import java.io.FileReader;
-
-import javax.xml.parsers.SAXParserFactory;
-
-import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.linuxtools.internal.oprofile.core.model.OpModelImage;
-import org.eclipse.linuxtools.internal.oprofile.core.model.OpModelSample;
-import org.eclipse.linuxtools.internal.oprofile.core.model.OpModelSymbol;
-import org.eclipse.linuxtools.internal.oprofile.core.opxml.OprofileSAXHandler;
-import org.eclipse.linuxtools.internal.oprofile.core.opxml.modeldata.ModelDataProcessor;
-import org.junit.Before;
-import org.junit.Test;
-import org.osgi.framework.FrameworkUtil;
-import org.xml.sax.InputSource;
-import org.xml.sax.XMLReader;
-
-public class TestModelDataParse {
- private static final String REL_PATH_TO_TEST_XML = "resources/test_model-data.xml"; //$NON-NLS-1$
- private static final String REL_PATH_TO_TEST_XML_MULTI_IMAGE = "resources/test_model-data_multiple_image.xml"; //$NON-NLS-1$
- private static final String IMAGE_OUTPUT = "/test/path/for/image, Count: 205000, Dependent Count: 5000\nSymbols: TestFunction1(int), File: /test/path/for/src/image.cpp, Count: 180000\n\tSample: Line #: 42, Count: 130000\n\tSample: Line #: 36, Count: 40000\n\tSample: Line #: 31, Count: 9999\n\tSample: Line #: 39, Count: 1\nSymbols: TestFunction2(int, int), File: /test/path/for/src/image2.cpp, Count: 20000\n\tSample: Line #: 94, Count: 19998\n\tSample: Line #: 12, Count: 1\n\tSample: Line #: 55, Count: 1\nDependent Image: /no-vmlinux, Count: 4400\nDependent Image: /lib64/ld-2.9.so, Count: 300\n\tSymbols: do_lookup_x, File: dl-lookup.c, Count: 299\n\t\tSample: Line #: 0, Count: 299\n\tSymbols: _dl_unload_cache, File: rawmemchr.c, Count: 1\n\t\tSample: Line #: 0, Count: 1\nDependent Image: /usr/lib64/libstdc++.so.6.0.10, Count: 160\nDependent Image: /lib64/libc-2.9.so, Count: 140\n\tSymbols: _IO_new_file_seekoff, File: , Count: 100\n\t\tSample: Line #: 0, Count: 100\n\tSymbols: bool std::operator!=<char, std::char_traits<char>, std::allocator<char> >(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, char const*), File: , Count: 40\n\t\tSample: Line #: 0, Count: 40\n"; //$NON-NLS-1$
- private static final String IMAGE_OUTPUT_WITHTAB = "/test/path/for/image, Count: 205000, Dependent Count: 5000\n\tSymbols: TestFunction1(int), File: /test/path/for/src/image.cpp, Count: 180000\n\t\tSample: Line #: 42, Count: 130000\n\t\tSample: Line #: 36, Count: 40000\n\t\tSample: Line #: 31, Count: 9999\n\t\tSample: Line #: 39, Count: 1\n\tSymbols: TestFunction2(int, int), File: /test/path/for/src/image2.cpp, Count: 20000\n\t\tSample: Line #: 94, Count: 19998\n\t\tSample: Line #: 12, Count: 1\n\t\tSample: Line #: 55, Count: 1\n\tDependent Image: /no-vmlinux, Count: 4400\n\tDependent Image: /lib64/ld-2.9.so, Count: 300\n\t\tSymbols: do_lookup_x, File: dl-lookup.c, Count: 299\n\t\t\tSample: Line #: 0, Count: 299\n\t\tSymbols: _dl_unload_cache, File: rawmemchr.c, Count: 1\n\t\t\tSample: Line #: 0, Count: 1\n\tDependent Image: /usr/lib64/libstdc++.so.6.0.10, Count: 160\n\tDependent Image: /lib64/libc-2.9.so, Count: 140\n\t\tSymbols: _IO_new_file_seekoff, File: , Count: 100\n\t\t\tSample: Line #: 0, Count: 100\n\t\tSymbols: bool std::operator!=<char, std::char_traits<char>, std::allocator<char> >(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, char const*), File: , Count: 40\n\t\t\tSample: Line #: 0, Count: 40\n"; //$NON-NLS-1$
-
- private OpModelImage parsedImage;
- private OpModelImage parsedErrorImage;
-
- @Before
- public void setUp() throws Exception {
- /* this code mostly taken from OpxmlRunner */
- XMLReader reader = null;
- parsedImage = new OpModelImage();
- ModelDataProcessor.CallData image = new ModelDataProcessor.CallData(parsedImage);
- OprofileSAXHandler handler = OprofileSAXHandler.getInstance(image);
-
- // Create XMLReader
- SAXParserFactory factory = SAXParserFactory.newInstance();
- reader = factory.newSAXParser().getXMLReader();
-
- // Set content/error handlers
- reader.setContentHandler(handler);
- reader.setErrorHandler(handler);
-
- String filePath = FileLocator.toFileURL(FileLocator.find(FrameworkUtil.getBundle(this.getClass()), new Path(REL_PATH_TO_TEST_XML), null)).getFile();
- reader.parse(new InputSource(new FileReader(filePath)));
-
- //2nd test image
- parsedErrorImage = new OpModelImage();
- ModelDataProcessor.CallData errorImage = new ModelDataProcessor.CallData(parsedErrorImage);
- handler = OprofileSAXHandler.getInstance(errorImage);
-
- // Set content/error handlers
- reader.setContentHandler(handler);
- reader.setErrorHandler(handler);
-
- filePath = FileLocator.toFileURL(FileLocator.find(FrameworkUtil.getBundle(this.getClass()), new Path(REL_PATH_TO_TEST_XML_MULTI_IMAGE), null)).getFile();
- reader.parse(new InputSource(new FileReader(filePath)));
- }
-
- @Test
- public void testParse() {
- //test attributes
- assertEquals("/test/path/for/image", parsedImage.getName()); //$NON-NLS-1$
- assertEquals(205000, parsedImage.getCount());
-
- //test symbols
- OpModelSymbol[] symbols = parsedImage.getSymbols();
- assertEquals(2, symbols.length);
- OpModelSymbol sym1 = symbols[0], sym2 = symbols[1];
- assertEquals("TestFunction1(int)", sym1.getName()); //$NON-NLS-1$
- assertEquals("/test/path/for/src/image.cpp", sym1.getFilePath()); //$NON-NLS-1$
- assertEquals(180000, sym1.getCount());
- assertEquals("TestFunction2(int, int)", sym2.getName()); //$NON-NLS-1$
- assertEquals("/test/path/for/src/image2.cpp", sym2.getFilePath()); //$NON-NLS-1$
- assertEquals(20000, sym2.getCount());
-
- //test samples
- OpModelSample[] sym1_spls = sym1.getSamples(), sym2_spls = sym2.getSamples();
- assertEquals(4, sym1_spls.length);
- assertEquals(3, sym2_spls.length);
- OpModelSample sym1_spl1 = sym1_spls[0], sym1_spl2 = sym1_spls[1], sym1_spl3 = sym1_spls[2], sym1_spl4 = sym1_spls[3];
- OpModelSample sym2_spl1 = sym2_spls[0], sym2_spl2 = sym2_spls[1], sym2_spl3 = sym2_spls[2];
- assertEquals(130000, sym1_spl1.getCount());
- assertEquals(42, sym1_spl1.getLine());
- assertEquals(40000, sym1_spl2.getCount());
- assertEquals(36, sym1_spl2.getLine());
- assertEquals(9999, sym1_spl3.getCount());
- assertEquals(31, sym1_spl3.getLine());
- assertEquals(1, sym1_spl4.getCount());
- assertEquals(39, sym1_spl4.getLine());
- assertEquals(19998, sym2_spl1.getCount());
- assertEquals(94, sym2_spl1.getLine());
- assertEquals(1, sym2_spl2.getCount());
- assertEquals(12, sym2_spl2.getLine());
- assertEquals(1, sym2_spl3.getCount());
- assertEquals(55, sym2_spl3.getLine());
-
- //test dependent images
- assertEquals(true, parsedImage.hasDependents());
- assertEquals(5000, parsedImage.getDepCount());
- OpModelImage[] deps = parsedImage.getDependents();
- assertEquals(4, deps.length);
- OpModelImage dep1 = deps[0], dep2 = deps[1], dep3 = deps[2], dep4 = deps[3];
-
- assertEquals(false, dep1.hasDependents());
- assertEquals("/no-vmlinux", dep1.getName()); //$NON-NLS-1$
- assertEquals(4400, dep1.getCount());
-
- assertEquals(false, dep2.hasDependents());
- OpModelSymbol[] dep2_syms = dep2.getSymbols();
- assertEquals(2, dep2_syms.length);
- OpModelSymbol dep2_sym1 = dep2_syms[0], dep2_sym2 = dep2_syms[1];
- OpModelSample[] dep2_sym1_spls = dep2_sym1.getSamples(), dep2_sym2_spls = dep2_sym2.getSamples();
- assertEquals(1, dep2_sym1_spls.length);
- assertEquals(1, dep2_sym2_spls.length);
- OpModelSample dep2_sym1_spl1 = dep2_sym1_spls[0], dep2_sym2_spl1 = dep2_sym2_spls[0];
- assertEquals("/lib64/ld-2.9.so", dep2.getName()); //$NON-NLS-1$
- assertEquals(300, dep2.getCount());
- assertEquals("do_lookup_x", dep2_sym1.getName()); //$NON-NLS-1$
- assertEquals("dl-lookup.c", dep2_sym1.getFilePath()); //$NON-NLS-1$
- assertEquals(299, dep2_sym1.getCount());
- assertEquals(299, dep2_sym1_spl1.getCount());
- assertEquals(0, dep2_sym1_spl1.getLine());
- assertEquals("_dl_unload_cache", dep2_sym2.getName()); //$NON-NLS-1$
- assertEquals("rawmemchr.c", dep2_sym2.getFilePath()); //$NON-NLS-1$
- assertEquals(1, dep2_sym2.getCount());
- assertEquals(1, dep2_sym2_spl1.getCount());
- assertEquals(0, dep2_sym2_spl1.getLine());
-
- assertEquals(false, dep3.hasDependents());
- assertEquals("/usr/lib64/libstdc++.so.6.0.10", dep3.getName()); //$NON-NLS-1$
- assertEquals(160, dep3.getCount());
-
- assertEquals(false, dep4.hasDependents());
- OpModelSymbol[] dep4_syms = dep4.getSymbols();
- assertEquals(2, dep4_syms.length);
- OpModelSymbol dep4_sym1 = dep4_syms[0], dep4_sym2 = dep4_syms[1];
- OpModelSample[] dep4_sym1_spls = dep4_sym1.getSamples(), dep4_sym2_spls = dep4_sym2.getSamples();
- assertEquals(1, dep4_sym1_spls.length);
- assertEquals(1, dep4_sym2_spls.length);
- OpModelSample dep4_sym1_spl1 = dep4_sym1_spls[0], dep4_sym2_spl1 = dep4_sym2_spls[0];
- assertEquals("/lib64/libc-2.9.so", dep4.getName()); //$NON-NLS-1$
- assertEquals(140, dep4.getCount());
- assertEquals("_IO_new_file_seekoff", dep4_sym1.getName()); //$NON-NLS-1$
- assertEquals("", dep4_sym1.getFilePath()); //$NON-NLS-1$
- assertEquals(100, dep4_sym1.getCount());
- assertEquals(100, dep4_sym1_spl1.getCount());
- assertEquals(0, dep4_sym1_spl1.getLine());
- assertEquals("bool std::operator!=<char, std::char_traits<char>, std::allocator<char> >(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, char const*)", dep4_sym2.getName()); //$NON-NLS-1$
- assertEquals("", dep4_sym2.getFilePath()); //$NON-NLS-1$
- assertEquals(40, dep4_sym2.getCount());
- assertEquals(40, dep4_sym2_spl1.getCount());
- assertEquals(0, dep4_sym2_spl1.getLine());
-
-
- assertEquals(OpModelImage.IMAGE_PARSE_ERROR, parsedErrorImage.getCount());
- assertEquals(0, parsedErrorImage.getDepCount());
- assertNull(parsedErrorImage.getDependents());
- assertNull(parsedErrorImage.getSymbols());
- assertEquals("", parsedErrorImage.getName()); //$NON-NLS-1$
- }
-
- @Test
- public void testStringOutput() {
- assertEquals(IMAGE_OUTPUT, parsedImage.toString());
- assertEquals(IMAGE_OUTPUT_WITHTAB, parsedImage.toString("\t")); //$NON-NLS-1$
- }
-}
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core.tests/src/org/eclipse/linuxtools/oprofile/core/tests/TestModelDataPreParse.java b/oprofile/org.eclipse.linuxtools.oprofile.core.tests/src/org/eclipse/linuxtools/oprofile/core/tests/TestModelDataPreParse.java
deleted file mode 100644
index ddcac7034fde44c424af6817d87a4547582f85e3..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.core.tests/src/org/eclipse/linuxtools/oprofile/core/tests/TestModelDataPreParse.java
+++ /dev/null
@@ -1,151 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010, 2018 Red Hat, Inc.
- *
- * This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License 2.0
- * which is available at https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- * Red Hat - initial API and implementation
- *******************************************************************************/
-package org.eclipse.linuxtools.oprofile.core.tests;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.net.URL;
-import java.util.ArrayList;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-
-import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.linuxtools.internal.oprofile.core.opxml.modeldata.ModelDataAdapter;
-import org.junit.Before;
-import org.junit.Test;
-import org.osgi.framework.FrameworkUtil;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NodeList;
-import org.xml.sax.SAXException;
-
-/**
- * Test cases for checking validity of the model data parsed from oprofile that
- * is modified to mimic the XML format expected by the SAX parser.
- * The oprofile module must be loaded and the driver interface must be
- * available. ie. run opcontrol --init
- */
-public class TestModelDataPreParse {
-
- private static final String REL_PATH_TO_MODEL_DATA_RAW = "resources/test_model-data_raw.xml";
- private static final String REL_PATH_TO_MODEL_DATA_EXPECTED = "resources/test_model-data_expected.xml";
-
- ModelDataAdapter mda;
- Element [] rootList;
- ArrayList<ArrayList<String>> valueList;
-
- @Before
- public void setUp (){
- String absFilePath;
- Path filePath = new Path(REL_PATH_TO_MODEL_DATA_RAW);
- URL fileURL = FileLocator.find(FrameworkUtil.getBundle(this.getClass()), filePath, null);
-
- try {
- absFilePath = FileLocator.toFileURL(fileURL).getFile();
- File file = new File (absFilePath);
- FileInputStream inp = new FileInputStream(file);
- mda = new ModelDataAdapter(inp);
- mda.process();
- } catch (IOException e) {
- e.printStackTrace();
- }
-
- mda.process();
- Document actualDocument = mda.getDocument();
- Element actualRoot = (Element) actualDocument.getElementsByTagName(ModelDataAdapter.MODEL_DATA).item(0);
-
- filePath = new Path(REL_PATH_TO_MODEL_DATA_EXPECTED);
- fileURL = FileLocator.find(FrameworkUtil.getBundle(this.getClass()), filePath, null);
- Element expectedRoot = null;
-
- try {
- absFilePath = FileLocator.toFileURL(fileURL).getFile();
- File file = new File (absFilePath);
- FileInputStream inp = new FileInputStream(file);
- DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
- DocumentBuilder builder;
- builder = factory.newDocumentBuilder();
- Document expectedDocument = builder.parse(inp);
- expectedRoot = (Element) expectedDocument.getElementsByTagName(ModelDataAdapter.MODEL_DATA).item(0);
- } catch (FileNotFoundException e) {
- fail("File was not found.");
- } catch (IOException e) {
- fail("Failed to convert the resource file's path.");
- } catch (SAXException e) {
- fail("Failed to parse the XML.");
- } catch (ParserConfigurationException e) {
- fail("Failed to create a document builder.");
- }
-
- rootList = new Element [] {expectedRoot, actualRoot};
- valueList = new ArrayList<> ();
-
- for (int i = 0; i < rootList.length; i++){
- valueList.add(new ArrayList<String>());
- }
- }
-
- @Test
- public void testBasic (){
- final String [] imageAttrs = new String [] {ModelDataAdapter.NAME, ModelDataAdapter.COUNT};
- final String [] symbolAttrs = new String [] {ModelDataAdapter.NAME, ModelDataAdapter.FILE, ModelDataAdapter.COUNT};
- final String [] sampleTags = new String [] {ModelDataAdapter.COUNT, ModelDataAdapter.LINE};
-
- for (int i = 0; i < rootList.length; i++){
- Element imageTag = (Element) rootList[i].getElementsByTagName(ModelDataAdapter.IMAGE).item(0);
- // image name, count
- for (int j = 0; j < imageAttrs.length; j++){
- String attr = imageTag.getAttribute(imageAttrs[j]);
- valueList.get(i).add(attr);
- }
-
- Element symbolsTag = (Element) rootList[i].getElementsByTagName(ModelDataAdapter.SYMBOLS).item(0);
- NodeList symbolList = symbolsTag.getElementsByTagName(ModelDataAdapter.SYMBOL);
- // go through each symbol
- for (int j = 0; j < symbolList.getLength(); j++){
- Element symbolTag = (Element) symbolList.item(j);
- // symbol name, file, count
- for (int k = 0; k < symbolAttrs.length; k++){
- String attr = symbolTag.getAttribute(symbolAttrs[k]);
- valueList.get(i).add(attr);
- }
-
- NodeList sampleList = symbolsTag.getElementsByTagName(ModelDataAdapter.SAMPLE);
- // go through each sample
- for (int k = 0; k < sampleList.getLength(); k++){
- Element sampleTag = (Element) sampleList.item(k);
-
- for (int n = 0; n < sampleTags.length; n++){
- Element elem = (Element) sampleTag.getElementsByTagName(sampleTags[n]).item(0);
- valueList.get(i).add(elem.getTextContent());
- }
- }
- }
- }
- assertSameValues(valueList);
- }
-
- private void assertSameValues(ArrayList<ArrayList<String>> valueList) {
- for (int i = 0; i < valueList.get(0).size(); i++){
- assertEquals(valueList.get(0).get(i), valueList.get(1).get(i));
- }
- }
-}
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core.tests/src/org/eclipse/linuxtools/oprofile/core/tests/TestSessionsParse.java b/oprofile/org.eclipse.linuxtools.oprofile.core.tests/src/org/eclipse/linuxtools/oprofile/core/tests/TestSessionsParse.java
deleted file mode 100644
index 134b761aae2da1382e05a2ef8b5d6aa4d6340f60..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.core.tests/src/org/eclipse/linuxtools/oprofile/core/tests/TestSessionsParse.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2018 Red Hat, Inc.
- *
- * This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License 2.0
- * which is available at https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- * Kent Sebastian <ksebasti@redhat.com> - initial API and implementation
- *******************************************************************************/
-package org.eclipse.linuxtools.oprofile.core.tests;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-
-import java.io.FileReader;
-import java.util.ArrayList;
-
-import javax.xml.parsers.SAXParserFactory;
-
-import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.linuxtools.internal.oprofile.core.model.OpModelEvent;
-import org.eclipse.linuxtools.internal.oprofile.core.model.OpModelSession;
-import org.eclipse.linuxtools.internal.oprofile.core.opxml.OprofileSAXHandler;
-import org.eclipse.linuxtools.internal.oprofile.core.opxml.sessions.SessionsProcessor;
-import org.junit.Before;
-import org.junit.Test;
-import org.osgi.framework.FrameworkUtil;
-import org.xml.sax.InputSource;
-import org.xml.sax.XMLReader;
-
-public class TestSessionsParse {
- private static final String REL_PATH_TO_TEST_XML = "resources/test_sessions.xml"; //$NON-NLS-1$
- private static final String EVENT1_OUTPUT = "current\nEvent: BR_INST_EXEC\nEvent: UOPS_RETIRED\n"; //$NON-NLS-1$
- private static final String EVENT1_OUTPUT_WITHTAB = "current\n\tEvent: BR_INST_EXEC\n\tEvent: UOPS_RETIRED\n"; //$NON-NLS-1$
- private static final String EVENT2_OUTPUT = "saved\nEvent: CPU_CLK_UNHALTED\n"; //$NON-NLS-1$
- private static final String EVENT2_OUTPUT_WITHTAB = "saved\n\tEvent: CPU_CLK_UNHALTED\n"; //$NON-NLS-1$
- private static final String EVENT3_OUTPUT = "\"<>&'\nEvent: UOPS_RETIRED\n"; //$NON-NLS-1$
- private static final String EVENT3_OUTPUT_WITHTAB = "\"<>&'\n\tEvent: UOPS_RETIRED\n"; //$NON-NLS-1$
-
- private ArrayList<OpModelSession> eventList;
-
- @Before
- public void setUp() throws Exception {
- /* this code mostly taken from OpxmlRunner */
- XMLReader reader = null;
- eventList = new ArrayList<>();
- SessionsProcessor.SessionInfo sessioninfo = new SessionsProcessor.SessionInfo(eventList);
- OprofileSAXHandler handler = OprofileSAXHandler.getInstance(sessioninfo);
-
- // Create XMLReader
- SAXParserFactory factory = SAXParserFactory.newInstance();
- reader = factory.newSAXParser().getXMLReader();
-
- // Set content/error handlers
- reader.setContentHandler(handler);
- reader.setErrorHandler(handler);
-
- String filePath = FileLocator.toFileURL(FileLocator.find(FrameworkUtil.getBundle(this.getClass()), new Path(REL_PATH_TO_TEST_XML), null)).getFile();
- reader.parse(new InputSource(new FileReader(filePath)));
- }
-
- @Test
- public void testParse() {
- assertEquals(3, eventList.size());
- OpModelEvent evt1 = eventList.get(0).getEvents()[0], evt2 = eventList.get(1).getEvents()[0], evt3 = eventList.get(2).getEvents()[0];
-
- assertEquals("BR_INST_EXEC", evt1.getName()); //$NON-NLS-1$
- assertEquals("CPU_CLK_UNHALTED", evt2.getName()); //$NON-NLS-1$
- assertEquals("UOPS_RETIRED", evt3.getName()); //$NON-NLS-1$
-
-
- OpModelSession evt1_ss_s1 = evt1.getSession();
- OpModelSession evt2_ss_s1 = evt2.getSession();
- OpModelSession evt3_ss_s1 = evt3.getSession();
-
-
- assertEquals("current", evt1_ss_s1.getName()); //$NON-NLS-1$
- assertEquals(true, evt1_ss_s1.isDefaultSession());
- assertNull(evt1.getImage());
- assertEquals(0, evt1.getCount());
- assertEquals(evt1, evt1_ss_s1.getEvents()[0]);
-
- assertEquals("saved", evt2_ss_s1.getName()); //$NON-NLS-1$
- assertEquals(false, evt2_ss_s1.isDefaultSession());
- assertNull(evt2.getImage());
- assertEquals(0, evt2.getCount());
- assertEquals(evt2, evt2_ss_s1.getEvents()[0]);
-
- assertEquals("\"<>&'", evt3_ss_s1.getName()); //$NON-NLS-1$
- assertEquals(false, evt3_ss_s1.isDefaultSession());
- assertNull(evt3.getImage());
- assertEquals(0, evt3.getCount());
- assertEquals(evt3, evt3_ss_s1.getEvents()[0]);
- }
-
- @Test
- public void testStringOutput() {
- assertEquals(EVENT1_OUTPUT, eventList.get(0).toString());
- assertEquals(EVENT1_OUTPUT_WITHTAB, eventList.get(0).toString("\t")); //$NON-NLS-1$
- assertEquals(EVENT2_OUTPUT, eventList.get(1).toString());
- assertEquals(EVENT2_OUTPUT_WITHTAB, eventList.get(1).toString("\t")); //$NON-NLS-1$
- assertEquals(EVENT3_OUTPUT, eventList.get(2).toString());
- assertEquals(EVENT3_OUTPUT_WITHTAB, eventList.get(2).toString("\t")); //$NON-NLS-1$
- }
-}
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core/.classpath b/oprofile/org.eclipse.linuxtools.oprofile.core/.classpath
deleted file mode 100644
index 43b986286a9e5fd1828793fa4b2353d02ab8625f..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.core/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="output" path="target/classes"/>
-</classpath>
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core/.gitignore b/oprofile/org.eclipse.linuxtools.oprofile.core/.gitignore
deleted file mode 100644
index a9b1a8caeb993d6bf848b201594b334fa16abb69..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.core/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-bin
-@dot
-javaCompiler...args
-build.xml
-oprofile-core.jar
-target
-natives/linux/scripts/opcontrol
\ No newline at end of file
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core/.project b/oprofile/org.eclipse.linuxtools.oprofile.core/.project
deleted file mode 100644
index 84a2053c2980c2a65155ea8dda098a308e649ada..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.core/.project
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.linuxtools.oprofile.core</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
- </natures>
-</projectDescription>
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core/.settings/org.eclipse.jdt.core.prefs b/oprofile/org.eclipse.linuxtools.oprofile.core/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 4523f478b06d44967f690cf09637fd18baabbd9d..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.core/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,109 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled
-org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
-org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull
-org.eclipse.jdt.core.compiler.annotation.nonnull.secondary=
-org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault
-org.eclipse.jdt.core.compiler.annotation.nonnullbydefault.secondary=
-org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
-org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
-org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.8
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
-org.eclipse.jdt.core.compiler.problem.deadCode=warning
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=warning
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDefaultCase=ignore
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning
-org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled
-org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=warning
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning
-org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning
-org.eclipse.jdt.core.compiler.problem.nonnullTypeVariableFromLegacyInvocation=warning
-org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error
-org.eclipse.jdt.core.compiler.problem.nullReference=warning
-org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error
-org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.pessimisticNullAnalysisForFreeTypeVariables=warning
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
-org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
-org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
-org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=warning
-org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
-org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
-org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentType=warning
-org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentTypeStrict=disabled
-org.eclipse.jdt.core.compiler.problem.unlikelyEqualsArgumentType=info
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=disabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=disabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=enabled
-org.eclipse.jdt.core.compiler.problem.unusedExceptionParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning
-org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.8
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core/META-INF/MANIFEST.MF b/oprofile/org.eclipse.linuxtools.oprofile.core/META-INF/MANIFEST.MF
deleted file mode 100644
index b108676b01de178df3b950f2652c445e3e21b8f8..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.core/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,26 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %bundleName
-Bundle-SymbolicName: org.eclipse.linuxtools.oprofile.core;singleton:=true
-Bundle-Version: 3.0.0.qualifier
-Bundle-Activator: org.eclipse.linuxtools.internal.oprofile.core.OprofileCorePlugin
-Bundle-Vendor: %bundleProvider
-Require-Bundle: org.eclipse.core.runtime;bundle-version="3.4.0",
- org.eclipse.ui;bundle-version="3.4.0",
- org.eclipse.linuxtools.tools.launch.core,
- org.eclipse.linuxtools.profiling.launch;bundle-version="0.9.0",
- org.eclipse.core.filesystem;bundle-version="1.3.100"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Bundle-ClassPath: .
-Bundle-ActivationPolicy: lazy
-Export-Package: org.eclipse.linuxtools.internal.oprofile.core,org.ecli
- pse.linuxtools.internal.oprofile.core.daemon,org.eclipse.linuxtools.i
- nternal.oprofile.core.linux,org.eclipse.linuxtools.internal.oprofile.
- core.model,org.eclipse.linuxtools.internal.oprofile.core.opxml,org.ec
- lipse.linuxtools.internal.oprofile.core.opxml.checkevent,org.eclipse.
- linuxtools.internal.oprofile.core.opxml.info,org.eclipse.linuxtools.i
- nternal.oprofile.core.opxml.modeldata,org.eclipse.linuxtools.internal
- .oprofile.core.opxml.sessions
-Bundle-Localization: plugin
-Import-Package: org.eclipse.core.resources
-Automatic-Module-Name: org.eclipse.linuxtools.oprofile.core
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core/META-INF/p2.inf b/oprofile/org.eclipse.linuxtools.oprofile.core/META-INF/p2.inf
deleted file mode 100644
index 8313fe485fbb171366676ac4f947a9a3417eead7..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.core/META-INF/p2.inf
+++ /dev/null
@@ -1,2 +0,0 @@
-instructions.install=\
- org.eclipse.equinox.p2.touchpoint.natives.checkAndPromptNativePackage(distro:fedora,package:oprofile);
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core/about.html b/oprofile/org.eclipse.linuxtools.oprofile.core/about.html
deleted file mode 100644
index 164f781a8fd2195f87c3d3d49946d56bce58992f..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.core/about.html
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<title>About</title>
-</head>
-<body lang="EN-US">
- <h2>About This Content</h2>
-
- <p>November 30, 2017</p>
- <h3>License</h3>
-
- <p>
- The Eclipse Foundation makes available all content in this plug-in
- ("Content"). Unless otherwise indicated below, the Content
- is provided to you under the terms and conditions of the Eclipse
- Public License Version 2.0 ("EPL"). A copy of the EPL is
- available at <a href="http://www.eclipse.org/legal/epl-2.0">http://www.eclipse.org/legal/epl-2.0</a>.
- For purposes of the EPL, "Program" will mean the Content.
- </p>
-
- <p>
- If you did not receive this Content directly from the Eclipse
- Foundation, the Content is being redistributed by another party
- ("Redistributor") and different terms and conditions may
- apply to your use of any object code in the Content. Check the
- Redistributor's license that was provided with the Content. If no such
- license exists, contact the Redistributor. Unless otherwise indicated
- below, the terms and conditions of the EPL still apply to any source
- code in the Content and such source code may be obtained at <a
- href="http://www.eclipse.org/">http://www.eclipse.org</a>.
- </p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core/build.properties b/oprofile/org.eclipse.linuxtools.oprofile.core/build.properties
deleted file mode 100644
index 6a2d9f256a8607769af14ecd6a962595576c9f79..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.core/build.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-source.. = src/
-bin.includes = META-INF/,\
- .,\
- plugin.properties,\
- about.html
-src.includes = about.html
-individualSourceBundles=true
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core/plugin.properties b/oprofile/org.eclipse.linuxtools.oprofile.core/plugin.properties
deleted file mode 100644
index 960861cbcf82fd6002dc2f3f8dd43bfaf1e8f99d..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.core/plugin.properties
+++ /dev/null
@@ -1,14 +0,0 @@
-#*******************************************************************************
-# Copyright (c) 2008, 2018 Red Hat, Inc.
-#
-# This program and the accompanying materials are made
-# available under the terms of the Eclipse Public License 2.0
-# which is available at https://www.eclipse.org/legal/epl-2.0/
-#
-# SPDX-License-Identifier: EPL-2.0
-#
-# Contributors:
-# Kent Sebastian <ksebasti@redhat.com> - initial API and implementation
-#*******************************************************************************
-bundleName=OProfile Core Plug-in
-bundleProvider=Eclipse Linux Tools
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core/pom.xml b/oprofile/org.eclipse.linuxtools.oprofile.core/pom.xml
deleted file mode 100644
index 95ffa126575afc99f1ff5d2af624aced056a8065..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.core/pom.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (C) 2011, 2018 Red Hat, Inc.
-
- This program and the accompanying materials are made
- available under the terms of the Eclipse Public License 2.0
- which is available at https://www.eclipse.org/legal/epl-2.0/
-
- SPDX-License-Identifier: EPL-2.0
--->
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <artifactId>linuxtools-oprofile-parent</artifactId>
- <groupId>org.eclipse.linuxtools.oprofile</groupId>
- <version>7.4.0</version>
- </parent>
-
- <artifactId>org.eclipse.linuxtools.oprofile.core</artifactId>
- <version>3.0.0-SNAPSHOT</version>
- <packaging>eclipse-plugin</packaging>
-
- <name>Linux Tools OProfile Core Plug-in</name>
-</project>
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/internal/oprofile/core/IOpxmlProvider.java b/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/internal/oprofile/core/IOpxmlProvider.java
deleted file mode 100644
index 014bbfaec58b5a5d06a39cfd5ec621bfcecc07e2..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/internal/oprofile/core/IOpxmlProvider.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2018 Red Hat, Inc.
- *
- * This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License 2.0
- * which is available at https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- * Keith Seitz <keiths@redhat.com> - initial API and implementation
- * Kent Sebastian <ksebasti@redhat.com> -
- *******************************************************************************/
-package org.eclipse.linuxtools.internal.oprofile.core;
-
-import java.util.ArrayList;
-
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.linuxtools.internal.oprofile.core.daemon.OpInfo;
-import org.eclipse.linuxtools.internal.oprofile.core.model.OpModelImage;
-import org.eclipse.linuxtools.internal.oprofile.core.model.OpModelSession;
-
-/**
- * Interface for the core to utilize opxml. Platform plugins should
- * define/register an OpxmlProvider for the core to use.
- */
-public interface IOpxmlProvider {
-
- /**
- * Returns an <code>IRunnableWithProgress</code> that fetches generic
- * information from opxml
- *
- * @param info <code>OpInfo</code> object for results
- * @return <code>IRunnableWithProgress</code> that may be run by the caller
- */
- IRunnableWithProgress info(OpInfo info);
-
- /**
- * Returns an <code>IRunnableWithProgress</code> that fetches samples for the
- * given <code>OpModelSession</code>
- *
- * @param eventName the event for which to fetch samples
- * @param sessionName the session for which to fetch samples
- * @param image the image being profiled to be returned to the caller
- * @return <code>IRunnableWithProgress</code> that may be run by the caller
- */
- IRunnableWithProgress modelData(String eventName, String sessionName, OpModelImage image);
-
- /**
- * Returns an <code>IRunnableWithProgress</code> that checks the validity of the
- * given event, unit mask, and counter combination
- *
- * @param ctr the counter
- * @param event the String event name
- * @param um the integer unit mask
- * @param eventValid a size one array to hold the return result (see
- * <code>CheckEventsProcessor</code>)
- * @return <code>IRunnableWithProgress</code> that may be run by the caller
- */
- IRunnableWithProgress checkEvents(int ctr, String event, int um, int[] eventValid);
-
- /**
- * Returns an <code>IRunnableWithProgress</code> that fetches the list of
- * sessions
- *
- * @param info the <code>OpInfo</code> for oprofile
- * @param sessionList an <code>ArrayList</code> in which to return the list of
- * sessions
- * @return <code>IRunnableWithProgress</code> that may be run by the caller
- */
- IRunnableWithProgress sessions(ArrayList<OpModelSession> sessionList);
-}
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/internal/oprofile/core/Oprofile.java b/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/internal/oprofile/core/Oprofile.java
deleted file mode 100644
index 8d64f28127d28a1c8a99eee73c0fac0310423436..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/internal/oprofile/core/Oprofile.java
+++ /dev/null
@@ -1,302 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2018 Red Hat, Inc.
- *
- * This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License 2.0
- * which is available at https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- * Keith Seitz <keiths@redhat.com> - initial API and implementation
- * Kent Sebastian <ksebasti@redhat.com> -
- *******************************************************************************/
-
-package org.eclipse.linuxtools.internal.oprofile.core;
-
-import java.io.IOException;
-import java.lang.reflect.InvocationTargetException;
-import java.util.ArrayList;
-
-import org.eclipse.core.filesystem.IFileStore;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.linuxtools.internal.oprofile.core.daemon.OpEvent;
-import org.eclipse.linuxtools.internal.oprofile.core.daemon.OpInfo;
-import org.eclipse.linuxtools.internal.oprofile.core.model.OpModelImage;
-import org.eclipse.linuxtools.internal.oprofile.core.model.OpModelSession;
-import org.eclipse.linuxtools.internal.oprofile.core.opxml.checkevent.CheckEventsProcessor;
-import org.eclipse.linuxtools.profiling.launch.IRemoteFileProxy;
-import org.eclipse.linuxtools.profiling.launch.RemoteProxyManager;
-import org.eclipse.linuxtools.tools.launch.core.factory.RuntimeProcessFactory;
-
-/**
- * Common class wrapper for all things Oprofile.
- */
-public class Oprofile {
- // Ugh. Need to know whether the module is loaded without running oprofile
- // commands...
- private static final String[] OPROFILE_CPU_TYPE_FILES = { "/dev/oprofile/cpu_type", //$NON-NLS-1$
- "/proc/sys/dev/oprofile/cpu_type" //$NON-NLS-1$
- };
-
- /**
- * Oprofile information
- */
- private static OpInfo info;
-
- /**
- * Make sure that oprofile is ready to go
- */
- static {
- initializeOprofileModule();
- }
-
- /**
- * Initialize the oprofile module
- *
- * This function will check if the kernel module is loaded. If it is not, it
- * will attempt to load it (which will cause the system to prompt the user for
- * root access).
- */
- static private void initializeOprofileModule() {
- if (OprofileProject.getProfilingBinary().equals(OprofileProject.OPERF_BINARY) || isKernelModuleLoaded()) {
- initializeOprofileCore();
- }
- }
-
- // This requires more inside knowledge about Oprofile than one would like,
- // but it is the only way of knowing whether the module is loaded (and we can
- // succesfully call into the oprofile wrapper library without causing it to
- // print out
- // a lot of warnings).
- /**
- * Check whether oprofile kernel module is loaded
- *
- * @return true if the module is loaded, otherwise false
- */
- private static boolean isKernelModuleLoaded() {
- IRemoteFileProxy proxy = null;
- try {
- proxy = RemoteProxyManager.getInstance().getFileProxy(Oprofile.OprofileProject.getProject());
- } catch (CoreException e) {
- e.printStackTrace();
- }
-
- for (int i = 0; i < OPROFILE_CPU_TYPE_FILES.length; ++i) {
- IFileStore f = proxy.getResource(OPROFILE_CPU_TYPE_FILES[i]);
- if (f.fetchInfo().exists()) {
- return true;
- }
- }
- return false;
- }
-
- /**
- * Initializes static data for oprofile.
- */
- private static void initializeOprofileCore() {
- info = OpInfo.getInfo();
-
- if (info == null) {
- throw new ExceptionInInitializerError(OprofileProperties.getString("fatal.opinfoNotParsed")); //$NON-NLS-1$
- }
- }
-
- /**
- * Queries oprofile for the number of counters on the current CPU. Used only in
- * launch config tabs.
- *
- * @return the number of counters
- */
- public static int getNumberOfCounters() {
- // If operf is not found, set no counters
- try {
- Process p = RuntimeProcessFactory.getFactory().exec(new String[] { "operf", "--version" }, //$NON-NLS-1$ //$NON-NLS-2$
- OprofileProject.getProject());
- if (p == null) {
- return 0;
- }
- } catch (IOException e) {
- return 0;
- }
- return info.getNrCounters();
- }
-
- /**
- * Returns the CPU speed of the current configuration.
- *
- * @return the cpu speed in MHz
- */
- public static double getCpuFrequency() {
- return info.getCPUSpeed();
- }
-
- /**
- * Get all the events that may be collected on the given counter.
- *
- * @param num the counter number
- * @return an array of all valid events -- NEVER RETURNS NULL!
- */
- public static OpEvent[] getEvents(int num) {
- return info.getEvents(num);
- }
-
- /**
- * Returns the default location of the opcontrol samples directory or the
- * project directory if the profiler is operf.
- *
- * @return the default samples directory
- */
- public static String getDefaultSamplesDirectory() {
- return info.getDefault(OpInfo.DEFAULT_SAMPLE_DIR);
- }
-
- /**
- * Returns the oprofile daemon log file.
- *
- * @return the log file (absolute pathname)
- */
- public static String getLogFile() {
- return info.getDefault(OpInfo.DEFAULT_LOG_FILE);
- }
-
- /**
- * Returns whether or not oprofile is in timer mode.
- *
- * @return true if oprofile is in timer mode, false otherwise
- */
- public static boolean getTimerMode() {
- return info.getTimerMode();
- }
-
- /**
- * Checks the requested counter, event, and unit mask for validity.
- *
- * @param ctr the counter
- * @param event the event name
- * @param um the unit mask
- * @return whether the requested event is valid
- */
- public static Boolean checkEvent(int ctr, String event, int um) {
- int[] validResult = new int[1];
- try {
- IRunnableWithProgress opxml = OprofileCorePlugin.getDefault().getOpxmlProvider().checkEvents(ctr, event, um,
- validResult);
- opxml.run(null);
- } catch (InvocationTargetException | InterruptedException e) {
- }
-
- return (validResult[0] == CheckEventsProcessor.EVENT_OK);
- }
-
- /**
- * Returns a list of all the session collected on the system, as well as the
- * event under each of them.
- *
- * @since 3.0
- * @returns a list of all collected events
- */
- public static OpModelSession[] getSessions() {
- OpModelSession[] events = null;
-
- ArrayList<OpModelSession> sessionList = new ArrayList<>();
- try {
- IRunnableWithProgress opxml = OprofileCorePlugin.getDefault().getOpxmlProvider().sessions(sessionList);
- opxml.run(null);
- events = new OpModelSession[sessionList.size()];
- sessionList.toArray(events);
- } catch (InvocationTargetException | InterruptedException e) {
- }
- return events;
- }
-
- /**
- * Return a list of all the Samples in the given session.
- *
- * @param session the session for which to get samples
- * @param shell the composite shell to use for the progress dialog
- */
- public static OpModelImage getModelData(String eventName, String sessionName) {
- OpModelImage image = new OpModelImage();
-
- final IRunnableWithProgress opxml;
- try {
- opxml = OprofileCorePlugin.getDefault().getOpxmlProvider().modelData(eventName, sessionName, image);
- opxml.run(null);
- } catch (InvocationTargetException | InterruptedException e) {
- }
-
- return image;
- }
-
- /**
- * Check if oprofile kernel module is loaded and update Oprofile's information.
- *
- * @since 1.1
- */
- public static void updateInfo() {
- info = OpInfo.getInfo();
- }
-
- // Oprofile class has a static initializer and the code inside it needs to know
- // which project
- // is being profiled in order to get the path for the Linux Tools' binaries set
- // for that project.
- // For this reason the project property has to be set outside the Oprofile class
- /**
- * OProfileProject class to set/get which project is being profiled
- *
- * @since 1.1
- */
- public static class OprofileProject {
- private static IProject project;
- public final static String OPERF_BINARY = "operf"; //$NON-NLS-1$
- public final static String OCOUNT_BINARY = "ocount"; //$NON-NLS-1$
- private static String binary = OPERF_BINARY;
- public final static String OPERF_DATA = "oprofile_data"; //$NON-NLS-1$
-
- /**
- * Set the project to be profiled
- *
- * @param project
- */
- public static void setProject(IProject project) {
- OprofileProject.project = project;
-
- }
-
- /**
- * Get the project to be profiled
- *
- * @return project
- */
- public static IProject getProject() {
- return project;
- }
-
- /**
- * Set the profiling binary to be used (operf or opcontrol)
- *
- * @param binary
- * @since 2.1
- */
- public static void setProfilingBinary(String binary) {
- OprofileProject.binary = binary;
-
- }
-
- /**
- * Get the profiling binary (operf or opcontrol)
- *
- * @return binary
- * @since 2.1
- */
- public static String getProfilingBinary() {
- return binary;
- }
-
- }
-
-}
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/internal/oprofile/core/OprofileCorePlugin.java b/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/internal/oprofile/core/OprofileCorePlugin.java
deleted file mode 100644
index bdea2d6f911c8547d9da130f08dcba98155c7084..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/internal/oprofile/core/OprofileCorePlugin.java
+++ /dev/null
@@ -1,162 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2018 Red Hat, Inc.
- *
- * This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License 2.0
- * which is available at https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- * Keith Seitz <keiths@redhat.com> - initial API and implementation
- * Kent Sebastian <ksebasti@redhat.com> -
- *******************************************************************************/
-
-package org.eclipse.linuxtools.internal.oprofile.core;
-
-import java.io.IOException;
-import java.net.URL;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.dialogs.ErrorDialog;
-import org.eclipse.linuxtools.internal.oprofile.core.linux.LinuxOpxmlProvider;
-import org.eclipse.swt.widgets.Display;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleContext;
-
-/**
- * The main plugin class to be used in the desktop.
- */
-public class OprofileCorePlugin extends Plugin {
- private static final String PLUGIN_ID = "org.eclipse.linuxtools.oprofile.core"; //$NON-NLS-1$
-
- // The shared instance.
- private static OprofileCorePlugin plugin;
-
- public static final String DEBUG_PRINT_PREFIX = "DEBUG: "; //$NON-NLS-1$
-
- /**
- * The constructor.
- */
- public OprofileCorePlugin() {
- plugin = this;
- }
-
- /**
- * This method is called when the plug-in is stopped
- */
- @Override
- public void stop(BundleContext context) throws Exception {
- super.stop(context);
- plugin = null;
- }
-
- /**
- * Returns the shared instance.
- */
- public static OprofileCorePlugin getDefault() {
- return plugin;
- }
-
- /**
- * Returns the unique id of this plugin. Should match plugin.xml!
- */
- public static String getId() {
- return PLUGIN_ID;
- }
-
- /**
- * Returns the OpxmlProvider registered with the plugin or throws an exception
- *
- * @return the OpxmlProvider
- */
- public IOpxmlProvider getOpxmlProvider() {
- return new LinuxOpxmlProvider();
- }
-
- /**
- * Creates an error status object
- *
- * @param errorClassString A string of the error class
- * @param e The type of exception
- * @return the status object of the error
- */
- public static IStatus createErrorStatus(String errorClassString, Exception e) {
- String statusMessage = OprofileProperties.getString(errorClassString + ".error.statusMessage"); //$NON-NLS-1$
-
- if (e == null) {
- return new Status(IStatus.ERROR, getId(), IStatus.OK, statusMessage, null);
- } else {
- return new Status(IStatus.ERROR, getId(), IStatus.OK, statusMessage, e);
- }
- }
-
- /**
- * Shows an error Dialog
- *
- * @param errorClassString A string of the error class
- * @param ex The type of exception
- */
- public static void showErrorDialog(String errorClassString, CoreException ex) {
- final IStatus status;
- final String dialogTitle = OprofileProperties.getString(errorClassString + ".error.dialog.title"); //$NON-NLS-1$
- final String errorMessage = OprofileProperties.getString(errorClassString + ".error.dialog.message"); //$NON-NLS-1$
-
- if (ex == null) {
- status = createErrorStatus(errorClassString, null);
- } else {
- status = ex.getStatus();
- }
-
- // needs to be run in the ui thread otherwise swt throws invalid thread access
- Display.getDefault().syncExec(() -> ErrorDialog.openError(null, dialogTitle, errorMessage, status));
-
- }
-
- /**
- *
- * @return {@code true} when platform was started in debug mode ({@code -debug}
- * switch) and
- * {@code org.eclipse.linuxtools.internal.oprofile.core/debug} is set in
- * some .options file either in $HOME/.options or $(pwd)/.options.
- */
- public static boolean isDebugMode() {
- return Platform.inDebugMode() && Platform.getDebugOption(OprofileCorePlugin.getId() + "/debug") != null; //$NON-NLS-1$
- }
-
- /**
- * Log a string message with the given severity in the error log.
- *
- * @param severity the severity of this exception
- * @param msg the string message to be logged
- */
- public static void log(int severity, String msg) {
- plugin.getLog().log(new Status(severity, PLUGIN_ID, IStatus.OK, msg, null));
- }
-
- /**
- * Returns the location of the plugin by checking the path of the bundle's
- * locationURL.
- *
- * @return An absolute path representing the location of this plugin
- */
- public String getPluginLocation() {
- Bundle bundle = getBundle();
-
- URL locationUrl = FileLocator.find(bundle, new Path("/"), null); //$NON-NLS-1$
- URL fileUrl = null;
- try {
- fileUrl = FileLocator.toFileURL(locationUrl);
- } catch (IOException e) {
- e.printStackTrace();
- }
- return fileUrl.getFile();
- }
-
-}
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/internal/oprofile/core/OprofileProperties.java b/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/internal/oprofile/core/OprofileProperties.java
deleted file mode 100644
index 0dc7800dcbeb15a0e98809019466691ec42c01db..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/internal/oprofile/core/OprofileProperties.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2018 Red Hat, Inc.
- *
- * This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License 2.0
- * which is available at https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- * Keith Seitz <keiths@redhat.com> - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.linuxtools.internal.oprofile.core;
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-public class OprofileProperties {
- private static final String BUNDLE_NAME = "org.eclipse.linuxtools.internal.oprofile.core.oprofile"; //$NON-NLS-1$
- private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle.getBundle(BUNDLE_NAME);
-
- private OprofileProperties() {
- }
-
- public static String getString(String key) {
- try {
- return RESOURCE_BUNDLE.getString(key);
- } catch (MissingResourceException e) {
- return '!' + key + '!';
- }
- }
-}
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/internal/oprofile/core/daemon/OpEvent.java b/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/internal/oprofile/core/daemon/OpEvent.java
deleted file mode 100644
index b0b5c31da9f81fd5a5eeca223d818a342db2b70c..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/internal/oprofile/core/daemon/OpEvent.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2018 Red Hat, Inc.
- *
- * This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License 2.0
- * which is available at https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- * Keith Seitz <keiths@redhat.com> - initial API and implementation
- * Kent Sebastian <ksebasti@redhat.com>
- *******************************************************************************/
-
-package org.eclipse.linuxtools.internal.oprofile.core.daemon;
-
-/**
- * A class which represents an Oprofile event
- */
-public class OpEvent {
- /**
- * The Oprofile event name, i.e., "CPU_CLK_UNHALTED"
- */
- private String name;
-
- /**
- * A description of the event
- */
- private String description;
-
- /**
- * Unit masks for this event type
- */
- private OpUnitMask unitMask;
-
- /**
- * Minimum count
- */
- private int minCount;
-
- /**
- * Sets the unit mask for this event. Only called from XML parsers.
- *
- * @param mask the new unit mask
- */
- public void setUnitMask(OpUnitMask mask) {
- unitMask = mask;
- }
-
- /**
- * Sets the name of this event. Only called from XML parsers.
- *
- * @param text the name
- */
- public void setText(String text) {
- name = text;
- }
-
- /**
- * Sets the description of this oprofile event. Only called from XML parsers.
- *
- * @param text the description
- */
- public void setTextDescription(String text) {
- description = text;
- }
-
- /**
- * Sets the minimum count for this event. Only called from XML parsers.
- *
- * @param min the minimum count
- */
- public void setMinCount(int min) {
- minCount = min;
- }
-
- /**
- * Returns the unit mask corresponding to this event.
- *
- * @return the unit mask
- */
- public OpUnitMask getUnitMask() {
- return unitMask;
- }
-
- /**
- * Returns the name of this oprofile event.
- *
- * @return the name
- */
- public String getText() {
- return name;
- }
-
- /**
- * Returns the description of this oprofile event.
- *
- * @return the description
- */
- public String getTextDescription() {
- return description;
- }
-
- /**
- * Returns the minimum count allowed for this event.
- *
- * @return the minimum count
- */
- public int getMinCount() {
- return minCount;
- }
-}
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/internal/oprofile/core/daemon/OpInfo.java b/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/internal/oprofile/core/daemon/OpInfo.java
deleted file mode 100644
index de1e7a86ad79ed0105b9b0ccb8729bc1ce256c83..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/internal/oprofile/core/daemon/OpInfo.java
+++ /dev/null
@@ -1,233 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2018 Red Hat, Inc.
- *
- * This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License 2.0
- * which is available at https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- * Keith Seitz <keiths@redhat.com> - initial API and implementation
- * Kent Sebastian <ksebasti@redhat.com>
- *******************************************************************************/
-
-package org.eclipse.linuxtools.internal.oprofile.core.daemon;
-
-import java.util.Arrays;
-import java.util.Comparator;
-import java.util.HashMap;
-
-import org.eclipse.linuxtools.internal.oprofile.core.OprofileCorePlugin;
-import org.eclipse.linuxtools.internal.oprofile.core.linux.LinuxOpxmlProvider.OpInfoRunner;
-import org.eclipse.linuxtools.internal.oprofile.core.opxml.info.DefaultsProcessor;
-
-/**
- * A class to hold generic information about Oprofile.
- */
-public class OpInfo {
- // Oprofile defaults
- public static final String DEFAULT_SAMPLE_DIR = DefaultsProcessor.SAMPLE_DIR;
- public static final String DEFAULT_LOCK_FILE = DefaultsProcessor.LOCK_FILE;
- public static final String DEFAULT_LOG_FILE = DefaultsProcessor.LOG_FILE;
- public static final String DEFAULT_DUMP_STATUS = DefaultsProcessor.DUMP_STATUS;
-
- /**
- * A comparator class used when sorting events (sorting by event name)
- */
- private static class SortEventComparator implements Comparator<OpEvent> {
- @Override
- public int compare(OpEvent o1, OpEvent o2) {
- return o1.getText().compareTo(o2.getText());
- }
- }
-
- /**
- * A comparator class used when searching events (searching by event name)
- */
- private static class SearchEventComparator implements Comparator<Object> {
- @Override
- public int compare(Object a, Object b) {
- String astr, bstr;
- if (a instanceof String) {
- astr = (String) a;
- bstr = ((OpEvent) b).getText();
- } else {
- astr = ((OpEvent) a).getText();
- bstr = (String) b;
- }
- return astr.compareTo(bstr);
- }
- }
-
- /**
- * The number of counters supported by this configuration
- */
- private int nrCounters;
-
- /**
- * A HashMap of Oprofile defaults
- */
- private HashMap<String, String> defaults;
-
- /**
- * The permanent list of events indexed by counter
- */
- private OpEvent[][] eventList;
-
- /**
- * The CPU frequency of this CPU in MHz
- */
- private double cpuSpeed;
-
- /**
- * Whether or not oprofile is running in timer mode
- */
- private boolean timerMode;
-
- /**
- * Return all of Oprofile's generic information.
- *
- * @return a class containing the information
- */
- public static OpInfo getInfo() {
- // Run opmxl and get the static information
- OpInfo info = new OpInfo();
-
- OpInfoRunner opxml = (OpInfoRunner) OprofileCorePlugin.getDefault().getOpxmlProvider().info(info);
- boolean ret = opxml.run0(null);
- if (!ret) {
- info = null;
- }
-
- return info;
- }
-
- /**
- * Sets the number of counters allowed by Oprofile. This method is called after
- * this object is contstructed, while opxml is run (the first tag output is
- * num-counters). Only called from XML parsers.
- *
- * @param ctrs the number of counters
- */
- public void setNrCounters(int ctrs) {
- nrCounters = ctrs;
-
- // Allocate room for event lists for the counters
- eventList = new OpEvent[nrCounters][];
- }
-
- /**
- * Set the CPU frequency (in MHz). Only called from the XML parsers.
- *
- * @param freq the frequency
- */
- public void setCPUSpeed(double freq) {
- cpuSpeed = freq;
- }
-
- /**
- * Sets the defaults associated with this configuration of Oprofile. Only called
- * from XML parsers.
- *
- * @param map the <code>HashMap</code> containing the defaults
- */
- public void setDefaults(HashMap<String, String> map) {
- defaults = map;
- }
-
- /**
- * Adds the events of the counter counterNum into the list of all events. Note
- * they are sorted here. Only called from XML parsers.
- *
- * @param counterNum the counter with the events
- * @param events an array of OpEvent events belonging to this counter
- */
- public void setEvents(int counterNum, OpEvent[] events) {
- if (counterNum < eventList.length) {
- eventList[counterNum] = events;
- Arrays.sort(eventList[counterNum], new SortEventComparator());
- }
- }
-
- /**
- * Sets whether or not oprofile is operating in timer mode. Only called from XML
- * parsers.
- *
- * @param timerMode true if oprofile is in timer mode, false if not
- */
- public void setTimerMode(boolean timerMode) {
- this.timerMode = timerMode;
- }
-
- /**
- * Returns the number of counters allowed by Oprofile
- *
- * @return the number of counters
- */
- public int getNrCounters() {
- return nrCounters;
- }
-
- /**
- * Returns the CPU's speed in MHz
- *
- * @return the speed
- */
- public double getCPUSpeed() {
- return cpuSpeed;
- }
-
- /**
- * Returns the requested default. Valid defaults are
- * <code>DEFAULT_DUMP_STATUS</code>, <code>DEFAULT_LOCK_FILE</code>,
- * <code>DEFAULT_LOG_FILE</code>, and <code>DEFAULT_SAMPLE_DIR</code>.
- *
- * @param what which default to return
- * @return the requested default or <code>null</code> if not known
- */
- public String getDefault(String what) {
- return defaults.get(what);
- }
-
- /**
- * Returns an array of events valid for the given counter number.
- *
- * @param num the counter number
- * @return an array of valid events
- */
- public OpEvent[] getEvents(int num) {
- if (num >= 0 && num < eventList.length) {
- return eventList[num];
- }
-
- return new OpEvent[0];
- }
-
- /**
- * Returns whether or not oprofile is operating in timer mode.
- *
- * @return a boolean, true if in timer mode, false if not
- */
- public boolean getTimerMode() {
- return timerMode;
- }
-
- /**
- * Searches the for the event with the given name
- *
- * @param name the name of the event (e.g., CPU_CLK_UNHALTED)
- * @return the event or <code>null</code> if not found
- */
- public OpEvent findEvent(String name) {
- // Search through all counters
- for (int counter = 0; counter < getNrCounters(); ++counter) {
- int idx = Arrays.binarySearch(getEvents(counter), name, new SearchEventComparator());
- if (idx >= 0) {
- return eventList[counter][idx];
- }
- }
-
- return null;
- }
-}
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/internal/oprofile/core/daemon/OpUnitMask.java b/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/internal/oprofile/core/daemon/OpUnitMask.java
deleted file mode 100644
index 94909072e5f6642b49f6e2f5c3fada1324165e0a..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/internal/oprofile/core/daemon/OpUnitMask.java
+++ /dev/null
@@ -1,321 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2019 Red Hat, Inc.
- *
- * This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License 2.0
- * which is available at https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- * Keith Seitz <keiths@redhat.com> - initial API and implementation
- * Kent Sebastian <ksebasti@redhat.com>
- *******************************************************************************/
-
-package org.eclipse.linuxtools.internal.oprofile.core.daemon;
-
-import java.util.HashSet;
-import java.util.Set;
-
-/**
- * A class representing the unit mask that may be associated with oprofile
- * events. Note that since this class was originally written, oprofile unit
- * masks have changed -- a single unit mask may affect several bits at once.
- * Hence, instead of a certain bit being flipped, the specific bits to be
- * changed are determined by the particular mask's index
- */
-public class OpUnitMask {
- /**
- * A class which describes an individual unit mask value. Used in XML parsing.
- */
- public static class MaskInfo {
- /**
- * The integer value of the mask.
- */
- public int value;
-
- /**
- * The name of the mask.
- */
- public String name;
-
- /**
- * A description of the mask.
- */
- public String description;
- }
-
- public static final int SET_DEFAULT_MASK = -1;
-
- /**
- * Invalid mask type.
- */
- public static final int INVALID = -1;
-
- /**
- * The mask is mandatory. It must be used.
- */
- public static final int MANDATORY = 1;
-
- /**
- * The mask is exclusive. Only one of its mask values may be used.
- */
- public static final int EXCLUSIVE = 2;
-
- /**
- * The mask is a bitmask. Any combination of its values may be used.
- */
- public static final int BITMASK = 3;
-
- /**
- * The current value of this unitmask
- */
- private int mask;
-
- /**
- * The current name of this unitmask (EXCLUSIVE-only)
- */
- private String maskName = ""; //$NON-NLS-1$
-
- /**
- * The default mask provided by the oprofile library
- */
- private int defaultMask;
-
- /**
- * The type of this unitmask
- */
- private int maskType;
-
- /**
- * Descriptions of the bits of this mask
- */
- private String[] maskOptionDescriptions = new String[0];
-
- /**
- * mask values -- now bit masks have distinct values (eg: an all of the above)
- */
-
- private int[] maskOptionValues;
-
- /**
- * Name of the bit mask
- */
-
- private String[] maskOptionNames = new String[0];
-
- /**
- * Set of non-unique mask values (EXCLUSIVE type only) Some platforms allow
- * multiple masks of same value and these need to be identified additionally by
- * their name
- */
- Set<Integer> nonUniqueValues = new HashSet<>();
-
- /**
- * Set the descriptions and values for this unitmask's mask options. Only used
- * from the XML parsers.
- *
- * @param masks a list of all the mask options
- */
- public void setMaskDescriptions(MaskInfo[] masks) {
- maskOptionDescriptions = new String[masks.length];
- maskOptionValues = new int[masks.length];
- maskOptionNames = new String[masks.length];
-
- Set<Integer> values = new HashSet<>();
-
- for (int i = 0; i < masks.length; ++i) {
- Integer val = Integer.valueOf(masks[i].value);
- if (values.contains(Integer.valueOf(val))) {
- nonUniqueValues.add(Integer.valueOf(val));
- }
- values.add(Integer.valueOf(val));
- maskOptionDescriptions[i] = masks[i].description;
- maskOptionValues[i] = masks[i].value;
- maskOptionNames[i] = masks[i].name;
- }
- }
-
- /**
- * Sets the default value for this unitmask, and initializes the current
- * unitmask value to this default. Only used from the XML parsers.
- *
- * @param theDefault the default value
- */
- public void setDefault(int theDefault) {
- defaultMask = theDefault;
- setDefaultMaskValue();
- }
-
- /**
- * Sets the unitmask type. Only used from the XML parsers.
- *
- * @param type the type
- */
- public void setType(int type) {
- maskType = type;
- }
-
- /**
- * Returns the integer value of this unitmask, suitable for passing to oprofile.
- *
- * @return the integer value
- */
- public int getMaskValue() {
- return mask;
- }
-
- /**
- * Returns the unitmask name if this is a non-unique bitmask (EXCLUSIVE-only),
- * otherwise returns null.
- */
- public String getMaskName() {
- if (nonUniqueValues.contains(Integer.valueOf(mask))) {
- return maskName;
- }
- return null;
- }
-
- /**
- * Tests whether a particular mask is set in the unitmask value, based on the
- * value of the mask option at the given index.
- *
- * @param index the index of the mask option to check
- * @return whether the given mask option's value is set
- */
- public boolean isMaskSetFromIndex(int index) {
- boolean result = false;
-
- if (index >= 0 && index < maskOptionValues.length) {
- switch (maskType) {
- case EXCLUSIVE:
- result = (mask == maskOptionValues[index]
- && (maskName.isEmpty() || maskName.equals(maskOptionNames[index])));
- break;
-
- case BITMASK:
- result = ((mask & maskOptionValues[index]) != 0);
- break;
-
- default:
- result = false;
- }
- }
-
- return result;
- }
-
- /**
- * Sets the absolute unitmask value.
- *
- * @param newValue the new value of this unitmask
- */
- public void setMaskValue(int newValue) {
- if (newValue == SET_DEFAULT_MASK) {
- mask = defaultMask;
- } else {
- mask = newValue;
- }
- }
-
- /**
- * Sets the unitmask name.
- *
- * @param newName the name of this unitmask
- */
- public void setMaskName(String newName) {
- maskName = newName;
- }
-
- /**
- * Sets the bits of the given mask option's value in the unitmask value.
- *
- * @param index the index of the mask option to set
- */
- public void setMaskFromIndex(int index) {
- // mandatory masks only use the default value
- if (index >= 0 && index < maskOptionValues.length) {
- if (maskType == BITMASK)
- mask |= maskOptionValues[index];
- else if (maskType == EXCLUSIVE) {
- mask = maskOptionValues[index];
- maskName = maskOptionNames[index];
- }
- }
- }
-
- /**
- * Returns the value of the mask based on the unitmask index.
- *
- * @param index the index of the mask option
- * @return the mask option's value
- */
- public int getMaskFromIndex(int index) {
- // mandatory masks only use the default value
- if (maskType == BITMASK) {
- if (index >= 0 && index < maskOptionValues.length) {
- return maskOptionValues[index];
- }
- } else if (maskType == EXCLUSIVE) {
- if (index >= 0 && index < maskOptionValues.length) {
- return maskOptionValues[index];
- }
- } else if (maskType == MANDATORY) {
- return defaultMask;
- }
-
- // type invalid or unknown, or out of bounds
- return -1;
- }
-
- /**
- * Unset the bits of the given mask option's value in the unitmask value.
- *
- * @param index the index of the mask option to set
- */
- public void unSetMaskFromIndex(int index) {
- if (index >= 0 && index < maskOptionValues.length && maskType == BITMASK) {
- mask = mask & ~maskOptionValues[index];
- }
- }
-
- /**
- * Sets the current unitmask value to the default mask value.
- */
- public void setDefaultMaskValue() {
- mask = defaultMask;
- }
-
- /**
- * Returns a description of the requested mask option.
- *
- * @param num the mask option index
- * @return the description
- */
- public String getText(int num) {
- if (num >= 0 && num < maskOptionDescriptions.length) {
- return maskOptionDescriptions[num];
- }
-
- return null;
- }
-
- /**
- * Returns the number of mask options in this unitmask.
- *
- * @return the number of mask options
- */
- public int getNumMasks() {
- return maskOptionDescriptions.length;
- }
-
- /**
- * Returns the mask type for this unit mask.
- *
- * @return <code>BITMASK</code>, <code>EXCLUSIVE</code>, or
- * <code>MANDATORY</code>
- */
- public int getType() {
- return maskType;
- }
-}
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/internal/oprofile/core/daemon/OprofileDaemonEvent.java b/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/internal/oprofile/core/daemon/OprofileDaemonEvent.java
deleted file mode 100644
index 316ad0646b6c2c51ca18bab18fa6f6a9486cd407..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/internal/oprofile/core/daemon/OprofileDaemonEvent.java
+++ /dev/null
@@ -1,135 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2018 Red Hat, Inc.
- *
- * This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License 2.0
- * which is available at https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- * Keith Seitz <keiths@redhat.com> - initial API and implementation
- * Kent Sebastian <ksebasti@redhat.com>
- *******************************************************************************/
-
-package org.eclipse.linuxtools.internal.oprofile.core.daemon;
-
-import org.eclipse.linuxtools.internal.oprofile.core.Oprofile;
-
-/**
- * This class represents an event used to configure the OProfile daemon.
- */
-public class OprofileDaemonEvent {
- public static final int COUNT_UNINITIALIZED = 0;
- public static final int COUNT_INVALID = -1;
-
- /**
- * The event to collect on this counter
- */
- private OpEvent event;
-
- /**
- * Boolean variable to enable/disable Profile kernel
- */
- private boolean profileKernel;
-
- /**
- * Boolean variable to enable/disable Profile userspace
- */
- private boolean profileUser;
-
- /**
- * Reset counter value
- */
- private int count;
-
- public OprofileDaemonEvent() {
- profileKernel = true;
- profileUser = true;
- count = COUNT_UNINITIALIZED;
- event = null;
- }
-
- /**
- * Set the event to collect
- *
- * @param event the OProfile event
- */
- public void setEvent(OpEvent event) {
- this.event = event;
- }
-
- /**
- * Get the event to collect
- *
- * @returns the OProfile event
- */
- public OpEvent getEvent() {
- return event;
- }
-
- /**
- * Set whether to profile the kernel
- *
- * @param profileKernel whether to enable kernel profiling
- */
- public void setProfileKernel(boolean profileKernel) {
- this.profileKernel = profileKernel;
- }
-
- /**
- * Get whether to profile the kernel
- *
- * @return whether to profile the kernel
- */
- public boolean getProfileKernel() {
- return profileKernel;
- }
-
- /**
- * Set whether to profile userspace
- *
- * @param profileUser whether to profile userspace
- */
- public void setProfileUser(boolean profileUser) {
- this.profileUser = profileUser;
- }
-
- /**
- * Get whether to profile userspace
- *
- * @return whether to profile userspace
- */
- public boolean getProfileUser() {
- return profileUser;
- }
-
- /**
- * Set the reset count
- *
- * @param count the new count
- */
- public void setResetCount(int count) {
- this.count = count;
- }
-
- /**
- * Get the reset count
- *
- * @return the reset count
- */
- public int getResetCount() {
- // FIXME: This isn't quite in the right place...
- if (count == COUNT_UNINITIALIZED) {
- // This is what Oprofile does in oprof_start.cpp:
- double speed = Oprofile.getCpuFrequency();
- if (speed == 0.0) {
- count = event.getMinCount() * 30;
- } else {
- count = (int) speed * 20;
- }
- }
-
- return count;
- }
-}
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/internal/oprofile/core/daemon/OprofileDaemonOptions.java b/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/internal/oprofile/core/daemon/OprofileDaemonOptions.java
deleted file mode 100644
index ca624e41b9b65a18c86bdc808c8980a12e18496a..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/internal/oprofile/core/daemon/OprofileDaemonOptions.java
+++ /dev/null
@@ -1,129 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2018 Red Hat, Inc.
- *
- * This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License 2.0
- * which is available at https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- * Keith Seitz <keiths@redhat.com> - initial API and implementation
- * Kent Sebastian <ksebasti@redhat.com>
- *******************************************************************************/
-package org.eclipse.linuxtools.internal.oprofile.core.daemon;
-
-/**
- * This class represents the global launch options for the OProfile daemon.
- */
-public class OprofileDaemonOptions {
- /**
- * Kernel image file
- */
- private String kernelImageFile;
-
- /**
- * How to separate profiles (mask)
- */
- private int separateProfiles;
-
- /**
- * The image to profile
- */
- private String binaryImage;
-
- /**
- * How many calls down to profile
- */
- private int callgraphDepth;
-
- /**
- * Sample separation options. Determines how oprofiled will group samples for
- * binaries which isn't the main binary being profiled.
- *
- * Currently only properly support: -none: ignore all other binaries -library:
- * include shared library samples -kernel: include kernel module samples (which
- * implicitly includes library)
- *
- * the others probably wouldn't show nicely in the view
- */
- public static final int SEPARATE_NONE = 0;
- public static final int SEPARATE_LIBRARY = 1;
- public static final int SEPARATE_KERNEL = 2;
- public static final int SEPARATE_THREAD = 4;
- public static final int SEPARATE_CPU = 8;
-
- /**
- * Constructor
- */
- public OprofileDaemonOptions() {
- // defaults
- kernelImageFile = ""; //$NON-NLS-1$
- separateProfiles = SEPARATE_NONE;
- binaryImage = ""; //$NON-NLS-1$
- callgraphDepth = 0;
- }
-
- /**
- * Get the kernel image file
- *
- * @return the kernel image file
- */
- public String getKernelImageFile() {
- return kernelImageFile;
- }
-
- /**
- * Set the kernel image file
- *
- * @param image the kernel image
- */
- public void setKernelImageFile(String image) {
- kernelImageFile = image;
- }
-
- /**
- * Get daemon profile separation mask
- *
- * @return mask of options
- */
- public int getSeparateProfilesMask() {
- return separateProfiles;
- }
-
- /**
- * Set daemon profile separation mask
- *
- * @param mask the new separation mask
- */
- public void setSeparateProfilesMask(int mask) {
- separateProfiles = mask;
- }
-
- /**
- * Get the path to the binary image being profiled.
- *
- * @return full path to the binary
- */
- public String getBinaryImage() {
- return binaryImage;
- }
-
- /**
- * Sets the path of the binary image to profile.
- *
- * @param image full path to the binary
- */
- public void setBinaryImage(String image) {
- this.binaryImage = image;
- }
-
- /**
- * Get the call depth value.
- *
- * @return integer amount of calls down to profile
- */
- public int getCallgraphDepth() {
- return callgraphDepth;
- }
-}
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/internal/oprofile/core/linux/LinuxOpxmlProvider.java b/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/internal/oprofile/core/linux/LinuxOpxmlProvider.java
deleted file mode 100644
index ca0daa3f631b367bde11159421a4dc69a81f34db..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/internal/oprofile/core/linux/LinuxOpxmlProvider.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2018 Red Hat, Inc.
- *
- * This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License 2.0
- * which is available at https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- * Keith Seitz <keiths@redhat.com> - initial API and implementation
- * Kent Sebastian <ksebasti@redhat.com>
- *******************************************************************************/
-package org.eclipse.linuxtools.internal.oprofile.core.linux;
-
-import java.util.ArrayList;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.linuxtools.internal.oprofile.core.IOpxmlProvider;
-import org.eclipse.linuxtools.internal.oprofile.core.daemon.OpInfo;
-import org.eclipse.linuxtools.internal.oprofile.core.model.OpModelImage;
-import org.eclipse.linuxtools.internal.oprofile.core.model.OpModelSession;
-import org.eclipse.linuxtools.internal.oprofile.core.opxml.OpxmlConstants;
-import org.eclipse.linuxtools.internal.oprofile.core.opxml.modeldata.ModelDataProcessor;
-import org.eclipse.linuxtools.internal.oprofile.core.opxml.sessions.SessionsProcessor;
-
-/**
- * A class which implements the IOpxmlProvider interface for running opxml.
- */
-public class LinuxOpxmlProvider implements IOpxmlProvider {
-
- @Override
- public IRunnableWithProgress info(final OpInfo info) {
- return new OpInfoRunner(info);
- }
-
- // public because it is used in OpInfo.java:getInfo()
- public class OpInfoRunner implements IRunnableWithProgress {
- private boolean b;
- private final OpInfo info;
-
- public OpInfoRunner(OpInfo info) {
- this.info = info;
- }
-
- public boolean run0(IProgressMonitor monitor) {
- run(monitor);
- return b;
- }
-
- @Override
- public void run(IProgressMonitor monitor) {
- OpxmlRunner runner = new OpxmlRunner();
- String[] args = new String[] { OpxmlConstants.OPXML_INFO };
- b = runner.run(args, info);
- }
- }
-
- @Override
- public IRunnableWithProgress modelData(final String eventName, final String sessionName, final OpModelImage image) {
- return monitor -> {
- OpxmlRunner runner = new OpxmlRunner();
-
- String[] args = new String[] { OpxmlConstants.OPXML_MODELDATA, eventName, sessionName };
-
- ModelDataProcessor.CallData data = new ModelDataProcessor.CallData(image);
- runner.run(args, data);
- };
- }
-
- @Override
- public IRunnableWithProgress checkEvents(final int ctr, final String event, final int um, final int[] eventValid) {
- return monitor -> {
- OpxmlRunner runner = new OpxmlRunner();
- String[] args = new String[] { OpxmlConstants.CHECKEVENTS_TAG, Integer.toString(ctr), event,
- Integer.toString(um) };
-
- runner.run(args, eventValid);
- };
- }
-
- /**
- * return list of session collected on this system as well as events under each
- * of them.
- *
- * @since 3.0
- */
- @Override
- public IRunnableWithProgress sessions(final ArrayList<OpModelSession> sessionList) {
- return monitor -> {
- OpxmlRunner runner = new OpxmlRunner();
- String[] args = new String[] { OpxmlConstants.OPXML_SESSIONS, };
-
- SessionsProcessor.SessionInfo sinfo = new SessionsProcessor.SessionInfo(sessionList);
- runner.run(args, sinfo);
- };
- }
-}
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/internal/oprofile/core/linux/OpxmlRunner.java b/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/internal/oprofile/core/linux/OpxmlRunner.java
deleted file mode 100644
index bc05cf9223c2529f8df1a691f4e783cb0f90384d..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/internal/oprofile/core/linux/OpxmlRunner.java
+++ /dev/null
@@ -1,348 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2018 Red Hat, Inc.
- *
- * This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License 2.0
- * which is available at https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- * Keith Seitz <keiths@redhat.com> - initial API and implementation
- * Kent Sebastian <ksebasti@redhat.com> -
- *******************************************************************************/
-package org.eclipse.linuxtools.internal.oprofile.core.linux;
-
-import java.io.BufferedReader;
-import java.io.BufferedWriter;
-import java.io.ByteArrayInputStream;
-import java.io.File;
-import java.io.FileReader;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
-import java.util.Collections;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.parsers.SAXParserFactory;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.dialogs.ErrorDialog;
-import org.eclipse.linuxtools.internal.oprofile.core.Oprofile;
-import org.eclipse.linuxtools.internal.oprofile.core.Oprofile.OprofileProject;
-import org.eclipse.linuxtools.internal.oprofile.core.OprofileCorePlugin;
-import org.eclipse.linuxtools.internal.oprofile.core.OprofileProperties;
-import org.eclipse.linuxtools.internal.oprofile.core.opxml.AbstractDataAdapter;
-import org.eclipse.linuxtools.internal.oprofile.core.opxml.OprofileSAXHandler;
-import org.eclipse.linuxtools.internal.oprofile.core.opxml.checkevent.CheckEventAdapter;
-import org.eclipse.linuxtools.internal.oprofile.core.opxml.info.InfoAdapter;
-import org.eclipse.linuxtools.internal.oprofile.core.opxml.modeldata.ModelDataAdapter;
-import org.eclipse.linuxtools.internal.oprofile.core.opxml.sessions.SessionManager;
-import org.eclipse.linuxtools.profiling.launch.IRemoteFileProxy;
-import org.eclipse.linuxtools.profiling.launch.RemoteProxyManager;
-import org.eclipse.linuxtools.tools.launch.core.factory.RuntimeProcessFactory;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.swt.widgets.Display;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NodeList;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-import org.xml.sax.XMLReader;
-
-/**
- * This class will run opxml.
- *
- * opxml is a small program which acts as a textual interface between Oprofile
- * and BFD and the oprofile plugins.
- */
-public class OpxmlRunner {
-
- /**
- * Runs opxml with the given arguments.
- *
- * @param args the arguments to pass to opxml
- * @param callData any callData to pass to the processor
- * @return boolean indicating the success/failure of opxml
- */
- public boolean run(String[] args, Object callData) {
- XMLReader reader = null;
- OprofileSAXHandler handler = OprofileSAXHandler.getInstance(callData);
-
- // Create XMLReader
- SAXParserFactory factory = SAXParserFactory.newInstance();
- try {
- reader = factory.newSAXParser().getXMLReader();
- } catch (Exception e) {
- e.printStackTrace();
- return false;
- }
-
- // Set content/error handlers
- reader.setContentHandler(handler);
- reader.setErrorHandler(handler);
-
- // Check for timer support
- InfoAdapter.checkTimerSupport();
-
- // Run opxml
- try {
- File file = constructFile(args);
-
- // handle the opxml_session file
- if (args[0].equals(SessionManager.SESSIONS)) {
- SessionManager sessManNew = new SessionManager(SessionManager.SESSION_LOCATION);
- populateWithCurrentSession(sessManNew);
- sessManNew.write();
- FileReader fr = new FileReader(file);
- reader.parse(new InputSource(fr));
- // file has not been saved
- } else if (!file.exists()) {
- AbstractDataAdapter aea;
- if (args[0].equals(CheckEventAdapter.CHECK_EVENTS)) {
- aea = new CheckEventAdapter(args[1], args[2], args[3]);
- aea.process();
- BufferedReader bi = new BufferedReader(new InputStreamReader(aea.getInputStream()));
- reader.parse(new InputSource(bi));
- } else if (args[0].equals(InfoAdapter.INFO)) {
- aea = new InfoAdapter();
- aea.process();
- BufferedReader bi = new BufferedReader(new InputStreamReader(aea.getInputStream()));
- reader.parse(new InputSource(bi));
- } else if (args[0].equals(ModelDataAdapter.MODEL_DATA)) {
- // this should only happen initially when the current
- // session
- // has not been generated
- if (!handleModelData(args)) {
- return false;
- }
- FileReader fr = new FileReader(file);
- reader.parse(new InputSource(fr));
- } else {
- throw new RuntimeException("Unrecognized argument encountered"); //$NON-NLS-1$
- }
- } else {
- // always regenerate the 'current' session file
- if (args.length == 3 && args[0].equals(SessionManager.MODEL_DATA)
- && args[2].equals(SessionManager.CURRENT)) {
- if (!handleModelData(args)) {
- return false;
- }
- }
- FileReader fr = new FileReader(file);
- reader.parse(new InputSource(fr));
- }
-
- return true;
- } catch (SAXException e) {
- e.printStackTrace();
- OprofileCorePlugin.showErrorDialog("opxmlSAXParseException", null); //$NON-NLS-1$
- } catch (IOException e) {
- e.printStackTrace();
- OprofileCorePlugin.showErrorDialog("opxmlParse", null); //$NON-NLS-1$
- }
- return false;
- }
-
- private File saveOpxmlToFile(BufferedReader bi, String[] args) {
- String fileName = ""; //$NON-NLS-1$
- for (String arg : args) {
- fileName += arg;
- }
- File file = new File(SessionManager.OPXML_PREFIX + fileName);
- String line;
- try {
- file.createNewFile();
- try (BufferedWriter bw = new BufferedWriter(new FileWriter(file))) {
- while ((line = bi.readLine()) != null) {
- bw.write(line + "\n"); //$NON-NLS-1$
- }
- bi.close();
- }
- } catch (IOException e) {
- e.printStackTrace();
- }
- return file;
- }
-
- private File constructFile(String[] args) {
- String fileName = ""; //$NON-NLS-1$
- for (int i = 0; i < args.length; i++) {
- fileName += args[i];
- }
- return new File(SessionManager.OPXML_PREFIX + fileName);
- }
-
- private boolean handleModelData(String[] args) {
- ArrayList<String> cmd = new ArrayList<>();
- cmd.add("-Xdg"); //$NON-NLS-1$
- if (!InfoAdapter.hasTimerSupport()) {
- cmd.add("event:" + args[1]); //$NON-NLS-1$
- }
- String[] a = {};
- InputStream is = runOpReport(cmd.toArray(a));
-
- if (is == null) {
- return false;
- }
- ModelDataAdapter mda = new ModelDataAdapter(is);
- if (!mda.isParseable()) {
- return false;
- }
- mda.process();
- BufferedReader bi = new BufferedReader(new InputStreamReader(mda.getInputStream()));
- saveOpxmlToFile(bi, args);
- return true;
- }
-
- /**
- * Add the current session to the session manager for each event that it was
- * profiled under.
- *
- * @param session the session manager to populate
- */
- private void populateWithCurrentSession(SessionManager session) {
- session.removeAllCurrentSessions();
- String[] eventName = getEventNames();
- if (eventName != null) {
- for (int i = 0; i < eventName.length; i++) {
- session.addSession(SessionManager.CURRENT, eventName[i]);
- }
- }
- }
-
- private String[] getEventNames() {
- String[] ret = null;
- try {
- String cmd[] = { "-X", "-d" }; //$NON-NLS-1$ //$NON-NLS-2$
- InputStream is = runOpReport(cmd);
-
- if (is != null) {
- DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
- DocumentBuilder builder;
- builder = factory.newDocumentBuilder();
- Document doc = builder.parse(is);
- Element root = (Element) doc.getElementsByTagName(ModelDataAdapter.PROFILE).item(0);
-
- String eventOrTimerSetup;
- String eventOrTimerName;
-
- // Determine if we are in timer-mode or not as the XML will vary
- if (!InfoAdapter.hasTimerSupport()) {
- eventOrTimerSetup = ModelDataAdapter.EVENT_SETUP;
- eventOrTimerName = ModelDataAdapter.EVENT_NAME;
- } else {
- eventOrTimerSetup = ModelDataAdapter.TIMER_SETUP;
- eventOrTimerName = ModelDataAdapter.RTC_INTERRUPTS;
- }
-
- Element setupTag = (Element) root.getElementsByTagName(ModelDataAdapter.SETUP).item(0);
- NodeList eventSetupList = setupTag.getElementsByTagName(eventOrTimerSetup);
-
- // get the event names for the current session
- ret = new String[eventSetupList.getLength()];
- for (int i = 0; i < eventSetupList.getLength(); i++) {
- Element elm = (Element) eventSetupList.item(i);
- ret[i] = elm.getAttribute(eventOrTimerName);
- }
- }
- } catch (IOException e) {
- e.printStackTrace();
- OprofileCorePlugin.showErrorDialog("opxmlParse", null); //$NON-NLS-1$
- } catch (ParserConfigurationException e) {
- e.printStackTrace();
- } catch (SAXException e) {
- e.printStackTrace();
- OprofileCorePlugin.showErrorDialog("opxmlSAXParseException", null); //$NON-NLS-1$
- }
- return ret;
- }
-
- /**
- * Run opreport with specified arguments <code>args</code> and return
- * InputStream to output of report for parsing.
- *
- * @param args arguments to run with opreport
- * @return InputStream to output of report
- */
- private InputStream runOpReport(String[] args) {
-
- ArrayList<String> cmd = new ArrayList<>();
- cmd.add("opreport"); //$NON-NLS-1$
- if (OprofileProject.getProfilingBinary().equals(OprofileProject.OPERF_BINARY)) {
- /*
- * The session-dir parameter is relative to project's working dir, which might
- * be local or remote. So it should use the proxy manager to determine working
- * dir.
- */
- String workingDir = ""; //$NON-NLS-1$
- RemoteProxyManager proxy = RemoteProxyManager.getInstance();
- try {
- IRemoteFileProxy rfile = proxy.getFileProxy(Oprofile.OprofileProject.getProject());
- workingDir = rfile.getWorkingDir().getPath();
- } catch (CoreException e) {
- e.printStackTrace();
- return null;
- }
- cmd.add(1, "--session-dir=" + workingDir + IPath.SEPARATOR + "oprofile_data"); //$NON-NLS-1$ //$NON-NLS-2$
- }
- Collections.addAll(cmd, args);
- Process p = null;
- try {
- p = RuntimeProcessFactory.getFactory().exec(cmd.toArray(new String[0]),
- Oprofile.OprofileProject.getProject());
-
- StringBuilder output = new StringBuilder();
- StringBuilder errorOutput = new StringBuilder();
- String s = null;
- try (BufferedReader stdInput = new BufferedReader(new InputStreamReader(p.getInputStream()));
- BufferedReader stdError = new BufferedReader(new InputStreamReader(p.getErrorStream()))) {
- // Read output of opreport. We need to do this, since this might
- // cause the plug-in to hang. See Eclipse bug 341621 for more
- // info.
- // FIXME: Both of those while loops should really be done in two
- // separate
- // threads, so that we avoid this very problem when the error
- // input
- // stream buffer fills up.
- while ((s = stdInput.readLine()) != null) {
- output.append(s + System.getProperty("line.separator")); //$NON-NLS-1$
- }
- while ((s = stdError.readLine()) != null) {
- errorOutput.append(s + System.getProperty("line.separator")); //$NON-NLS-1$
- }
- if (!errorOutput.toString().trim().equals("")) { //$NON-NLS-1$
- // needs to be run in the ui thread otherwise swt throws invalid thread access
- final String dialogTitle = NLS.bind(OprofileProperties.getString("process.log.stderr.dialog.title"), //$NON-NLS-1$
- "opreport"); //$NON-NLS-1$
- final String errorMessage = NLS.bind(OprofileProperties.getString("process.log.stderr"), //$NON-NLS-1$
- "opreport", errorOutput.toString().trim()); //$NON-NLS-1$
- Display.getDefault().asyncExec(() -> ErrorDialog.openError(null, dialogTitle, errorMessage,
- new Status(IStatus.ERROR, OprofileCorePlugin.getId(), IStatus.OK, errorMessage, null)));
- }
- } catch (IOException e) {
- e.printStackTrace();
- }
-
- if (p.waitFor() == 0) {
- // convert the string to inputstream to pass to builder.parse
- return new ByteArrayInputStream(output.toString().getBytes(StandardCharsets.UTF_8));
- }
- } catch (IOException e1) {
- e1.printStackTrace();
- OprofileCorePlugin.showErrorDialog("opxmlParse", null); //$NON-NLS-1$
- } catch (InterruptedException e) {
- e.printStackTrace();
- }
-
- return null;
- }
-}
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/internal/oprofile/core/model/OpModelEvent.java b/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/internal/oprofile/core/model/OpModelEvent.java
deleted file mode 100644
index cf5bb275b96397b7896845af213d1086c1817f5d..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/internal/oprofile/core/model/OpModelEvent.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2018 Red Hat, Inc.
- *
- * This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License 2.0
- * which is available at https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- * Keith Seitz <keiths@redhat.com> - initial API and implementation
- * Kent Sebastian <ksebasti@redhat.com> -
- *******************************************************************************/
-
-package org.eclipse.linuxtools.internal.oprofile.core.model;
-
-import org.eclipse.linuxtools.internal.oprofile.core.Oprofile;
-
-/**
- * A class which represents the event collected in a given session.
- */
-public class OpModelEvent {
- private String eventName;
- private String printTabs = ""; // for nice output //$NON-NLS-1$
- private OpModelImage image;
- private OpModelSession parentSession;
-
- public OpModelEvent(OpModelSession parentSession, String name) {
- this.parentSession = parentSession;
- this.eventName = name;
- }
-
- public String getName() {
- return eventName;
- }
-
- public OpModelSession getSession() {
- return parentSession;
- }
-
- // populate all images & dependent images
- public void refreshModel() {
- image = getNewImage();
- }
-
- public OpModelImage getImage() {
- return image;
- }
-
- protected OpModelImage getNewImage() {
- return Oprofile.getModelData(this.eventName, parentSession.getName());
- }
-
- public int getCount() {
- if (image == null) {
- return 0;
- } else {
- return image.getCount();
- }
- }
-
- public String toString(String tabs) {
- printTabs = tabs;
- String s = toString();
- printTabs = ""; //$NON-NLS-1$
- return s;
- }
-
- @Override
- public String toString() {
- String s = eventName + "\n"; //$NON-NLS-1$
- if (image != null) {
- s += printTabs + "Image: "; //$NON-NLS-1$
- s += image.toString(printTabs + "\t"); //$NON-NLS-1$
- }
- return s;
- }
-}
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/internal/oprofile/core/model/OpModelImage.java b/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/internal/oprofile/core/model/OpModelImage.java
deleted file mode 100644
index 8dc53a80711d43ca91078446dafef8f53ae45b5c..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/internal/oprofile/core/model/OpModelImage.java
+++ /dev/null
@@ -1,146 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2018 Red Hat, Inc.
- *
- * This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License 2.0
- * which is available at https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- * Keith Seitz <keiths@redhat.com> - initial API and implementation
- * Kent Sebastian <ksebasti@redhat.com>
- *******************************************************************************/
-package org.eclipse.linuxtools.internal.oprofile.core.model;
-
-/**
- * A class which represents an image (executables, libraries, modules) profile
- * by OProfile.
- */
-public class OpModelImage {
- public static final int IMAGE_PARSE_ERROR = -1;
-
- // The count of all samples from this image
- private int count;
-
- // the count for all dependent images -- needed?
- private int depcount;
-
- // The name of this image (the full path, where applicable)
- private String name;
-
- // The symbols profiled in this image
- private OpModelSymbol[] symbols;
-
- // Any dependent images on this image (usually shared libs, kernel modules)
- private OpModelImage[] dependents;
-
- private String printTabs = ""; // for nice output //$NON-NLS-1$
-
- public OpModelImage() {
- name = ""; //$NON-NLS-1$
- count = 0;
- depcount = 0;
- symbols = null;
- dependents = null;
- }
-
- public int getCount() {
- return count;
- }
-
- public int getDepCount() {
- return depcount;
- }
-
- public String getName() {
- return name;
- }
-
- public OpModelSymbol[] getSymbols() {
- return symbols;
- }
-
- public OpModelImage[] getDependents() {
- return dependents;
- }
-
- public boolean hasDependents() {
- return (dependents == null || dependents.length == 0 ? false : true);
- }
-
- /**
- * This method is not meant to be called publicly, used only from the XML
- * processors
- *
- * @param count
- */
- public void setCount(int count) {
- this.count = count;
- }
-
- /**
- * This method is not meant to be called publicly, used only from the XML
- * processors
- *
- * @param depcount
- */
- public void setDepCount(int depcount) {
- this.depcount = depcount;
- }
-
- /**
- * This method is not meant to be called publicly, used only from the XML
- * processors
- *
- * @param name
- */
- public void setName(String name) {
- this.name = name;
- }
-
- /**
- * This method is not meant to be called publicly, used only from the XML
- * processors
- *
- * @param symbols
- */
- public void setSymbols(OpModelSymbol[] symbols) {
- this.symbols = symbols;
- }
-
- /**
- * This method is not meant to be called publicly, used only from the XML
- * processors
- *
- * @param dependents
- */
- public void setDependents(OpModelImage[] dependents) {
- this.dependents = dependents;
- }
-
- public String toString(String tabs) {
- printTabs = tabs;
- String s = toString();
- printTabs = ""; //$NON-NLS-1$
- return s;
- }
-
- @Override
- public String toString() {
- String s = name + ", Count: " + count + (depcount != 0 ? ", Dependent Count: " + depcount + "\n" : "\n"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
- if (symbols != null) {
- for (int i = 0; i < symbols.length; i++) {
- s += printTabs + "Symbols: "; //$NON-NLS-1$
- s += symbols[i].toString(printTabs + "\t"); //$NON-NLS-1$
- }
- }
- if (dependents != null) {
- for (int i = 0; i < dependents.length; i++) {
- s += printTabs + "Dependent Image: "; //$NON-NLS-1$
- s += dependents[i].toString(printTabs + "\t"); //$NON-NLS-1$
- }
- }
- return s;
- }
-}
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/internal/oprofile/core/model/OpModelRoot.java b/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/internal/oprofile/core/model/OpModelRoot.java
deleted file mode 100644
index 9332112ce33a23edf617eb1e45543bf3ebb3e3ae..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/internal/oprofile/core/model/OpModelRoot.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2018 Red Hat, Inc.
- *
- * This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License 2.0
- * which is available at https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- * Kent Sebastian <ksebasti@redhat.com> - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.linuxtools.internal.oprofile.core.model;
-
-import org.eclipse.linuxtools.internal.oprofile.core.Oprofile;
-
-/**
- * A root node for the data model. Only one instance exists at any time,
- * although the contents will change. On instantiation the events and sessions
- * are gathered.
- *
- * Note that this data model does not map 1:1 to the oprofile data model. This
- * model is for use in profiling one application compiled with debug info, from
- * within eclipse.
- */
-
-public class OpModelRoot {
- // single instance
- private static OpModelRoot modelRoot = new OpModelRoot();
-
- private OpModelSession[] session;
-
- protected OpModelRoot() {
- session = null;
- }
-
- public static OpModelRoot getDefault() {
- return modelRoot;
- }
-
- public void refreshModel() {
- // TODO-performance/interactivity: some persistence for events/sessions
- // that dont change from run to run (non default sessions)
-
- session = getNewSessions();
- if (session != null) {
- for (int i = 0; i < session.length; i++) {
- if (session[i] != null)
- session[i].refreshModel();
- }
- }
- }
-
- /**
- * return list of session collected on this system as well as events under each
- * of them.
- *
- * @return collected sessions list
- * @since 3.0
- */
- protected OpModelSession[] getNewSessions() {
- // launch `opxml sessions`, gather up events & the sessions under them
- return Oprofile.getSessions();
- }
-
- public OpModelSession[] getSessions() {
- return session;
- }
-
- @Override
- public String toString() {
- String s = ""; //$NON-NLS-1$
- if (session != null) {
- for (int i = 0; i < session.length; i++) {
- if (session[i] != null) {
- s += "Session: "; //$NON-NLS-1$
- s += session[i].toString("\t"); //$NON-NLS-1$
- }
- }
- }
- return s;
- }
-}
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/internal/oprofile/core/model/OpModelSample.java b/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/internal/oprofile/core/model/OpModelSample.java
deleted file mode 100644
index 993672bdd627f0308680814a3db69fa93d5274b7..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/internal/oprofile/core/model/OpModelSample.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2018 Red Hat, Inc.
- *
- * This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License 2.0
- * which is available at https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- * Keith Seitz <keiths@redhat.com> - initial API and implementation
- * Kent Sebastian <ksebasti@redhat.com> -
- *******************************************************************************/
-
-package org.eclipse.linuxtools.internal.oprofile.core.model;
-
-/**
- * Represents an OProfile sample.
- */
-public class OpModelSample {
- private int count;
- private int line;
- private String file;
-
- public OpModelSample() {
- count = 0;
- line = 0;
- }
-
- public void setCount(int count) {
- this.count = count;
- }
-
- public void setLine(int line) {
- this.line = line;
- }
-
- public void setFilePath(String file) {
- this.file = file;
- }
-
- public int getCount() {
- return count;
- }
-
- public int getLine() {
- return line;
- }
-
- public String getFilePath() {
- return file;
- }
-
- @Override
- public String toString() {
- return "Line #: " + line + ", Count: " + count + "\n"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- }
-}
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/internal/oprofile/core/model/OpModelSession.java b/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/internal/oprofile/core/model/OpModelSession.java
deleted file mode 100644
index f968db1996b583e33069206db089df1b1f131af9..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/internal/oprofile/core/model/OpModelSession.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2018 Red Hat, Inc.
- *
- * This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License 2.0
- * which is available at https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- * Kent Sebastian <ksebasti@redhat.com> - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.linuxtools.internal.oprofile.core.model;
-
-/**
- * This class represents oprofile sessions. Sessions contain an image of the
- * profiled binary.
- */
-public class OpModelSession {
- private static final String DEFAULT_SESSION_STRING = "current"; //$NON-NLS-1$
-
- private String name;
- private String printTabs = ""; // for nice output //$NON-NLS-1$
- private OpModelEvent[] events;
-
- public OpModelSession(String name) {
- this.name = name;
- }
-
- public String getName() {
- return name;
- }
-
- public OpModelEvent[] getEvents() {
- return events;
- }
-
- public void setEvents(OpModelEvent[] events) {
- this.events = events;
- }
-
- public boolean isDefaultSession() {
- return name.equals(DEFAULT_SESSION_STRING);
- }
-
- public void refreshModel() {
- if (events != null) {
- for (int i = 0; i < events.length; i++) {
- events[i].refreshModel();
- }
- }
- }
-
- public String toString(String tabs) {
- printTabs = tabs;
- String s = toString();
- printTabs = ""; //$NON-NLS-1$
- return s;
- }
-
- @Override
- public String toString() {
- String s = name + "\n"; //$NON-NLS-1$
- if (events != null) {
- for (int i = 0; i < events.length; i++) {
- s += printTabs + "Event: "; //$NON-NLS-1$
- s += events[i].toString(printTabs + "\t"); //$NON-NLS-1$
- }
- }
- return s;
-
- }
-}
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/internal/oprofile/core/model/OpModelSymbol.java b/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/internal/oprofile/core/model/OpModelSymbol.java
deleted file mode 100644
index b7b35c2fd887aa652528e8d2d8c2300e2e6f343d..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/internal/oprofile/core/model/OpModelSymbol.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2018 Red Hat, Inc.
- *
- * This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License 2.0
- * which is available at https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- * Kent Sebastian <ksebasti@redhat.com> - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.linuxtools.internal.oprofile.core.model;
-
-/**
- * This class represents a debugging symbol, the symbol output from opxml. If a
- * symbol exists, it must have samples (which are OpModelSamples), although
- * those samples may or may not have complete debug info.
- */
-public class OpModelSymbol {
- private String name;
- private String file;
- private int line;
- private int count;
- private OpModelSample[] samples;
- private String printTabs = ""; // for nice output //$NON-NLS-1$
-
- public OpModelSymbol() {
- name = ""; //$NON-NLS-1$
- file = ""; //$NON-NLS-1$
- count = 0;
- samples = null;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public void setFilePath(String file) {
- this.file = file;
- }
-
- public void setLine(int line) {
- this.line = line;
- }
-
- public void setCount(int count) {
- this.count = count;
- }
-
- public void setSamples(OpModelSample[] samples) {
- this.samples = samples;
- }
-
- public String getName() {
- return name;
- }
-
- public String getFilePath() {
- return file;
- }
-
- public int getLine() {
- return line;
- }
-
- public int getCount() {
- return count;
- }
-
- public OpModelSample[] getSamples() {
- return samples;
- }
-
- public String toString(String tabs) {
- printTabs = tabs;
- String s = toString();
- printTabs = ""; //$NON-NLS-1$
- return s;
- }
-
- @Override
- public String toString() {
- String s = name + ", File: " + file + ", Count: " + count + "\n"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- if (samples != null) {
- for (int i = 0; i < samples.length; i++) {
- s += printTabs + "Sample: "; //$NON-NLS-1$
- s += samples[i].toString();
- }
- }
- return s;
- }
-}
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/internal/oprofile/core/oprofile.properties b/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/internal/oprofile/core/oprofile.properties
deleted file mode 100644
index 454e54dc5f4ee0ae2c5383cf6c117820a61e5a18..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/internal/oprofile/core/oprofile.properties
+++ /dev/null
@@ -1,42 +0,0 @@
-######################################################################
-# Copyright (c) 2004, 2018 Red Hat, Inc.
-#
-# This program and the accompanying materials are made
-# available under the terms of the Eclipse Public License 2.0
-# which is available at https://www.eclipse.org/legal/epl-2.0/
-#
-# SPDX-License-Identifier: EPL-2.0
-#
-# Contributors:
-# Keith Seitz <keiths@redhat.com> - Initial implementation
-# Kent Sebastian <ksebasti@redhat.com>
-######################################################################
-getSamples.caption=Reading samples for session \"{0}\"...
-getSamples.caption.default-session=Reading samples for session \"Default\"...
-
-process.log.stderr.dialog.title=Unexpected {0} error output
-process.log.stderr={0} process error output: {1}
-process.log.stdout={0} process output: {1}
-
-ophelpRun.error.statusMessage=Error during run of ophelp
-
-opxmlParse.error.statusMessage=An unexpected error occurred with parsing the output. Please file a bug at http://bugs.eclipse.org/bugs.
-opxmlParse.error.dialog.title=Error with XML parsing
-opxmlParse.error.dialog.message=An error occurred with parsing the XML output from OProfile.
-
-opxmlSAXParseException.error.statusMessage=The XML output could not be read, most likely a fatal error.
-opxmlSAXParseException.error.dialog.title=Error with XML parsing
-opxmlSAXParseException.error.dialog.message=An error occurred with parsing the XML output from OProfile.
-
-ophelpInputStream.error.dialog.title=Error with ophelp run
-ophelpInputStream.error.dialog.message=An error occurred when collecting the output from ophelp. Check if Oprofile is properly installed and try again.
-
-fatal.opinfoNotParsed=Fatal error: core OProfile information failed to parse. Please fix the issue and restart Eclipse.
-
-ui.annotate.no.sessions.error.statusMessage=There are no sessions to annotate. Please profile a binary.
-ui.annotate.no.sessions.error.dialog.title=Annotation Error
-ui.annotate.no.sessions.error.dialog.message=Error annotating
-
-countersNotFound.error.dialog.message=Could not get Oprofile counters information. Check if Oprofile is properly installed and try again.
-countersNotFound.error.dialog.title=Oprofile counters
-countersNotFound.error.statusMessage=Error getting counters.
\ No newline at end of file
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/internal/oprofile/core/opxml/AbstractDataAdapter.java b/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/internal/oprofile/core/opxml/AbstractDataAdapter.java
deleted file mode 100644
index e7c4d3be0db6071477f7d30fb7b19e17315c5579..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/internal/oprofile/core/opxml/AbstractDataAdapter.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010, 2018 Red Hat, Inc. and others.
- *
- * This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License 2.0
- * which is available at https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- * Red Hat - initial API and implementation
- *******************************************************************************/
-package org.eclipse.linuxtools.internal.oprofile.core.opxml;
-
-import java.io.ByteArrayInputStream;
-import java.io.InputStream;
-import java.io.StringWriter;
-import java.nio.charset.StandardCharsets;
-
-import javax.xml.transform.Result;
-import javax.xml.transform.Source;
-import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerException;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.stream.StreamResult;
-
-import org.w3c.dom.Document;
-
-public abstract class AbstractDataAdapter {
-
- /**
- * @return a Document representing the newly created XML data.
- */
- public abstract Document getDocument();
-
- /**
- * parse the XML data modifying it as necessary to produce the necessary XML
- * output.
- */
- public abstract void process();
-
- /**
- * @return an InputStream to the newly created XML data.
- */
- public InputStream getInputStream() {
- InputStream inp = null;
- Source source = new DOMSource(getDocument());
- StringWriter stw = new StringWriter();
- Result result = new StreamResult(stw);
- TransformerFactory factory = TransformerFactory.newInstance();
- Transformer xformer;
- try {
- xformer = factory.newTransformer();
- xformer.setOutputProperty("indent", "yes"); //$NON-NLS-1$ //$NON-NLS-2$
- xformer.transform(source, result);
- inp = new ByteArrayInputStream(stw.toString().getBytes(StandardCharsets.UTF_8));
- } catch (TransformerException e) {
- e.printStackTrace();
- }
- return inp;
- }
-
- @Override
- public String toString() {
- String ret = null;
- Source source = new DOMSource(getDocument());
- StringWriter stw = new StringWriter();
- Result result = new StreamResult(stw);
- TransformerFactory factory = TransformerFactory.newInstance();
- Transformer xformer;
- try {
- xformer = factory.newTransformer();
- xformer.setOutputProperty("indent", "yes"); //$NON-NLS-1$ //$NON-NLS-2$
- xformer.transform(source, result);
- ret = stw.toString();
- } catch (TransformerException e) {
- e.printStackTrace();
- }
- return ret;
- }
-
-}
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/internal/oprofile/core/opxml/EventIdCache.java b/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/internal/oprofile/core/opxml/EventIdCache.java
deleted file mode 100644
index 924548262f5fbc549659989c31b19573f9b1430c..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/internal/oprofile/core/opxml/EventIdCache.java
+++ /dev/null
@@ -1,256 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010, 2018 Red Hat, Inc.
- *
- * This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License 2.0
- * which is available at https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- * Red Hat - initial API and implementation
- *******************************************************************************/
-package org.eclipse.linuxtools.internal.oprofile.core.opxml;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.util.HashMap;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-
-import org.eclipse.core.filesystem.EFS;
-import org.eclipse.core.filesystem.IFileStore;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.linuxtools.internal.oprofile.core.Oprofile;
-import org.eclipse.linuxtools.internal.oprofile.core.opxml.info.InfoAdapter;
-import org.eclipse.linuxtools.profiling.launch.IRemoteFileProxy;
-import org.eclipse.linuxtools.profiling.launch.RemoteProxyManager;
-import org.eclipse.linuxtools.tools.launch.core.factory.RuntimeProcessFactory;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NodeList;
-import org.xml.sax.SAXException;
-
-/**
- * Caches the event data used by the CheckEventAdapter. The performance
- * improvement is targeted at the first time a call with the given arguments is
- * made. The first given call to check-event will take roughly O(n), and all
- * other calls whether they be new or recurring take O(1). Note that recurring
- * calls are handled by an entirely different cache. This particular class
- * simply parses the XML from ophelp -X and stores it.
- */
-public class EventIdCache {
-
- private static final String HELP_EVENTS = "help_events"; //$NON-NLS-1$
- private static final String HEADER = "header"; //$NON-NLS-1$
- private static final String SCHEMA = "schemaversion"; //$NON-NLS-1$
- private static final String CATEGORY = "category"; //$NON-NLS-1$
- private static final String OPHELP = "ophelp"; //$NON-NLS-1$
- private static final String EVENT = "event"; //$NON-NLS-1$
- private static final String EVENT_NAME = "event_name"; //$NON-NLS-1$
-
- private static final String LOCAL = "local"; //$NON-NLS-1$
-
- private Document eventDoc; // the document to hold the xml from ophelp
- private Element eventRoot; // the root corresponding to the xml from ophelp
- // name - the name of the event
- // Element - the DOM node
- private HashMap<String, Element> nameMap;
-
- // Map containing the caches for remote machines
- private static HashMap<String, EventIdCache> cacheMap;
-
- public static EventIdCache getInstance() {
-
- if (cacheMap == null) {
- cacheMap = new HashMap<>();
- }
-
- IProject project = Oprofile.OprofileProject.getProject();
- EventIdCache newCache = new EventIdCache();
- if (project != null) {
- EventIdCache eventIdCache = cacheMap.get(project.getLocationURI().getHost());
- if (eventIdCache == null) {
- cacheMap.put(project.getLocationURI().getHost(), newCache);
- } else {
- return eventIdCache;
- }
- } else {
- // If no project associated we should launch locally
- EventIdCache eventIdCache = cacheMap.get(LOCAL);
- if (eventIdCache == null) {
- cacheMap.put(LOCAL, newCache);
- } else {
- return eventIdCache;
- }
- }
-
- return newCache;
- }
-
- /**
- * @param id the id corresponding to an event
- * @return the DOM Element corresponding to the event tag
- */
- public Element getElementWithName(String name) {
- IProject project = Oprofile.OprofileProject.getProject();
- EventIdCache eventIdCache;
- if (project != null) {
- eventIdCache = cacheMap.get(project.getLocationURI().getHost());
- } else {
- eventIdCache = cacheMap.get(LOCAL);
- }
-
- if (eventIdCache.nameMap == null) {
- readXML(eventIdCache);
- buildCache(eventIdCache);
- }
- return eventIdCache.nameMap.get(name) != null ? (Element) eventIdCache.nameMap.get(name) : null;
-
- }
-
- /**
- * Build the cache
- */
- private void buildCache(EventIdCache eventId) {
- eventId.nameMap = new HashMap<>();
- NodeList eventList = eventId.eventRoot.getElementsByTagName(EVENT);
- for (int i = 0; i < eventList.getLength(); i++) {
- Element elem = (Element) eventList.item(i);
- String eventName = elem.getAttribute(EVENT_NAME);
- eventId.nameMap.put(eventName, elem);
- }
- }
-
- /**
- * Read the XML from ophelp
- */
- private void readXML(EventIdCache eventId) {
- if (eventId.eventRoot != null) {
- return;
- }
-
- try {
- Process p = RuntimeProcessFactory.getFactory().exec(OPHELP + ' ' + "-X", //$NON-NLS-1$
- Oprofile.OprofileProject.getProject());
-
- DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
- DocumentBuilder builder;
- try {
- builder = factory.newDocumentBuilder();
- try {
- eventId.eventDoc = builder.parse(p.getInputStream());
- Element elem = (Element) eventId.eventDoc.getElementsByTagName(HELP_EVENTS).item(0);
- eventId.eventRoot = elem;
- } catch (IOException | SAXException e) {
- }
- } catch (ParserConfigurationException e1) {
- e1.printStackTrace();
- }
-
- } catch (IOException e) {
- e.printStackTrace();
- }
- }
-
- /**
- * Get the unit mask type. Schema Version 1.1 and newer of ophelp XML will list
- * the unit mask type as an attribute. Older version will not so we default to
- * file lookups.
- *
- * @param name the name of the event
- * @return the type of unit mask. This can be either mandatory, exclusive,
- * bitmask, or null if none could be found.
- */
- public String getUnitMaskType(String name) {
- IProject project = Oprofile.OprofileProject.getProject();
- EventIdCache eventIdCache;
- if (project != null) {
- eventIdCache = cacheMap.get(project.getLocationURI().getHost());
- } else {
- eventIdCache = cacheMap.get(LOCAL);
- }
-
- if (eventIdCache.eventRoot == null) {
- readXML(eventIdCache);
- buildCache(eventIdCache);
- }
-
- Element header = (Element) eventIdCache.eventRoot.getElementsByTagName(HEADER).item(0);
-
- double schemaVersion = 0;
-
- if (!eventIdCache.eventRoot.getAttribute(SCHEMA).isEmpty()) {
- schemaVersion = Double.parseDouble(eventIdCache.eventRoot.getAttribute(SCHEMA));
- } else {
- schemaVersion = Double.parseDouble(header.getAttribute(SCHEMA));
- }
-
- String unitMaskType = null;
- IRemoteFileProxy proxy = null;
- try {
- proxy = RemoteProxyManager.getInstance().getFileProxy(Oprofile.OprofileProject.getProject());
- } catch (CoreException e) {
- e.printStackTrace();
- }
-
- // Schema Version > 1.0 has the unit mask type within the XML
- if (schemaVersion > 1.0) {
- Element event = getElementWithName(name);
- Element unitMaskTag = (Element) event.getElementsByTagName(InfoAdapter.UNIT_MASKS).item(0);
- return unitMaskTag.getAttribute(CATEGORY);
- } else {
- IFileStore fileStore = proxy.getResource(InfoAdapter.CPUTYPE);
- try (InputStream fileInputStream = fileStore.openInputStream(EFS.NONE, new NullProgressMonitor());
- BufferedReader bi = new BufferedReader(new InputStreamReader(fileInputStream))) {
-
- String cpuType = bi.readLine();
- IFileStore opArchEvents = proxy.getResource(InfoAdapter.OP_SHARE + cpuType + "/" + InfoAdapter.EVENTS); //$NON-NLS-1$
- IFileStore opArchUnitMasks = proxy
- .getResource(InfoAdapter.OP_SHARE + cpuType + "/" + InfoAdapter.UNIT_MASKS); //$NON-NLS-1$
-
- try (InputStream inputStreamEvents = opArchEvents.openInputStream(EFS.NONE, new NullProgressMonitor());
- BufferedReader eventReader = new BufferedReader(new InputStreamReader(inputStreamEvents))) {
- String line;
- while ((line = eventReader.readLine()) != null) {
- // find the line with the event name
- if (line.contains("name:" + name + ' ')) { //$NON-NLS-1$
- int start = line.indexOf("um:") + 3; //$NON-NLS-1$
- int end = line.indexOf(' ', start);
- // grab the string that references the unit mask type
- String um = line.substring(start, end);
- try (InputStream inputStreamMasks = opArchUnitMasks.openInputStream(EFS.NONE,
- new NullProgressMonitor());
- BufferedReader unitMaskReader = new BufferedReader(
- new InputStreamReader(inputStreamMasks))) {
- while ((line = unitMaskReader.readLine()) != null) {
- if (line.contains("name:" + um + ' ')) { //$NON-NLS-1$
- start = line.indexOf("type:") + 5; //$NON-NLS-1$
- end = line.indexOf(' ', start);
- unitMaskType = line.substring(start, end);
- return unitMaskType;
- }
- }
- }
- }
- }
- }
- } catch (IOException | CoreException e) {
- }
- }
- return unitMaskType;
- }
-
- /**
- * @since 3.0
- */
- public void setCacheDoc(Element oldRoot) {
- eventRoot = oldRoot;
- }
-}
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/internal/oprofile/core/opxml/OprofileSAXHandler.java b/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/internal/oprofile/core/opxml/OprofileSAXHandler.java
deleted file mode 100644
index 6f7b9773086dff1123360ebfd2d850b46941d719..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/internal/oprofile/core/opxml/OprofileSAXHandler.java
+++ /dev/null
@@ -1,192 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2018 Red Hat, Inc.
- *
- * This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License 2.0
- * which is available at https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- * Keith Seitz <keiths@redhat.com> - initial API and implementation
- *******************************************************************************/
-package org.eclipse.linuxtools.internal.oprofile.core.opxml;
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.HashMap;
-import java.util.Stack;
-
-import org.eclipse.linuxtools.internal.oprofile.core.opxml.checkevent.CheckEventsProcessor;
-import org.eclipse.linuxtools.internal.oprofile.core.opxml.info.OpInfoProcessor;
-import org.eclipse.linuxtools.internal.oprofile.core.opxml.modeldata.ModelDataProcessor;
-import org.eclipse.linuxtools.internal.oprofile.core.opxml.sessions.SessionsProcessor;
-import org.xml.sax.Attributes;
-import org.xml.sax.helpers.DefaultHandler;
-
-/**
- * The SAX handler class that is used to parse the output of opxml.
- *
- * @see org.eclipse.linuxtools.internal.oprofile.core.opxml.OpxmlRunner
- */
-public class OprofileSAXHandler extends DefaultHandler {
- // The only allowed instance of this class
- private static OprofileSAXHandler instance = null;
-
- // A Map of all the XML processors for opxml
- private static HashMap<String, Class<?>> processors = new HashMap<>();
-
- // The current processor being used to parse the document
- private XMLProcessor processor = null;
- private Object callData;
-
- /*
- * A stack of XML processors. This allows processors to invoke sub-processors
- * for handling nested tags more efficiently.
- */
- private Stack<XMLProcessor> processorStack = new Stack<>();
-
- // Introduced for fix of Eclipse BZ#343025
- // As per SAX spec, SAX parsers are allowed to split character data into as many
- // chunks as
- // they please, and they can split the text at whichever boundaries they want.
- // In order to
- // handle this properly, it is needed to accumulate the text returned in each
- // call
- // until it recieves a callback that isn't characters.
- private StringBuilder charactersBuffer;
-
- // A convenience class for specifying XMLProcessors
- private static class ProcessorItem {
- public String tagName;
- public Class<?> handlerClass;
-
- public ProcessorItem(String name, Class<?> cls) {
- tagName = name;
- handlerClass = cls;
- }
- }
-
- // The list of all "root" XML tags and their handler classes
- private static final ProcessorItem[] handlerList = {
- new ProcessorItem(OpxmlConstants.INFO_TAG, OpInfoProcessor.class),
- new ProcessorItem(OpxmlConstants.CHECKEVENTS_TAG, CheckEventsProcessor.class),
- new ProcessorItem(OpxmlConstants.MODELDATA_TAG, ModelDataProcessor.class),
- new ProcessorItem(OpxmlConstants.SESSIONS_TAG, SessionsProcessor.class) };
-
- /**
- * Returns an instance of the handler. This must be used to access the parser!
- *
- * @return a handler instance
- */
- public static OprofileSAXHandler getInstance(Object callData) {
- if (instance == null) {
- instance = new OprofileSAXHandler();
-
- // Initialize processor map
- for (int i = 0; i < handlerList.length; ++i) {
- processors.put(handlerList[i].tagName, handlerList[i].handlerClass);
- }
- }
-
- // Set calldata into handler
- instance.setCallData(callData);
- return instance;
- }
-
- /**
- * Sets the calldata for the processor.
- *
- * @param callData the calldata to pass to the processor
- */
- private void setCallData(Object callData) {
- this.callData = callData;
- }
-
- /**
- * Returns the processor for a given request type.
- *
- * @param type the name of the processor
- * @return the requested processor or null
- */
- private static XMLProcessor getProcessor(String type) {
- XMLProcessor processor = null;
-
- Class<?> handlerClass = processors.get(type);
- if (handlerClass != null) {
- try {
- processor = (XMLProcessor) handlerClass.getDeclaredConstructor().newInstance();
- } catch (InstantiationException | IllegalAccessException | IllegalArgumentException
- | InvocationTargetException | NoSuchMethodException | SecurityException e) {
- }
- }
-
- return processor;
- }
-
- @Override
- public void startDocument() {
- // Reset processor
- processor = null;
- }
-
- @Override
- public void endDocument() {
- }
-
- @Override
- public void startElement(String uri, String lName, String qName, Attributes attrs) {
- if (processor == null) {
- // Get processor for this event type
- processor = getProcessor(qName);
- processor.reset(callData);
- }
-
- // If we already have a processor, so let it deal with this new element.
- // Allow the processor to deal with it's own tag as well: this way it can
- // grab attributes from it.
- processor.startElement(qName, attrs, callData);
-
- // Clean up the characters buffer
- charactersBuffer = new StringBuilder();
- }
-
- @Override
- public void endElement(String uri, String name, String qName) {
- // Set the accumulated characters
- processor.characters(charactersBuffer.toString(), callData);
- processor.endElement(qName, callData);
- }
-
- @Override
- public void characters(char ch[], int start, int length) {
- // Ignore characters which are only whitespace
- String str = new String(ch, start, length).trim();
- if (str.length() > 0 && processor != null)
- // Append the character to the buffer.
- charactersBuffer.append(str);
- }
-
- /**
- * Pushes the current XMLProcessor onto the stack and installs the given
- * processor as the document's parser/handler.
- *
- * @param proc the processor to continue parsing the document
- */
- public void push(XMLProcessor proc) {
- processorStack.add(processor);
- processor = proc;
- processor.reset(callData);
- }
-
- /**
- * Removes the current XMLProcessor and installs the previous processor. NOTE:
- * This assumes that endElement caused the pop, so it calls endElement in the
- * parent processor.
- *
- * @param tag the XML tag to pass to the parent processor
- */
- public void pop(String tag) {
- processor = processorStack.pop();
- processor.endElement(tag, callData);
- }
-}
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/internal/oprofile/core/opxml/OpxmlConstants.java b/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/internal/oprofile/core/opxml/OpxmlConstants.java
deleted file mode 100644
index 98a4adf50926bf7b15954f67a9586e5f1557ae30..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/internal/oprofile/core/opxml/OpxmlConstants.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2018 Red Hat, Inc.
- *
- * This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License 2.0
- * which is available at https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- * Keith Seitz <keiths@redhat.com> - initial API and implementation
- * Kent Sebastian <ksebasti@redhat.com> - change samples to model-data
- *******************************************************************************/
-package org.eclipse.linuxtools.internal.oprofile.core.opxml;
-
-/**
- * A class of constants for communications with the opxml wrapper program.
- *
- * @see org.eclipse.linuxtools.internal.oprofile.core.opxml.OprofileSAXHandler
- */
-public class OpxmlConstants {
- /**
- * Request static oprofile information (num counters, defaults, event lists)
- */
- public static final String OPXML_INFO = "info"; //$NON-NLS-1$
- public static final String INFO_TAG = OPXML_INFO;
-
- /**
- * Request model data for a session
- */
- public static final String OPXML_MODELDATA = "model-data"; //$NON-NLS-1$
- public static final String MODELDATA_TAG = OPXML_MODELDATA;
-
- /**
- * Request event validity check
- */
- public static final String OPXML_CHECKEVENTS = "check-events"; //$NON-NLS-1$
- public static final String CHECKEVENTS_TAG = OPXML_CHECKEVENTS;
-
- /**
- * Request session list
- */
- public static final String OPXML_SESSIONS = "sessions"; //$NON-NLS-1$
- public static final String SESSIONS_TAG = OPXML_SESSIONS;
-}
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/internal/oprofile/core/opxml/XMLProcessor.java b/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/internal/oprofile/core/opxml/XMLProcessor.java
deleted file mode 100644
index a75a6cb385257c40443a07a0fefc7842c4e36959..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/internal/oprofile/core/opxml/XMLProcessor.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2018 Red Hat, Inc.
- *
- * This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License 2.0
- * which is available at https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- * Keith Seitz <keiths@redhat.com> - initial API and implementation
- *******************************************************************************/
-package org.eclipse.linuxtools.internal.oprofile.core.opxml;
-
-import org.xml.sax.Attributes;
-
-/**
- * A class which (minimally) parses XML documents. This class provides only
- * basic support for collecting information from XML documents. It is intended
- * to be subclassed, providing only common functionality for all parser classes.
- *
- * @see org.eclipse.linuxtools.internal.oprofile.core.opxml.OpxmlRunner
- */
-public class XMLProcessor {
- // The characters in the current tag
- protected String characters;
-
- /**
- * This method is called whenever the SAXHandler is about to invoke the
- * processor for the first time on a given document.
- *
- * @param callData call data for the processor (usually the result is stored
- * here)
- */
- public void reset(Object callData) {
- }
-
- /**
- * This method is called whenever a new tag is seen in the document. By default,
- * this process will clear the characters collected for the tag. Processors will
- * typically call this baseclass method to setup for collecting new character
- * information for a tag.
- *
- * @param name the name of the tag
- * @param attrs the tag's attributes
- * @param callData call data for the processor (usually the result is stored
- * here)
- */
- public void startElement(String name, Attributes attrs, Object callData) {
- characters = ""; //$NON-NLS-1$
- }
-
- /**
- * This method is called whenever the closing tag for an element is seen in the
- * document.
- *
- * @param name the element which is ending
- * @param callData call data for the processor (usually the result is stored
- * here)
- */
- public void endElement(String name, Object callData) {
- }
-
- /**
- * This method is called whenever characters are seen in the document that are
- * not in a markup tag.
- *
- * @param chars the characters read
- * @param callData call data for the processor (usually the result is stored
- * here)
- */
- public void characters(String chars, Object callData) {
- characters = chars;
- }
-
- /**
- * This method is called on attribute strings and does the reverse of
- * valid_string in xmlfmt.cc in opxml.
- *
- * @param source source attribute string
- * @return the source string with escaped characters translated back to their
- * single character counterpart
- */
- public String validString(String source) {
- final String chars_long[] = { "&", """, "'", "<", ">" }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
- final String chars[] = { "&", "\"", "'", "<", ">" }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
- for (int i = 0; i < chars_long.length; i++) {
- source.replaceAll(chars_long[i], chars[i]);
- }
- return source;
- }
-}
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/internal/oprofile/core/opxml/checkevent/CheckEventAdapter.java b/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/internal/oprofile/core/opxml/checkevent/CheckEventAdapter.java
deleted file mode 100644
index 661c1f54cc2147a36c6379b4a7157edefc698c47..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/internal/oprofile/core/opxml/checkevent/CheckEventAdapter.java
+++ /dev/null
@@ -1,131 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010, 2018 Red Hat, Inc.
- *
- * This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License 2.0
- * which is available at https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- * Red Hat - initial API and implementation
- *******************************************************************************/
-package org.eclipse.linuxtools.internal.oprofile.core.opxml.checkevent;
-
-import java.util.TreeSet;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-
-import org.eclipse.linuxtools.internal.oprofile.core.opxml.AbstractDataAdapter;
-import org.eclipse.linuxtools.internal.oprofile.core.opxml.EventIdCache;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NodeList;
-
-/**
- * This class takes the XML that is output from various checks for and uses that
- * data to modify it into the format expected by the SAX parser.
- */
-public class CheckEventAdapter extends AbstractDataAdapter {
-
- public static final String CHECK_EVENTS = "check-events"; //$NON-NLS-1$
- public static final String RESULT = "result"; //$NON-NLS-1$
- public static final String UNIT_MASKS = "unit_masks"; //$NON-NLS-1$
- public static final String UNIT_MASK = "unit_mask"; //$NON-NLS-1$
- public static final String MASK = "mask"; //$NON-NLS-1$
-
- private Element event; // the element corresponding to the event id
- private String eventName; // the id corresponding to the event
- private String unitMask; // the unit mask for the event
- private Document resultDoc; // the document to hold the generated xml
- private String returnCode; // the return code to be used in the generated xml
-
- public CheckEventAdapter(String ctr, String event, String umask) {
- eventName = event;
- unitMask = umask;
-
- this.event = EventIdCache.getInstance().getElementWithName(eventName);
- DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
- DocumentBuilder builder;
- try {
- builder = factory.newDocumentBuilder();
- resultDoc = builder.newDocument();
- } catch (ParserConfigurationException e1) {
- e1.printStackTrace();
- }
- }
-
- @Override
- public void process() {
- setReturnCode();
- createXML();
- }
-
- private void setReturnCode() {
- if (!isValidUnitMask()) {
- returnCode = "invalid-um"; //$NON-NLS-1$
- return;
- }
-
- returnCode = "ok"; //$NON-NLS-1$
- }
-
- /**
- * Check if the unit mask being used is acceptable for this event
- *
- * @return true if the unit mask is recognized by the event and false otherwise.
- */
- private boolean isValidUnitMask() {
- TreeSet<Integer> bitMaskSet = new TreeSet<>();
- Element unitMasksTag = (Element) event.getElementsByTagName(UNIT_MASKS).item(0);
-
- if (unitMasksTag == null) {
- return true;
- }
-
- NodeList unitMasksList = unitMasksTag.getElementsByTagName(UNIT_MASK);
-
- // type:exclusive unit mask support
- for (int i = 0; i < unitMasksList.getLength(); i++) {
- Element unitMaskElem = (Element) unitMasksList.item(i);
- String val = unitMaskElem.getAttribute(MASK);
- if (val.equals(unitMask)) {
- return true;
- }
- bitMaskSet.add(Integer.parseInt(val));
- }
-
- // type:bitmask unit mask support
- String unitMaskType = EventIdCache.getInstance().getUnitMaskType(eventName);
- if ("bitmask".equals(unitMaskType)) { //$NON-NLS-1$
- int tmpVal = Integer.parseInt(unitMask);
- int count = 0;
- while (tmpVal != 0) {
- if (tmpVal % 2 != 0 && !bitMaskSet.contains((int) Math.pow(2, count))) {
- return false;
- }
- tmpVal = tmpVal / 2;
- count++;
- }
- return true;
- }
-
- return false;
- }
-
- private void createXML() {
- Element resultRoot = resultDoc.createElement(CHECK_EVENTS);
- Element resultTag = resultDoc.createElement(RESULT);
- resultTag.setTextContent(returnCode);
- resultRoot.appendChild(resultTag);
- resultDoc.appendChild(resultRoot);
- }
-
- @Override
- public Document getDocument() {
- return resultDoc;
- }
-
-}
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/internal/oprofile/core/opxml/checkevent/CheckEventsProcessor.java b/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/internal/oprofile/core/opxml/checkevent/CheckEventsProcessor.java
deleted file mode 100644
index 32246d5f40d025179ab294ac29cdd87b86136575..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/internal/oprofile/core/opxml/checkevent/CheckEventsProcessor.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2018 Red Hat, Inc.
- *
- * This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License 2.0
- * which is available at https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- * Keith Seitz <keiths@redhat.com> - initial API and implementation
- * Kent Sebastian <ksebasti@redhat.com>
- *******************************************************************************/
-package org.eclipse.linuxtools.internal.oprofile.core.opxml.checkevent;
-
-import org.eclipse.linuxtools.internal.oprofile.core.opxml.XMLProcessor;
-
-/**
- * XML handler class for opxml's "check-events".
- *
- * @see org.eclipse.linuxtools.internal.oprofile.core.opxml.OpxmlRunner
- */
-public class CheckEventsProcessor extends XMLProcessor {
- public static final int INVALID_UNKNOWN = 0; // unexpected error
- public static final int EVENT_OK = 1; // valid
- public static final int INVALID_UMASK = 3; // invalid unit mask value
- public static final int INVALID_COUNTER = 4; // invalid event for given counter number
-
- private static final String RESULT_TAG = "result"; //$NON-NLS-1$
- private static final String CHECK_EVENTS_TAG = "check-events"; //$NON-NLS-1$
-
- private static final String EVENT_OK_STR = "ok"; //$NON-NLS-1$
- private static final String INVALID_UMASK_STR = "invalid-um"; //$NON-NLS-1$
- private static final String INVALID_COUNTER_STR = "invalid-counter"; //$NON-NLS-1$
-
- private int result;
-
- @Override
- public void reset(Object callData) {
- result = INVALID_UNKNOWN;
- }
-
- @Override
- public void endElement(String name, Object callData) {
- if (name.equals(RESULT_TAG)) {
- if (characters.equals(EVENT_OK_STR)) {
- result = EVENT_OK;
- } else if (characters.equals(INVALID_UMASK_STR)) {
- result = INVALID_UMASK;
- } else if (characters.equals(INVALID_COUNTER_STR)) {
- result = INVALID_COUNTER;
- }
- } else if (name.equals(CHECK_EVENTS_TAG)) {
- int[] r = (int[]) callData;
- r[0] = result;
- }
- }
-}
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/internal/oprofile/core/opxml/info/DefaultsProcessor.java b/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/internal/oprofile/core/opxml/info/DefaultsProcessor.java
deleted file mode 100644
index 98e8674fc723f524d5372d72a9786835c0c43184..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/internal/oprofile/core/opxml/info/DefaultsProcessor.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2018 Red Hat, Inc.
- *
- * This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License 2.0
- * which is available at https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- * Keith Seitz <keiths@redhat.com> - initial API and implementation
- *******************************************************************************/
-package org.eclipse.linuxtools.internal.oprofile.core.opxml.info;
-
-import java.util.HashMap;
-
-import org.eclipse.linuxtools.internal.oprofile.core.daemon.OpInfo;
-import org.eclipse.linuxtools.internal.oprofile.core.opxml.OprofileSAXHandler;
-import org.eclipse.linuxtools.internal.oprofile.core.opxml.XMLProcessor;
-
-/**
- * XML handler class for opxml's "defaults".
- *
- * @see org.eclipse.linuxtools.internal.oprofile.core.opxml.OpxmlRunner
- */
-public class DefaultsProcessor extends XMLProcessor {
- // XML tags reconize by this processor (public)
- public static final String SAMPLE_DIR = "sample-dir"; //$NON-NLS-1$
- public static final String LOCK_FILE = "lock-file"; //$NON-NLS-1$
- public static final String LOG_FILE = "log-file"; //$NON-NLS-1$
- public static final String DUMP_STATUS = "dump-status"; //$NON-NLS-1$
- protected HashMap<String, String> map = new HashMap<>();
-
- @Override
- public void reset(Object callData) {
- map.clear();
- }
-
- @Override
- public void endElement(String name, Object callData) {
- if (name.equals(OpInfoProcessor.DEFAULTS_TAG)) {
- OpInfo info = (OpInfo) callData;
- info.setDefaults(map);
- OprofileSAXHandler.getInstance(callData).pop(name);
- } else {
- map.put(name, characters);
- }
- }
-}
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/internal/oprofile/core/opxml/info/EventListProcessor.java b/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/internal/oprofile/core/opxml/info/EventListProcessor.java
deleted file mode 100644
index 2975be8bf9cd9749e38cbb65c08368360d157144..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/internal/oprofile/core/opxml/info/EventListProcessor.java
+++ /dev/null
@@ -1,230 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2018 Red Hat, Inc.
- *
- * This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License 2.0
- * which is available at https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- * Keith Seitz <keiths@redhat.com> - initial API and implementation
- * Kent Sebastian <ksebasti@redhat.com>
- *******************************************************************************/
-package org.eclipse.linuxtools.internal.oprofile.core.opxml.info;
-
-import java.util.ArrayList;
-
-import org.eclipse.linuxtools.internal.oprofile.core.daemon.OpEvent;
-import org.eclipse.linuxtools.internal.oprofile.core.daemon.OpUnitMask;
-import org.eclipse.linuxtools.internal.oprofile.core.opxml.OprofileSAXHandler;
-import org.eclipse.linuxtools.internal.oprofile.core.opxml.XMLProcessor;
-import org.xml.sax.Attributes;
-
-/**
- * XML handler class for opxml's "event-list".
- *
- * @see org.eclipse.linuxtools.internal.oprofile.core.opxml.OpxmlRunner
- */
-public class EventListProcessor extends XMLProcessor {
- // The current event being constructed
- private OpEvent currentEvent;
- private int counter;
- private ArrayList<OpEvent> currentEventList;
-
- // An XML processor for reading the unit mask information for an event
- private UnitMaskProcessor umProcessor;
-
- // XML elements recognized by this processor
- private static final String EVENT_TAG = "event"; //$NON-NLS-1$
- private static final String UNIT_MASK_TAG = "unit-mask"; //$NON-NLS-1$
- private static final String NAME_TAG = "name"; //$NON-NLS-1$
- private static final String VALUE_TAG = "value"; //$NON-NLS-1$
- private static final String DESCRIPTION_TAG = "description"; //$NON-NLS-1$
- private static final String MASK_TAG = "mask"; //$NON-NLS-1$
- private static final String MINIMUM_COUNT_TAG = "minimum"; //$NON-NLS-1$
- private static final String ATTR_EVENT_LIST_COUNTER = "counter"; //$NON-NLS-1$
-
- // This is a special processor which is used to deal with a single mask value
- private static class MaskProcessor extends XMLProcessor {
- private OpUnitMask.MaskInfo info;
-
- @Override
- public void reset(Object callData) {
- info = new OpUnitMask.MaskInfo();
- }
-
- @Override
- public void endElement(String name, Object callData) {
- if (name.equals(VALUE_TAG)) {
- // Set mask's value
- info.value = Integer.parseInt(characters);
- } else if (name.equals(DESCRIPTION_TAG)) {
- info.description = characters;
- } else if (name.equals(NAME_TAG)) {
- info.name = characters;
- } else if (name.equals(MASK_TAG)) {
- // Pop and pass mask tag to previous processor (UnitMaskProcessor)
- OprofileSAXHandler.getInstance(callData).pop(MASK_TAG);
- }
- }
-
- /**
- * Returns the information that has been collected about a mask.
- *
- * @return the mask information
- */
- public OpUnitMask.MaskInfo getResult() {
- return info;
- }
- }
-
- // This is a special processor to handle unit mask information
- private class UnitMaskProcessor extends XMLProcessor {
- // An ArrayList to hold all the valid masks for a unit mask.
- private ArrayList<OpUnitMask.MaskInfo> masks;
-
- // The unit mask being constructed
- private OpUnitMask unitMask;
-
- // An XML processor for each individual mask value.
- private MaskProcessor maskProcessor;
-
- // XML elements recognized by this processor
- private static final String MASK_TYPE_TAG = "type"; //$NON-NLS-1$
- private static final String MASK_DEFAULT_TAG = "default"; //$NON-NLS-1$
- private static final String MASK_TYPE_BITMASK = "bitmask"; //$NON-NLS-1$
- private static final String MASK_TYPE_MANDATORY = "mandatory"; //$NON-NLS-1$
- private static final String MASK_TYPE_EXCLUSIVE = "exclusive"; //$NON-NLS-1$
-
- /**
- * Constructor for UnitMaskProcessor. Initializes internal state.
- */
- public UnitMaskProcessor() {
- super();
- maskProcessor = new MaskProcessor();
- masks = new ArrayList<>();
- }
-
- @Override
- public void reset(Object callData) {
- unitMask = new OpUnitMask();
- masks.clear();
- }
-
- @Override
- public void startElement(String name, Attributes attrs, Object callData) {
- if (name.equals(MASK_TAG)) {
- // Tell SAX handler to use the mask processor
- OprofileSAXHandler.getInstance(callData).push(maskProcessor);
- } else {
- super.startElement(name, attrs, callData);
- }
- }
-
- @Override
- public void endElement(String name, Object callData) {
- if (name.equals(MASK_TYPE_TAG)) {
- // Set the mask type
- unitMask.setType(getTypeFromString(characters));
- } else if (name.equals(MASK_DEFAULT_TAG)) {
- // Set the default mask
- unitMask.setDefault(Integer.parseInt(characters));
- } else if (name.equals(MASK_TAG)) {
- // Add this mask description to the list of all masks
- masks.add(maskProcessor.getResult());
- } else if (name.equals(UNIT_MASK_TAG)) {
- // All done. Add the known masks to the unit mask
- OpUnitMask.MaskInfo[] descs = new OpUnitMask.MaskInfo[masks.size()];
- masks.toArray(descs);
- unitMask.setMaskDescriptions(descs);
-
- // Pop this processor and pass _UNIT_MASK_TAG to previoius processor
- OprofileSAXHandler.getInstance(callData).pop(UNIT_MASK_TAG);
- }
- }
-
- /**
- * Returns the constructed unit mask.
- *
- * @return the unit mask
- */
- public OpUnitMask getResult() {
- return unitMask;
- }
-
- // Converts a string representing a mask type into an integer
- private int getTypeFromString(String string) {
- if (string.equals(MASK_TYPE_MANDATORY)) {
- return OpUnitMask.MANDATORY;
- } else if (string.equals(MASK_TYPE_BITMASK)) {
- return OpUnitMask.BITMASK;
- } else if (string.equals(MASK_TYPE_EXCLUSIVE)) {
- return OpUnitMask.EXCLUSIVE;
- }
-
- return -1;
- }
- }
-
- /**
- * Constructor for EventListProcessor. Initializes internal state.
- */
- public EventListProcessor() {
- super();
- umProcessor = new UnitMaskProcessor();
- }
-
- @Override
- public void reset(Object callData) {
- currentEventList = new ArrayList<>();
- }
-
- @Override
- public void startElement(String name, Attributes attrs, Object callData) {
- if (name.equals(EVENT_TAG)) {
- // new event
- currentEvent = new OpEvent();
- } else if (name.equals(UNIT_MASK_TAG)) {
- // Tell the SAX handler to use the unit mask processor
- OprofileSAXHandler.getInstance(callData).push(umProcessor);
- } else if (name.equals(OpInfoProcessor.EVENT_LIST_TAG)) {
- // Our start tag: grab the counter number from the attributes
- counter = Integer.parseInt(attrs.getValue(ATTR_EVENT_LIST_COUNTER));
- } else {
- super.startElement(name, attrs, callData);
- }
- }
-
- @Override
- public void endElement(String name, Object callData) {
- if (name.equals(EVENT_TAG)) {
- // Finished constructing an event. Add it to the list.
- currentEventList.add(currentEvent);
- } else if (name.equals(UNIT_MASK_TAG)) {
- // Set the event's unit mask
- currentEvent.setUnitMask(umProcessor.getResult());
- } else if (name.equals(NAME_TAG)) {
- // Set event's name
- currentEvent.setText(characters);
- } else if (name.equals(DESCRIPTION_TAG)) {
- // Set event's description
- currentEvent.setTextDescription(characters);
- } else if (name.equals(MINIMUM_COUNT_TAG)) {
- // Set event's minimum count
- currentEvent.setMinCount(Integer.parseInt(characters));
- } else if (name.equals(OpInfoProcessor.EVENT_LIST_TAG)) {
- OprofileSAXHandler.getInstance(callData).pop(name);
- }
- }
-
- public int getCounterNum() {
- return counter;
- }
-
- public OpEvent[] getEvents() {
- OpEvent[] events = new OpEvent[currentEventList.size()];
- currentEventList.toArray(events);
- return events;
- }
-}
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/internal/oprofile/core/opxml/info/InfoAdapter.java b/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/internal/oprofile/core/opxml/info/InfoAdapter.java
deleted file mode 100644
index 2757e12be09707b932067c0e6dc2ad5df4ee9f45..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/internal/oprofile/core/opxml/info/InfoAdapter.java
+++ /dev/null
@@ -1,470 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010, 2018 Red Hat, Inc.
- *
- * This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License 2.0
- * which is available at https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- * Red Hat - initial API and implementation
- *******************************************************************************/
-package org.eclipse.linuxtools.internal.oprofile.core.opxml.info;
-
-import java.io.BufferedReader;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-
-import org.eclipse.core.filesystem.EFS;
-import org.eclipse.core.filesystem.IFileStore;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.linuxtools.internal.oprofile.core.Oprofile;
-import org.eclipse.linuxtools.internal.oprofile.core.Oprofile.OprofileProject;
-import org.eclipse.linuxtools.internal.oprofile.core.OprofileCorePlugin;
-import org.eclipse.linuxtools.internal.oprofile.core.opxml.AbstractDataAdapter;
-import org.eclipse.linuxtools.internal.oprofile.core.opxml.EventIdCache;
-import org.eclipse.linuxtools.profiling.launch.IRemoteFileProxy;
-import org.eclipse.linuxtools.profiling.launch.RemoteProxyManager;
-import org.eclipse.linuxtools.tools.launch.core.factory.RuntimeProcessFactory;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NodeList;
-import org.xml.sax.SAXException;
-
-/**
- * This class takes the XML that is output from 'ophelp -X' for and uses that
- * data to modify it into the format expected by the SAX parser.
- */
-public class InfoAdapter extends AbstractDataAdapter {
-
- public static final String HELP_EVENTS = "help_events"; //$NON-NLS-1$
- public static final String INFO = "info"; //$NON-NLS-1$
-
- public static final String DEFAULTS = "defaults"; //$NON-NLS-1$
- public static final String NUM_COUNTERS = "num-counters"; //$NON-NLS-1$
- public static final String CPU_FREQUENCY = "cpu-frequency"; //$NON-NLS-1$
- public static final String TIMER_MODE = "timer-mode"; //$NON-NLS-1$
- public static final String TIMER = "timer"; //$NON-NLS-1$
-
- public static final String EVENT_LIST = "event-list"; //$NON-NLS-1$
- public static final String COUNTER = "counter"; //$NON-NLS-1$
-
- public static final String EVENT = "event"; //$NON-NLS-1$
- public static final String EVENT_NAME = "event_name"; //$NON-NLS-1$
- public static final String NAME = "name"; //$NON-NLS-1$
- public static final String DESC = "desc"; //$NON-NLS-1$
- public static final String DESCRIPTION = "description"; //$NON-NLS-1$
- public static final String MIN_COUNT = "min_count"; //$NON-NLS-1$
- public static final String MINIMUM = "minimum"; //$NON-NLS-1$
- public static final String VALUE = "value"; //$NON-NLS-1$
-
- public static final String UNIT_MASKS = "unit_masks"; //$NON-NLS-1$
- public static final String UNITMASK = "unit-mask"; //$NON-NLS-1$
- public static final String DEFAULT = "default"; //$NON-NLS-1$
- public static final String TYPE = "type"; //$NON-NLS-1$
-
- public static final String UNIT_MASK = "unit_mask"; //$NON-NLS-1$
- public static final String MASK = "mask"; //$NON-NLS-1$
-
- public static final String SAMPLE_DIR = "sample-dir"; //$NON-NLS-1$
- public static final String LOCK_FILE = "lock-file"; //$NON-NLS-1$
- public static final String LOG_FILE = "log-file"; //$NON-NLS-1$
- public static final String DUMP_STATUS = "dump-status"; //$NON-NLS-1$
-
- public static final String CPUINFO = "/proc/cpuinfo"; //$NON-NLS-1$
- public static String DEV_OPROFILE = "/dev/oprofile/"; //$NON-NLS-1$
- public static String CPUTYPE = DEV_OPROFILE + "cpu_type"; //$NON-NLS-1$
- public static final String OP_SHARE = "/usr/share/oprofile/"; //$NON-NLS-1$
- public static final String EVENTS = "events"; //$NON-NLS-1$
-
- public static final String SAMPLE_DIR_VAL = "/var/lib/oprofile/samples/"; //$NON-NLS-1$
- public static final String LOCK_FILE_VAL = "/var/lib/oprofile/lock"; //$NON-NLS-1$
- public static final String LOG_FILE_VAL = "/var/lib/oprofile/samples/oprofiled.log"; //$NON-NLS-1$
- public static final String DUMP_STATUS_VAL = "/var/lib/oprofile/complete_dump"; //$NON-NLS-1$
-
- private Document newDoc; // the document we intend to build
- private Element oldRoot; // the root of the document with data from ophelp
- private Element newRoot; // the root of the document we intent to build
- private static IRemoteFileProxy proxy;
-
- private static boolean hasTimerSupport;
-
- public InfoAdapter() {
- try {
- if (hasTimerSupport()) {
- // In timer mode, we have no relevant XML generated by ophelp
- createDOM(null);
- } else {
- Process p = RuntimeProcessFactory.getFactory().exec("ophelp -X", Oprofile.OprofileProject.getProject()); //$NON-NLS-1$
- if (p != null) {
- InputStream is = p.getInputStream();
- createDOM(is);
- } else {
- createDOM(null);
- }
- }
- } catch (IOException e) {
- createDOM(null);
- }
- }
-
- /**
- * @since 1.1
- */
- public InfoAdapter(IFileStore resourceFile) {
- InputStream inputStream = null;
- try {
- inputStream = resourceFile.openInputStream(EFS.NONE, new NullProgressMonitor());
- createDOM(inputStream);
- setEventIdCacheDoc(oldRoot);
- } catch (CoreException e) {
- e.printStackTrace();
- }
- }
-
- /**
- * Set up the DOM for later manipulation
- *
- * @param is the InpuStream resulting from running the ophelp command. This will
- * be passed in as null for timer mode.
- */
- private void createDOM(InputStream is) {
- DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
- DocumentBuilder builder;
- try {
- builder = factory.newDocumentBuilder();
- if (is != null) {
- try {
- Document oldDoc = builder.parse(is);
- Element elem = (Element) oldDoc.getElementsByTagName(HELP_EVENTS).item(0);
- oldRoot = elem;
- } catch (SAXException | IOException e) {
- e.printStackTrace();
- CoreException opcontrolException = new CoreException(
- OprofileCorePlugin.createErrorStatus("ophelpRun", null)); //$NON-NLS-1$
- OprofileCorePlugin.showErrorDialog("opxmlSAXParseException", opcontrolException); //$NON-NLS-1$
- }
- } else {
- CoreException opcontrolException = new CoreException(
- OprofileCorePlugin.createErrorStatus("ophelpRun", null)); //$NON-NLS-1$
- OprofileCorePlugin.showErrorDialog("ophelpInputStream", opcontrolException); //$NON-NLS-1$
- }
-
- newDoc = builder.newDocument();
- try {
- newRoot = newDoc.createElement(INFO);
- newDoc.appendChild(newRoot);
- } catch (Exception e) {
- e.printStackTrace();
- }
- } catch (ParserConfigurationException e1) {
- e1.printStackTrace();
- }
- }
-
- @Override
- public void process() {
- if (getNrCounters() == -1) {
- Element numCountersTag = newDoc.createElement(NUM_COUNTERS);
- numCountersTag.setTextContent("error"); //$NON-NLS-1$
- newRoot.appendChild(numCountersTag);
- return;
- }
- createHeaders();
- if (!hasTimerSupport() && oldRoot != null) {
- createXML();
- }
- }
-
- private void createHeaders() {
- // number of counters
- String numCounters = String.valueOf(getNrCounters());
- Element numCountersTag = newDoc.createElement(NUM_COUNTERS);
- numCountersTag.setTextContent(String.valueOf(numCounters));
- newRoot.appendChild(numCountersTag);
-
- // cpu frequency
- int cpuFreq = getCPUFrequency();
- Element cpuFreqTag = newDoc.createElement(CPU_FREQUENCY);
- cpuFreqTag.setTextContent(String.valueOf(cpuFreq));
- newRoot.appendChild(cpuFreqTag);
-
- // file defaults
- Element defaultsTag = newDoc.createElement(DEFAULTS);
-
- Element sampleDirTag = newDoc.createElement(SAMPLE_DIR);
- sampleDirTag.setTextContent(SAMPLE_DIR_VAL);
- defaultsTag.appendChild(sampleDirTag);
-
- Element lockFileTag = newDoc.createElement(LOCK_FILE);
- lockFileTag.setTextContent(LOCK_FILE_VAL);
- defaultsTag.appendChild(lockFileTag);
-
- Element logFileTag = newDoc.createElement(LOG_FILE);
- logFileTag.setTextContent(LOG_FILE_VAL);
- defaultsTag.appendChild(logFileTag);
-
- Element dumpStatusTag = newDoc.createElement(DUMP_STATUS);
- dumpStatusTag.setTextContent(DUMP_STATUS_VAL);
- defaultsTag.appendChild(dumpStatusTag);
-
- newRoot.appendChild(defaultsTag);
-
- // timer mode
- Element timerModeTag = newDoc.createElement(TIMER_MODE);
- timerModeTag.setTextContent(String.valueOf(hasTimerSupport()));
- newRoot.appendChild(timerModeTag);
- }
-
- /**
- * @since 3.0
- */
- public static void setOprofileDir(String dir) {
- DEV_OPROFILE = dir;
- CPUTYPE = DEV_OPROFILE + "cpu_type"; //$NON-NLS-1$
- }
-
- /**
- * Determine whether the cpu supports timer mode
- *
- * @return true if it is true, and false otherwise
- */
- public static boolean hasTimerSupport() {
- return hasTimerSupport;
- }
-
- /**
- * Set whether the cpu supports timer mode
- */
- public static void checkTimerSupport() {
-
- try {
- proxy = RemoteProxyManager.getInstance().getFileProxy(Oprofile.OprofileProject.getProject());
- IFileStore fileStore = proxy.getResource(CPUTYPE);
- if (fileStore.fetchInfo().exists()) {
- try (InputStream is = fileStore.openInputStream(EFS.NONE, new NullProgressMonitor());
- BufferedReader bi = new BufferedReader(new InputStreamReader(is))) {
- String cpuType = bi.readLine();
- if (cpuType.equals(TIMER)) {
- hasTimerSupport = true;
- } else {
- hasTimerSupport = false;
- }
- }
- }
- } catch (FileNotFoundException e) {
- hasTimerSupport = true;
- } catch (IOException e) {
- hasTimerSupport = true;
- e.printStackTrace();
- } catch (CoreException e) {
- e.printStackTrace();
- }
- }
-
- /**
- * Get the system's cpu frequency
- *
- * @return the system's cpu frequency
- */
- private int getCPUFrequency() {
- int val = 0;
- try {
- proxy = RemoteProxyManager.getInstance().getFileProxy(Oprofile.OprofileProject.getProject());
- IFileStore fileStore = proxy.getResource(CPUINFO);
- if (fileStore.fetchInfo().exists()) {
- InputStream is = fileStore.openInputStream(EFS.NONE, new NullProgressMonitor());
- try (BufferedReader bi = new BufferedReader(new InputStreamReader(is))) {
- String line;
- while ((line = bi.readLine()) != null) {
- int index = line.indexOf(':');
- if (index != -1) {
- String substr;
-
- // x86/ia64/x86_64
- if (line.startsWith("cpu MHz")) { //$NON-NLS-1$
- substr = line.substring(index + 1).trim();
- return (int) Double.parseDouble(substr);
- // ppc/pc64
- } else if (line.startsWith("clock")) { //$NON-NLS-1$
- int MHzLoc = line.indexOf("MHz"); //$NON-NLS-1$
- substr = line.substring(index + 1, MHzLoc);
- return (int) Double.parseDouble(substr);
- // alpha
- } else if (line.startsWith("cycle frequency [Hz]")) { //$NON-NLS-1$
- substr = line.substring(index + 1).trim();
- return (int) (Double.parseDouble(substr) / 1E6);
- // sparc64
- } else if (line.startsWith("Cpu0ClkTck")) { //$NON-NLS-1$
- substr = line.substring(index + 1).trim();
- return (int) (Double.parseDouble(substr) / 1E6);
- }
- }
- }
- } catch (IOException | NumberFormatException e) {
- e.printStackTrace();
- }
- }
- } catch (CoreException e) {
- e.printStackTrace();
- }
-
- return val;
- }
-
- /**
- * Get the number of counters for the system
- *
- * @return the number of counters for the system
- */
- private int getNrCounters() {
- /*
- * TODO: Originally the number of counters for a given arch were hard-coded in a
- * list. This method may not be entirely correct, although much simpler.
- */
-
- /*
- * Returning 1 for operf since it multiplexes the events through the counters
- * and it is not possible to read data from opcontrol /dev dir if the opcontrol
- * module was not initialized. TODO: Make possible to select more than one event
- * in a tab.
- */
- if ((OprofileProject.getProfilingBinary().equals(OprofileProject.OPERF_BINARY))
- || (OprofileProject.getProfilingBinary().equals(OprofileProject.OCOUNT_BINARY))) {
- return 1;
- }
- try {
- proxy = RemoteProxyManager.getInstance().getFileProxy(Oprofile.OprofileProject.getProject());
- } catch (CoreException e) {
- e.printStackTrace();
- }
- final int MAXCPUS = Integer.MAX_VALUE;
- for (int i = 0; i < MAXCPUS; i++) {
- IFileStore fileStore = proxy.getResource(DEV_OPROFILE + i);
- if (!fileStore.fetchInfo().exists()) {
- return i;
- }
- }
- return -1;
- }
-
- private void createXML() {
-
- NodeList eventList = oldRoot.getElementsByTagName(EVENT);
- Element newEventList = newDoc.createElement(EVENT_LIST);
-
- for (int i = 0; i < eventList.getLength(); i++) {
- // get the event data
- Element event = (Element) eventList.item(i);
- String name = event.getAttribute(EVENT_NAME);
- String desc = event.getAttribute(DESC);
- String min_count = event.getAttribute(MIN_COUNT);
-
- // create the data for the new event
- Element newEventTag = newDoc.createElement(EVENT);
- Element nameTag = newDoc.createElement(NAME);
- nameTag.setTextContent(name);
- Element descTag = newDoc.createElement(DESCRIPTION);
- descTag.setTextContent(desc);
- Element minimumTag = newDoc.createElement(MINIMUM);
- minimumTag.setTextContent(min_count);
-
- newEventTag.appendChild(nameTag);
- newEventTag.appendChild(descTag);
- newEventTag.appendChild(minimumTag);
-
- Element unitMaskTag = (Element) event.getElementsByTagName(UNIT_MASKS).item(0);
-
- // check if there are any unit masks for this event
- if (unitMaskTag != null) {
- String defaultVal = unitMaskTag.getAttribute(DEFAULT);
-
- // Get the unit mask type (compatible with 1.0 and 1.1 ophelp
- // xml schemas)
- String type = EventIdCache.getInstance().getUnitMaskType(name);
-
- Element newUnitMaskTag = newDoc.createElement(UNITMASK);
- Element typeTag = newDoc.createElement(TYPE);
- typeTag.setTextContent(type);
- Element defaultValTag = newDoc.createElement(DEFAULT);
- defaultValTag.setTextContent(defaultVal);
-
- newUnitMaskTag.appendChild(typeTag);
- newUnitMaskTag.appendChild(defaultValTag);
- newEventTag.appendChild(newUnitMaskTag);
-
- NodeList unitMaskList = unitMaskTag.getElementsByTagName(UNIT_MASK);
- for (int j = 0; j < unitMaskList.getLength(); j++) {
- Element unitMask = (Element) unitMaskList.item(j);
- String maskVal = unitMask.getAttribute(MASK);
- String maskDesc = unitMask.getAttribute(DESC);
- String maskName = unitMask.getAttribute(NAME);
-
- Element newMask = newDoc.createElement(MASK);
- Element newVal = newDoc.createElement(VALUE);
- newVal.setTextContent(maskVal);
- Element newDesc = newDoc.createElement(DESCRIPTION);
- newDesc.setTextContent(maskDesc);
- Element newName = newDoc.createElement(NAME);
- newName.setTextContent(maskName);
-
- newMask.appendChild(newVal);
- newMask.appendChild(newDesc);
- newUnitMaskTag.appendChild(newMask);
- }
- // not unit mask for this event
- } else {
- String defaultVal = "0"; //$NON-NLS-1$
- String type = "mandatory"; //$NON-NLS-1$
-
- Element newUnitMaskTag = newDoc.createElement(UNITMASK);
- Element typeTag = newDoc.createElement(TYPE);
- typeTag.setTextContent(type);
- Element defaultValTag = newDoc.createElement(DEFAULT);
- defaultValTag.setTextContent(defaultVal);
-
- newUnitMaskTag.appendChild(typeTag);
- newUnitMaskTag.appendChild(defaultValTag);
- newEventTag.appendChild(newUnitMaskTag);
-
- Element newMask = newDoc.createElement(MASK);
- Element newVal = newDoc.createElement(VALUE);
- newVal.setTextContent("0"); //$NON-NLS-1$
- Element newDesc = newDoc.createElement(DESCRIPTION);
- newDesc.setTextContent("No unit mask"); //$NON-NLS-1$
-
- newMask.appendChild(newVal);
- newMask.appendChild(newDesc);
- newUnitMaskTag.appendChild(newMask);
- }
-
- newEventList.appendChild(newEventTag);
- }
-
- for (int i = 0; i < getNrCounters(); i++) {
- Element eventListTag = (Element) newEventList.cloneNode(true);
- eventListTag.setAttribute(COUNTER, String.valueOf(i));
- newRoot.appendChild(eventListTag);
- }
- }
-
- @Override
- public Document getDocument() {
- return newDoc;
- }
-
- /**
- * @since 3.0
- */
- private void setEventIdCacheDoc(Element elem) {
- EventIdCache.getInstance().setCacheDoc(elem);
- }
-}
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/internal/oprofile/core/opxml/info/OpInfoProcessor.java b/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/internal/oprofile/core/opxml/info/OpInfoProcessor.java
deleted file mode 100644
index e70ca68fb48a18ac9da236b10128eb71b0607b75..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/internal/oprofile/core/opxml/info/OpInfoProcessor.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2018 Red Hat, Inc.
- *
- * This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License 2.0
- * which is available at https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- * Keith Seitz <keiths@redhat.com> - initial API and implementation
- * Kent Sebastian <ksebasti@redhat.com>
- *******************************************************************************/
-package org.eclipse.linuxtools.internal.oprofile.core.opxml.info;
-
-import org.eclipse.linuxtools.internal.oprofile.core.daemon.OpInfo;
-import org.eclipse.linuxtools.internal.oprofile.core.opxml.OprofileSAXHandler;
-import org.eclipse.linuxtools.internal.oprofile.core.opxml.XMLProcessor;
-import org.xml.sax.Attributes;
-
-/**
- * Opxml processor for the "info" command.
- *
- * @see org.eclipse.linuxtools.internal.oprofile.core.opxml.OpxmlRunner
- */
-public class OpInfoProcessor extends XMLProcessor {
- // Other XMLProcessors used by this processor
- private DefaultsProcessor defaultsProc;
- private EventListProcessor eventListProc;
-
- // XML tags processed by this processor
- public static final String NUM_COUNTERS_TAG = "num-counters"; //$NON-NLS-1$
- public static final String DEFAULTS_TAG = "defaults"; //$NON-NLS-1$
- public static final String EVENT_LIST_TAG = "event-list"; //$NON-NLS-1$
- public static final String CPU_FREQUENCY_TAG = "cpu-frequency"; //$NON-NLS-1$
- public static final String TIMER_MODE = "timer-mode"; //$NON-NLS-1$
-
- public OpInfoProcessor() {
- defaultsProc = new DefaultsProcessor();
- eventListProc = new EventListProcessor();
- }
-
- @Override
- public void startElement(String name, Attributes attrs, Object callData) {
- if (name.equals(DEFAULTS_TAG)) {
- OprofileSAXHandler.getInstance(callData).push(defaultsProc);
- } else if (name.equals(EVENT_LIST_TAG)) {
- OprofileSAXHandler.getInstance(callData).push(eventListProc);
- eventListProc.startElement(name, attrs, callData);
- } else {
- super.startElement(name, attrs, callData);
- }
- }
-
- @Override
- public void endElement(String name, Object callData) {
- if (name.equals(CPU_FREQUENCY_TAG)) {
- double speed = Double.parseDouble(characters);
- OpInfo info = (OpInfo) callData;
- info.setCPUSpeed(speed);
- } else if (name.equals(TIMER_MODE)) {
- boolean timerMode = Boolean.parseBoolean(characters);
- OpInfo info = (OpInfo) callData;
- info.setTimerMode(timerMode);
- } else if (name.equals(NUM_COUNTERS_TAG)) {
- int numCounters = 0;
- try {
- numCounters = Integer.parseInt(characters);
- } catch (NumberFormatException nfe) {
- }
- OpInfo info = (OpInfo) callData;
- info.setNrCounters(numCounters);
- } else if (name.equals(EVENT_LIST_TAG)) {
- OpInfo info = (OpInfo) callData;
- info.setEvents(eventListProc.getCounterNum(), eventListProc.getEvents());
- }
- }
-}
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/internal/oprofile/core/opxml/modeldata/DependentProcessor.java b/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/internal/oprofile/core/opxml/modeldata/DependentProcessor.java
deleted file mode 100644
index 32f4ddfe4f626a92bcb0f4e809282df7cbb4cbaf..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/internal/oprofile/core/opxml/modeldata/DependentProcessor.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2018 Red Hat, Inc.
- *
- * This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License 2.0
- * which is available at https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- * Kent Sebastian <ksebasti@redhat.com> - initial API and implementation
- *******************************************************************************/
-package org.eclipse.linuxtools.internal.oprofile.core.opxml.modeldata;
-
-import java.util.ArrayList;
-
-import org.eclipse.linuxtools.internal.oprofile.core.model.OpModelImage;
-import org.eclipse.linuxtools.internal.oprofile.core.opxml.OprofileSAXHandler;
-import org.eclipse.linuxtools.internal.oprofile.core.opxml.XMLProcessor;
-import org.xml.sax.Attributes;
-
-/**
- * XML handler class for dependent images (<image> tags under <dependent>)
- */
-public class DependentProcessor extends XMLProcessor {
- // XML tags parsed by this processor
- private static final String IMAGE_TAG = "image"; //$NON-NLS-1$
- private static final String SYMBOLS_TAG = "symbols"; //$NON-NLS-1$
- private static final String DEPENDENT_TAG = "dependent"; //$NON-NLS-1$
-
- // attribute tags
- private static final String ATTR_IMAGENAME = "name"; //$NON-NLS-1$
- private static final String ATTR_COUNT = "count"; //$NON-NLS-1$
-
- /**
- * the current image being constructed
- */
- private OpModelImage image;
- /**
- * a list of all the dependent images
- */
- private ArrayList<OpModelImage> imageList;
- /**
- * processor used for symbols of an image
- */
- private SymbolsProcessor _symbolsProcessor = new SymbolsProcessor();
-
- @Override
- public void reset(Object callData) {
- image = new OpModelImage();
- imageList = new ArrayList<>();
- }
-
- @Override
- public void startElement(String name, Attributes attrs, Object callData) {
- if (name.equals(IMAGE_TAG)) {
- image.setName(validString(attrs.getValue(ATTR_IMAGENAME)));
- image.setCount(Integer.parseInt(attrs.getValue(ATTR_COUNT)));
- } else if (name.equals(SYMBOLS_TAG)) {
- OprofileSAXHandler.getInstance(callData).push(_symbolsProcessor);
- }
- }
-
- @Override
- public void endElement(String name, Object callData) {
- if (name.equals(IMAGE_TAG)) {
- imageList.add(image);
- image = new OpModelImage();
- } else if (name.equals(SYMBOLS_TAG)) {
- image.setSymbols(_symbolsProcessor.getSymbols());
- } else if (name.equals(DEPENDENT_TAG)) {
- OprofileSAXHandler.getInstance(callData).pop(DEPENDENT_TAG);
- }
- }
-
- public OpModelImage[] getImages() {
- OpModelImage[] images = new OpModelImage[imageList.size()];
- imageList.toArray(images);
- return images;
- }
-
-}
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/internal/oprofile/core/opxml/modeldata/ModelDataAdapter.java b/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/internal/oprofile/core/opxml/modeldata/ModelDataAdapter.java
deleted file mode 100644
index 9363ec13757efd29bb75378fe38b518f164b5dea..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/internal/oprofile/core/opxml/modeldata/ModelDataAdapter.java
+++ /dev/null
@@ -1,380 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010, 2018 Red Hat, Inc.
- *
- * This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License 2.0
- * which is available at https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- * Red Hat - initial API and implementation
- *******************************************************************************/
-package org.eclipse.linuxtools.internal.oprofile.core.opxml.modeldata;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.TreeSet;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-
-import org.eclipse.linuxtools.internal.oprofile.core.opxml.AbstractDataAdapter;
-import org.eclipse.linuxtools.internal.oprofile.core.opxml.info.InfoAdapter;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NodeList;
-import org.xml.sax.SAXException;
-
-/**
- * This class takes the XML that is output from 'opreport -X --details' for the
- * current session, and uses that data to modify it into the format expected by
- * the SAX parser.
- */
-public class ModelDataAdapter extends AbstractDataAdapter {
-
- public final static String ID = "id"; //$NON-NLS-1$
- public final static String IDREF = "idref"; //$NON-NLS-1$
- public final static String NAME = "name"; //$NON-NLS-1$
- public final static String COUNT = "count"; //$NON-NLS-1$
- public final static String SAMPLE = "sample"; //$NON-NLS-1$
- public final static String LINE = "line"; //$NON-NLS-1$
-
- public final static String SYMBOL_DATA = "symboldata"; //$NON-NLS-1$
- public final static String SYMBOL_DETAILS = "symboldetails"; //$NON-NLS-1$
- public final static String SYMBOL = "symbol"; //$NON-NLS-1$
-
- public final static String FILE = "file"; //$NON-NLS-1$
-
- public final static String SETUP = "setup"; //$NON-NLS-1$
- public final static String EVENT_SETUP = "eventsetup"; //$NON-NLS-1$
- public final static String TIMER_SETUP = "timersetup"; //$NON-NLS-1$
- public final static String SETUP_COUNT = "setupcount"; //$NON-NLS-1$
- public final static String EVENT_NAME = "eventname"; //$NON-NLS-1$
- public final static String RTC_INTERRUPTS = "rtcinterrupts"; //$NON-NLS-1$
-
- public final static String PROFILE = "profile"; //$NON-NLS-1$
- public final static String MODEL_DATA = "model-data"; //$NON-NLS-1$
-
- public final static String MODULE = "module"; //$NON-NLS-1$
- public final static String DEPENDENT = "dependent"; //$NON-NLS-1$
-
- public final static String BINARY = "binary"; //$NON-NLS-1$
- public final static String IMAGE = "image"; //$NON-NLS-1$
-
- public final static String SYMBOLS = "symbols"; //$NON-NLS-1$
- public final static String SYMBOL_TABLE = "symboltable"; //$NON-NLS-1$
- public final static String DETAIL_TABLE = "detailtable"; //$NON-NLS-1$
-
- public final static String DETAIL_DATA = "detaildata"; //$NON-NLS-1$
-
- private boolean isParseable;
- private Document newDoc; // the document we intend to build
- private Element oldRoot; // the root of the document with data from opreport
- private Element newRoot; // the root of the document we intent to build
-
- /**
- * Constructor to the ModelAdapter class
- *
- * @param is The input stream to be parsed
- */
- public ModelDataAdapter(InputStream is) {
- isParseable = true;
- DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
- DocumentBuilder builder;
- try {
- builder = factory.newDocumentBuilder();
- try {
- Document oldDoc = builder.parse(is);
- Element elem = (Element) oldDoc.getElementsByTagName(PROFILE).item(0);
- oldRoot = elem;
-
- newDoc = builder.newDocument();
- newRoot = newDoc.createElement(MODEL_DATA);
- newDoc.appendChild(newRoot);
- } catch (IOException e) {
- isParseable = false;
- } catch (SAXException e) {
- isParseable = false;
- }
- } catch (ParserConfigurationException e1) {
- e1.printStackTrace();
- }
- }
-
- @Override
- public void process() {
- createXML();
- }
-
- private void createXML() {
-
- // get the binary name and the image count
- Element oldImage = (Element) oldRoot.getElementsByTagName(BINARY).item(0);
- Element newImage = newDoc.createElement(IMAGE);
-
- String binName = oldImage.getAttribute(NAME);
- newImage.setAttribute(NAME, binName);
-
- Element countTag = (Element) oldImage.getElementsByTagName(COUNT).item(0);
- String imageCount = countTag.getTextContent().trim();
- newImage.setAttribute(COUNT, imageCount);
-
- // There is no setup count in timer mode
- if (!InfoAdapter.hasTimerSupport()) {
- // get the count that was used to profile
- Element setupTag = (Element) oldRoot.getElementsByTagName(SETUP).item(0);
- Element eventSetupTag = (Element) setupTag.getElementsByTagName(EVENT_SETUP).item(0);
- String setupcount = eventSetupTag.getAttribute(SETUP_COUNT);
- newImage.setAttribute(SETUP_COUNT, setupcount);
- }
-
- // these elements contain the data needed to populate the new symbol table
- Element oldSymbolTableTag = (Element) oldRoot.getElementsByTagName(SYMBOL_TABLE).item(0);
- NodeList oldSymbolDataList = oldSymbolTableTag.getElementsByTagName(SYMBOL_DATA);
-
- Element oldDetailTableTag = (Element) oldRoot.getElementsByTagName(DETAIL_TABLE).item(0);
- NodeList oldDetailTableList = oldDetailTableTag.getElementsByTagName(SYMBOL_DETAILS);
-
- // parse the data into HashMaps for O(1) lookup time, as opposed to O(n).
- HashMap<String, HashMap<String, String>> oldSymbolDataListMap = parseDataList(oldSymbolDataList);
- HashMap<String, NodeList> oldDetailTableListMap = parseDetailTable(oldDetailTableList);
-
- // An ArrayList to hold the binary and other modules
- ArrayList<Element> oldImageList = new ArrayList<>();
- // The first element is the original binary!
- oldImageList.add(oldImage);
-
- NodeList oldModuleList = oldImage.getElementsByTagName(MODULE);
- // Set up the dependent tag for any modules run by this binary
- Element dependentTag = newDoc.createElement(DEPENDENT);
- if (oldModuleList.getLength() > 0) {
- dependentTag.setAttribute(COUNT, "0"); //$NON-NLS-1$
-
- for (int t = 0; t < oldModuleList.getLength(); t++) {
- oldImageList.add((Element) oldModuleList.item(t));
- }
- }
-
- // iterate through all (binary/modules)
- for (Element oldImg : oldImageList) {
- Element newImg;
- if (oldImg.getTagName().equals(BINARY)) {
- newImg = newImage;
- } else {
- newImg = newDoc.createElement(IMAGE);
-
- String imgName = oldImg.getAttribute(NAME);
- newImg.setAttribute(NAME, imgName);
-
- Element modCountTag = (Element) oldImg.getElementsByTagName(COUNT).item(0);
- String imgCount = modCountTag.getTextContent().trim();
- newImg.setAttribute(COUNT, imgCount);
- }
-
- Element newSymbolsTag = newDoc.createElement(SYMBOLS);
-
- // these elements contain the data needed to populate the new symbol table
- NodeList oldSymbolList = oldImg.getElementsByTagName(SYMBOL);
-
- // iterate through all symbols
- for (int i = 0; i < oldSymbolList.getLength(); i++) {
- Element oldSymbol = (Element) oldSymbolList.item(i);
-
- /**
- * The original binary is a parent for all symbols We only want library function
- * calls under their respective modules, and not under the original binary as
- * well.
- */
- if (!oldSymbol.getParentNode().isSameNode(oldImg)) {
- continue;
- }
-
- Element newSymbol = newDoc.createElement(SYMBOL);
- String idref = oldSymbol.getAttribute(IDREF);
- String symbolCount = ((Element) oldSymbol.getElementsByTagName(COUNT).item(0)).getTextContent().trim();
- newSymbol.setAttribute(COUNT, symbolCount);
-
- // get the symboltable entry corresponding to the id of this symbol
- HashMap<String, String> symbolData = oldSymbolDataListMap.get(idref);
- newSymbol.setAttribute(NAME, symbolData.get(NAME));
- newSymbol.setAttribute(FILE, symbolData.get(FILE));
- newSymbol.setAttribute(LINE, symbolData.get(LINE));
-
- // get the symboldetails entry corresponding to the id of this symbol
- NodeList detailDataList = oldDetailTableListMap.get(idref);
-
- // go through the detail data of each symbol's details
- HashMap<String, Element> tmp = new HashMap<>();
- // temporary place to store the elements for sorting
- TreeSet<Element> sorted = new TreeSet<>(SAMPLE_COUNT_ORDER);
- for (int l = 0; l < detailDataList.getLength(); l++) {
-
- Element detailData = (Element) detailDataList.item(l);
- String sampleFile = detailData.getAttribute(FILE);
- String sampleLine = detailData.getAttribute(LINE);
-
- // The sample has a line number but no file
- // This means that the file is the same as the symbol (parent)
- if (sampleFile.equals("") && !sampleLine.isEmpty()) { //$NON-NLS-1$ $NON-NLS-2$
- sampleFile = symbolData.get(FILE);
- } else {
- if (sampleFile.equals("")) { //$NON-NLS-1$
- sampleFile = "??"; //$NON-NLS-1$
- }
- if (sampleLine.equals("")) { //$NON-NLS-1$
- sampleLine = "0"; //$NON-NLS-1$
- }
- }
- Element detailDataCount = (Element) detailData.getElementsByTagName(COUNT).item(0);
- String count = detailDataCount.getTextContent().trim();
-
- // if a sample at this line already exists then increase count for that line.
- if (tmp.containsKey(sampleLine)) {
- Element elem = (Element) tmp.get(sampleLine).getElementsByTagName(COUNT).item(0);
- int val = Integer.parseInt(elem.getTextContent().trim()) + Integer.parseInt(count);
- elem.setTextContent(String.valueOf(val));
- } else {
- Element sampleTag = newDoc.createElement(SAMPLE);
-
- Element fileTag = newDoc.createElement(FILE);
- fileTag.setTextContent(sampleFile);
-
- Element lineTag = newDoc.createElement(LINE);
- lineTag.setTextContent(sampleLine);
-
- Element sampleCountTag = newDoc.createElement(COUNT);
- sampleCountTag.setTextContent(count);
-
- sampleTag.appendChild(fileTag);
- sampleTag.appendChild(lineTag);
- sampleTag.appendChild(sampleCountTag);
-
- tmp.put(sampleLine, sampleTag);
- }
- }
-
- // add the elements to the sorter
- for (Element elem : tmp.values()) {
- sorted.add(elem);
- }
-
- // append the elements in sorted order
- for (Element e : sorted) {
- newSymbol.appendChild(e);
- }
-
- newSymbolsTag.appendChild(newSymbol);
- }
-
- newImg.appendChild(newSymbolsTag);
- // If this is a module, attach it to the dependent tag
- if (oldImg.getTagName().equals(MODULE)) {
- dependentTag.appendChild(newImg);
- int currVal = Integer.parseInt(dependentTag.getAttribute(COUNT));
- int val = Integer.parseInt(newImg.getAttribute(COUNT));
- dependentTag.setAttribute(COUNT, String.valueOf(currVal + val));
- } else {
- newRoot.appendChild(newImg);
- }
- }
-
- if (oldModuleList.getLength() > 0) {
- newImage.appendChild(dependentTag);
- }
-
- }
-
- /**
- *
- * @param oldDetailTableList the list of 'symboldetails' tags within detailtable
- * @return a HashMap where the key is a function id and the value is a NodeList
- * containing a list of the 'detaildata' tags that contain sample
- * information.
- */
- private HashMap<String, NodeList> parseDetailTable(NodeList oldDetailTableList) {
- HashMap<String, NodeList> ret = new HashMap<>();
- for (int i = 0; i < oldDetailTableList.getLength(); i++) {
- Element symbolDetails = (Element) oldDetailTableList.item(i);
- String id = symbolDetails.getAttribute(ID);
- NodeList detailDataList = symbolDetails.getElementsByTagName(DETAIL_DATA);
- ret.put(id, detailDataList);
- }
- return ret;
- }
-
- /**
- *
- * @param oldSymbolDataList the list of 'symboldata' tags within symboltable
- * @return a Hashmap where the key is a function id and the value is a HashMap
- * with various parameters of data
- */
- private HashMap<String, HashMap<String, String>> parseDataList(NodeList oldSymbolDataList) {
- HashMap<String, HashMap<String, String>> ret = new HashMap<>();
- for (int j = 0; j < oldSymbolDataList.getLength(); j++) {
- HashMap<String, String> tmp = new HashMap<>();
- Element symbolData = (Element) oldSymbolDataList.item(j);
- String id = symbolData.getAttribute(ID);
- String name = symbolData.getAttribute(NAME);
- String file = symbolData.getAttribute(FILE);
- if (file.equals("")) { //$NON-NLS-1$
- file = "??"; //$NON-NLS-1$
- }
- String line = symbolData.getAttribute(LINE);
- if (line.equals("")) { //$NON-NLS-1$
- line = "0"; //$NON-NLS-1$
- }
- tmp.put(NAME, name);
- tmp.put(FILE, file);
- tmp.put(LINE, line);
- ret.put(id, tmp);
- }
- return ret;
- }
-
- @Override
- public Document getDocument() {
- return newDoc;
- }
-
- /**
- * Helper class to sort the samples of a given symbol in descending order from
- * largest to smallest
- */
- private static final Comparator<Element> SAMPLE_COUNT_ORDER = new Comparator<Element>() {
- @Override
- public int compare(Element a, Element b) {
- // sort from largest to smallest count in descending order
- // items with the same count are sorted by line number from smallest
- // to largest in descending order
- Element a_countTag = (Element) a.getElementsByTagName(COUNT).item(0);
- Element b_countTag = (Element) b.getElementsByTagName(COUNT).item(0);
- Element a_LineTag = (Element) a.getElementsByTagName(LINE).item(0);
- Element b_LineTag = (Element) b.getElementsByTagName(LINE).item(0);
-
- Integer a_count = Integer.parseInt(a_countTag.getTextContent().trim());
- Integer b_count = Integer.parseInt(b_countTag.getTextContent().trim());
- Integer a_line = Integer.parseInt(a_LineTag.getTextContent().trim());
- Integer b_line = Integer.parseInt(b_LineTag.getTextContent().trim());
-
- if (a_count.compareTo(b_count) == 0) {
- return a_line.compareTo(b_line);
- }
- return -a_count.compareTo(b_count);
- }
- };
-
- /**
- * Returns if parseable
- *
- * @return isParseable boolean variable
- */
- public boolean isParseable() {
- return isParseable;
- }
-
-}
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/internal/oprofile/core/opxml/modeldata/ModelDataProcessor.java b/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/internal/oprofile/core/opxml/modeldata/ModelDataProcessor.java
deleted file mode 100644
index d44a510786470564665378e083d08c3db8fe1f02..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/internal/oprofile/core/opxml/modeldata/ModelDataProcessor.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2018 Red Hat, Inc.
- *
- * This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License 2.0
- * which is available at https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- * Keith Seitz <keiths@redhat.com> - initial API and implementation
- * Kent Sebastian <ksebasti@redhat.com> -
- *******************************************************************************/
-
-package org.eclipse.linuxtools.internal.oprofile.core.opxml.modeldata;
-
-import org.eclipse.linuxtools.internal.oprofile.core.model.OpModelImage;
-import org.eclipse.linuxtools.internal.oprofile.core.opxml.OprofileSAXHandler;
-import org.eclipse.linuxtools.internal.oprofile.core.opxml.XMLProcessor;
-import org.xml.sax.Attributes;
-
-/**
- * A processor for `opxml samples`.
- */
-public class ModelDataProcessor extends XMLProcessor {
- // The resulting image compiled by the processor to be used by the caller.
- public static class CallData {
- public OpModelImage opModelImage;
-
- public CallData(OpModelImage im) {
- opModelImage = im;
- }
- }
-
- // XML tags parsed by this processor
- private static final String IMAGE_TAG = "image"; //$NON-NLS-1$
- private static final String SYMBOLS_TAG = "symbols"; //$NON-NLS-1$
- private static final String DEPENDENT_TAG = "dependent"; //$NON-NLS-1$
-
- // attribute tags
- private static final String ATTR_IMAGENAME = "name"; //$NON-NLS-1$
- private static final String ATTR_COUNT = "count"; //$NON-NLS-1$
- private static final String ATTR_DEPCOUNT = "count"; //$NON-NLS-1$
-
- // the current image being constructed
- private OpModelImage image;
- private int imgSeen; // for ensuring image singleton-ness
-
- // processors used for symbols and dependent images
- private SymbolsProcessor _symbolsProcessor = new SymbolsProcessor();
- private DependentProcessor _dependentProcessor = new DependentProcessor();
-
- @Override
- public void reset(Object callData) {
- image = ((CallData) callData).opModelImage;
- imgSeen = 0;
- }
-
- @Override
- public void startElement(String name, Attributes attrs, Object callData) {
- if (name.equals(IMAGE_TAG)) {
- if (imgSeen == 0) {
- image.setName(validString(attrs.getValue(ATTR_IMAGENAME)));
- image.setCount(Integer.parseInt(attrs.getValue(ATTR_COUNT)));
- }
-
- imgSeen++;
- } else if (name.equals(SYMBOLS_TAG)) {
- OprofileSAXHandler.getInstance(callData).push(_symbolsProcessor);
- } else if (name.equals(DEPENDENT_TAG)) {
- image.setDepCount(Integer.parseInt(attrs.getValue(ATTR_DEPCOUNT)));
- OprofileSAXHandler.getInstance(callData).push(_dependentProcessor);
- } else {
- super.startElement(name, attrs, callData);
- }
- }
-
- @Override
- public void endElement(String name, Object callData) {
- if (name.equals(IMAGE_TAG)) {
- if (imgSeen > 1) {
- // should only ever be one image, otherwise oprofile was run
- // outside of eclipse and the ui would not handle it properly
- image.setCount(OpModelImage.IMAGE_PARSE_ERROR);
- image.setDepCount(0);
- image.setDependents(null);
- image.setSymbols(null);
- image.setName(""); //$NON-NLS-1$
- }
- } else if (name.equals(SYMBOLS_TAG)) {
- image.setSymbols(_symbolsProcessor.getSymbols());
- } else if (name.equals(DEPENDENT_TAG)) {
- image.setDependents(_dependentProcessor.getImages());
- } else {
- super.endElement(name, callData);
- }
- }
-}
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/internal/oprofile/core/opxml/modeldata/SamplesProcessor.java b/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/internal/oprofile/core/opxml/modeldata/SamplesProcessor.java
deleted file mode 100644
index ab3272c6cbc992c58025dc2cf22257a59b96dda8..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/internal/oprofile/core/opxml/modeldata/SamplesProcessor.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2018 Red Hat, Inc.
- *
- * This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License 2.0
- * which is available at https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- * Kent Sebastian <ksebasti@redhat.com> - initial API and implementation
- * - Note: the original SamplesProcessor class was removed, this is a new
- * implementation
- *******************************************************************************/
-package org.eclipse.linuxtools.internal.oprofile.core.opxml.modeldata;
-
-import java.util.ArrayList;
-
-import org.eclipse.linuxtools.internal.oprofile.core.model.OpModelSample;
-import org.eclipse.linuxtools.internal.oprofile.core.opxml.OprofileSAXHandler;
-import org.eclipse.linuxtools.internal.oprofile.core.opxml.XMLProcessor;
-
-/**
- * XML handler class for <sample> tags (individual samples).
- */
-public class SamplesProcessor extends XMLProcessor {
- // XML tags parsed by this processor
- private static final String SAMPLE_TAG = "sample"; //$NON-NLS-1$
- private static final String COUNT_TAG = "count"; //$NON-NLS-1$
- private static final String LINE_TAG = "line"; //$NON-NLS-1$
- private static final String SYMBOL_TAG = "symbol"; //$NON-NLS-1$
- private static final String FILE_TAG = "file"; //$NON-NLS-1$
-
- // the current sample being constructed
- private OpModelSample sample;
- // a list of all samples (for this symbol)
- private ArrayList<OpModelSample> sampleList;
-
- @Override
- public void reset(Object callData) {
- sample = new OpModelSample();
- sampleList = new ArrayList<>();
- }
-
- @Override
- public void endElement(String name, Object callData) {
- if (name.equals(COUNT_TAG)) {
- sample.setCount(Integer.parseInt(characters));
- } else if (name.equals(LINE_TAG)) {
- sample.setLine(Integer.parseInt(characters));
- } else if (name.equals(FILE_TAG)) {
- sample.setFilePath(characters);
- } else if (name.equals(SAMPLE_TAG)) {
- sampleList.add(sample);
- sample = new OpModelSample();
- } else if (name.equals(SYMBOL_TAG)) {
- OprofileSAXHandler.getInstance(callData).pop(SYMBOL_TAG);
- }
- }
-
- /**
- * Return oprofile samples
- *
- * @return samples An array of oprofile samples
- */
- public OpModelSample[] getSamples() {
- OpModelSample[] samples = new OpModelSample[sampleList.size()];
- sampleList.toArray(samples);
- return samples;
- }
-}
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/internal/oprofile/core/opxml/modeldata/SymbolsProcessor.java b/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/internal/oprofile/core/opxml/modeldata/SymbolsProcessor.java
deleted file mode 100644
index 6a78b272f80c3b0016ad7745a5201aac60caad7e..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/internal/oprofile/core/opxml/modeldata/SymbolsProcessor.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2018 Red Hat, Inc.
- *
- * This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License 2.0
- * which is available at https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- * Kent Sebastian <ksebasti@redhat.com> - initial API and implementation
- *******************************************************************************/
-package org.eclipse.linuxtools.internal.oprofile.core.opxml.modeldata;
-
-import java.util.ArrayList;
-
-import org.eclipse.linuxtools.internal.oprofile.core.model.OpModelSymbol;
-import org.eclipse.linuxtools.internal.oprofile.core.opxml.OprofileSAXHandler;
-import org.eclipse.linuxtools.internal.oprofile.core.opxml.XMLProcessor;
-import org.xml.sax.Attributes;
-
-/**
- * A processor for the <symbols> tag from `opxml samples ..`
- */
-public class SymbolsProcessor extends XMLProcessor {
- // XML tags parsed by this processor
- private static final String SYMBOLS_TAG = "symbols"; //$NON-NLS-1$
- private static final String SYMBOL_TAG = "symbol"; //$NON-NLS-1$
- private static final String SAMPLE_TAG = "sample"; //$NON-NLS-1$
-
- // attribute tags
- private static final String ATTR_NAME = "name"; //$NON-NLS-1$
- private static final String ATTR_FILE = "file"; //$NON-NLS-1$
- private static final String ATTR_COUNT = "count"; //$NON-NLS-1$
- private static final String ATTR_LINE = "line"; //$NON-NLS-1$
-
- /**
- * The current symbol being constructed
- */
- private OpModelSymbol symbol;
- // all the symbols in this <symbols> tag, to be returned to the calling
- // ModelDataProcessor
- private ArrayList<OpModelSymbol> symbols;
-
- /**
- * The processor used for individual samples
- */
- private SamplesProcessor samplesProcessor = new SamplesProcessor();
-
- @Override
- public void reset(Object callData) {
- symbol = new OpModelSymbol();
- symbols = new ArrayList<>();
- }
-
- @Override
- public void startElement(String name, Attributes attrs, Object callData) {
- if (name.equals(SYMBOL_TAG)) {
- symbol.setName(validString(attrs.getValue(ATTR_NAME)));
- symbol.setCount(Integer.parseInt(attrs.getValue(ATTR_COUNT)));
- symbol.setFilePath(validString(attrs.getValue(ATTR_FILE)));
- symbol.setLine(Integer.parseInt(attrs.getValue(ATTR_LINE)));
- } else if (name.equals(SAMPLE_TAG)) {
- OprofileSAXHandler.getInstance(callData).push(samplesProcessor);
- }
- }
-
- @Override
- public void endElement(String name, Object callData) {
- if (name.equals(SYMBOL_TAG)) {
- symbol.setSamples(samplesProcessor.getSamples());
- symbols.add(symbol);
- symbol = new OpModelSymbol();
- } else if (name.equals(SYMBOLS_TAG)) {
- OprofileSAXHandler.getInstance(callData).pop(SYMBOLS_TAG);
- }
- }
-
- /**
- * Return all parsed samples
- *
- * @return s the parsed symbols
- */
- public OpModelSymbol[] getSymbols() {
- OpModelSymbol[] s = new OpModelSymbol[symbols.size()];
- symbols.toArray(s);
- return s;
- }
-}
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/internal/oprofile/core/opxml/sessions/SessionManager.java b/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/internal/oprofile/core/opxml/sessions/SessionManager.java
deleted file mode 100644
index a432538045a0b976cdb923b0218d8481ea5e2f74..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/internal/oprofile/core/opxml/sessions/SessionManager.java
+++ /dev/null
@@ -1,301 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010, 2018 Red Hat, Inc.
- *
- * This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License 2.0
- * which is available at https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- * Red Hat - initial API and implementation
- *******************************************************************************/
-package org.eclipse.linuxtools.internal.oprofile.core.opxml.sessions;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.ArrayList;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.transform.Result;
-import javax.xml.transform.Source;
-import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerException;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.stream.StreamResult;
-
-import org.eclipse.linuxtools.internal.oprofile.core.OprofileCorePlugin;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NodeList;
-import org.xml.sax.SAXException;
-
-/**
- * This class manipulates the XML data output from the command 'opxml sessions'
- */
-public class SessionManager {
- public final static String PLUGIN_LOC = OprofileCorePlugin.getDefault().getStateLocation().toOSString();
- public final static String SESSIONS = "sessions"; //$NON-NLS-1$
- public final static String EVENT = "event"; //$NON-NLS-1$
- public final static String SESSION = "session"; //$NON-NLS-1$
- public final static String NAME = "name"; //$NON-NLS-1$
- public final static String CURRENT = "current"; //$NON-NLS-1$
- public final static String OPXML_PREFIX = PLUGIN_LOC + "/opxml_"; //$NON-NLS-1$
- public final static String SESSION_LOCATION = OPXML_PREFIX + SESSIONS;
- public final static String MODEL_DATA = "model-data"; //$NON-NLS-1$
-
- public Document doc;
- public Element root;
- public String absfilePath;
-
- public SessionManager(String filePath) {
- this(new File(filePath));
- absfilePath = filePath;
- write();
- }
-
- /**
- * Session manager class constructor to manipulate the XML data
- *
- * @param file the xml file
- */
- public SessionManager(File file) {
- DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
- DocumentBuilder builder;
- try {
- builder = factory.newDocumentBuilder();
- if (!file.exists()) {
- file.createNewFile();
- doc = builder.newDocument();
- root = doc.createElement(SESSIONS);
- doc.appendChild(root);
- } else {
- InputStream is = new FileInputStream(file);
- doc = builder.parse(is);
- Element elem = (Element) doc.getElementsByTagName(SESSIONS).item(0);
- root = elem;
- }
- } catch (ParserConfigurationException | SAXException | IOException e) {
- e.printStackTrace();
- }
- }
-
- /**
- * Add a session to the specified event element if it does not exist.
- *
- * @param sessionName the name of the session
- * @param eventName the name of the event
- */
- public void addSession(String sessionName, String eventName) {
- Element event = null;
- Element session = find(root, SESSION, NAME, sessionName);
- if (session == null) {
- session = doc.createElement(SESSION);
- session.setAttribute(NAME, sessionName);
- root.appendChild(session);
- } else {
- event = find(session, EVENT, NAME, eventName);
- }
-
- if (event == null) {
- event = doc.createElement(EVENT);
- event.setAttribute(NAME, eventName);
- session.appendChild(event);
- }
- }
-
- /**
- * Check if a session exists
- *
- * @param sessionName the name of the session
- * @return true if the session exists, otherwise false
- */
- public boolean existsSession(String sessionName) {
- return find(root, SESSION, NAME, sessionName) != null ? true : false;
- }
-
- /**
- * Find an element in the XML
- *
- * @param elem the element to look under
- * @param tagName the name of the tag
- * @param attName the name of the attribute
- * @param attVal the name of the attribute value
- * @return the element that matches the search, or null if none is found.
- */
- private Element find(Element elem, String tagName, String attName, String attVal) {
- NodeList list = elem.getElementsByTagName(tagName);
- for (int i = 0; i < list.getLength(); i++) {
- if (list.item(i) instanceof Element) {
- Element e = (Element) list.item(i);
- if (e.getAttribute(attName).equals(attVal)) {
- return e;
- }
- }
- }
- return null;
- }
-
- /**
- * Remove all sessions under any event that have the name 'current'
- */
- public void removeAllCurrentSessions() {
- NodeList sessionList = root.getElementsByTagName(SESSION);
- for (int i = 0; i < sessionList.getLength(); i++) {
- Element session = (Element) sessionList.item(i);
- String sessionName = session.getAttribute(NAME);
- if (CURRENT.equals(sessionName)) {
- NodeList eventList = session.getElementsByTagName(EVENT);
- for (int j = 0; j < eventList.getLength(); j++) {
- Element event = (Element) eventList.item(j);
- String eventName = event.getAttribute(NAME);
- session.removeChild(event);
- File file = new File(SessionManager.OPXML_PREFIX + SessionManager.MODEL_DATA + eventName
- + SessionManager.CURRENT);
- file.delete();
- if (sessionList.getLength() == 0) {
- root.removeChild(session);
- }
- }
- }
- }
- }
-
- /**
- * Remove a session named sessionName that is under eventName if it exists.
- *
- * @param sessionName
- * @param eventName
- */
- public void removeSession(String sessionName, String eventName) {
- NodeList list = root.getElementsByTagName(SESSION);
- for (int i = 0; i < list.getLength(); i++) {
-
- if (list.item(i) instanceof Element) {
- Element session = (Element) list.item(i);
- if (session.getAttribute(NAME).equals(sessionName)) {
- Element event = find((Element) list.item(i), EVENT, NAME, eventName);
- if (event != null) {
- removeSessionHelper(sessionName, event);
- }
- }
- }
- }
- }
-
- /**
- * remove event elem for given session sessionName , also remove session if
- * there is no event under it.
- *
- * @param sessionName
- * @param elem
- *
- */
- private void removeSessionHelper(String sessionName, Element elem) {
- NodeList list = root.getElementsByTagName(SESSION);
- for (int i = 0; i < list.getLength(); i++) {
- if (list.item(i) instanceof Element) {
- Element e = (Element) list.item(i);
- if (e.getAttribute(NAME).equals(sessionName)) {
- NodeList events = e.getElementsByTagName(EVENT);
- for (int j = 0; j < events.getLength(); j++) {
- Element event = (Element) events.item(j);
- if (event.getAttribute(NAME).equals(elem.getAttribute(NAME))) {
- e.removeChild(event);
- }
- if (events.getLength() == 0) {
- root.removeChild(e);
- }
- }
- }
- }
- }
- }
-
- /**
- * Return a list of the events run with the given session
- *
- * @param sessionName the name of the session
- * @return A String ArrayList of event names that were run with the given
- * session.
- */
- public ArrayList<String> getSessionEvents(String sessionName) {
- ArrayList<String> ret = new ArrayList<>();
- NodeList eventList = root.getElementsByTagName(SESSION);
-
- for (int i = 0; i < eventList.getLength(); i++) {
- if (eventList.item(i) instanceof Element) {
- Element event = ((Element) eventList.item(i));
- if (event.getAttribute(NAME).equals(sessionName)) {
-
- NodeList sessionList = event.getElementsByTagName(EVENT);
- for (int j = 0; j < sessionList.getLength(); j++) {
- if (sessionList.item(j) instanceof Element) {
- Element session = ((Element) sessionList.item(j));
- ret.add(session.getAttribute(NAME));
- }
- }
- }
- }
- }
- return ret;
- }
-
- /**
- * Write back to the same file, that the data was loaded from.
- */
- public void write() {
- writeToFile(absfilePath);
- }
-
- /**
- * Write the contents of the given Document to a file.
- */
- private void writeToFile(String filePath) {
- Source source = new DOMSource(doc);
- Result result = new StreamResult(new File(filePath));
- TransformerFactory factory = TransformerFactory.newInstance();
- Transformer xformer;
- try {
- xformer = factory.newTransformer();
- xformer.transform(source, result);
- } catch (TransformerException e) {
- e.printStackTrace();
- }
- }
-
- public static void saveSession(String name) {
- SessionManager sessMan;
- try {
- sessMan = new SessionManager(SessionManager.SESSION_LOCATION);
- for (String event : sessMan.getSessionEvents(SessionManager.CURRENT)) {
- sessMan.addSession(name, event);
- String oldFile = SessionManager.OPXML_PREFIX + SessionManager.MODEL_DATA + event
- + SessionManager.CURRENT;
- String newFile = SessionManager.OPXML_PREFIX + SessionManager.MODEL_DATA + event + name;
- Process p = Runtime.getRuntime().exec("cp " + oldFile + " " + newFile); //$NON-NLS-1$ //$NON-NLS-2$
- p.waitFor();
- }
- sessMan.write();
- } catch (FileNotFoundException e) {
- // intentionally blank
- // during a save, the session file will exist
- } catch (IOException | InterruptedException e) {
- e.printStackTrace();
- }
- }
-
- public static void deleteSession(String sessionName, String eventName) {
- File file = new File(SessionManager.OPXML_PREFIX + SessionManager.MODEL_DATA + eventName + sessionName);
- file.delete();
- SessionManager sessMan = new SessionManager(SessionManager.SESSION_LOCATION);
- sessMan.removeSession(sessionName, eventName);
- sessMan.write();
- }
-}
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/internal/oprofile/core/opxml/sessions/SessionsProcessor.java b/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/internal/oprofile/core/opxml/sessions/SessionsProcessor.java
deleted file mode 100644
index fd7602ebdfb1d597f80e107d6b7aeeb00dab9d1d..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/internal/oprofile/core/opxml/sessions/SessionsProcessor.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2018 Red Hat, Inc.
- *
- * This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License 2.0
- * which is available at https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- * Keith Seitz <keiths@redhat.com> - initial API and implementation
- *******************************************************************************/
-package org.eclipse.linuxtools.internal.oprofile.core.opxml.sessions;
-
-import java.util.ArrayList;
-
-import org.eclipse.linuxtools.internal.oprofile.core.model.OpModelEvent;
-import org.eclipse.linuxtools.internal.oprofile.core.model.OpModelSession;
-import org.eclipse.linuxtools.internal.oprofile.core.opxml.XMLProcessor;
-import org.xml.sax.Attributes;
-
-/**
- * A processor for sessions.
- *
- * @see org.eclipse.linuxtools.internal.oprofile.core.opxml.OpxmlRunner
- */
-public class SessionsProcessor extends XMLProcessor {
- public static class SessionInfo {
- /**
- * A list of Session as well as Events under each of them
- */
- public ArrayList<OpModelSession> list;
-
- public SessionInfo(ArrayList<OpModelSession> session) {
- this.list = session;
- }
- }
-
- // XML tags recognized by this processor
- public static final String SESSION_TAG = "session"; //$NON-NLS-1$
- private static final String SESSION_NAME_ATTR = "name"; //$NON-NLS-1$
- public static final String SAMPLE_COUNT_TAG = "count"; //$NON-NLS-1$
- public static final String EVENT_TAG = "event"; //$NON-NLS-1$
- private static final String EVENT_NAME_ATTR = "name"; //$NON-NLS-1$
-
- /**
- * The current session being constructed
- */
- private OpModelSession currentSession;
-
- /**
- * The current event being constructed
- */
- private OpModelEvent currentEvent;
-
- /**
- * A list of all sessions
- */
- private ArrayList<OpModelEvent> eventList;
-
- @Override
- public void startElement(String name, Attributes attrs, Object callData) {
- if (name.equals(SESSION_TAG)) {
- String sessionName = validString(attrs.getValue(SESSION_NAME_ATTR));
- currentSession = new OpModelSession(sessionName);
- eventList = new ArrayList<>();
- } else if (name.equals(EVENT_TAG)) {
- String eventName = attrs.getValue(EVENT_NAME_ATTR);
- currentEvent = new OpModelEvent(currentSession, eventName);
- } else {
- super.startElement(name, attrs, callData);
- }
- }
-
- @Override
- public void endElement(String name, Object callData) {
- if (name.equals(SESSION_TAG)) {
- // Got end of session -- save in session list
- OpModelEvent[] s = new OpModelEvent[eventList.size()];
- eventList.toArray(s);
- currentSession.setEvents(s);
- SessionInfo info = (SessionInfo) callData;
- info.list.add(currentSession);
- currentSession = null;
- eventList = null;
- } else if (name.equals(EVENT_TAG)) {
- // Got end of event -- save session list into current OpModelEvent and
- // save current event into call data
- eventList.add(currentEvent);
- currentEvent = null;
- } else {
- super.endElement(name, callData);
- }
- }
-}
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.doc/.gitignore b/oprofile/org.eclipse.linuxtools.oprofile.doc/.gitignore
deleted file mode 100644
index 8d94ef8debe45a7bc3866f985fdc60d41c12822f..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.doc/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-bin
-@dot
-javaCompiler...args
-build.xml
-target
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.doc/.project b/oprofile/org.eclipse.linuxtools.oprofile.doc/.project
deleted file mode 100644
index db498cc7dc1cde245b230f2db0538e6c37d98b21..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.doc/.project
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.linuxtools.oprofile.doc</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- </natures>
-</projectDescription>
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.doc/.settings/org.eclipse.jdt.core.prefs b/oprofile/org.eclipse.linuxtools.oprofile.doc/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 0d476152afc40e6b9296ad3e7d6ef618d0c6462a..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.doc/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-#Tue Apr 14 09:48:05 EDT 2009
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.doc/Linux_Tools_Project/OProfile/User_Guide/Example-Project.html b/oprofile/org.eclipse.linuxtools.oprofile.doc/Linux_Tools_Project/OProfile/User_Guide/Example-Project.html
deleted file mode 100644
index e42a5716b8415e6031c447365095280d77adaff3..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.doc/Linux_Tools_Project/OProfile/User_Guide/Example-Project.html
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version='1.0' encoding='utf-8' ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
- <title>OProfile User Guide - Example Project</title>
- <link type="text/css" rel="stylesheet" href="../../../book.css"/>
- </head>
- <body>
- <table class="navigation" style="width: 100%;" border="0" summary="navigation">
- <tr>
- <th style="width: 100%" align="center" colspan="3">Example Project</th>
- </tr>
- <tr>
- <td style="width: 20%" align="left">
- <a href="Remote-OProfile.html" title="Remote OProfile">
- <img alt="Previous" border="0" src="../../../images/prev.gif"/>
- </a>
- </td>
- <td style="width: 60%" align="center"></td>
- <td style="width: 20%" align="right">
- <a href="Troubleshooting.html" title="Troubleshooting">
- <img alt="Next" border="0" src="../../../images/next.gif"/>
- </a>
- </td>
- </tr>
- <tr>
- <td style="width: 20%" align="left" valign="top">Remote OProfile</td>
- <td style="width: 60%" align="center"></td>
- <td style="width: 20%" align="right" valign="top">Troubleshooting</td>
- </tr>
- </table><hr class="navigation-separator"/>
- <h1 id="Example_Project">Example Project</h1>
- <p>If you wish to try the documented steps in this article with a test project, you can download the same sample project used to create the screenshots at the following link:</p>
- <p>
- <a href="http://wiki.eclipse.org/images/7/77/Eclipse-oprofile_testproj_factorial.zip">http://wiki.eclipse.org/images/7/77/Eclipse-oprofile_testproj_factorial.zip</a>
- </p>
- <p>To import the project into the Eclipse workspace, navigate to <u>File</u> > <u>Import</u> > <u>General</u> > <u>Existing Projects into Workspace</u>. Then, choose <u>Select archive file</u> and use the <u>Browse</u> button to point to the location of the sample project on your file system.</p><hr class="navigation-separator"/>
- <table class="navigation" style="width: 100%;" border="0" summary="navigation">
- <tr>
- <td style="width: 20%" align="left">
- <a href="Remote-OProfile.html" title="Remote OProfile">
- <img alt="Previous" border="0" src="../../../images/prev.gif"/>
- </a>
- </td>
- <td style="width: 60%" align="center">
- <a href="User-Guide.html" title="OProfile User Guide">
- <img alt="OProfile User Guide" border="0" src="../../../images/home.gif"/>
- </a>
- </td>
- <td style="width: 20%" align="right">
- <a href="Troubleshooting.html" title="Troubleshooting">
- <img alt="Next" border="0" src="../../../images/next.gif"/>
- </a>
- </td>
- </tr>
- <tr>
- <td style="width: 20%" align="left" valign="top">Remote OProfile</td>
- <td style="width: 60%" align="center"></td>
- <td style="width: 20%" align="right" valign="top">Troubleshooting</td>
- </tr>
- </table>
- </body>
-</html>
\ No newline at end of file
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.doc/Linux_Tools_Project/OProfile/User_Guide/Installation-and-Set-Up.html b/oprofile/org.eclipse.linuxtools.oprofile.doc/Linux_Tools_Project/OProfile/User_Guide/Installation-and-Set-Up.html
deleted file mode 100644
index b7fc17726ac4658d0d5315b89b0cedb26c6ccd43..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.doc/Linux_Tools_Project/OProfile/User_Guide/Installation-and-Set-Up.html
+++ /dev/null
@@ -1,155 +0,0 @@
-<?xml version='1.0' encoding='utf-8' ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
- <title>OProfile User Guide - Installation and Set-Up</title>
- <link type="text/css" rel="stylesheet" href="../../../book.css"/>
- </head>
- <body>
- <table class="navigation" style="width: 100%;" border="0" summary="navigation">
- <tr>
- <th style="width: 100%" align="center" colspan="3">Installation and Set-Up</th>
- </tr>
- <tr>
- <td style="width: 20%" align="left">
- <a href="User-Guide.html" title="OProfile User Guide">
- <img alt="Previous" border="0" src="../../../images/prev.gif"/>
- </a>
- </td>
- <td style="width: 60%" align="center"></td>
- <td style="width: 20%" align="right">
- <a href="Launching-A-Profile.html" title="Launching A Profile">
- <img alt="Next" border="0" src="../../../images/next.gif"/>
- </a>
- </td>
- </tr>
- <tr>
- <td style="width: 20%" align="left" valign="top">OProfile User Guide</td>
- <td style="width: 60%" align="center"></td>
- <td style="width: 20%" align="right" valign="top">Launching A Profile</td>
- </tr>
- </table><hr class="navigation-separator"/>
- <h1 id="Installation_and_Set-Up">Installation and Set-Up</h1>
- <p>The easiest way to install the OProfile plug-in for Eclipse is through the
- <b>
- <i>Software Updates and Add-ons </i>
- </b> menu. For information on how to use this menu, refer to
- <a href="http://wiki.eclipse.org/Linux_Tools_Project/PluginInstallHelp#Installing_Updates_From_the_Linux_Tools_Update_Site">http://wiki.eclipse.org/Linux_Tools_Project/PluginInstallHelp#Installing_Updates_From_the_Linux_Tools_Update_Site</a>.
- </p>
- <p>Unlike most Eclipse plug-ins, the OProfile plug-in requires some configuration after installation. Note that this configuration process takes only a few simple steps, and only needs to be done once.</p>
- <p>After the plug-in is first installed, performing a profile run with OProfile will bring up a dialog similar to the following:</p>
- <p>
- <img border="0" src="images/Screenshot-installscript_error_dialog.png"/>
- </p>
- <p>As the dialog suggests, you must run the supplied install script; this script will allow the OProfile plug-in to perform OProfile tasks as root (since OProfile cannot be run as an unprivileged user). The steps below are the same as the dialog but described in more detail.</p>
- <p>To avoid having to perform the installation setup users can create a launch configuration for their project that uses 'operf' instead of 'opcontrol'. Simply navigate to either the Profiling/Profiling Tools launch configuration dialog and create an OProfile launch configuration. Select the OProfile
- <a href="Profiling-Configuration.html#Global_Settings">Global Settings</a> tab, and select 'operf' from the 'Profile With' combo box. In future releases, 'operf' will become the default option.
- </p>
- <h2 id="Step_1_-_Locate_the_Installation_Scripts">Step 1 - Locate the Installation Scripts</h2>
- <p>Open up a terminal and locate the
- <i><code>natives/linux/scripts</code></i> subdirectory, which is found in the
- <i><code>org.eclipse.linuxtools.oprofile.core</code></i> plug-in directory. The location of this plug-in directory depends on how you installed Eclipse.
- </p>
- <ul>
- <li>If you are using a distro-supplied version of Eclipse and installed the plug-in via the update site, the plug-in directory will most likely be under
- <i><code>~/.eclipse</code></i>. To find the exact location of the plug-in directory in this case, use the following command:
- </li>
- <li><code>find ~/.eclipse -name 'org.eclipse.linuxtools.oprofile.core_*'</code></li>
- <li>Alternatively, if you are using an extracted tarball of Eclipse (i.e. you downloaded a
- <i><code>.tar.gz</code></i> from
- <a href="http://www.eclipse.org/downloads/">http://www.eclipse.org/downloads/</a>), then the plug-in will most likely be in the <code>plugins</code> sub-directory of where you extracted it.
- </li>
- <li>For example, if you extracted the tarball to <code>
- <i>/home/ksebasti</i></code>, your Eclipse installation would be in <code>
- <i>/home/ksebasti/eclipse</i></code>. In this case, you should use the following command to find the exact location of the plug-in directory:
- </li>
- <li><code>find /home/ksebasti/eclipse -name 'org.eclipse.linuxtools.oprofile.core_*'</code></li>
- </ul>
- <p>
- <b>Note:</b> In both cases, the quotes (') and asterisk (*) are necessary.
- </p>
- <p>Sample output will look like this:</p>
- <pre>$ find /home/ksebasti/eclipse -name 'org.eclipse.linuxtools.oprofile.core_*'
-/home/ksebasti/eclipse/plugins/org.eclipse.linuxtools.oprofile.core_0.2.0.200904131051
-</pre>
- <p>Once you find the plug-in directory, navigate to its <code>
- <i>natives/linux/scripts</i></code> subdirectory. Using our previous example:
- </p>
- <pre>$ cd /home/ksebasti/eclipse/plugins/org.eclipse.linuxtools.oprofile.core_0.2.0.200904131051/natives/linux/scripts
-</pre>
- <p>The <code>
- <i>natives/linux/scripts</i></code> subdirectory contains the installation scripts you will need to run in order to allow OProfile to run as root.
- </p>
- <h2 id="Step_2_-_Choose_Which_Installation_Script_To_Run">Step 2 - Choose Which Installation Script To Run</h2>
- <p>The
- <i><code>natives/linux/scripts</code></i> subdirectory contains two scripts:
- <i><code>install.sh</code></i>, and
- <i><code>install-noconsolehelper.sh</code></i>. These scripts perform sanity checks to ensure OProfile is installed. The difference is in how root authentication with the plug-in is set up.
- </p>
- <ul>
- <li>
- <i><code>install.sh</code></i> uses PolicyKit. This is the default and recommended method for root authentication. When an OProfile task is required, you will be presented with a dialog to enter the root password. If PolicyKit is not installed on the system, it is recommended to use
- <i><code>install-noconsolehelper.sh</code></i> instead.
- <br/>
- </li>
- <li>
- <i><code>install-noconsolehelper.sh</code></i> can be used when <code>PolicyKit</code> is not present on the system. It uses the sudo mechanism and a small wrapper script. The install script will describe the text which should be written in the
- <i><code>sudoers</code></i> file, then run the command <code>visudo</code> to edit it.
- <br/>
- <b>Warning:</b> The
- <i><code>sudoers</code></i> file is a sensitive system file and altering it in other ways may lead to system instability. Only users with enough knowledge of running a Linux system should use this method. For these reasons, this method of root authentication is discouraged. However, it may be the only option available to some users and it has been tested to work by developers and users of the plug-in.
- </li>
- </ul>
- <h2 id="Step_3_-_Running_The_Install_Script">Step 3 - Running The Install Script</h2>
- <p>Once you have selected an install script, log in as root. Assuming you are in the
- <i><code>natives/linux/scripts</code></i> subdirectory of the plug-in directory (as in
- <a href="#Step_1_-_Locate_the_Installation_Scripts">Step 1 - Locate the Installation Scripts</a>), run your selected install script:
- </p>
- <pre> # ./install.sh
-</pre>
- <p>Successful output will look like this:</p>
- <pre>./install.sh
-Eclipse-OProfile plugin install successful.
-</pre>
- <p>Install scripts should be run as the root user since these scripts perform some actions that require elevated privileges:
- <i><code>install.sh</code></i> uses PolicyKit, and
- <i><code>install-noconsolehelper.sh</code></i> runs the command <code>visudo</code>. If you wish to simply run either install script without logging in as root, use:
- </p>
- <pre> su -c './install.sh'
-</pre>
- <p>This command will run only the install script as the root user, then return control to the regular user. Note that you will still need to enter the root password to make this work. If you receive an error message, refer to the
- <a href="Troubleshooting.html#Troubleshooting">Troubleshooting</a> section.
- </p>
- <h2 id="Step_4_-_Restart_Eclipse">Step 4 - Restart Eclipse</h2>
- <p>After running the install script, restart Eclipse using <u>File</u> > <u>Restart</u>. </p>
- <p>If you need to uninstall the plug-in, run the uninstall script that corresponds to the install script used. For example, if you used
- <i><code>install.sh</code></i>, you would run
- <i><code>uninstall.sh</code></i> before uninstalling it from within Eclipse. These scripts are also located in the
- <i><code>natives/linux/scripts</code></i> subdirectory of the OProfile core plug-in directory (i.e. the same directory where the install scripts are found).
- </p><hr class="navigation-separator"/>
- <table class="navigation" style="width: 100%;" border="0" summary="navigation">
- <tr>
- <td style="width: 20%" align="left">
- <a href="User-Guide.html" title="OProfile User Guide">
- <img alt="Previous" border="0" src="../../../images/prev.gif"/>
- </a>
- </td>
- <td style="width: 60%" align="center">
- <a href="User-Guide.html" title="OProfile User Guide">
- <img alt="OProfile User Guide" border="0" src="../../../images/home.gif"/>
- </a>
- </td>
- <td style="width: 20%" align="right">
- <a href="Launching-A-Profile.html" title="Launching A Profile">
- <img alt="Next" border="0" src="../../../images/next.gif"/>
- </a>
- </td>
- </tr>
- <tr>
- <td style="width: 20%" align="left" valign="top">OProfile User Guide</td>
- <td style="width: 60%" align="center"></td>
- <td style="width: 20%" align="right" valign="top">Launching A Profile</td>
- </tr>
- </table>
- </body>
-</html>
\ No newline at end of file
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.doc/Linux_Tools_Project/OProfile/User_Guide/Launching-A-Profile.html b/oprofile/org.eclipse.linuxtools.oprofile.doc/Linux_Tools_Project/OProfile/User_Guide/Launching-A-Profile.html
deleted file mode 100644
index f3aae520d6e019450820d212aa4fb028b6f60b6b..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.doc/Linux_Tools_Project/OProfile/User_Guide/Launching-A-Profile.html
+++ /dev/null
@@ -1,122 +0,0 @@
-<?xml version='1.0' encoding='utf-8' ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
- <title>OProfile User Guide - Launching A Profile</title>
- <link type="text/css" rel="stylesheet" href="../../../book.css"/>
- </head>
- <body>
- <table class="navigation" style="width: 100%;" border="0" summary="navigation">
- <tr>
- <th style="width: 100%" align="center" colspan="3">Launching A Profile</th>
- </tr>
- <tr>
- <td style="width: 20%" align="left">
- <a href="Installation-and-Set-Up.html" title="Installation and Set-Up">
- <img alt="Previous" border="0" src="../../../images/prev.gif"/>
- </a>
- </td>
- <td style="width: 60%" align="center"></td>
- <td style="width: 20%" align="right">
- <a href="Profiling-Configuration.html" title="Profiling Configuration">
- <img alt="Next" border="0" src="../../../images/next.gif"/>
- </a>
- </td>
- </tr>
- <tr>
- <td style="width: 20%" align="left" valign="top">Installation and Set-Up</td>
- <td style="width: 60%" align="center"></td>
- <td style="width: 20%" align="right" valign="top">Profiling Configuration</td>
- </tr>
- </table><hr class="navigation-separator"/>
- <h1 id="Launching_A_Profile">Launching A Profile</h1>
- <p>The purpose of the OProfile plug-in is to provide useful profile information in a user-friendly manner. To do this, it first gathers the required information. The plug-in hooks into the Eclipse and CDT's launching facilities; in doing so, profiling becomes as easy as a normal run of your program. </p>
- <p>During a profile run, the OProfile plug-in will start, stop and perform other OProfile tasks in the background as needed, while the binary being profiled runs as normal. Currently, it is possible to start profiling when a user binary is run and stop after the binary has returned as well as the ability to start/stop profiling at arbitrary times.</p>
- <h2 id="One-Click_Launch">One-Click Launch</h2>
- <p>Most users are interested in profiling where a program spends the most CPU time during execution. The OProfile plug-in for Eclipse includes a
- <i>one-click launch</i> feature which profiles this. The one-click launch sets appropriate defaults for a profile configuration using the
- <i>execution time</i> event, and launches the profile with no further required user intervention.
- </p>
- <p>To use the one-click launch, right click on the
- <i>project</i>, the
- <i>binary</i> or in an
- <i>open editor</i> for a source file belonging to that project. Here there are two ways to start a launch:
- </p>
- <p>Navigating to <u>Profiling Tools</u> and clicking <u>Profile With OProfile</u></p>
- <p>
- <img border="0" src="images/Oprofile_original_submenu.png"/>
- </p>
- <p>or navigating to <u>Profiling Tools</u>, clicking on <u>Profile Timing</u> and setting the timing tools to be Oprofile.</p>
- <p>
- <img border="0" src="images/Callgraph_timing_submenu.png"/>
- </p>
- <p>To properly set the preferences you can go to
- <b>C/C++->Profiling->Categories->Timing</b> and set the default timing tool to be Oprofile.
- </p>
- <p>
- <img border="0" src="images/Oprofile_global_prefs.png"/>
- </p>
- <p>Alternatively, you can set project specific preferences which override workspace preferences by using project
- <b>Properties->C/C++ General->Profiling Categories->Timing</b>.
- </p>
- <p>
- <img border="0" src="images/Oprofile_proj_prefs.png"/>
- </p>
- <p>You can also profile your application using Profile as...->Local C/C++ Application whereby you have set the profiling tool in the Profiler tab to be Oprofile. </p>
- <p>
- <img border="0" src="images/Oprofile_tab.png"/>
- </p>
- <h2 id="Launching_a_Customized_Profile">Launching a Customized Profile</h2>
- <p>The OProfile plug-in allows you to configure a profile run using several available OProfile options. These options are exposed via the launch configuration in a user-friendly manner, allowing for a more complex profile. </p>
- <p>To customize a profile, right click on the
- <i>project</i>, the
- <i>binary</i> or in an
- <i>open editor</i> for a source file belonging to that project. Then, navigate to <u>Profiling Tools</u> > <u>Profile Configurations...</u> to open the
- <b>
- <i>Profile Configurations</i>
- </b> menu. Refer to the
- <a href="Profiling-Configuration.html#Profiling_Configuration">Profiling Configuration</a> section for more information about configuring a profile.
- </p>
- <p>After configuring a profile, click the <u>Profile</u> button to launch the profile.</p>
- <h2 id="Manual_Profile">Manual Profile</h2>
- <p>As of the 0.3.0 release, users can profile their applications in two ways: an automatic or manual profile. Automatic is the previously described method whereby the OProfile daemon is started before the binary is launched and stopped after the binary returns. A manual profile configures the daemon with the appropriate settings, but instead a control dialog is available which the user can use to start or stop the OProfile daemon at will. Each mode has their own configuration type and icon, as to disambiguate the type of profile an entry in the profile history. A feedback list in the dialog assures the user that the operations have been received, since at times an operation may take a few seconds to complete. This feature is most useful to profile applications which halt on input, or large applications for which it is undesirable to launch and return several times. It is not recommended to use this feature to only profile when you believe your application is spending time; the statistical nature of OProfile will account for this.</p>
- <p>
- <img border="0" src="images/Oprofile_manual_dialog.png"/>
- </p>
- <p>
- <img border="0" src="images/Oprofile_manual_shortcut.png"/>
- </p>
- <p>The basic workflow to run manual OProfile is</p>
- <ol>
- <li>Profile -> Profile with OProfile (Manual)</li>
- <li>On control dialog, hit "Start Daemon"</li>
- <li>Run the application binary</li>
- <li>On control dialog, hit "Refresh View" (Oprofile view should be refreshed with profiling data)</li>
- <li>On control dialog, hit "Stop Daemon"</li>
- </ol><hr class="navigation-separator"/>
- <table class="navigation" style="width: 100%;" border="0" summary="navigation">
- <tr>
- <td style="width: 20%" align="left">
- <a href="Installation-and-Set-Up.html" title="Installation and Set-Up">
- <img alt="Previous" border="0" src="../../../images/prev.gif"/>
- </a>
- </td>
- <td style="width: 60%" align="center">
- <a href="User-Guide.html" title="OProfile User Guide">
- <img alt="OProfile User Guide" border="0" src="../../../images/home.gif"/>
- </a>
- </td>
- <td style="width: 20%" align="right">
- <a href="Profiling-Configuration.html" title="Profiling Configuration">
- <img alt="Next" border="0" src="../../../images/next.gif"/>
- </a>
- </td>
- </tr>
- <tr>
- <td style="width: 20%" align="left" valign="top">Installation and Set-Up</td>
- <td style="width: 60%" align="center"></td>
- <td style="width: 20%" align="right" valign="top">Profiling Configuration</td>
- </tr>
- </table>
- </body>
-</html>
\ No newline at end of file
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.doc/Linux_Tools_Project/OProfile/User_Guide/OProfile-View.html b/oprofile/org.eclipse.linuxtools.oprofile.doc/Linux_Tools_Project/OProfile/User_Guide/OProfile-View.html
deleted file mode 100644
index d5a7ca7ce5cfad4fd7079985b84ea21651041943..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.doc/Linux_Tools_Project/OProfile/User_Guide/OProfile-View.html
+++ /dev/null
@@ -1,148 +0,0 @@
-<?xml version='1.0' encoding='utf-8' ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
- <title>OProfile User Guide - OProfile View</title>
- <link type="text/css" rel="stylesheet" href="../../../book.css"/>
- </head>
- <body>
- <table class="navigation" style="width: 100%;" border="0" summary="navigation">
- <tr>
- <th style="width: 100%" align="center" colspan="3">OProfile View</th>
- </tr>
- <tr>
- <td style="width: 20%" align="left">
- <a href="Profiling-Configuration.html" title="Profiling Configuration">
- <img alt="Previous" border="0" src="../../../images/prev.gif"/>
- </a>
- </td>
- <td style="width: 60%" align="center"></td>
- <td style="width: 20%" align="right">
- <a href="Remote-OProfile.html" title="Remote OProfile">
- <img alt="Next" border="0" src="../../../images/next.gif"/>
- </a>
- </td>
- </tr>
- <tr>
- <td style="width: 20%" align="left" valign="top">Profiling Configuration</td>
- <td style="width: 60%" align="center"></td>
- <td style="width: 20%" align="right" valign="top">Remote OProfile</td>
- </tr>
- </table><hr class="navigation-separator"/>
- <h1 id="OProfile_View">OProfile View</h1>
- <p>The OProfile view is the central point of interaction of the plug-in with the results of profiling.</p>
- <p>
- <img border="0" src="images/Screenshot-oprofile_view_full.png"/>
- </p>
- <p>The tree structure displayed above describes one or more profiles of one or more events in the following manner:</p>
- <ul>
- <li>
- <img border="0" src="images/Icon-oprofile_event.gif"/> Events -- the name of the profiling event used by OProfile (e.g. <code>CPU_CLK_UNHALTED</code>)
- <ul>
- <li>
- <img border="0" src="images/Icon-oprofile_session.gif"/> Session -- the name of the session the profile is stored in (e.g. <code>run1</code>)
- <ul>
- <li>
- <img border="0" src="images/Icon-oprofile_image.gif"/> Image -- the binary being profiled (e.g.
- <i><code>/notnfs/ksebasti/oprofile/plugin/factorial/Debug/factorial</code></i>)
- <ul>
- <li>
- <img border="0" src="images/Icon-oprofile_symbol.gif"/> Symbol -- symbols gathered from the binary's debug information (e.g. <code>factorial2</code>)
- <ul>
- <li>
- <img border="0" src="images/Icon-oprofile_sample.gif"/> Sample -- individual OProfile samples correlated to line numbers of source code
- </li>
- </ul>
- </li>
- <li>
- <img border="0" src="images/Icon-oprofile_dependent.gif"/> Dependent Images -- other binaries related to the run of the program; shared libraries or kernel modules
- <ul>
- <li>
- <img border="0" src="images/Icon-oprofile_image.gif"/> Image -- the dependent binary
- <ul>
- <li>
- <img border="0" src="images/Icon-oprofile_symbol.gif"/> Symbol -- same as above
- <ul>
- <li>
- <img border="0" src="images/Icon-oprofile_sample.gif"/> Sample -- same as above
- </li>
- </ul>
- </li>
- </ul>
- </li>
- </ul>
- </li>
- </ul>
- </li>
- </ul>
- </li>
- </ul>
- </li>
- </ul>
- <p>If source code is not available, some symbols (including source file name) may be shown, but no samples. This is normally the case with programs that use shared libraries. Also, depending on the
- <a href="Profiling-Configuration.html#Global_Settings">Global Settings</a>, a profile may have no dependent images.
- </p>
- <p>Note that after Eclipse is restarted, there will be no data shown in the OProfile view. Data from past profiles will still be on the system, if not touched otherwise, and can be re-read with the <u>Refresh View</u> menu action (refer to the
- <a href="#View_Menu">View Menu</a> section for more details).
- </p>
- <h2 id="Features">Features</h2>
- <p>This section describes the features of the plug-in exposed through the view.</p>
- <h3 id="View_Tree">View Tree</h3>
- <p>Double-clicking on a
- <img border="0" src="images/Icon-oprofile_sample.gif"/>sample will open the source file in an editor and place the insertion point at the corresponding line in code.
- </p>
- <p>
- <b>Note:</b> For this to work, the source code must be available and it must be in the correct directory (as described in the debug info of the binary).
- </p>
- <h3 id="View_Menu">View Menu</h3>
- <dl>
- <dt>Open OProfile Daemon Log</dt>
- <dd>This will launch a dialog showing the contents of the OProfile daemon log.
- <br/>
- <img border="0" src="images/Screenshot-oprofiled_log_reader.png"/>
- <br/>By default, the OProfile daemon log is in <code>
- <i>/var/lib/oprofile/samples/oprofiled.log</i></code>
- </dd>
- </dl>
- <dl>
- <dt>Refresh View</dt>
- <dd>This will re-read the OProfile data on the system, re-create the internal data model and re-display the profile tree. Doing so allows you to display data already on the system without launching a profile (e.g. when Eclipse first starts up).</dd>
- </dl>
- <dl>
- <dt>Save Default Session</dt>
- <dd>The default session, named <code>current</code>, is overwritten on each launch of a profile if it is not saved. If you wish to keep a profile for later viewing, this menu action will allow you to save the session to a different name.
- <br/>Since the samples are in a system directory, this operation requires root privileges; hence, you will be prompted for the root password. The
- <b>
- <i>Save Session</i>
- </b> dialog is shown below:
- </dd>
- </dl>
- <p>
- <img border="0" src="images/Screenshot-oprofile_save_session.png"/>
- </p><hr class="navigation-separator"/>
- <table class="navigation" style="width: 100%;" border="0" summary="navigation">
- <tr>
- <td style="width: 20%" align="left">
- <a href="Profiling-Configuration.html" title="Profiling Configuration">
- <img alt="Previous" border="0" src="../../../images/prev.gif"/>
- </a>
- </td>
- <td style="width: 60%" align="center">
- <a href="User-Guide.html" title="OProfile User Guide">
- <img alt="OProfile User Guide" border="0" src="../../../images/home.gif"/>
- </a>
- </td>
- <td style="width: 20%" align="right">
- <a href="Remote-OProfile.html" title="Remote OProfile">
- <img alt="Next" border="0" src="../../../images/next.gif"/>
- </a>
- </td>
- </tr>
- <tr>
- <td style="width: 20%" align="left" valign="top">Profiling Configuration</td>
- <td style="width: 60%" align="center"></td>
- <td style="width: 20%" align="right" valign="top">Remote OProfile</td>
- </tr>
- </table>
- </body>
-</html>
\ No newline at end of file
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.doc/Linux_Tools_Project/OProfile/User_Guide/Profiling-Configuration.html b/oprofile/org.eclipse.linuxtools.oprofile.doc/Linux_Tools_Project/OProfile/User_Guide/Profiling-Configuration.html
deleted file mode 100644
index 351c17154ebceb8f23211546d771045e1f324f07..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.doc/Linux_Tools_Project/OProfile/User_Guide/Profiling-Configuration.html
+++ /dev/null
@@ -1,236 +0,0 @@
-<?xml version='1.0' encoding='utf-8' ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
- <title>OProfile User Guide - Profiling Configuration</title>
- <link type="text/css" rel="stylesheet" href="../../../book.css"/>
- </head>
- <body>
- <table class="navigation" style="width: 100%;" border="0" summary="navigation">
- <tr>
- <th style="width: 100%" align="center" colspan="3">Profiling Configuration</th>
- </tr>
- <tr>
- <td style="width: 20%" align="left">
- <a href="Launching-A-Profile.html" title="Launching A Profile">
- <img alt="Previous" border="0" src="../../../images/prev.gif"/>
- </a>
- </td>
- <td style="width: 60%" align="center"></td>
- <td style="width: 20%" align="right">
- <a href="OProfile-View.html" title="OProfile View">
- <img alt="Next" border="0" src="../../../images/next.gif"/>
- </a>
- </td>
- </tr>
- <tr>
- <td style="width: 20%" align="left" valign="top">Launching A Profile</td>
- <td style="width: 60%" align="center"></td>
- <td style="width: 20%" align="right" valign="top">OProfile View</td>
- </tr>
- </table><hr class="navigation-separator"/>
- <h1 id="Profiling_Configuration">Profiling Configuration</h1>
- <p>OProfile has many configuration options, the amount of which can be overwhelming. For more information about these options, refer to
- <a href="http://oprofile.sourceforge.net/doc/controlling-daemon.html">http://oprofile.sourceforge.net/doc/controlling-daemon.html</a>. The
- <b>
- <i>Profile Configurations</i>
- </b> menu provided by the OProfile plug-in aims to make relevant, commonly-used OProfile configuration options easily accessible to users of all experience levels. Currently, the
- <b>
- <i>Profile Configurations</i>
- </b> menu provides two configuration tabs to the standard CDT launch configuration:
- <a href="#Global_Settings">Global Settings</a> and
- <a href="#Event_Configuration">Event Configuration</a>.
- </p>
- <p>Since Linux Tools 2.1, the Oprofile plug-in supports opcontrol and operf as profiling tools. Both of them are explained as follows.</p>
- <h2 id="Operf_vs_Opcontrol">Operf vs Opcontrol</h2>
- <p>Legacy OProfile consists of the opcontrol shell script for configuring, starting, and stopping a profiling session. To this purpose, a kernel driver (usually built as a kernel module) is used for collecting samples, which are recorded into sample files. A disadvantage of this mode is the necessity of elevated user privileges to run opcontrol.</p>
- <p>Operf was designed to be used in place of opcontrol for profiling. It uses the Linux Performance Events Subsystem, and therefore, does not require the use of the opcontrol daemon or any elevated privileges. The use of operf and opcontrol are mutually exclusive.</p>
- <h2 id="Global_Settings">Global Settings</h2>
- <p>The
- <b>
- <i>Global Settings</i>
- </b> tab configures which profiling binary is going to be used (operf or opcontrol) and how the OProfile daemon gathers profiling information. Each option is described below.
- </p>
- <p>
- <img border="0" src="images/Oprofile_global_config.png"/>
- </p>
- <dl>
- <dt>Profile with</dt>
- <dd>user can select opcontrol or operf as profiling tools.</dd>
- </dl>
- <dl>
- <dt>Kernel Image File (optional)</dt>
- <dd>To collect more detailed information about the operation of a program in the Linux kernel, use the <u>Browse</u> button specify the location of your running kernel's
- <i><code>vmlinux</code></i> file. A kernel's
- <i><code>vmlinux</code></i> file contains debugging information required by OProfile. Note that the compressed
- <i>vmlinux</i> file, often named
- <i><code>vmlinuz</code></i>, cannot be used for this purpose.
- <br/> Note: For this option to have any effect, you must enable the
- <b>
- <i>Include dependent kernel modules</i>
- </b> option.
- </dd>
- </dl>
- <dl>
- <dt>Include dependent shared libraries</dt>
- <dd>This option will make OProfile include samples from shared libraries that are used by the profiled binary/program. These samples will then be aggregated in the profile results. This is performed by default when using operf.</dd>
- </dl>
- <dl>
- <dt>Include dependent kernel modules</dt>
- <dd>This option will make OProfile include samples related to running in the kernel. If the
- <i><code>vmlinux</code></i> file is specified, the profile will include details of the specific kernel modules in use. Otherwise, kernel samples will be grouped under the name <code>no-vmlinux</code>. Operf by default separates kernel samples per application.
- </dd>
- </dl>
- <p>The differences between the options are illustrated in the following OProfile view screenshot:</p>
- <p>
- <img border="0" src="images/Screenshot-oprofile_global_differences.png"/>
- </p>
- <ul>
- <li><code>incl_library</code> was run with only the
- <b>
- <i>Include dependent shared libraries</i>
- </b> checked
- </li>
- <li><code>incl_vmlinux</code> was run with the
- <i><code>vmlinux</code></i> file specified; both
- <b>
- <i>Include dependent shared libraries</i>
- </b> and
- <b>
- <i>Include dependent kernel modules</i>
- </b> checked
- </li>
- <li><code>no_vmlinux</code> was run without any
- <i><code>vmlinux</code></i> file specified; both
- <b>
- <i>Include dependent shared libraries</i>
- </b> and
- <b>
- <i>Include dependent kernel modules</i>
- </b> checked
- </li>
- <li><code>novmlinux_noseparate</code> was run with none of the options checked</li>
- </ul>
- <h2 id="Event_Configuration">Event Configuration</h2>
- <p>Your system processor's hardware profiling registers often contain a large number of options. The
- <b>
- <i>Event Configuration</i>
- </b> tab condenses these options to a more manageable amount.
- </p>
- <h3 id="Timer_Interrupt_Mode">Timer Interrupt Mode</h3>
- <p>If your processor (or kernel) does not support the hardware profiling registers OProfile uses, OProfile will run in
- <i>timer-interrupt mode</i>. This mode has no user-configurable events. For more information about
- <i>timer-interrupt mode</i>, refer to
- <a href="http://oprofile.sourceforge.net/doc/detailed-parameters.html#timer">http://oprofile.sourceforge.net/doc/detailed-parameters.html#timer</a>.
- </p>
- <p>The event configuration tab will then look like the screenshot below:</p>
- <p>
- <img border="0" src="images/Oprofile_event_timer.png"/>
- </p>
- <h3 id="Regular_Mode">Regular Mode</h3>
- <p>If your processor (or kernel) supports hardware profiling registers, there are several configuration options available to you. The availability of these configuration options depend on your processor model or kernel version. With proper support, the
- <b>
- <i>Events</i>
- </b> configuration tab will look like the following screenshot:
- </p>
- <p>
- <img border="0" src="images/Oprofile_eventconfig.png"/>
- </p>
- <p>In
- <i>regular mode</i>, the
- <b>
- <i>Events</i>
- </b> configuration tab can contain any of the following options:
- </p>
- <dl>
- <dt>Use default event</dt>
- <dd>This option is enabled by default when creating a new profile configuration, or when a profile configuration is created through the
- <a href="Launching-A-Profile.html#One-Click_Launch">one-click launch</a>.
- <b>
- <i>Use default event</i>
- </b> is a shortcut to use an event based on processor execution time, with a reasonable value for the
- <b>
- <i>Count</i>
- </b> option. Using this option will prevent you from configuring the counters any further.
- <br/> For a list of default events for various processors, refer to
- <a href="http://oprofile.sourceforge.net/doc/controlling.html#eventspec">http://oprofile.sourceforge.net/doc/controlling.html#eventspec</a>.
- </dd>
- </dl>
- <dl>
- <dt>Counter Tabs (
- <b>
- <i>Ctr 0</i>
- </b>,
- <b>
- <i>Ctr 1</i>
- </b>,
- <b>
- <i>Ctr 2</i>
- </b>, and so on)
- </dt>
- <dd>A processor may have 1 to 8 hardware profiling registers (also called counters). Each one may be programmed separately to profile many events simultaneously. Each tabs labelled
- <i>Ctr</i> represents one counter and exposes the same options.
- </dd>
- </dl>
- <dl>
- <dt>Enabled</dt>
- <dd>This option (located in each counter tab) disables or enables a counter.</dd>
- </dl>
- <dl>
- <dt>Event List</dt>
- <dd>A list of the events available for profiling on a given counter.</dd>
- </dl>
- <dl>
- <dt>Event Description</dt>
- <dd>When you select an event from the events list, this field provides a short description of that event's function. OProfile provides the content for this field.</dd>
- </dl>
- <dl>
- <dt>Profile Kernel and Profile user binaries</dt>
- <dd>Instructs OProfile to profile binaries in the selected spaces. Keeping both checked is recommended (even if other
- <a href="#Global_Settings">Global Settings</a> are not specified).
- </dd>
- </dl>
- <dl>
- <dt>Count</dt>
- <dd>Specifies a reset count for the hardware counter. In most cases, the default value (based on the CPU clock frequency) is sufficient. Each event has a minimum value, but it is recommended to use a value many orders of magnitude larger.
- <br/>
- <b>WARNING</b>: if you specify a value that is too low, the profiled program may take much longer to return or your system may hang.
- </dd>
- </dl>
- <dl>
- <dt>Unit Mask</dt>
- <dd>Many events have a
- <i>unit mask</i> which allows further narrowing of the scope of the event. If in doubt, use the default value (specified by OProfile). There are three types of unit masks:
- </dd>
- </dl>
- <ul>
- <li>Mandatory -- no selection necessary; a single required value</li>
- <li>Exclusive -- several possible values; a single required value</li>
- <li>Bitmask -- several possible values; a combination of several values</li>
- </ul><hr class="navigation-separator"/>
- <table class="navigation" style="width: 100%;" border="0" summary="navigation">
- <tr>
- <td style="width: 20%" align="left">
- <a href="Launching-A-Profile.html" title="Launching A Profile">
- <img alt="Previous" border="0" src="../../../images/prev.gif"/>
- </a>
- </td>
- <td style="width: 60%" align="center">
- <a href="User-Guide.html" title="OProfile User Guide">
- <img alt="OProfile User Guide" border="0" src="../../../images/home.gif"/>
- </a>
- </td>
- <td style="width: 20%" align="right">
- <a href="OProfile-View.html" title="OProfile View">
- <img alt="Next" border="0" src="../../../images/next.gif"/>
- </a>
- </td>
- </tr>
- <tr>
- <td style="width: 20%" align="left" valign="top">Launching A Profile</td>
- <td style="width: 60%" align="center"></td>
- <td style="width: 20%" align="right" valign="top">OProfile View</td>
- </tr>
- </table>
- </body>
-</html>
\ No newline at end of file
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.doc/Linux_Tools_Project/OProfile/User_Guide/Remote-OProfile.html b/oprofile/org.eclipse.linuxtools.oprofile.doc/Linux_Tools_Project/OProfile/User_Guide/Remote-OProfile.html
deleted file mode 100644
index 52a563ef5e13baa810e098638bb429aa3e002ba3..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.doc/Linux_Tools_Project/OProfile/User_Guide/Remote-OProfile.html
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version='1.0' encoding='utf-8' ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
- <title>OProfile User Guide - Remote OProfile</title>
- <link type="text/css" rel="stylesheet" href="../../../book.css"/>
- </head>
- <body>
- <table class="navigation" style="width: 100%;" border="0" summary="navigation">
- <tr>
- <th style="width: 100%" align="center" colspan="3">Remote OProfile</th>
- </tr>
- <tr>
- <td style="width: 20%" align="left">
- <a href="OProfile-View.html" title="OProfile View">
- <img alt="Previous" border="0" src="../../../images/prev.gif"/>
- </a>
- </td>
- <td style="width: 60%" align="center"></td>
- <td style="width: 20%" align="right">
- <a href="Example-Project.html" title="Example Project">
- <img alt="Next" border="0" src="../../../images/next.gif"/>
- </a>
- </td>
- </tr>
- <tr>
- <td style="width: 20%" align="left" valign="top">OProfile View</td>
- <td style="width: 60%" align="center"></td>
- <td style="width: 20%" align="right" valign="top">Example Project</td>
- </tr>
- </table><hr class="navigation-separator"/>
- <h1 id="Remote_OProfile">Remote OProfile</h1>
- <p>The OProfile plug-in allows profiling a project stored in a remote machine. This can be particularly useful when developing an application for a different architecture. </p>
- <h2 id="Set-up">Set-up</h2>
- <p>The remote OProfile plug-in doesn't have installation scripts, but requires some setup in the remote machine. First, the remote machine's user must be able to run OProfile as root. For this, log in the remote machine as root and edit the /etc/sudoers file to add the following line: </p>
- <pre><user> ALL=(ALL) NOPASSWD: <linux-tools-path>/opcontrol
-</pre>
- <p>Where: </p>
- <ul>
- <li>
- <b><user></b> - Remote machine's user
- </li>
- <li>
- <b><linux-tools-path></b> - Path for linux tools set for the project. The default is /usr/bin. This path can be modified by right-clicking the remote project, clicking in "Properties" and choosing the "Linux Tools Path" tab.
- </li>
- </ul>
- <p>Also make sure that following line is not present or commented out: </p>
- <pre>Defaults requiretty
-</pre>
- <p>This is necessary for running a remote command using sudo. </p>
- <h2 id="Launching_A_Remote_Profile">Launching A Remote Profile</h2>
- <p>To run OProfile remotely, right-click the project and navigate to "Profiling Tools", then to "Profile Configurations". (Note: there's no One-click launch for remote OProfile). In the new window, double-click the Profile with OProfile (remote) profile configuration. </p>
- <p>In the main tab, choose the binary that will be profiled by clicking the "Browse" button under "C/C++ executable".</p>
- <p>
- <img border="0" src="images/Remote-oprofile.png"/>
- </p>
- <p>The same
- <a href="Profiling-Configuration.html#Event_Configuration">Event Configuration</a> Event Configuration options for regular OProfile apply for remote OProfile as well.
- </p>
- <p>After configuring the profile, click the Profile button to launch the profile. The same
- <a href="OProfile-View.html#OProfile_View">OProfile View</a> as the local one will show the results.
- </p><hr class="navigation-separator"/>
- <table class="navigation" style="width: 100%;" border="0" summary="navigation">
- <tr>
- <td style="width: 20%" align="left">
- <a href="OProfile-View.html" title="OProfile View">
- <img alt="Previous" border="0" src="../../../images/prev.gif"/>
- </a>
- </td>
- <td style="width: 60%" align="center">
- <a href="User-Guide.html" title="OProfile User Guide">
- <img alt="OProfile User Guide" border="0" src="../../../images/home.gif"/>
- </a>
- </td>
- <td style="width: 20%" align="right">
- <a href="Example-Project.html" title="Example Project">
- <img alt="Next" border="0" src="../../../images/next.gif"/>
- </a>
- </td>
- </tr>
- <tr>
- <td style="width: 20%" align="left" valign="top">OProfile View</td>
- <td style="width: 60%" align="center"></td>
- <td style="width: 20%" align="right" valign="top">Example Project</td>
- </tr>
- </table>
- </body>
-</html>
\ No newline at end of file
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.doc/Linux_Tools_Project/OProfile/User_Guide/Troubleshooting.html b/oprofile/org.eclipse.linuxtools.oprofile.doc/Linux_Tools_Project/OProfile/User_Guide/Troubleshooting.html
deleted file mode 100644
index 2da93733db4a340f309f1bffe461c18b8fb401f2..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.doc/Linux_Tools_Project/OProfile/User_Guide/Troubleshooting.html
+++ /dev/null
@@ -1,136 +0,0 @@
-<?xml version='1.0' encoding='utf-8' ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
- <title>OProfile User Guide - Troubleshooting</title>
- <link type="text/css" rel="stylesheet" href="../../../book.css"/>
- </head>
- <body>
- <table class="navigation" style="width: 100%;" border="0" summary="navigation">
- <tr>
- <th style="width: 100%" align="center" colspan="3">Troubleshooting</th>
- </tr>
- <tr>
- <td style="width: 20%" align="left">
- <a href="Example-Project.html" title="Example Project">
- <img alt="Previous" border="0" src="../../../images/prev.gif"/>
- </a>
- </td>
- <td style="width: 60%" align="center"></td>
- <td style="width: 20%" align="right">
- <a href="Updating-This-Document.html" title="Updating This Document">
- <img alt="Next" border="0" src="../../../images/next.gif"/>
- </a>
- </td>
- </tr>
- <tr>
- <td style="width: 20%" align="left" valign="top">Example Project</td>
- <td style="width: 60%" align="center"></td>
- <td style="width: 20%" align="right" valign="top">Updating This Document</td>
- </tr>
- </table><hr class="navigation-separator"/>
- <h1 id="Troubleshooting">Troubleshooting</h1>
- <p>Various problems and their solutions are described here. If you encounter a problem not described here, please
- <a href="https://bugs.eclipse.org/bugs/enter_bug.cgi?assigned_to=ksebasti%40redhat.com&blocked=&bug_file_loc=http%3A%2F%2F&bug_severity=normal&bug_status=NEW&comment=&component=OProfile&contenttypeentry=&contenttypemethod=autodetect&contenttypeselection=text%2Fplain&data=&dependson=&description=&flag_type-1=X&flag_type-2=X&flag_type-4=X&flag_type-6=X&flag_type-7=X&flag_type-8=X&form_name=enter_bug&keywords=&op_sys=Linux&priority=P3&product=Linux%20Tools&qa_contact=&rep_platform=PC&short_desc=">file a bug</a>.
- </p>
- <h2 id="Install_Script_Errors">Install Script Errors</h2>
- <p>This section describes different errors that could occur from running the install scripts (i.e. <code>
- <i>install.sh</i></code> or <code>
- <i>install-noconsolehelper.sh</i></code>)
- </p>
- <h3 id="Error:_script_must_be_run_as_the_root_user">Error: script must be run as the root user</h3>
- <p>You attempted to run the script as an ordinary, non-root user. You must be the root user to run the install script, as the scripts edit files located in root-owned directories. </p>
- <p>Solution: Run the command <code>su -</code> to become the root user, or run the script as the root user with <code>su -c './install.sh'</code>.</p>
- <h3 id="Error:_script_must_be_run_with_pwd_in_script_dir">Error: script must be run with pwd in script dir</h3>
- <p>Your current working directory must be the <code>
- <i>natives/linux/scripts</i></code> subdirectory of the OProfile core plug-in; running the script relative from another location will not work.
- </p>
- <p>Solution: Simply follow the steps on
- <a href="Installation-and-Set-Up.html#Step_1_-_Locate_the_Installation_Scripts">Step 1 - Locate the Installation Scripts</a> to find the <code>
- <i>natives/linux/scripts</i></code> subdirectory of the OProfile core plug-in.
- </p>
- <h3 id="Error:_required_binaries_do_not_exist.2C_OProfile_not_installed.3F">Error: required binaries do not exist, OProfile not installed?</h3>
- <p>The OProfile plug-in could not find the <code>
- <i>oprofiled</i></code> and <code>
- <i>opcontrol</i></code> binaries. This could mean they are not in their default directory (<code>
- <i>/usr/bin</i></code>), or they do not exist at all.
- </p>
- <p>Solution: If the binaries are on your system (and in your <code>PATH</code>) but not in those directories, you can either remove these checks from the install script or create symlinks in the <code>
- <i>/usr/bin</i></code> directory. Of course, if the binaries do not exist on your system, then install the <code>
- <i>oprofile</i></code> package.
- </p>
- <h3 id="Error:_.2Fusr.2Fbin.2Fpkexec_does_not_exist">Error: /usr/bin/pkexec does not exist</h3>
- <p>You ran the <code>
- <i>install.sh</i></code> script, but <code>pkexec</code> which is provided by PolicyKit was not installed on your system.
- As described in
- <a href="Installation-and-Set-Up.html#Step_2_-_Choose_Which_Installation_Script_To_Run">Step 2 - Choose Which Installation Script To Run</a>, if <code>PolicyKit</code> is not installed, then you can use the <code>
- <i>install-noconsolehelper.sh</i></code> script.
- </p>
- <p>Solution: Run the <code>
- <i>install-noconsolehelper.sh</i></code> script instead.
- </p>
- <h3 id="install.sh:_line_47:_opcontrol:_Permission_denied">install.sh: line 47: opcontrol: Permission denied</h3>
- <p>The opcontrol wrapper file could not be created. This can occur if the <code>
- <i>natives/linux/scripts</i></code> subdirectory is located on an NFS mount; the NFS server will not allow the local root user to create files in the directory.
- </p>
- <p>Solution: After seeing the error mentioned run the following commands from the commandline :</p>
- <pre>echo '#!/bin/sh' > opcontrol || exit 1
-echo 'exec pkexec /usr/bin/opcontrol ${1+"$@"}' >> opcontrol
-chmod +x ./opcontrol
-</pre>
- <h2 id="No_Samples_From_A_Profile">No Samples From A Profile</h2>
- <p>It is possible for a profile run of a program to return no samples, resulting in no <code>current</code> session displayed. This is not always indicative of a problem with either OProfile or the profiled program. OProfile is a system-wide profiling tool; hence, other active processes running on your system may overshadow your program. This is particularly true if the profiled program is not CPU intensive. </p>
- <p>In addition, the
- <i>Event</i> you choose (selected through the
- <b>
- <i>Events</i>
- </b> tab, as described in
- <a href="Profiling-Configuration.html#Regular_Mode">Regular Mode</a>) could cause a profile to return no samples; for example the event
- <i>BR_CND_MISSP_EXEC</i> will only provide samples if a branch was mispredicted by the processor. Note also that due to the statistical nature of OProfile, profiling is neither deterministic nor consistent; two subsequent runs may output very different results. In some cases, one run can result in no samples, while another run on the same program can result in many samples. The OProfile online documentation has other useful information
- <a href="http://oprofile.sourceforge.net/doc/results.html#no-results">here</a>.
- </p>
- <p>Solution: The following suggestions could help you generate more samples from a profile run:</p>
- <ul>
- <li>run your program with a larger input</li>
- <li>halt or kill as many other non-essential processes as possible </li>
- <li>reduce the
- <i>Count</i> in the
- <a href="Profiling-Configuration.html#Event_Configuration">Event Configuration</a> tab
- </li>
- <li>launch a profile several times </li>
- </ul>
- <p>If you are unsure whether your configuration is working correctly, try profiling the sample project in the
- <a href="Example-Project.html#Example_Project">Example Project</a> section.
- </p>
- <h2 id="Log_Reader_Hangs">Log Reader Hangs</h2>
- <p>If the OProfile daemon log file is too large, the log reader may hang and possibly cause the OProfile plug-in to crash. This occurs when the
- <i>verbosity</i> option is set to <code>all</code>, which results in several hundred MiB of text in the log over several profile runs. If you do require all this data in the log file, do not launch the log reader. Delete or backup the log file before running the log reader again.
- </p>
- <h2 id="Using_PolicyKit_with_X.2FVNC">Using PolicyKit with X/VNC</h2>
- <p>When using an X/VNC viewer, PolicyKit may open the authentication dialog in the wrong display. If using this setup, please make sure to connect your VNC viewer to the main display.</p><hr class="navigation-separator"/>
- <table class="navigation" style="width: 100%;" border="0" summary="navigation">
- <tr>
- <td style="width: 20%" align="left">
- <a href="Example-Project.html" title="Example Project">
- <img alt="Previous" border="0" src="../../../images/prev.gif"/>
- </a>
- </td>
- <td style="width: 60%" align="center">
- <a href="User-Guide.html" title="OProfile User Guide">
- <img alt="OProfile User Guide" border="0" src="../../../images/home.gif"/>
- </a>
- </td>
- <td style="width: 20%" align="right">
- <a href="Updating-This-Document.html" title="Updating This Document">
- <img alt="Next" border="0" src="../../../images/next.gif"/>
- </a>
- </td>
- </tr>
- <tr>
- <td style="width: 20%" align="left" valign="top">Example Project</td>
- <td style="width: 60%" align="center"></td>
- <td style="width: 20%" align="right" valign="top">Updating This Document</td>
- </tr>
- </table>
- </body>
-</html>
\ No newline at end of file
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.doc/Linux_Tools_Project/OProfile/User_Guide/Updating-This-Document.html b/oprofile/org.eclipse.linuxtools.oprofile.doc/Linux_Tools_Project/OProfile/User_Guide/Updating-This-Document.html
deleted file mode 100644
index 8e24c6e841d2356cb63116fc22468ad2cae2088e..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.doc/Linux_Tools_Project/OProfile/User_Guide/Updating-This-Document.html
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version='1.0' encoding='utf-8' ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
- <title>OProfile User Guide - Updating This Document</title>
- <link type="text/css" rel="stylesheet" href="../../../book.css"/>
- </head>
- <body>
- <table class="navigation" style="width: 100%;" border="0" summary="navigation">
- <tr>
- <th style="width: 100%" align="center" colspan="3">Updating This Document</th>
- </tr>
- <tr>
- <td style="width: 20%" align="left">
- <a href="Troubleshooting.html" title="Troubleshooting">
- <img alt="Previous" border="0" src="../../../images/prev.gif"/>
- </a>
- </td>
- <td style="width: 60%" align="center"></td>
- <td style="width: 20%" align="right"></td>
- </tr>
- <tr>
- <td style="width: 20%" align="left" valign="top">Troubleshooting</td>
- <td style="width: 60%" align="center"></td>
- <td style="width: 20%" align="right" valign="top"></td>
- </tr>
- </table><hr class="navigation-separator"/>
- <h1 id="Updating_This_Document">Updating This Document</h1>
- <p>This document is maintained in a collaborative wiki. If you wish to update or modify this document please visit
-
- <a href="http://wiki.eclipse.org/Linux_Tools_Project/OProfile/User_Guide">http://wiki.eclipse.org/Linux_Tools_Project/OProfile/User_Guide</a> .
- </p><hr class="navigation-separator"/>
- <table class="navigation" style="width: 100%;" border="0" summary="navigation">
- <tr>
- <td style="width: 20%" align="left">
- <a href="Troubleshooting.html" title="Troubleshooting">
- <img alt="Previous" border="0" src="../../../images/prev.gif"/>
- </a>
- </td>
- <td style="width: 60%" align="center">
- <a href="User-Guide.html" title="OProfile User Guide">
- <img alt="OProfile User Guide" border="0" src="../../../images/home.gif"/>
- </a>
- </td>
- <td style="width: 20%" align="right"></td>
- </tr>
- <tr>
- <td style="width: 20%" align="left" valign="top">Troubleshooting</td>
- <td style="width: 60%" align="center"></td>
- <td style="width: 20%" align="right" valign="top"></td>
- </tr>
- </table>
- </body>
-</html>
\ No newline at end of file
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.doc/Linux_Tools_Project/OProfile/User_Guide/User-Guide.html b/oprofile/org.eclipse.linuxtools.oprofile.doc/Linux_Tools_Project/OProfile/User_Guide/User-Guide.html
deleted file mode 100644
index 4417b6a379d559b78716d4eb269ac7516e319563..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.doc/Linux_Tools_Project/OProfile/User_Guide/User-Guide.html
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version='1.0' encoding='utf-8' ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
- <title>OProfile User Guide</title>
- <link type="text/css" rel="stylesheet" href="../../../book.css"/>
- </head>
- <body>
- <table class="navigation" style="width: 100%;" border="0" summary="navigation">
- <tr>
- <th style="width: 100%" align="center" colspan="3">OProfile User Guide</th>
- </tr>
- <tr>
- <td style="width: 20%" align="left"></td>
- <td style="width: 60%" align="center"></td>
- <td style="width: 20%" align="right">
- <a href="Installation-and-Set-Up.html" title="Installation and Set-Up">
- <img alt="Next" border="0" src="../../../images/next.gif"/>
- </a>
- </td>
- </tr>
- <tr>
- <td style="width: 20%" align="left" valign="top"></td>
- <td style="width: 60%" align="center"></td>
- <td style="width: 20%" align="right" valign="top">Installation and Set-Up</td>
- </tr>
- </table><hr class="navigation-separator"/>
- <h1 id="Overview">Overview</h1>
- <p>OProfile is a system-wide Linux profiler, capable of running at low overhead. It consists of a kernel driver and a daemon for collecting raw sample data, along with a suite of tools for parsing that data into meaningful information. OProfile is generally used by developers to determine which sections of code consume the most amount of CPU time, and why.</p>
- <p>The OProfile plug-in allows Eclipse users to seamlessly include OProfile capabilities into their development workflow, regardless of their experience in using OProfile. Users with little experience in OProfile can use the
- <a href="Launching-A-Profile.html#One-Click_Launch">One-Click Launch</a> to run a default OProfile view. Experienced users can perform the same OProfile functions they would on the command line, but with a much richer visualization of the results.
- </p>
- <p>For more details on OProfile, visit the project homepage at
- <a href="http://oprofile.sourceforge.net/news/">http://oprofile.sourceforge.net/news/</a>.
- </p>
- <p>
- <b>Note : The following steps in
- <a href="Installation-and-Set-Up.html#Installation_and_Set-Up">Installation and Set-Up</a> may not be necessary if installing the Eclipse OProfile plugin from a distribution specific package (eg. .deb, .rpm, etc.). These packages may perform the necessary setup on behalf of the user eliminating the need for steps 1-4. For example, on Fedora, the 'eclipse-oprofile' package automatically configures support for PolicyKit. These steps are also not necessary if using the operf binary for profiling instead of legacy opcontrol.
- </b>
- </p><hr class="navigation-separator"/>
- <table class="navigation" style="width: 100%;" border="0" summary="navigation">
- <tr>
- <td style="width: 20%" align="left"></td>
- <td style="width: 60%" align="center"></td>
- <td style="width: 20%" align="right">
- <a href="Installation-and-Set-Up.html" title="Installation and Set-Up">
- <img alt="Next" border="0" src="../../../images/next.gif"/>
- </a>
- </td>
- </tr>
- <tr>
- <td style="width: 20%" align="left" valign="top"></td>
- <td style="width: 60%" align="center"></td>
- <td style="width: 20%" align="right" valign="top">Installation and Set-Up</td>
- </tr>
- </table>
- </body>
-</html>
\ No newline at end of file
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.doc/Linux_Tools_Project/OProfile/User_Guide/images/Callgraph_timing_submenu.png b/oprofile/org.eclipse.linuxtools.oprofile.doc/Linux_Tools_Project/OProfile/User_Guide/images/Callgraph_timing_submenu.png
deleted file mode 100644
index 5718ed1ed6dc3a7dc0c1f142ad3a0e9e0b02d1e7..0000000000000000000000000000000000000000
Binary files a/oprofile/org.eclipse.linuxtools.oprofile.doc/Linux_Tools_Project/OProfile/User_Guide/images/Callgraph_timing_submenu.png and /dev/null differ
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.doc/Linux_Tools_Project/OProfile/User_Guide/images/Icon-oprofile_dependent.gif b/oprofile/org.eclipse.linuxtools.oprofile.doc/Linux_Tools_Project/OProfile/User_Guide/images/Icon-oprofile_dependent.gif
deleted file mode 100644
index 122bada5ffde2e46901b19cd3e1626c318568aa5..0000000000000000000000000000000000000000
Binary files a/oprofile/org.eclipse.linuxtools.oprofile.doc/Linux_Tools_Project/OProfile/User_Guide/images/Icon-oprofile_dependent.gif and /dev/null differ
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.doc/Linux_Tools_Project/OProfile/User_Guide/images/Icon-oprofile_event.gif b/oprofile/org.eclipse.linuxtools.oprofile.doc/Linux_Tools_Project/OProfile/User_Guide/images/Icon-oprofile_event.gif
deleted file mode 100644
index c91f254ab1728df3d6555002c789ef4519693eb0..0000000000000000000000000000000000000000
Binary files a/oprofile/org.eclipse.linuxtools.oprofile.doc/Linux_Tools_Project/OProfile/User_Guide/images/Icon-oprofile_event.gif and /dev/null differ
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.doc/Linux_Tools_Project/OProfile/User_Guide/images/Icon-oprofile_image.gif b/oprofile/org.eclipse.linuxtools.oprofile.doc/Linux_Tools_Project/OProfile/User_Guide/images/Icon-oprofile_image.gif
deleted file mode 100644
index 8aa0162df05c16227da66fddaa907c9b6cf28e6b..0000000000000000000000000000000000000000
Binary files a/oprofile/org.eclipse.linuxtools.oprofile.doc/Linux_Tools_Project/OProfile/User_Guide/images/Icon-oprofile_image.gif and /dev/null differ
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.doc/Linux_Tools_Project/OProfile/User_Guide/images/Icon-oprofile_sample.gif b/oprofile/org.eclipse.linuxtools.oprofile.doc/Linux_Tools_Project/OProfile/User_Guide/images/Icon-oprofile_sample.gif
deleted file mode 100644
index 061161ae1c9e6435863ba173c0b3fed6a239f745..0000000000000000000000000000000000000000
Binary files a/oprofile/org.eclipse.linuxtools.oprofile.doc/Linux_Tools_Project/OProfile/User_Guide/images/Icon-oprofile_sample.gif and /dev/null differ
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.doc/Linux_Tools_Project/OProfile/User_Guide/images/Icon-oprofile_session.gif b/oprofile/org.eclipse.linuxtools.oprofile.doc/Linux_Tools_Project/OProfile/User_Guide/images/Icon-oprofile_session.gif
deleted file mode 100644
index c2b41bda923b87ab63ee4564d9bf7ff6385404e3..0000000000000000000000000000000000000000
Binary files a/oprofile/org.eclipse.linuxtools.oprofile.doc/Linux_Tools_Project/OProfile/User_Guide/images/Icon-oprofile_session.gif and /dev/null differ
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.doc/Linux_Tools_Project/OProfile/User_Guide/images/Icon-oprofile_symbol.gif b/oprofile/org.eclipse.linuxtools.oprofile.doc/Linux_Tools_Project/OProfile/User_Guide/images/Icon-oprofile_symbol.gif
deleted file mode 100644
index 6ae4604cdba44133c67384abbac46e9035200142..0000000000000000000000000000000000000000
Binary files a/oprofile/org.eclipse.linuxtools.oprofile.doc/Linux_Tools_Project/OProfile/User_Guide/images/Icon-oprofile_symbol.gif and /dev/null differ
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.doc/Linux_Tools_Project/OProfile/User_Guide/images/Oprofile_event_timer.png b/oprofile/org.eclipse.linuxtools.oprofile.doc/Linux_Tools_Project/OProfile/User_Guide/images/Oprofile_event_timer.png
deleted file mode 100644
index b98ec2348cb1fe3e7512dee5e7c005aa67ca5aaa..0000000000000000000000000000000000000000
Binary files a/oprofile/org.eclipse.linuxtools.oprofile.doc/Linux_Tools_Project/OProfile/User_Guide/images/Oprofile_event_timer.png and /dev/null differ
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.doc/Linux_Tools_Project/OProfile/User_Guide/images/Oprofile_eventconfig.png b/oprofile/org.eclipse.linuxtools.oprofile.doc/Linux_Tools_Project/OProfile/User_Guide/images/Oprofile_eventconfig.png
deleted file mode 100644
index c080c2d3e2c82c5561002a3471d41d80d8ea31f5..0000000000000000000000000000000000000000
Binary files a/oprofile/org.eclipse.linuxtools.oprofile.doc/Linux_Tools_Project/OProfile/User_Guide/images/Oprofile_eventconfig.png and /dev/null differ
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.doc/Linux_Tools_Project/OProfile/User_Guide/images/Oprofile_global_config.png b/oprofile/org.eclipse.linuxtools.oprofile.doc/Linux_Tools_Project/OProfile/User_Guide/images/Oprofile_global_config.png
deleted file mode 100644
index 99c460bce041a291b5d635a2b8ffe07ee6dc30c5..0000000000000000000000000000000000000000
Binary files a/oprofile/org.eclipse.linuxtools.oprofile.doc/Linux_Tools_Project/OProfile/User_Guide/images/Oprofile_global_config.png and /dev/null differ
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.doc/Linux_Tools_Project/OProfile/User_Guide/images/Oprofile_global_prefs.png b/oprofile/org.eclipse.linuxtools.oprofile.doc/Linux_Tools_Project/OProfile/User_Guide/images/Oprofile_global_prefs.png
deleted file mode 100644
index 989f379bc2c04262f54ef55abecff65dfeee0ef8..0000000000000000000000000000000000000000
Binary files a/oprofile/org.eclipse.linuxtools.oprofile.doc/Linux_Tools_Project/OProfile/User_Guide/images/Oprofile_global_prefs.png and /dev/null differ
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.doc/Linux_Tools_Project/OProfile/User_Guide/images/Oprofile_manual_dialog.png b/oprofile/org.eclipse.linuxtools.oprofile.doc/Linux_Tools_Project/OProfile/User_Guide/images/Oprofile_manual_dialog.png
deleted file mode 100644
index b9232e3dfe7974ee9f29ae804cf45f3b6d320bcf..0000000000000000000000000000000000000000
Binary files a/oprofile/org.eclipse.linuxtools.oprofile.doc/Linux_Tools_Project/OProfile/User_Guide/images/Oprofile_manual_dialog.png and /dev/null differ
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.doc/Linux_Tools_Project/OProfile/User_Guide/images/Oprofile_manual_shortcut.png b/oprofile/org.eclipse.linuxtools.oprofile.doc/Linux_Tools_Project/OProfile/User_Guide/images/Oprofile_manual_shortcut.png
deleted file mode 100644
index 187a7ef211217198574bdaa328f4b545d15080d4..0000000000000000000000000000000000000000
Binary files a/oprofile/org.eclipse.linuxtools.oprofile.doc/Linux_Tools_Project/OProfile/User_Guide/images/Oprofile_manual_shortcut.png and /dev/null differ
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.doc/Linux_Tools_Project/OProfile/User_Guide/images/Oprofile_original_submenu.png b/oprofile/org.eclipse.linuxtools.oprofile.doc/Linux_Tools_Project/OProfile/User_Guide/images/Oprofile_original_submenu.png
deleted file mode 100644
index 05e80eb895b3a793a2ff2e2a537bb402200f44f3..0000000000000000000000000000000000000000
Binary files a/oprofile/org.eclipse.linuxtools.oprofile.doc/Linux_Tools_Project/OProfile/User_Guide/images/Oprofile_original_submenu.png and /dev/null differ
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.doc/Linux_Tools_Project/OProfile/User_Guide/images/Oprofile_proj_prefs.png b/oprofile/org.eclipse.linuxtools.oprofile.doc/Linux_Tools_Project/OProfile/User_Guide/images/Oprofile_proj_prefs.png
deleted file mode 100644
index 9c1f4abc7aef4d2033518c703d11640649ca28fa..0000000000000000000000000000000000000000
Binary files a/oprofile/org.eclipse.linuxtools.oprofile.doc/Linux_Tools_Project/OProfile/User_Guide/images/Oprofile_proj_prefs.png and /dev/null differ
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.doc/Linux_Tools_Project/OProfile/User_Guide/images/Oprofile_tab.png b/oprofile/org.eclipse.linuxtools.oprofile.doc/Linux_Tools_Project/OProfile/User_Guide/images/Oprofile_tab.png
deleted file mode 100644
index d7a36344e11652212d18c0eb73abba5fc2470e87..0000000000000000000000000000000000000000
Binary files a/oprofile/org.eclipse.linuxtools.oprofile.doc/Linux_Tools_Project/OProfile/User_Guide/images/Oprofile_tab.png and /dev/null differ
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.doc/Linux_Tools_Project/OProfile/User_Guide/images/Remote-oprofile.png b/oprofile/org.eclipse.linuxtools.oprofile.doc/Linux_Tools_Project/OProfile/User_Guide/images/Remote-oprofile.png
deleted file mode 100644
index f91f7295b310ba15008120a10304722f1010cadd..0000000000000000000000000000000000000000
Binary files a/oprofile/org.eclipse.linuxtools.oprofile.doc/Linux_Tools_Project/OProfile/User_Guide/images/Remote-oprofile.png and /dev/null differ
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.doc/Linux_Tools_Project/OProfile/User_Guide/images/Screenshot-global_config.png b/oprofile/org.eclipse.linuxtools.oprofile.doc/Linux_Tools_Project/OProfile/User_Guide/images/Screenshot-global_config.png
deleted file mode 100644
index af97846ec929cc8a1d3aab997b715836429df595..0000000000000000000000000000000000000000
Binary files a/oprofile/org.eclipse.linuxtools.oprofile.doc/Linux_Tools_Project/OProfile/User_Guide/images/Screenshot-global_config.png and /dev/null differ
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.doc/Linux_Tools_Project/OProfile/User_Guide/images/Screenshot-installscript_error_dialog.png b/oprofile/org.eclipse.linuxtools.oprofile.doc/Linux_Tools_Project/OProfile/User_Guide/images/Screenshot-installscript_error_dialog.png
deleted file mode 100644
index 3dea3b95a6c1a3aa094f66777758fb671e6aa987..0000000000000000000000000000000000000000
Binary files a/oprofile/org.eclipse.linuxtools.oprofile.doc/Linux_Tools_Project/OProfile/User_Guide/images/Screenshot-installscript_error_dialog.png and /dev/null differ
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.doc/Linux_Tools_Project/OProfile/User_Guide/images/Screenshot-one-click_launch.png b/oprofile/org.eclipse.linuxtools.oprofile.doc/Linux_Tools_Project/OProfile/User_Guide/images/Screenshot-one-click_launch.png
deleted file mode 100644
index ce6c2d8b24487d484a61cd4aed2dd5c6385db2e2..0000000000000000000000000000000000000000
Binary files a/oprofile/org.eclipse.linuxtools.oprofile.doc/Linux_Tools_Project/OProfile/User_Guide/images/Screenshot-one-click_launch.png and /dev/null differ
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.doc/Linux_Tools_Project/OProfile/User_Guide/images/Screenshot-opcontrol_consolehelper.png b/oprofile/org.eclipse.linuxtools.oprofile.doc/Linux_Tools_Project/OProfile/User_Guide/images/Screenshot-opcontrol_consolehelper.png
deleted file mode 100644
index 5b2bc10372f6575959d9688bad05a7efab9fde31..0000000000000000000000000000000000000000
Binary files a/oprofile/org.eclipse.linuxtools.oprofile.doc/Linux_Tools_Project/OProfile/User_Guide/images/Screenshot-opcontrol_consolehelper.png and /dev/null differ
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.doc/Linux_Tools_Project/OProfile/User_Guide/images/Screenshot-oprofile_event_timer.png b/oprofile/org.eclipse.linuxtools.oprofile.doc/Linux_Tools_Project/OProfile/User_Guide/images/Screenshot-oprofile_event_timer.png
deleted file mode 100644
index 37b3e8240573703600bf2745d791793d04cb0b68..0000000000000000000000000000000000000000
Binary files a/oprofile/org.eclipse.linuxtools.oprofile.doc/Linux_Tools_Project/OProfile/User_Guide/images/Screenshot-oprofile_event_timer.png and /dev/null differ
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.doc/Linux_Tools_Project/OProfile/User_Guide/images/Screenshot-oprofile_eventconfig.png b/oprofile/org.eclipse.linuxtools.oprofile.doc/Linux_Tools_Project/OProfile/User_Guide/images/Screenshot-oprofile_eventconfig.png
deleted file mode 100644
index d0bc0b627b59dd7b20080328827547da1083c52c..0000000000000000000000000000000000000000
Binary files a/oprofile/org.eclipse.linuxtools.oprofile.doc/Linux_Tools_Project/OProfile/User_Guide/images/Screenshot-oprofile_eventconfig.png and /dev/null differ
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.doc/Linux_Tools_Project/OProfile/User_Guide/images/Screenshot-oprofile_global_differences.png b/oprofile/org.eclipse.linuxtools.oprofile.doc/Linux_Tools_Project/OProfile/User_Guide/images/Screenshot-oprofile_global_differences.png
deleted file mode 100644
index 5d7cd3717e84954981d802769cba32f1e25bca94..0000000000000000000000000000000000000000
Binary files a/oprofile/org.eclipse.linuxtools.oprofile.doc/Linux_Tools_Project/OProfile/User_Guide/images/Screenshot-oprofile_global_differences.png and /dev/null differ
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.doc/Linux_Tools_Project/OProfile/User_Guide/images/Screenshot-oprofile_save_session.png b/oprofile/org.eclipse.linuxtools.oprofile.doc/Linux_Tools_Project/OProfile/User_Guide/images/Screenshot-oprofile_save_session.png
deleted file mode 100644
index afb189b6041cfe718a289435adc4269369512052..0000000000000000000000000000000000000000
Binary files a/oprofile/org.eclipse.linuxtools.oprofile.doc/Linux_Tools_Project/OProfile/User_Guide/images/Screenshot-oprofile_save_session.png and /dev/null differ
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.doc/Linux_Tools_Project/OProfile/User_Guide/images/Screenshot-oprofile_view_full.png b/oprofile/org.eclipse.linuxtools.oprofile.doc/Linux_Tools_Project/OProfile/User_Guide/images/Screenshot-oprofile_view_full.png
deleted file mode 100644
index 6008028e64763b2c16229c16f5c7d48ff963d782..0000000000000000000000000000000000000000
Binary files a/oprofile/org.eclipse.linuxtools.oprofile.doc/Linux_Tools_Project/OProfile/User_Guide/images/Screenshot-oprofile_view_full.png and /dev/null differ
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.doc/Linux_Tools_Project/OProfile/User_Guide/images/Screenshot-oprofiled_log_reader.png b/oprofile/org.eclipse.linuxtools.oprofile.doc/Linux_Tools_Project/OProfile/User_Guide/images/Screenshot-oprofiled_log_reader.png
deleted file mode 100644
index 5a7f61ef888a006465de8ab5756903616c931ebe..0000000000000000000000000000000000000000
Binary files a/oprofile/org.eclipse.linuxtools.oprofile.doc/Linux_Tools_Project/OProfile/User_Guide/images/Screenshot-oprofiled_log_reader.png and /dev/null differ
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.doc/Linux_Tools_Project/OProfile/User_Guide/images/Screenshot-remote-oprofile.png b/oprofile/org.eclipse.linuxtools.oprofile.doc/Linux_Tools_Project/OProfile/User_Guide/images/Screenshot-remote-oprofile.png
deleted file mode 100644
index 4fa53629e330a162fcd5b9619fe40c4b9bb27aaa..0000000000000000000000000000000000000000
Binary files a/oprofile/org.eclipse.linuxtools.oprofile.doc/Linux_Tools_Project/OProfile/User_Guide/images/Screenshot-remote-oprofile.png and /dev/null differ
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.doc/META-INF/MANIFEST.MF b/oprofile/org.eclipse.linuxtools.oprofile.doc/META-INF/MANIFEST.MF
deleted file mode 100644
index ed92bf1be3d70d1f8367679d8a5451782107f4a6..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.doc/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,10 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name
-Bundle-SymbolicName: org.eclipse.linuxtools.oprofile.doc; singleton:=true
-Bundle-Version: 1.0.0.qualifier
-Bundle-ActivationPolicy: lazy
-Bundle-Vendor: %Bundle-Vendor
-Require-Bundle: org.eclipse.help
-Bundle-Localization: plugin
-Automatic-Module-Name: org.eclipse.linuxtools.oprofile.doc
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.doc/about.html b/oprofile/org.eclipse.linuxtools.oprofile.doc/about.html
deleted file mode 100644
index 164f781a8fd2195f87c3d3d49946d56bce58992f..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.doc/about.html
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<title>About</title>
-</head>
-<body lang="EN-US">
- <h2>About This Content</h2>
-
- <p>November 30, 2017</p>
- <h3>License</h3>
-
- <p>
- The Eclipse Foundation makes available all content in this plug-in
- ("Content"). Unless otherwise indicated below, the Content
- is provided to you under the terms and conditions of the Eclipse
- Public License Version 2.0 ("EPL"). A copy of the EPL is
- available at <a href="http://www.eclipse.org/legal/epl-2.0">http://www.eclipse.org/legal/epl-2.0</a>.
- For purposes of the EPL, "Program" will mean the Content.
- </p>
-
- <p>
- If you did not receive this Content directly from the Eclipse
- Foundation, the Content is being redistributed by another party
- ("Redistributor") and different terms and conditions may
- apply to your use of any object code in the Content. Check the
- Redistributor's license that was provided with the Content. If no such
- license exists, contact the Redistributor. Unless otherwise indicated
- below, the terms and conditions of the EPL still apply to any source
- code in the Content and such source code may be obtained at <a
- href="http://www.eclipse.org/">http://www.eclipse.org</a>.
- </p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.doc/book.css b/oprofile/org.eclipse.linuxtools.oprofile.doc/book.css
deleted file mode 100644
index 797473964aba9738251468fab3251d887e57a275..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.doc/book.css
+++ /dev/null
@@ -1,59 +0,0 @@
-/* following font face declarations need to be removed for DBCS */
-
-
-body, h1, h2, h3, h4, p, table, td, caption, th, ul, ol, dl, li, dd, dt {font-family: Arial, sans-serif; color: #000000}
-pre { font-family: Courier, monospace}
-
-/* end font face declarations */
-
-/* following font size declarations should be OK for DBCS */
-body, h1, h2, h3, h4, p, table, td, caption, th, ul, ol, dl, li, dd, dt {font-size: 12pt; }
-pre { font-size: 12pt}
-
-/* end font size declarations */
-
-body { background: #FFFFFF}
-h1 { font-size: 18pt; margin-top: 5; margin-bottom: 1 }
-h2 { font-size: 14pt; margin-top: 25; margin-bottom: 3 }
-h3 { font-size: 11pt; margin-top: 20; margin-bottom: 3 }
-h4 { font-size: 10pt; margin-top: 20; margin-bottom: 3; font-style: italic }
-h5 { font size: 13.5pt; }
-p { font-size: 12pt; }
-pre { margin-left: 6; font-size: 9pt }
-
-a:link { color: #006699 }
-a:visited { color: #996699 }
-a:hover { color: #006699 }
-
-ul { margin-top: 0; margin-bottom: 10 }
-li { margin-top: 0; margin-bottom: 0 }
-li p { margin-top: 0; margin-bottom: 0 }
-ol { margin-top: 0; margin-bottom: 10 }
-dl { margin-top: 0; margin-bottom: 10 }
-dt { margin-top: 0; margin-bottom: 0; font-weight: bold }
-dd { margin-top: 0; margin-bottom: 0 }
-strong { font-weight: bold}
-em { font-style: italic}
-var { font-style: italic}
-div.revision { border-left-style: solid; border-left-width: thin;
- border-left-color: #7B68EE; padding-left:5 }
-th { font-weight: bold }
-.hidden {
- display: none;
-}
-
-/* Mike Behm's addition to the style sheet */
-.userinput { font-family: monospace; }
-.guitab, .important, .guibutton, .selectblue, .guimenu, .guilabel,
-.notetitle {
- color: #000000;
- font-family: helvetica, arial, sans-serif;
- font-weight: bold;
- }
-div.linux {display:none;}
-.firsterm {font-style:italic;}
-
-.typewriter {font-family:monospace;}
-.bold {font-weight:600;}
-.linethrough {text-decoration: line-through;}
-.underline {text-decoration: underline;}
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.doc/build-helper.xml b/oprofile/org.eclipse.linuxtools.oprofile.doc/build-helper.xml
deleted file mode 100644
index e2131a089dd521be8ad0ebbdc43ba96d21027199..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.doc/build-helper.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="org.eclipse.linuxtools.oprofile.doc" default="all">
- <description>
- Generate Eclipse help content for the Linux Tools OProfile user guide
- </description>
-
- <property name="help.doc.url.base" value="http://wiki.eclipse.org" />
-
- <target name="all" description="Generate Eclipse help content for the Linux Tools OProfile user guide">
- <mediawiki-to-eclipse-help wikiBaseUrl="${help.doc.url.base}" title="OProfile User Guide" formatoutput="true" dest="." templateExcludes="*eclipseproject*">
-
- <path name="Linux_Tools_Project/OProfile/User_Guide" title="OProfile User Guide" generateToc="false" />
- <stylesheet url="book.css" />
- <pageAppendum>
-= Updating This Document =
-
-This document is maintained in a collaborative wiki. If you wish to update or modify this document please visit
-http://wiki.eclipse.org/Linux_Tools_Project/OProfile/User_Guide .
- </pageAppendum>
- </mediawiki-to-eclipse-help>
- <antcall target="test" />
- </target>
-
- <target name="test" description="verify that all of the HTML files are well-formed XML">
- <echo level="info">
-Validating help content XML and HTML files: The Eclipse help system expects well-formed XML
-
-If validation fails it is because either:
-
-* the userguide source code is poorly formed, or
-* the WikiText MediaWiki parser has a bug
-
-Problems with userguide source are usually caused by improper use of HTML markup in the MediaWiki source,
-or inadvertently starting a line with a space character (in MediaWiki this starts a preformatted block)
- </echo>
-
- <!--
- Don't bother with DTD validation: we only care if the files are well-formed.
- We therefore provide an empty DTD
- -->
- <echo file="tmp/__empty.dtd" message="" />
- <xmlvalidate lenient="true">
- <fileset dir="Linux_Tools_Project">
- <include name="**/*.html" />
- </fileset>
- <dtd publicid="-//W3C//DTD XHTML 1.0 Transitional//EN" location="${basedir}/tmp/__empty.dtd" />
- </xmlvalidate>
- <delete dir="tmp" />
- </target>
-</project>
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.doc/build.properties b/oprofile/org.eclipse.linuxtools.oprofile.doc/build.properties
deleted file mode 100644
index da432261b1f7fc448950accf42ef2e846ec116f3..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.doc/build.properties
+++ /dev/null
@@ -1,16 +0,0 @@
-bin.includes = plugin.xml,\
- META-INF/,\
- .,\
- doc/,\
- toc.xml,\
- plugin.properties,\
- about.html,\
- Linux_Tools_Project/,\
- toc-doc.xml,\
- images/,\
- book.css
-
-src.includes = toc.xml,\
- doc/,\
- about.html
-individualSourceBundles=true
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.doc/doc/notices.html b/oprofile/org.eclipse.linuxtools.oprofile.doc/doc/notices.html
deleted file mode 100644
index dd6688fd29714793bb425c02ca9800a92f35ec2b..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.doc/doc/notices.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-
-<meta name="copyright" content="© Copyright 2009 Eclipse Linux Tools project committers and others. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-
- <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
- <LINK REL="STYLESHEET" HREF="book.css" CHARSET="ISO-8859-1" TYPE="text/css">
- <title>Legal Notices</title>
-</head>
-<body>
-
-<h3>
-<a NAME="Notices"></a>Notices</h3>
-<p>
-The material in this guide is © Copyright 2009 Eclipse Linux Tools project committers and others.
-</p>
-<p>
-<a href="../about.html">Terms and conditions regarding the use of this guide.</a>
-</p>
-</body>
-</html>
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.doc/images/home.gif b/oprofile/org.eclipse.linuxtools.oprofile.doc/images/home.gif
deleted file mode 100644
index 4472e8ce5b377934abe5910749b8c58591947424..0000000000000000000000000000000000000000
Binary files a/oprofile/org.eclipse.linuxtools.oprofile.doc/images/home.gif and /dev/null differ
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.doc/images/next.gif b/oprofile/org.eclipse.linuxtools.oprofile.doc/images/next.gif
deleted file mode 100644
index e2f8c3e1feeb0541239db4061812008af2225105..0000000000000000000000000000000000000000
Binary files a/oprofile/org.eclipse.linuxtools.oprofile.doc/images/next.gif and /dev/null differ
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.doc/images/prev.gif b/oprofile/org.eclipse.linuxtools.oprofile.doc/images/prev.gif
deleted file mode 100644
index 4fb41501036b940c99c8a839d7459c88eb98385c..0000000000000000000000000000000000000000
Binary files a/oprofile/org.eclipse.linuxtools.oprofile.doc/images/prev.gif and /dev/null differ
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.doc/plugin.properties b/oprofile/org.eclipse.linuxtools.oprofile.doc/plugin.properties
deleted file mode 100644
index 911f160f40fd7344d7893d35bbe4b60597b8da58..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.doc/plugin.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-Bundle-Vendor = Eclipse Linux Tools
-Bundle-Name = OProfile Documentation
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.doc/plugin.xml b/oprofile/org.eclipse.linuxtools.oprofile.doc/plugin.xml
deleted file mode 100644
index 53bdf8de24d180d90a70bf99d6411011d81d4d70..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.doc/plugin.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.4"?>
-<plugin>
- <extension
- id="org.eclipse.linuxtools.oprofile.doc.helpDocs"
- name="OProfile"
- point="org.eclipse.help.toc">
- <toc file="toc-doc.xml" primary="true" />
- <toc file="toc.xml" primary="false"/>
- </extension>
-</plugin>
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.doc/pom.xml b/oprofile/org.eclipse.linuxtools.oprofile.doc/pom.xml
deleted file mode 100644
index 3155061f6091656ea65bc39081c2841c667f1956..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.doc/pom.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (C) 2011, 2018 Red Hat, Inc.
-
- This program and the accompanying materials are made
- available under the terms of the Eclipse Public License 2.0
- which is available at https://www.eclipse.org/legal/epl-2.0/
-
- SPDX-License-Identifier: EPL-2.0
--->
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <artifactId>linuxtools-oprofile-parent</artifactId>
- <groupId>org.eclipse.linuxtools.oprofile</groupId>
- <version>7.4.0</version>
- </parent>
-
- <artifactId>org.eclipse.linuxtools.oprofile.doc</artifactId>
- <version>1.0.0-SNAPSHOT</version>
- <packaging>eclipse-plugin</packaging>
-
- <name>Linux Tools OProfile Documentation Plug-in</name>
-
- <profiles>
- <profile>
- <id>regenHelp</id>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <id>helpdocs</id>
- <phase>generate-resources</phase>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
-</project>
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.doc/toc-doc.xml b/oprofile/org.eclipse.linuxtools.oprofile.doc/toc-doc.xml
deleted file mode 100644
index 1314f2d274d26a1e4160a07da0db32b70e16da1f..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.doc/toc-doc.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version='1.0' encoding='utf-8' ?>
-<toc topic="Linux_Tools_Project/OProfile/User_Guide/User-Guide.html" label="OProfile User Guide">
-<link toc="toc.xml" />
-<topic href="doc/notices.html" label="Legal"> </topic>
-</toc>
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.doc/toc.xml b/oprofile/org.eclipse.linuxtools.oprofile.doc/toc.xml
deleted file mode 100644
index 9a3793cc6018d0ff31cf487db43a6f06a343c48e..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.doc/toc.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version='1.0' encoding='utf-8' ?>
-<toc topic="Linux_Tools_Project/OProfile/User_Guide/User-Guide.html" label="OProfile User Guide">
- <topic href="Linux_Tools_Project/OProfile/User_Guide/User-Guide.html" label="OProfile User Guide">
- <topic href="Linux_Tools_Project/OProfile/User_Guide/User-Guide.html" label="Overview"></topic>
- <topic href="Linux_Tools_Project/OProfile/User_Guide/Installation-and-Set-Up.html" label="Installation and Set-Up">
- <topic href="Linux_Tools_Project/OProfile/User_Guide/Installation-and-Set-Up.html#Step_1_-_Locate_the_Installation_Scripts" label="Step 1 - Locate the Installation Scripts"></topic>
- <topic href="Linux_Tools_Project/OProfile/User_Guide/Installation-and-Set-Up.html#Step_2_-_Choose_Which_Installation_Script_To_Run" label="Step 2 - Choose Which Installation Script To Run"></topic>
- <topic href="Linux_Tools_Project/OProfile/User_Guide/Installation-and-Set-Up.html#Step_3_-_Running_The_Install_Script" label="Step 3 - Running The Install Script"></topic>
- <topic href="Linux_Tools_Project/OProfile/User_Guide/Installation-and-Set-Up.html#Step_4_-_Restart_Eclipse" label="Step 4 - Restart Eclipse"></topic>
- </topic>
- <topic href="Linux_Tools_Project/OProfile/User_Guide/Launching-A-Profile.html" label="Launching A Profile">
- <topic href="Linux_Tools_Project/OProfile/User_Guide/Launching-A-Profile.html#One-Click_Launch" label="One-Click Launch"></topic>
- <topic href="Linux_Tools_Project/OProfile/User_Guide/Launching-A-Profile.html#Launching_a_Customized_Profile" label="Launching a Customized Profile"></topic>
- <topic href="Linux_Tools_Project/OProfile/User_Guide/Launching-A-Profile.html#Manual_Profile" label="Manual Profile"></topic>
- </topic>
- <topic href="Linux_Tools_Project/OProfile/User_Guide/Profiling-Configuration.html" label="Profiling Configuration">
- <topic href="Linux_Tools_Project/OProfile/User_Guide/Profiling-Configuration.html#Operf_vs_Opcontrol" label="Operf vs Opcontrol"></topic>
- <topic href="Linux_Tools_Project/OProfile/User_Guide/Profiling-Configuration.html#Global_Settings" label="Global Settings"></topic>
- <topic href="Linux_Tools_Project/OProfile/User_Guide/Profiling-Configuration.html#Event_Configuration" label="Event Configuration">
- <topic href="Linux_Tools_Project/OProfile/User_Guide/Profiling-Configuration.html#Timer_Interrupt_Mode" label="Timer Interrupt Mode"></topic>
- <topic href="Linux_Tools_Project/OProfile/User_Guide/Profiling-Configuration.html#Regular_Mode" label="Regular Mode"></topic>
- </topic>
- </topic>
- <topic href="Linux_Tools_Project/OProfile/User_Guide/OProfile-View.html" label="OProfile View">
- <topic href="Linux_Tools_Project/OProfile/User_Guide/OProfile-View.html#Features" label="Features">
- <topic href="Linux_Tools_Project/OProfile/User_Guide/OProfile-View.html#View_Tree" label="View Tree"></topic>
- <topic href="Linux_Tools_Project/OProfile/User_Guide/OProfile-View.html#View_Menu" label="View Menu"></topic>
- </topic>
- </topic>
- <topic href="Linux_Tools_Project/OProfile/User_Guide/Remote-OProfile.html" label="Remote OProfile">
- <topic href="Linux_Tools_Project/OProfile/User_Guide/Remote-OProfile.html#Set-up" label="Set-up"></topic>
- <topic href="Linux_Tools_Project/OProfile/User_Guide/Remote-OProfile.html#Launching_A_Remote_Profile" label="Launching A Remote Profile"></topic>
- </topic>
- <topic href="Linux_Tools_Project/OProfile/User_Guide/Example-Project.html" label="Example Project"></topic>
- <topic href="Linux_Tools_Project/OProfile/User_Guide/Troubleshooting.html" label="Troubleshooting">
- <topic href="Linux_Tools_Project/OProfile/User_Guide/Troubleshooting.html#Install_Script_Errors" label="Install Script Errors">
- <topic href="Linux_Tools_Project/OProfile/User_Guide/Troubleshooting.html#Error:_script_must_be_run_as_the_root_user" label="Error: script must be run as the root user"></topic>
- <topic href="Linux_Tools_Project/OProfile/User_Guide/Troubleshooting.html#Error:_script_must_be_run_with_pwd_in_script_dir" label="Error: script must be run with pwd in script dir"></topic>
- <topic href="Linux_Tools_Project/OProfile/User_Guide/Troubleshooting.html#Error:_required_binaries_do_not_exist.2C_OProfile_not_installed.3F" label="Error: required binaries do not exist, OProfile not installed?"></topic>
- <topic href="Linux_Tools_Project/OProfile/User_Guide/Troubleshooting.html#Error:_.2Fusr.2Fbin.2Fpkexec_does_not_exist" label="Error: /usr/bin/pkexec does not exist"></topic>
- <topic href="Linux_Tools_Project/OProfile/User_Guide/Troubleshooting.html#install.sh:_line_47:_opcontrol:_Permission_denied" label="install.sh: line 47: opcontrol: Permission denied"></topic>
- </topic>
- <topic href="Linux_Tools_Project/OProfile/User_Guide/Troubleshooting.html#No_Samples_From_A_Profile" label="No Samples From A Profile"></topic>
- <topic href="Linux_Tools_Project/OProfile/User_Guide/Troubleshooting.html#Log_Reader_Hangs" label="Log Reader Hangs"></topic>
- <topic href="Linux_Tools_Project/OProfile/User_Guide/Troubleshooting.html#Using_PolicyKit_with_X.2FVNC" label="Using PolicyKit with X/VNC"></topic>
- </topic>
- <topic href="Linux_Tools_Project/OProfile/User_Guide/Updating-This-Document.html" label="Updating This Document"></topic>
- </topic>
-</toc>
\ No newline at end of file
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.launch.tests/.classpath b/oprofile/org.eclipse.linuxtools.oprofile.launch.tests/.classpath
deleted file mode 100644
index 43b986286a9e5fd1828793fa4b2353d02ab8625f..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.launch.tests/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="output" path="target/classes"/>
-</classpath>
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.launch.tests/.gitignore b/oprofile/org.eclipse.linuxtools.oprofile.launch.tests/.gitignore
deleted file mode 100644
index 8d94ef8debe45a7bc3866f985fdc60d41c12822f..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.launch.tests/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-bin
-@dot
-javaCompiler...args
-build.xml
-target
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.launch.tests/.project b/oprofile/org.eclipse.linuxtools.oprofile.launch.tests/.project
deleted file mode 100644
index a5702a738c88a03794c892e1116239957ccdc046..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.launch.tests/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.linuxtools.oprofile.launch.tests</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.launch.tests/.settings/org.eclipse.jdt.core.prefs b/oprofile/org.eclipse.linuxtools.oprofile.launch.tests/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index a571a447ab721b74923412ea3a849f27d81613bb..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.launch.tests/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,100 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled
-org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
-org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull
-org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault
-org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
-org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.8
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
-org.eclipse.jdt.core.compiler.problem.deadCode=warning
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=warning
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDefaultCase=ignore
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning
-org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled
-org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=warning
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning
-org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning
-org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error
-org.eclipse.jdt.core.compiler.problem.nullReference=warning
-org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error
-org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
-org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
-org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
-org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=warning
-org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
-org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
-org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=disabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=disabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=enabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=error
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning
-org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.8
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.launch.tests/.settings/org.eclipse.jdt.ui.prefs b/oprofile/org.eclipse.linuxtools.oprofile.launch.tests/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 879fe263426bd09df516cdeefc6bd43b8f61e18c..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.launch.tests/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,54 +0,0 @@
-eclipse.preferences.version=1
-editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
-sp_cleanup.add_default_serial_version_id=true
-sp_cleanup.add_generated_serial_version_id=false
-sp_cleanup.add_missing_annotations=true
-sp_cleanup.add_missing_deprecated_annotations=true
-sp_cleanup.add_missing_methods=false
-sp_cleanup.add_missing_nls_tags=false
-sp_cleanup.add_missing_override_annotations=true
-sp_cleanup.add_missing_override_annotations_interface_methods=true
-sp_cleanup.add_serial_version_id=false
-sp_cleanup.always_use_blocks=true
-sp_cleanup.always_use_parentheses_in_expressions=false
-sp_cleanup.always_use_this_for_non_static_field_access=false
-sp_cleanup.always_use_this_for_non_static_method_access=false
-sp_cleanup.convert_to_enhanced_for_loop=false
-sp_cleanup.correct_indentation=false
-sp_cleanup.format_source_code=false
-sp_cleanup.format_source_code_changes_only=false
-sp_cleanup.make_local_variable_final=false
-sp_cleanup.make_parameters_final=false
-sp_cleanup.make_private_fields_final=true
-sp_cleanup.make_type_abstract_if_missing_method=false
-sp_cleanup.make_variable_declarations_final=true
-sp_cleanup.never_use_blocks=false
-sp_cleanup.never_use_parentheses_in_expressions=true
-sp_cleanup.on_save_use_additional_actions=false
-sp_cleanup.organize_imports=true
-sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
-sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
-sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
-sp_cleanup.qualify_static_member_accesses_with_declaring_class=false
-sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
-sp_cleanup.remove_private_constructors=true
-sp_cleanup.remove_trailing_whitespaces=false
-sp_cleanup.remove_trailing_whitespaces_all=true
-sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
-sp_cleanup.remove_unnecessary_casts=true
-sp_cleanup.remove_unnecessary_nls_tags=false
-sp_cleanup.remove_unused_imports=false
-sp_cleanup.remove_unused_local_variables=false
-sp_cleanup.remove_unused_private_fields=true
-sp_cleanup.remove_unused_private_members=false
-sp_cleanup.remove_unused_private_methods=true
-sp_cleanup.remove_unused_private_types=true
-sp_cleanup.sort_members=false
-sp_cleanup.sort_members_all=false
-sp_cleanup.use_blocks=false
-sp_cleanup.use_blocks_only_for_return_and_throw=false
-sp_cleanup.use_parentheses_in_expressions=false
-sp_cleanup.use_this_for_non_static_field_access=false
-sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
-sp_cleanup.use_this_for_non_static_method_access=false
-sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.launch.tests/META-INF/MANIFEST.MF b/oprofile/org.eclipse.linuxtools.oprofile.launch.tests/META-INF/MANIFEST.MF
deleted file mode 100644
index 41a9c62321c30170f3fbf513f219a5f76aafea40..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.launch.tests/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,14 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %bundleName
-Bundle-SymbolicName: org.eclipse.linuxtools.oprofile.launch.tests
-Bundle-Version: 1.0.0.qualifier
-Bundle-Vendor: %bundleProvider
-Require-Bundle:
- org.junit;bundle-version="4.10.0"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Bundle-ActivationPolicy: lazy
-Fragment-Host: org.eclipse.linuxtools.oprofile.launch
-Import-Package: org.eclipse.linuxtools.profiling.tests
-Bundle-Localization: plugin
-Automatic-Module-Name: org.eclipse.linuxtools.oprofile.launch.tests
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.launch.tests/about.html b/oprofile/org.eclipse.linuxtools.oprofile.launch.tests/about.html
deleted file mode 100644
index 164f781a8fd2195f87c3d3d49946d56bce58992f..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.launch.tests/about.html
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<title>About</title>
-</head>
-<body lang="EN-US">
- <h2>About This Content</h2>
-
- <p>November 30, 2017</p>
- <h3>License</h3>
-
- <p>
- The Eclipse Foundation makes available all content in this plug-in
- ("Content"). Unless otherwise indicated below, the Content
- is provided to you under the terms and conditions of the Eclipse
- Public License Version 2.0 ("EPL"). A copy of the EPL is
- available at <a href="http://www.eclipse.org/legal/epl-2.0">http://www.eclipse.org/legal/epl-2.0</a>.
- For purposes of the EPL, "Program" will mean the Content.
- </p>
-
- <p>
- If you did not receive this Content directly from the Eclipse
- Foundation, the Content is being redistributed by another party
- ("Redistributor") and different terms and conditions may
- apply to your use of any object code in the Content. Check the
- Redistributor's license that was provided with the Content. If no such
- license exists, contact the Redistributor. Unless otherwise indicated
- below, the terms and conditions of the EPL still apply to any source
- code in the Content and such source code may be obtained at <a
- href="http://www.eclipse.org/">http://www.eclipse.org</a>.
- </p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.launch.tests/build.properties b/oprofile/org.eclipse.linuxtools.oprofile.launch.tests/build.properties
deleted file mode 100644
index 19d923f90f40de3aac5fe2c219f654f69e74fbbc..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.launch.tests/build.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-source.. = src/
-bin.includes = META-INF/,\
- .,\
- plugin.properties,\
- resources/
-src.includes = resources/,\
- about.html
-individualSourceBundles=true
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.launch.tests/plugin.properties b/oprofile/org.eclipse.linuxtools.oprofile.launch.tests/plugin.properties
deleted file mode 100644
index a7eef039b212825d791bc7a35349bb74e7a11b70..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.launch.tests/plugin.properties
+++ /dev/null
@@ -1,14 +0,0 @@
-#*******************************************************************************
-# Copyright (c) 2009, 2018 Red Hat, Inc.
-#
-# This program and the accompanying materials are made
-# available under the terms of the Eclipse Public License 2.0
-# which is available at https://www.eclipse.org/legal/epl-2.0/
-#
-# SPDX-License-Identifier: EPL-2.0
-#
-# Contributors:
-# Kent Sebastian <ksebasti@redhat.com> - initial API and implementation
-#*******************************************************************************
-bundleName=OProfile Ui Tests Plug-in
-bundleProvider=Eclipse Linux Tools
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.launch.tests/pom.xml b/oprofile/org.eclipse.linuxtools.oprofile.launch.tests/pom.xml
deleted file mode 100644
index ffddb768b6bd6a0148c1bbf23c71c2597813e8cd..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.launch.tests/pom.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (C) 2011, 2018 Red Hat, Inc.
-
- This program and the accompanying materials are made
- available under the terms of the Eclipse Public License 2.0
- which is available at https://www.eclipse.org/legal/epl-2.0/
-
- SPDX-License-Identifier: EPL-2.0
--->
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <artifactId>linuxtools-oprofile-parent</artifactId>
- <groupId>org.eclipse.linuxtools.oprofile</groupId>
- <version>7.4.0</version>
- </parent>
-
- <artifactId>org.eclipse.linuxtools.oprofile.launch.tests</artifactId>
- <version>1.0.0-SNAPSHOT</version>
- <packaging>eclipse-test-plugin</packaging>
-
- <name>Linux Tools OProfile Launch Tests Plug-in</name>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-surefire-plugin</artifactId>
- <version>${tycho-version}</version>
- <configuration>
- <useUIHarness>true</useUIHarness>
- <useUIThread>true</useUIThread>
- <product>org.eclipse.platform.ide</product>
- <testSuite>org.eclipse.linuxtools.oprofile.launch.tests</testSuite>
- <testClass>org.eclipse.linuxtools.oprofile.launch.tests.AllLaunchTests</testClass>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
-</project>
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.launch.tests/resources/primeTest/.cproject b/oprofile/org.eclipse.linuxtools.oprofile.launch.tests/resources/primeTest/.cproject
deleted file mode 100644
index 189e0592c17696547e0e056316fdd39f4d437ecc..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.launch.tests/resources/primeTest/.cproject
+++ /dev/null
@@ -1,593 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?fileVersion 4.0.0?>
-
-<cproject>
-<storageModule moduleId="org.eclipse.cdt.core.settings">
-<cconfiguration id="cdt.managedbuild.config.gnu.exe.debug.403427377">
-<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="cdt.managedbuild.config.gnu.exe.debug.403427377" moduleId="org.eclipse.cdt.core.settings" name="Debug">
-<externalSettings/>
-<extensions>
-<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
-<extension id="org.eclipse.cdt.core.MakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-</extensions>
-</storageModule>
-<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-<configuration artifactName="primeTest" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug,org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe" cleanCommand="rm -rf" description="" id="cdt.managedbuild.config.gnu.exe.debug.403427377" name="Debug" parent="cdt.managedbuild.config.gnu.exe.debug">
-<folderInfo id="cdt.managedbuild.config.gnu.exe.debug.403427377." name="/" resourcePath="">
-<toolChain id="cdt.managedbuild.toolchain.gnu.exe.debug.558427244" name="Linux GCC" superClass="cdt.managedbuild.toolchain.gnu.exe.debug">
-<targetPlatform id="cdt.managedbuild.target.gnu.platform.exe.debug.1359199583" name="Debug Platform" superClass="cdt.managedbuild.target.gnu.platform.exe.debug"/>
-<builder buildPath="${workspace_loc:/primeTest/Debug}" id="cdt.managedbuild.target.gnu.builder.exe.debug.586737917" managedBuildOn="true" name="Gnu Make Builder.Debug" superClass="cdt.managedbuild.target.gnu.builder.exe.debug"/>
-<tool id="cdt.managedbuild.tool.gnu.archiver.base.2089156823" name="GCC Archiver" superClass="cdt.managedbuild.tool.gnu.archiver.base"/>
-<tool id="cdt.managedbuild.tool.gnu.cpp.compiler.exe.debug.838879119" name="GCC C++ Compiler" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.exe.debug">
-<option id="gnu.cpp.compiler.exe.debug.option.optimization.level.2129883685" superClass="gnu.cpp.compiler.exe.debug.option.optimization.level" value="gnu.cpp.compiler.optimization.level.none" valueType="enumerated"/>
-<option id="gnu.cpp.compiler.exe.debug.option.debugging.level.900612275" superClass="gnu.cpp.compiler.exe.debug.option.debugging.level" value="gnu.cpp.compiler.debugging.level.max" valueType="enumerated"/>
-</tool>
-<tool id="cdt.managedbuild.tool.gnu.c.compiler.exe.debug.890848790" name="GCC C Compiler" superClass="cdt.managedbuild.tool.gnu.c.compiler.exe.debug">
-<option defaultValue="gnu.c.optimization.level.none" id="gnu.c.compiler.exe.debug.option.optimization.level.1566991183" superClass="gnu.c.compiler.exe.debug.option.optimization.level" valueType="enumerated"/>
-<option id="gnu.c.compiler.exe.debug.option.debugging.level.733038562" superClass="gnu.c.compiler.exe.debug.option.debugging.level" value="gnu.c.debugging.level.max" valueType="enumerated"/>
-<inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.582042928" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/>
-</tool>
-<tool id="cdt.managedbuild.tool.gnu.c.linker.exe.debug.1103748863" name="GCC C Linker" superClass="cdt.managedbuild.tool.gnu.c.linker.exe.debug">
-<inputType id="cdt.managedbuild.tool.gnu.c.linker.input.720696663" superClass="cdt.managedbuild.tool.gnu.c.linker.input">
-<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
-<additionalInput kind="additionalinput" paths="$(LIBS)"/>
-</inputType>
-</tool>
-<tool id="cdt.managedbuild.tool.gnu.cpp.linker.exe.debug.1031198340" name="GCC C++ Linker" superClass="cdt.managedbuild.tool.gnu.cpp.linker.exe.debug"/>
-<tool id="cdt.managedbuild.tool.gnu.assembler.exe.debug.711744790" name="GCC Assembler" superClass="cdt.managedbuild.tool.gnu.assembler.exe.debug">
-<inputType id="cdt.managedbuild.tool.gnu.assembler.input.1029709722" superClass="cdt.managedbuild.tool.gnu.assembler.input"/>
-</tool>
-</toolChain>
-</folderInfo>
-</configuration>
-</storageModule>
-<storageModule moduleId="scannerConfiguration">
-<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile"/>
-<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="makefileGenerator">
-<runAction arguments="-f ${project_name}_scd.mk" command="make" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfile">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileCPP">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileC">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.exe.debug.403427377;cdt.managedbuild.config.gnu.exe.debug.403427377.;cdt.managedbuild.tool.gnu.c.compiler.exe.debug.890848790;cdt.managedbuild.tool.gnu.c.compiler.input.582042928">
-<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC"/>
-<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="makefileGenerator">
-<runAction arguments="-f ${project_name}_scd.mk" command="make" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfile">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileCPP">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileC">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-</scannerConfigBuildInfo>
-<scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.exe.release.24056498;cdt.managedbuild.config.gnu.exe.release.24056498.;cdt.managedbuild.tool.gnu.c.compiler.exe.release.1686021986;cdt.managedbuild.tool.gnu.c.compiler.input.1357248577">
-<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC"/>
-<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="makefileGenerator">
-<runAction arguments="-f ${project_name}_scd.mk" command="make" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfile">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileCPP">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileC">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-</scannerConfigBuildInfo>
-</storageModule>
-<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
-</cconfiguration>
-<cconfiguration id="cdt.managedbuild.config.gnu.exe.release.24056498">
-<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="cdt.managedbuild.config.gnu.exe.release.24056498" moduleId="org.eclipse.cdt.core.settings" name="Release">
-<externalSettings/>
-<extensions>
-<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
-<extension id="org.eclipse.cdt.core.MakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-</extensions>
-</storageModule>
-<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-<configuration artifactName="primeTest" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.release,org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe" cleanCommand="rm -rf" description="" id="cdt.managedbuild.config.gnu.exe.release.24056498" name="Release" parent="cdt.managedbuild.config.gnu.exe.release">
-<folderInfo id="cdt.managedbuild.config.gnu.exe.release.24056498." name="/" resourcePath="">
-<toolChain id="cdt.managedbuild.toolchain.gnu.exe.release.247847873" name="Linux GCC" superClass="cdt.managedbuild.toolchain.gnu.exe.release">
-<targetPlatform id="cdt.managedbuild.target.gnu.platform.exe.release.2144033541" name="Debug Platform" superClass="cdt.managedbuild.target.gnu.platform.exe.release"/>
-<builder buildPath="${workspace_loc:/primeTest/Release}" id="cdt.managedbuild.target.gnu.builder.exe.release.1815603600" managedBuildOn="true" name="Gnu Make Builder.Release" superClass="cdt.managedbuild.target.gnu.builder.exe.release"/>
-<tool id="cdt.managedbuild.tool.gnu.archiver.base.514329033" name="GCC Archiver" superClass="cdt.managedbuild.tool.gnu.archiver.base"/>
-<tool id="cdt.managedbuild.tool.gnu.cpp.compiler.exe.release.732737648" name="GCC C++ Compiler" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.exe.release">
-<option id="gnu.cpp.compiler.exe.release.option.optimization.level.1782789072" superClass="gnu.cpp.compiler.exe.release.option.optimization.level" value="gnu.cpp.compiler.optimization.level.most" valueType="enumerated"/>
-<option id="gnu.cpp.compiler.exe.release.option.debugging.level.883245152" superClass="gnu.cpp.compiler.exe.release.option.debugging.level" value="gnu.cpp.compiler.debugging.level.none" valueType="enumerated"/>
-</tool>
-<tool id="cdt.managedbuild.tool.gnu.c.compiler.exe.release.1686021986" name="GCC C Compiler" superClass="cdt.managedbuild.tool.gnu.c.compiler.exe.release">
-<option defaultValue="gnu.c.optimization.level.most" id="gnu.c.compiler.exe.release.option.optimization.level.1286291976" superClass="gnu.c.compiler.exe.release.option.optimization.level" valueType="enumerated"/>
-<option id="gnu.c.compiler.exe.release.option.debugging.level.74557006" superClass="gnu.c.compiler.exe.release.option.debugging.level" value="gnu.c.debugging.level.none" valueType="enumerated"/>
-<inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.1357248577" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/>
-</tool>
-<tool id="cdt.managedbuild.tool.gnu.c.linker.exe.release.1980307205" name="GCC C Linker" superClass="cdt.managedbuild.tool.gnu.c.linker.exe.release">
-<inputType id="cdt.managedbuild.tool.gnu.c.linker.input.1094559692" superClass="cdt.managedbuild.tool.gnu.c.linker.input">
-<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
-<additionalInput kind="additionalinput" paths="$(LIBS)"/>
-</inputType>
-</tool>
-<tool id="cdt.managedbuild.tool.gnu.cpp.linker.exe.release.906024509" name="GCC C++ Linker" superClass="cdt.managedbuild.tool.gnu.cpp.linker.exe.release"/>
-<tool id="cdt.managedbuild.tool.gnu.assembler.exe.release.1057582725" name="GCC Assembler" superClass="cdt.managedbuild.tool.gnu.assembler.exe.release">
-<inputType id="cdt.managedbuild.tool.gnu.assembler.input.592314293" superClass="cdt.managedbuild.tool.gnu.assembler.input"/>
-</tool>
-</toolChain>
-</folderInfo>
-</configuration>
-</storageModule>
-<storageModule moduleId="scannerConfiguration">
-<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile"/>
-<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="makefileGenerator">
-<runAction arguments="-f ${project_name}_scd.mk" command="make" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfile">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileCPP">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileC">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.exe.debug.403427377;cdt.managedbuild.config.gnu.exe.debug.403427377.;cdt.managedbuild.tool.gnu.c.compiler.exe.debug.890848790;cdt.managedbuild.tool.gnu.c.compiler.input.582042928">
-<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC"/>
-<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="makefileGenerator">
-<runAction arguments="-f ${project_name}_scd.mk" command="make" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfile">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileCPP">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileC">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-</scannerConfigBuildInfo>
-<scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.exe.release.24056498;cdt.managedbuild.config.gnu.exe.release.24056498.;cdt.managedbuild.tool.gnu.c.compiler.exe.release.1686021986;cdt.managedbuild.tool.gnu.c.compiler.input.1357248577">
-<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC"/>
-<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="makefileGenerator">
-<runAction arguments="-f ${project_name}_scd.mk" command="make" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfile">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileCPP">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileC">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-</scannerConfigBuildInfo>
-</storageModule>
-</cconfiguration>
-</storageModule>
-<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-<project id="primeTest.cdt.managedbuild.target.gnu.exe.2060231390" name="Executable" projectType="cdt.managedbuild.target.gnu.exe"/>
-</storageModule>
-</cproject>
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.launch.tests/resources/primeTest/.project b/oprofile/org.eclipse.linuxtools.oprofile.launch.tests/resources/primeTest/.project
deleted file mode 100644
index bcbd6b7b3cacfd87d37d043353710598151bc98f..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.launch.tests/resources/primeTest/.project
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>primeTest</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>
- <triggers>clean,full,incremental,</triggers>
- <arguments>
- <dictionary>
- <key>?name?</key>
- <value></value>
- </dictionary>
- <dictionary>
- <key>org.eclipse.cdt.make.core.append_environment</key>
- <value>true</value>
- </dictionary>
- <dictionary>
- <key>org.eclipse.cdt.make.core.autoBuildTarget</key>
- <value>all</value>
- </dictionary>
- <dictionary>
- <key>org.eclipse.cdt.make.core.buildArguments</key>
- <value></value>
- </dictionary>
- <dictionary>
- <key>org.eclipse.cdt.make.core.buildCommand</key>
- <value>make</value>
- </dictionary>
- <dictionary>
- <key>org.eclipse.cdt.make.core.buildLocation</key>
- <value>${workspace_loc:/primeTest/Debug}</value>
- </dictionary>
- <dictionary>
- <key>org.eclipse.cdt.make.core.cleanBuildTarget</key>
- <value>clean</value>
- </dictionary>
- <dictionary>
- <key>org.eclipse.cdt.make.core.contents</key>
- <value>org.eclipse.cdt.make.core.activeConfigSettings</value>
- </dictionary>
- <dictionary>
- <key>org.eclipse.cdt.make.core.enableAutoBuild</key>
- <value>false</value>
- </dictionary>
- <dictionary>
- <key>org.eclipse.cdt.make.core.enableCleanBuild</key>
- <value>true</value>
- </dictionary>
- <dictionary>
- <key>org.eclipse.cdt.make.core.enableFullBuild</key>
- <value>true</value>
- </dictionary>
- <dictionary>
- <key>org.eclipse.cdt.make.core.fullBuildTarget</key>
- <value>all</value>
- </dictionary>
- <dictionary>
- <key>org.eclipse.cdt.make.core.stopOnError</key>
- <value>true</value>
- </dictionary>
- <dictionary>
- <key>org.eclipse.cdt.make.core.useDefaultBuildCmd</key>
- <value>true</value>
- </dictionary>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
- <nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>
- <nature>org.eclipse.cdt.core.cnature</nature>
- </natures>
-</projectDescription>
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.launch.tests/resources/primeTest/primeTest.c b/oprofile/org.eclipse.linuxtools.oprofile.launch.tests/resources/primeTest/primeTest.c
deleted file mode 100644
index df4f802a0b7753851b3fdedb83f6432f68055c0e..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.launch.tests/resources/primeTest/primeTest.c
+++ /dev/null
@@ -1,36 +0,0 @@
-void
-PrimeFactors(int n)
-{
- int count = 0;
- int temp = 0;
- int i = 0;
- for (i = 1; i <= n; i++)
- {
- int j = i - 1;
- while (j > 1)
- {
- if (i % j == 0) //Is PRIME
- break;
- else
- j--;
- }
-
- if (j == 1)
- {
- if (n % i == 0)
- {
- if (i > temp)
- temp = i;
- count++;
- }
- }
- }
-}
-
-int
-main()
-{
- int a = 35324;
- PrimeFactors(a);
- return 0;
-}
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.launch.tests/resources/sleepTest/.cproject b/oprofile/org.eclipse.linuxtools.oprofile.launch.tests/resources/sleepTest/.cproject
deleted file mode 100644
index cd18366c9c9c61303ca1c336c6b93c8fef872ca9..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.launch.tests/resources/sleepTest/.cproject
+++ /dev/null
@@ -1,593 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?fileVersion 4.0.0?>
-
-<cproject>
-<storageModule moduleId="org.eclipse.cdt.core.settings">
-<cconfiguration id="cdt.managedbuild.config.gnu.exe.debug.1175678966">
-<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="cdt.managedbuild.config.gnu.exe.debug.1175678966" moduleId="org.eclipse.cdt.core.settings" name="Debug">
-<externalSettings/>
-<extensions>
-<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
-<extension id="org.eclipse.cdt.core.MakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-</extensions>
-</storageModule>
-<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-<configuration artifactName="sleepTest" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug,org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe" cleanCommand="rm -rf" description="" id="cdt.managedbuild.config.gnu.exe.debug.1175678966" name="Debug" parent="cdt.managedbuild.config.gnu.exe.debug">
-<folderInfo id="cdt.managedbuild.config.gnu.exe.debug.1175678966." name="/" resourcePath="">
-<toolChain id="cdt.managedbuild.toolchain.gnu.exe.debug.1707235535" name="Linux GCC" superClass="cdt.managedbuild.toolchain.gnu.exe.debug">
-<targetPlatform id="cdt.managedbuild.target.gnu.platform.exe.debug.1214447499" name="Debug Platform" superClass="cdt.managedbuild.target.gnu.platform.exe.debug"/>
-<builder buildPath="${workspace_loc:/sleepTest/Debug}" id="cdt.managedbuild.target.gnu.builder.exe.debug.1027550092" managedBuildOn="true" name="Gnu Make Builder.Debug" superClass="cdt.managedbuild.target.gnu.builder.exe.debug"/>
-<tool id="cdt.managedbuild.tool.gnu.archiver.base.1529643871" name="GCC Archiver" superClass="cdt.managedbuild.tool.gnu.archiver.base"/>
-<tool id="cdt.managedbuild.tool.gnu.cpp.compiler.exe.debug.339425130" name="GCC C++ Compiler" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.exe.debug">
-<option id="gnu.cpp.compiler.exe.debug.option.optimization.level.1980513678" superClass="gnu.cpp.compiler.exe.debug.option.optimization.level" value="gnu.cpp.compiler.optimization.level.none" valueType="enumerated"/>
-<option id="gnu.cpp.compiler.exe.debug.option.debugging.level.587285095" superClass="gnu.cpp.compiler.exe.debug.option.debugging.level" value="gnu.cpp.compiler.debugging.level.max" valueType="enumerated"/>
-</tool>
-<tool id="cdt.managedbuild.tool.gnu.c.compiler.exe.debug.1711527348" name="GCC C Compiler" superClass="cdt.managedbuild.tool.gnu.c.compiler.exe.debug">
-<option defaultValue="gnu.c.optimization.level.none" id="gnu.c.compiler.exe.debug.option.optimization.level.948398850" superClass="gnu.c.compiler.exe.debug.option.optimization.level" valueType="enumerated"/>
-<option id="gnu.c.compiler.exe.debug.option.debugging.level.1175577535" superClass="gnu.c.compiler.exe.debug.option.debugging.level" value="gnu.c.debugging.level.max" valueType="enumerated"/>
-<inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.1219179977" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/>
-</tool>
-<tool id="cdt.managedbuild.tool.gnu.c.linker.exe.debug.546839158" name="GCC C Linker" superClass="cdt.managedbuild.tool.gnu.c.linker.exe.debug">
-<inputType id="cdt.managedbuild.tool.gnu.c.linker.input.1380471818" superClass="cdt.managedbuild.tool.gnu.c.linker.input">
-<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
-<additionalInput kind="additionalinput" paths="$(LIBS)"/>
-</inputType>
-</tool>
-<tool id="cdt.managedbuild.tool.gnu.cpp.linker.exe.debug.1493322213" name="GCC C++ Linker" superClass="cdt.managedbuild.tool.gnu.cpp.linker.exe.debug"/>
-<tool id="cdt.managedbuild.tool.gnu.assembler.exe.debug.1271920137" name="GCC Assembler" superClass="cdt.managedbuild.tool.gnu.assembler.exe.debug">
-<inputType id="cdt.managedbuild.tool.gnu.assembler.input.2029809829" superClass="cdt.managedbuild.tool.gnu.assembler.input"/>
-</tool>
-</toolChain>
-</folderInfo>
-</configuration>
-</storageModule>
-<storageModule moduleId="scannerConfiguration">
-<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile"/>
-<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="makefileGenerator">
-<runAction arguments="-f ${project_name}_scd.mk" command="make" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfile">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileCPP">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileC">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.exe.release.1894586679;cdt.managedbuild.config.gnu.exe.release.1894586679.;cdt.managedbuild.tool.gnu.c.compiler.exe.release.1456980182;cdt.managedbuild.tool.gnu.c.compiler.input.1930258097">
-<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC"/>
-<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="makefileGenerator">
-<runAction arguments="-f ${project_name}_scd.mk" command="make" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfile">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileCPP">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileC">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-</scannerConfigBuildInfo>
-<scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.exe.debug.1175678966;cdt.managedbuild.config.gnu.exe.debug.1175678966.;cdt.managedbuild.tool.gnu.c.compiler.exe.debug.1711527348;cdt.managedbuild.tool.gnu.c.compiler.input.1219179977">
-<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC"/>
-<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="makefileGenerator">
-<runAction arguments="-f ${project_name}_scd.mk" command="make" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfile">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileCPP">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileC">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-</scannerConfigBuildInfo>
-</storageModule>
-<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
-</cconfiguration>
-<cconfiguration id="cdt.managedbuild.config.gnu.exe.release.1894586679">
-<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="cdt.managedbuild.config.gnu.exe.release.1894586679" moduleId="org.eclipse.cdt.core.settings" name="Release">
-<externalSettings/>
-<extensions>
-<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
-<extension id="org.eclipse.cdt.core.MakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-</extensions>
-</storageModule>
-<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-<configuration artifactName="sleepTest" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.release,org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe" cleanCommand="rm -rf" description="" id="cdt.managedbuild.config.gnu.exe.release.1894586679" name="Release" parent="cdt.managedbuild.config.gnu.exe.release">
-<folderInfo id="cdt.managedbuild.config.gnu.exe.release.1894586679." name="/" resourcePath="">
-<toolChain id="cdt.managedbuild.toolchain.gnu.exe.release.1335316415" name="Linux GCC" superClass="cdt.managedbuild.toolchain.gnu.exe.release">
-<targetPlatform id="cdt.managedbuild.target.gnu.platform.exe.release.1056384912" name="Debug Platform" superClass="cdt.managedbuild.target.gnu.platform.exe.release"/>
-<builder buildPath="${workspace_loc:/sleepTest/Release}" id="cdt.managedbuild.target.gnu.builder.exe.release.1890388296" managedBuildOn="true" name="Gnu Make Builder.Release" superClass="cdt.managedbuild.target.gnu.builder.exe.release"/>
-<tool id="cdt.managedbuild.tool.gnu.archiver.base.1599654641" name="GCC Archiver" superClass="cdt.managedbuild.tool.gnu.archiver.base"/>
-<tool id="cdt.managedbuild.tool.gnu.cpp.compiler.exe.release.110695799" name="GCC C++ Compiler" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.exe.release">
-<option id="gnu.cpp.compiler.exe.release.option.optimization.level.483218288" superClass="gnu.cpp.compiler.exe.release.option.optimization.level" value="gnu.cpp.compiler.optimization.level.most" valueType="enumerated"/>
-<option id="gnu.cpp.compiler.exe.release.option.debugging.level.1740548907" superClass="gnu.cpp.compiler.exe.release.option.debugging.level" value="gnu.cpp.compiler.debugging.level.none" valueType="enumerated"/>
-</tool>
-<tool id="cdt.managedbuild.tool.gnu.c.compiler.exe.release.1456980182" name="GCC C Compiler" superClass="cdt.managedbuild.tool.gnu.c.compiler.exe.release">
-<option defaultValue="gnu.c.optimization.level.most" id="gnu.c.compiler.exe.release.option.optimization.level.564508580" superClass="gnu.c.compiler.exe.release.option.optimization.level" valueType="enumerated"/>
-<option id="gnu.c.compiler.exe.release.option.debugging.level.216318945" superClass="gnu.c.compiler.exe.release.option.debugging.level" value="gnu.c.debugging.level.none" valueType="enumerated"/>
-<inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.1930258097" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/>
-</tool>
-<tool id="cdt.managedbuild.tool.gnu.c.linker.exe.release.1609842259" name="GCC C Linker" superClass="cdt.managedbuild.tool.gnu.c.linker.exe.release">
-<inputType id="cdt.managedbuild.tool.gnu.c.linker.input.1263392915" superClass="cdt.managedbuild.tool.gnu.c.linker.input">
-<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
-<additionalInput kind="additionalinput" paths="$(LIBS)"/>
-</inputType>
-</tool>
-<tool id="cdt.managedbuild.tool.gnu.cpp.linker.exe.release.1176128340" name="GCC C++ Linker" superClass="cdt.managedbuild.tool.gnu.cpp.linker.exe.release"/>
-<tool id="cdt.managedbuild.tool.gnu.assembler.exe.release.1836498428" name="GCC Assembler" superClass="cdt.managedbuild.tool.gnu.assembler.exe.release">
-<inputType id="cdt.managedbuild.tool.gnu.assembler.input.1282718375" superClass="cdt.managedbuild.tool.gnu.assembler.input"/>
-</tool>
-</toolChain>
-</folderInfo>
-</configuration>
-</storageModule>
-<storageModule moduleId="scannerConfiguration">
-<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile"/>
-<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="makefileGenerator">
-<runAction arguments="-f ${project_name}_scd.mk" command="make" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfile">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileCPP">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileC">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.exe.release.1894586679;cdt.managedbuild.config.gnu.exe.release.1894586679.;cdt.managedbuild.tool.gnu.c.compiler.exe.release.1456980182;cdt.managedbuild.tool.gnu.c.compiler.input.1930258097">
-<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC"/>
-<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="makefileGenerator">
-<runAction arguments="-f ${project_name}_scd.mk" command="make" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfile">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileCPP">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileC">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-</scannerConfigBuildInfo>
-<scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.exe.debug.1175678966;cdt.managedbuild.config.gnu.exe.debug.1175678966.;cdt.managedbuild.tool.gnu.c.compiler.exe.debug.1711527348;cdt.managedbuild.tool.gnu.c.compiler.input.1219179977">
-<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC"/>
-<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="makefileGenerator">
-<runAction arguments="-f ${project_name}_scd.mk" command="make" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfile">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileCPP">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileC">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-</scannerConfigBuildInfo>
-</storageModule>
-</cconfiguration>
-</storageModule>
-<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-<project id="sleepTest.cdt.managedbuild.target.gnu.exe.918644780" name="Executable" projectType="cdt.managedbuild.target.gnu.exe"/>
-</storageModule>
-</cproject>
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.launch.tests/resources/sleepTest/.project b/oprofile/org.eclipse.linuxtools.oprofile.launch.tests/resources/sleepTest/.project
deleted file mode 100644
index 8e8d33630cfe16b0e40a7853b80a07e9390fbe9e..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.launch.tests/resources/sleepTest/.project
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>sleepTest</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>
- <triggers>clean,full,incremental,</triggers>
- <arguments>
- <dictionary>
- <key>?name?</key>
- <value></value>
- </dictionary>
- <dictionary>
- <key>org.eclipse.cdt.make.core.append_environment</key>
- <value>true</value>
- </dictionary>
- <dictionary>
- <key>org.eclipse.cdt.make.core.autoBuildTarget</key>
- <value>all</value>
- </dictionary>
- <dictionary>
- <key>org.eclipse.cdt.make.core.buildArguments</key>
- <value></value>
- </dictionary>
- <dictionary>
- <key>org.eclipse.cdt.make.core.buildCommand</key>
- <value>make</value>
- </dictionary>
- <dictionary>
- <key>org.eclipse.cdt.make.core.buildLocation</key>
- <value>${workspace_loc:/sleepTest/Debug}</value>
- </dictionary>
- <dictionary>
- <key>org.eclipse.cdt.make.core.cleanBuildTarget</key>
- <value>clean</value>
- </dictionary>
- <dictionary>
- <key>org.eclipse.cdt.make.core.contents</key>
- <value>org.eclipse.cdt.make.core.activeConfigSettings</value>
- </dictionary>
- <dictionary>
- <key>org.eclipse.cdt.make.core.enableAutoBuild</key>
- <value>false</value>
- </dictionary>
- <dictionary>
- <key>org.eclipse.cdt.make.core.enableCleanBuild</key>
- <value>true</value>
- </dictionary>
- <dictionary>
- <key>org.eclipse.cdt.make.core.enableFullBuild</key>
- <value>true</value>
- </dictionary>
- <dictionary>
- <key>org.eclipse.cdt.make.core.fullBuildTarget</key>
- <value>all</value>
- </dictionary>
- <dictionary>
- <key>org.eclipse.cdt.make.core.stopOnError</key>
- <value>true</value>
- </dictionary>
- <dictionary>
- <key>org.eclipse.cdt.make.core.useDefaultBuildCmd</key>
- <value>true</value>
- </dictionary>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
- <nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>
- <nature>org.eclipse.cdt.core.cnature</nature>
- </natures>
-</projectDescription>
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.launch.tests/resources/sleepTest/sleepTest.c b/oprofile/org.eclipse.linuxtools.oprofile.launch.tests/resources/sleepTest/sleepTest.c
deleted file mode 100644
index e13b08b066c9c514ef4b43baf2458646d005f71e..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.launch.tests/resources/sleepTest/sleepTest.c
+++ /dev/null
@@ -1,6 +0,0 @@
-#include <unistd.h>
-
-int main() {
- sleep(10);
- return 0;
-}
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.launch.tests/src/org/eclipse/linuxtools/oprofile/launch/tests/TestLaunching.java b/oprofile/org.eclipse.linuxtools.oprofile.launch.tests/src/org/eclipse/linuxtools/oprofile/launch/tests/TestLaunching.java
deleted file mode 100644
index 447ffd86a5cf47278fbf435f7511773676e28000..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.launch.tests/src/org/eclipse/linuxtools/oprofile/launch/tests/TestLaunching.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2018 Red Hat, Inc.
- *
- * This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License 2.0
- * which is available at https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- * Kent Sebastian <ksebasti@redhat.com> - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.linuxtools.oprofile.launch.tests;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.debug.core.ILaunch;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.core.ILaunchConfigurationType;
-import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
-import org.eclipse.debug.core.ILaunchManager;
-import org.eclipse.debug.core.Launch;
-import org.eclipse.linuxtools.internal.oprofile.core.Oprofile;
-import org.eclipse.linuxtools.internal.oprofile.core.daemon.OprofileDaemonOptions;
-import org.eclipse.linuxtools.internal.oprofile.launch.OprofileLaunchPlugin;
-import org.eclipse.linuxtools.internal.oprofile.launch.configuration.OprofileSetupTab;
-import org.eclipse.linuxtools.oprofile.launch.tests.utils.LaunchTestingOptions;
-import org.eclipse.linuxtools.oprofile.launch.tests.utils.OprofileTestingEventConfigTab;
-import org.eclipse.linuxtools.oprofile.launch.tests.utils.TestingOprofileLaunchConfigurationDelegate;
-import org.eclipse.linuxtools.profiling.tests.AbstractTest;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Shell;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.osgi.framework.FrameworkUtil;
-
-public class TestLaunching extends AbstractTest {
- private ILaunchConfiguration config;
- private Shell testShell;
-
- @Before
- public void setUp() throws Exception {
- proj = createProjectAndBuild(FrameworkUtil.getBundle(this.getClass()), "primeTest"); //$NON-NLS-1$
- config = createConfiguration(proj.getProject());
- testShell = new Shell(Display.getDefault());
- testShell.setLayout(new GridLayout());
- }
-
- @After
- public void tearDown() throws Exception {
- testShell.dispose();
- deleteProject(proj);
- }
-
- @Override
- protected ILaunchConfigurationType getLaunchConfigType() {
- return getLaunchManager().getLaunchConfigurationType(OprofileLaunchPlugin.ID_LAUNCH_PROFILE);
- }
-
- @Override
- protected void setProfileAttributes(ILaunchConfigurationWorkingCopy wc) {
- OprofileTestingEventConfigTab configTab = new OprofileTestingEventConfigTab();
- OprofileSetupTab setupTab = new OprofileSetupTab();
- configTab.setOprofileProject(proj.getProject());
- configTab.setDefaults(wc);
- setupTab.setDefaults(wc);
- }
- @Test
- public void testDefaultLaunch() throws CoreException {
- TestingOprofileLaunchConfigurationDelegate delegate = new TestingOprofileLaunchConfigurationDelegate();
- ILaunch launch = new Launch(config, ILaunchManager.PROFILE_MODE, null);
-
- LaunchTestingOptions options = new LaunchTestingOptions();
- options.setOprofileProject(proj.getProject());
- options.loadConfiguration(config);
- assertTrue(options.isValid());
- assertTrue(options.getBinaryImage().isEmpty());
- assertTrue(options.getKernelImageFile().isEmpty());
- assertEquals(OprofileDaemonOptions.SEPARATE_NONE, options.getSeparateSamples());
- Oprofile.OprofileProject.setProfilingBinary(Oprofile.OprofileProject.OPERF_BINARY);
- delegate.launch(config, ILaunchManager.PROFILE_MODE, launch, null);
- }
- @Test
- public void testEventLaunch() throws CoreException {
- TestingOprofileLaunchConfigurationDelegate delegate = new TestingOprofileLaunchConfigurationDelegate();
- ILaunch launch = new Launch(config, ILaunchManager.PROFILE_MODE, null);
-
- ILaunchConfigurationWorkingCopy wc = config.getWorkingCopy();
- wc.setAttribute(OprofileLaunchPlugin.ATTR_USE_DEFAULT_EVENT, false);
- wc.setAttribute(OprofileLaunchPlugin.attrConterEnabled(0), true);
- wc.setAttribute(OprofileLaunchPlugin.attrCounterCount(0), 100000);
- wc.setAttribute(OprofileLaunchPlugin.attrConterEvent(0, 0), "FAKE_EVENT"); //$NON-NLS-1$
- wc.setAttribute(OprofileLaunchPlugin.attrCounterProfileKernel(0), true);
- wc.setAttribute(OprofileLaunchPlugin.attrCounterProfileUser(0), true);
- wc.setAttribute(OprofileLaunchPlugin.attrCounterUnitMask(0), 0);
- wc.doSave();
- LaunchTestingOptions options = new LaunchTestingOptions();
- options.setOprofileProject(proj.getProject());
- options.loadConfiguration(config);
- assertTrue(options.isValid());
- assertTrue(options.getBinaryImage().isEmpty());
- assertTrue(options.getKernelImageFile().isEmpty());
- assertEquals(OprofileDaemonOptions.SEPARATE_NONE, options.getSeparateSamples());
-
- Oprofile.OprofileProject.setProfilingBinary(Oprofile.OprofileProject.OPERF_BINARY);
- delegate.launch(config, ILaunchManager.PROFILE_MODE, launch, null);
- }
-}
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.launch.tests/src/org/eclipse/linuxtools/oprofile/launch/tests/TestLaunchingExternalProject.java b/oprofile/org.eclipse.linuxtools.oprofile.launch.tests/src/org/eclipse/linuxtools/oprofile/launch/tests/TestLaunchingExternalProject.java
deleted file mode 100644
index a1e2789dabebaab71b7c23703fddd1ad0c826b14..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.launch.tests/src/org/eclipse/linuxtools/oprofile/launch/tests/TestLaunchingExternalProject.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2018 Red Hat, Inc.
- *
- * This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License 2.0
- * which is available at https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- * Kent Sebastian <ksebasti@redhat.com> - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.linuxtools.oprofile.launch.tests;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
-import java.io.File;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.debug.core.ILaunch;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.core.ILaunchConfigurationType;
-import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
-import org.eclipse.debug.core.ILaunchManager;
-import org.eclipse.debug.core.Launch;
-import org.eclipse.linuxtools.internal.oprofile.core.Oprofile.OprofileProject;
-import org.eclipse.linuxtools.internal.oprofile.core.daemon.OprofileDaemonOptions;
-import org.eclipse.linuxtools.internal.oprofile.launch.OprofileLaunchPlugin;
-import org.eclipse.linuxtools.internal.oprofile.launch.configuration.OprofileSetupTab;
-import org.eclipse.linuxtools.oprofile.launch.tests.utils.LaunchTestingOptions;
-import org.eclipse.linuxtools.oprofile.launch.tests.utils.OprofileTestingEventConfigTab;
-import org.eclipse.linuxtools.oprofile.launch.tests.utils.TestingOprofileLaunchConfigurationDelegate;
-import org.eclipse.linuxtools.profiling.tests.AbstractTest;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Shell;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.osgi.framework.FrameworkUtil;
-
-public class TestLaunchingExternalProject extends AbstractTest {
-
- private final Path EXTERNAL_PROJECT_PATH = new Path("/tmp/eclipse-oprofile-ext_project_test"); //$NON-NLS-1$
- private final String PROJECT_NAME = "primeTest"; //$NON-NLS-1$
- private ILaunchConfiguration config;
- private Shell testShell;
- private IProject externalProject; // external project to work with
-
- @Before
- public void setUp() throws Exception {
- // Setup a temporary workspace external path
- File tempExternalProjectPath = EXTERNAL_PROJECT_PATH.toFile();
- // create directory if not existing
- if (!tempExternalProjectPath.exists()) {
- tempExternalProjectPath.mkdir();
- }
- externalProject = createExternalProjectAndBuild(FrameworkUtil.getBundle(this.getClass()),
- PROJECT_NAME, EXTERNAL_PROJECT_PATH);
- config = createConfiguration(externalProject);
- testShell = new Shell(Display.getDefault());
- testShell.setLayout(new GridLayout());
- }
-
- @After
- public void tearDown() throws Exception {
- testShell.dispose();
- externalProject.delete(true, null); // delete project
- // cleanup temporary directory
- File tempExternalProjectPath = EXTERNAL_PROJECT_PATH.toFile();
- if (tempExternalProjectPath.exists()) {
- tempExternalProjectPath.delete();
- }
- }
-
- // Implemented abstract method of AbstractTest
- @Override
- protected ILaunchConfigurationType getLaunchConfigType() {
- return getLaunchManager().getLaunchConfigurationType(OprofileLaunchPlugin.ID_LAUNCH_PROFILE);
- }
-
- // Implemented abstract method of AbstractTest
- @Override
- protected void setProfileAttributes(ILaunchConfigurationWorkingCopy wc) {
- OprofileTestingEventConfigTab configTab = new OprofileTestingEventConfigTab();
- configTab.setOprofileProject(externalProject);
- OprofileSetupTab setupTab = new OprofileSetupTab();
- configTab.setDefaults(wc);
- setupTab.setDefaults(wc);
- }
-
- /**
- * Testcase for Eclipse BugZilla 321905/RedHat BZ
- *
- * @throws CoreException
- */
- @Test
- public void testLaunchExternalProject() throws CoreException {
- LaunchTestingOptions options = new LaunchTestingOptions();
- options.setOprofileProject(externalProject);
- options.loadConfiguration(config);
-
- TestingOprofileLaunchConfigurationDelegate delegate = new TestingOprofileLaunchConfigurationDelegate();
- ILaunch launch = new Launch(config, ILaunchManager.PROFILE_MODE, null);
-
- assertTrue(options.isValid());
- assertTrue(options.getBinaryImage().isEmpty());
- assertTrue(options.getKernelImageFile().isEmpty());
- assertEquals(OprofileDaemonOptions.SEPARATE_NONE, options.getSeparateSamples());
-
- OprofileProject.setProfilingBinary(OprofileProject.OPERF_BINARY);
- delegate.launch(config, ILaunchManager.PROFILE_MODE, launch, null);
- }
-}
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.launch.tests/src/org/eclipse/linuxtools/oprofile/launch/tests/TestSetup.java b/oprofile/org.eclipse.linuxtools.oprofile.launch.tests/src/org/eclipse/linuxtools/oprofile/launch/tests/TestSetup.java
deleted file mode 100644
index 5a7c48616e5ce1a31c0d453aa07d8de26a6ab850..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.launch.tests/src/org/eclipse/linuxtools/oprofile/launch/tests/TestSetup.java
+++ /dev/null
@@ -1,169 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2018 Red Hat, Inc.
- *
- * This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License 2.0
- * which is available at https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- * Kent Sebastian <ksebasti@redhat.com> - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.linuxtools.oprofile.launch.tests;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.core.ILaunchConfigurationType;
-import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
-import org.eclipse.debug.ui.ILaunchConfigurationTab;
-import org.eclipse.linuxtools.internal.oprofile.core.daemon.OprofileDaemonOptions;
-import org.eclipse.linuxtools.internal.oprofile.launch.OprofileLaunchPlugin;
-import org.eclipse.linuxtools.internal.oprofile.launch.configuration.OprofileSetupTab;
-import org.eclipse.linuxtools.oprofile.launch.tests.utils.LaunchTestingOptions;
-import org.eclipse.linuxtools.oprofile.launch.tests.utils.OprofileTestingEventConfigTab;
-import org.eclipse.linuxtools.profiling.tests.AbstractTest;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Text;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.osgi.framework.FrameworkUtil;
-
-public class TestSetup extends AbstractTest {
- protected ILaunchConfiguration config;
- protected Shell testShell;
- protected IProject project;
-
- @Before
- public void setUp() throws Exception {
- proj = createProjectAndBuild(FrameworkUtil.getBundle(this.getClass()), "primeTest"); //$NON-NLS-1$
- project = proj.getProject();
- config = createConfiguration(proj.getProject());
- testShell = new Shell(Display.getDefault());
- testShell.setLayout(new GridLayout());
- }
-
- @After
- public void tearDown() throws Exception {
- testShell.dispose();
- deleteProject(proj);
- }
-
- @Override
- protected ILaunchConfigurationType getLaunchConfigType() {
- return getLaunchManager().getLaunchConfigurationType(OprofileLaunchPlugin.ID_LAUNCH_PROFILE);
- }
-
- @Override
- protected void setProfileAttributes(ILaunchConfigurationWorkingCopy wc) {
- OprofileTestingEventConfigTab configTab = new OprofileTestingEventConfigTab();
- OprofileSetupTab setupTab = new OprofileSetupTab();
- configTab.setOprofileProject(proj.getProject());
- configTab.setDefaults(wc);
- setupTab.setDefaults(wc);
- }
-
- //getter functions for otherwise unaccessible member variables
- private class OprofileTestingSetupTab extends OprofileSetupTab {
- @Override
- protected IProject getOprofileProject() { return proj.getProject(); }
- @Override
- public void setDefaults(ILaunchConfigurationWorkingCopy config) {
- options = new LaunchTestingOptions();
- options.saveConfiguration(config);
- }
- protected Button getKernelCheck() { return checkSeparateKernel; }
- protected Button getLibraryCheck() { return checkSeparateLibrary; }
- protected Text getTextKernelImage() { return kernelImageFileText; }
- }
- @Test
- public void testSetupTab() throws CoreException {
- OprofileTestingSetupTab tab = new OprofileTestingSetupTab();
- tab.createControl(new Shell());
- assertNotNull(tab.getImage());
- assertNotNull(tab.getName());
-
- ILaunchConfigurationWorkingCopy wc = config.getWorkingCopy();
-
- //default config
- tab.setDefaults(wc);
- tab.initializeFrom(config);
-
- Button libraryCheck = tab.getLibraryCheck();
- libraryCheck.setSelection(true);
- libraryCheck.notifyListeners(SWT.Selection, null);
- performApply(tab, wc);
- assertEquals(OprofileDaemonOptions.SEPARATE_LIBRARY, config.getAttribute(OprofileLaunchPlugin.ATTR_SEPARATE_SAMPLES, -1));
- libraryCheck.setSelection(false);
- libraryCheck.notifyListeners(SWT.Selection, null);
- performApply(tab, wc);
- assertEquals(OprofileDaemonOptions.SEPARATE_NONE, config.getAttribute(OprofileLaunchPlugin.ATTR_SEPARATE_SAMPLES, -1));
-
- Button kernelCheck = tab.getKernelCheck();
- kernelCheck.setSelection(true);
- kernelCheck.notifyListeners(SWT.Selection, null);
- performApply(tab, wc);
- assertEquals(OprofileDaemonOptions.SEPARATE_KERNEL, config.getAttribute(OprofileLaunchPlugin.ATTR_SEPARATE_SAMPLES, -1));
- kernelCheck.setSelection(false);
- kernelCheck.notifyListeners(SWT.Selection, null);
- performApply(tab, wc);
- assertEquals(OprofileDaemonOptions.SEPARATE_NONE, config.getAttribute(OprofileLaunchPlugin.ATTR_SEPARATE_SAMPLES, -1));
-
- libraryCheck.setSelection(true);
- libraryCheck.notifyListeners(SWT.Selection, null);
- kernelCheck.setSelection(true);
- kernelCheck.notifyListeners(SWT.Selection, null);
- performApply(tab, wc);
- tab.initializeFrom(config);
- assertTrue(libraryCheck.getSelection());
- assertTrue(kernelCheck.getSelection());
-
- Text kernelLocationText = tab.getTextKernelImage();
- kernelLocationText.setText("doesntexist"); //$NON-NLS-1$
- kernelLocationText.notifyListeners(SWT.Selection, null);
- performApply(tab, wc);
- assertFalse(tab.isValid(config));
-
- kernelLocationText.setText(""); //$NON-NLS-1$
- kernelLocationText.notifyListeners(SWT.Selection, null);
- performApply(tab, wc);
- assertTrue(tab.isValid(config));
- }
- @Test
- public void testEventConfigTab() throws CoreException {
- OprofileTestingEventConfigTab tab = new OprofileTestingEventConfigTab();
- tab.createControl(new Shell());
- assertNotNull(tab.getImage());
- assertNotNull(tab.getName());
-
- tab.setDefaults(config.getWorkingCopy());
- tab.initializeFrom(config);
- assertTrue(tab.isValid(config));
-
- assertTrue(tab.getDefaultCheck().getSelection());
- tab.getDefaultCheck().notifyListeners(SWT.Selection, null);
- tab.getDefaultCheck().setSelection(false);
- tab.getDefaultCheck().notifyListeners(SWT.Selection, null);
-
- ILaunchConfigurationWorkingCopy wc = config.getWorkingCopy();
- wc.setAttribute(OprofileLaunchPlugin.ATTR_USE_DEFAULT_EVENT, false);
- performApply(tab, wc);
- assertFalse(tab.isValid(config));
- }
- private void performApply (ILaunchConfigurationTab tab , ILaunchConfigurationWorkingCopy wc) throws CoreException {
- tab.performApply(wc);
- wc.doSave();
- }
-}
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.launch.tests/src/org/eclipse/linuxtools/oprofile/launch/tests/utils/LaunchTestingOptions.java b/oprofile/org.eclipse.linuxtools.oprofile.launch.tests/src/org/eclipse/linuxtools/oprofile/launch/tests/utils/LaunchTestingOptions.java
deleted file mode 100644
index 1e48cb43cc553082a7676a8b58290c85ed2a54e4..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.launch.tests/src/org/eclipse/linuxtools/oprofile/launch/tests/utils/LaunchTestingOptions.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2013, 2018 Red Hat, Inc.
- *
- * This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License 2.0
- * which is available at https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- * Red Hat - initial API and implementation
- *******************************************************************************/
-package org.eclipse.linuxtools.oprofile.launch.tests.utils;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.linuxtools.internal.oprofile.launch.configuration.LaunchOptions;
-
-public class LaunchTestingOptions extends LaunchOptions {
- private IProject project;
-
- public void setOprofileProject(IProject proj) {
- project = proj;
- }
-
- @Override
- protected IProject getOprofileProject() {
- return project;
- }
-}
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.launch.tests/src/org/eclipse/linuxtools/oprofile/launch/tests/utils/OprofileTestingEventConfigTab.java b/oprofile/org.eclipse.linuxtools.oprofile.launch.tests/src/org/eclipse/linuxtools/oprofile/launch/tests/utils/OprofileTestingEventConfigTab.java
deleted file mode 100644
index cac04d7446afd9e17df4e87e11bd4232dea2a8bb..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.launch.tests/src/org/eclipse/linuxtools/oprofile/launch/tests/utils/OprofileTestingEventConfigTab.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2013, 2018 Red Hat, Inc.
- *
- * This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License 2.0
- * which is available at https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- * Red Hat - initial API and implementation
- *******************************************************************************/
-package org.eclipse.linuxtools.oprofile.launch.tests.utils;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.linuxtools.internal.oprofile.core.daemon.OpEvent;
-import org.eclipse.linuxtools.internal.oprofile.core.daemon.OpUnitMask;
-import org.eclipse.linuxtools.internal.oprofile.core.daemon.OpUnitMask.MaskInfo;
-import org.eclipse.linuxtools.internal.oprofile.launch.configuration.AbstractEventConfigTab;
-import org.eclipse.linuxtools.internal.oprofile.launch.configuration.OprofileCounter;
-import org.eclipse.swt.widgets.Button;
-
-// mock event configuration tab
-public class OprofileTestingEventConfigTab extends AbstractEventConfigTab {
- private IProject project;
-
- @Override
- protected boolean getOprofileTimerMode() {
- return false;
- }
-
- @Override
- protected int getNumberOfOprofileCounters() {
- return 1;
- }
-
- @Override
- protected boolean checkEventSetupValidity(int counter, String name,
- int maskValue) {
- return true;
- }
-
- @Override
- protected IProject getOprofileProject() {
- return project;
- }
-
- @Override
- public void setOprofileProject(IProject proj) {
- project = proj;
- }
-
- @Override
- protected void updateOprofileInfo() {
- }
-
- public Button getDefaultCheck() {
- return defaultEventCheck;
- }
-
- @Override
- protected OprofileCounter[] getOprofileCounters(ILaunchConfiguration config) {
- // setup and return mock counters
- OprofileCounter[] ctrs = new OprofileCounter[] { getOprofileCounter(1) };
- return ctrs;
- }
-
- @Override
- public OprofileCounter getOprofileCounter(int i) {
- // mock mask info
- MaskInfo maskInfo = new MaskInfo();
- maskInfo.description = "mock mask info"; //$NON-NLS-1$
- maskInfo.value = 0;
-
- MaskInfo[] maskInfoDescriptions = { maskInfo };
-
- // mock mask
- OpUnitMask mask = new OpUnitMask();
- mask.setDefault(0);
- mask.setMaskDescriptions(maskInfoDescriptions);
- mask.setType(0);
- mask.setMaskFromIndex(0);
- mask.setMaskValue(0);
-
- // mock events
- OpEvent event = new OpEvent();
- event.setMinCount(1);
- event.setText("mock-event"); //$NON-NLS-1$
- event.setTextDescription("Mock Event"); //$NON-NLS-1$
- event.setUnitMask(mask);
-
- OpEvent[] events = { event };
-
- // mock counter
- OprofileCounter ctr = new OprofileCounter(i, events);
- ctr.setCount(1);
- ctr.setEvents(new OpEvent [] {event});
-
- return ctr;
- }
-
-}
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.launch.tests/src/org/eclipse/linuxtools/oprofile/launch/tests/utils/TestingOprofileLaunchConfigurationDelegate.java b/oprofile/org.eclipse.linuxtools.oprofile.launch.tests/src/org/eclipse/linuxtools/oprofile/launch/tests/utils/TestingOprofileLaunchConfigurationDelegate.java
deleted file mode 100644
index 11a83ee837fd235deec5ae43697b0aa9a97b8981..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.launch.tests/src/org/eclipse/linuxtools/oprofile/launch/tests/utils/TestingOprofileLaunchConfigurationDelegate.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2018 Red Hat, Inc.
- *
- * This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License 2.0
- * which is available at https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- * Kent Sebastian <ksebasti@redhat.com> - initial API and implementation
- * Severin Gehwolf <sgehwolf@redhat.com> - moved to separate class
- *******************************************************************************/
-
-package org.eclipse.linuxtools.oprofile.launch.tests.utils;
-
-import java.net.URI;
-
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.linuxtools.internal.oprofile.core.daemon.OprofileDaemonEvent;
-import org.eclipse.linuxtools.internal.oprofile.core.daemon.OprofileDaemonOptions;
-import org.eclipse.linuxtools.internal.oprofile.launch.configuration.LaunchOptions;
-import org.eclipse.linuxtools.internal.oprofile.launch.configuration.OprofileCounter;
-import org.eclipse.linuxtools.internal.oprofile.launch.launching.OprofileLaunchConfigurationDelegate;
-
-/**
- * Helper delegate class
- */
-public final class TestingOprofileLaunchConfigurationDelegate extends
- OprofileLaunchConfigurationDelegate {
- public boolean eventsIsNull;
- public OprofileDaemonOptions _options;
-
- @Override
- protected boolean oprofileStatus() {
- return false;
- }
-
- @Override
- protected void postExec(LaunchOptions options,
- OprofileDaemonEvent[] daemonEvents, Process process) {
- super.postExec(options, daemonEvents, process);
-
- try {
- process.waitFor();
- } catch (InterruptedException e) {
- e.printStackTrace();
- }
- }
-
- @Override
- protected OprofileCounter[] oprofileCounters(ILaunchConfiguration config) {
- return new OprofileCounter[0];
-
- }
-
- @Override
- protected URI oprofileWorkingDirURI(ILaunchConfiguration config){
- return oprofileProject().getLocationURI();
- }
-}
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.launch/.gitignore b/oprofile/org.eclipse.linuxtools.oprofile.launch/.gitignore
deleted file mode 100644
index 8d94ef8debe45a7bc3866f985fdc60d41c12822f..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.launch/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-bin
-@dot
-javaCompiler...args
-build.xml
-target
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.launch/.project b/oprofile/org.eclipse.linuxtools.oprofile.launch/.project
deleted file mode 100644
index 1af4663e6c559f3d0e4a78ae53c4f878cc933b1d..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.launch/.project
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.linuxtools.oprofile.launch</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
- </natures>
-</projectDescription>
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.launch/.settings/org.eclipse.jdt.core.prefs b/oprofile/org.eclipse.linuxtools.oprofile.launch/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 269514738d7dcc5eeed1361f5d2167f58dff0ee2..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.launch/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,104 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled
-org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
-org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull
-org.eclipse.jdt.core.compiler.annotation.nonnull.secondary=
-org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault
-org.eclipse.jdt.core.compiler.annotation.nonnullbydefault.secondary=
-org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
-org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
-org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.8
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
-org.eclipse.jdt.core.compiler.problem.deadCode=warning
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=warning
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDefaultCase=ignore
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning
-org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled
-org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=warning
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning
-org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning
-org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error
-org.eclipse.jdt.core.compiler.problem.nullReference=warning
-org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error
-org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
-org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
-org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
-org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=error
-org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
-org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
-org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=disabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=disabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=enabled
-org.eclipse.jdt.core.compiler.problem.unusedExceptionParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameter=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning
-org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.8
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.launch/META-INF/MANIFEST.MF b/oprofile/org.eclipse.linuxtools.oprofile.launch/META-INF/MANIFEST.MF
deleted file mode 100644
index efad52a39eefd3f7379362d20d7bd1b75fb630d3..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.launch/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,33 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %bundleName
-Bundle-SymbolicName: org.eclipse.linuxtools.oprofile.launch;singleton:=true
-Bundle-Version: 1.1.0.qualifier
-Bundle-Vendor: %bundleProvider
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Require-Bundle: org.eclipse.core.runtime;bundle-version="3.4.0",
- org.eclipse.linuxtools.tools.launch.core,
- org.eclipse.linuxtools.profiling.launch;bundle-version="0.9.0",
- org.eclipse.cdt.core;bundle-version="5.3.0",
- org.eclipse.core.filesystem;bundle-version="1.3.100",
- org.eclipse.ui;bundle-version="3.4.0",
- org.eclipse.debug.ui;bundle-version="3.7.0"
-Bundle-Activator: org.eclipse.linuxtools.internal.oprofile.launch.OprofileLaunchPlugin
-Bundle-ActivationPolicy: lazy
-Bundle-Localization: plugin
-Import-Package: org.eclipse.cdt.core.model,
- org.eclipse.cdt.debug.core,
- org.eclipse.cdt.launch,
- org.eclipse.core.resources,
- org.eclipse.debug.core,
- org.eclipse.debug.ui,
- org.eclipse.linuxtools.internal.oprofile.core,
- org.eclipse.linuxtools.internal.oprofile.core.daemon,
- org.eclipse.linuxtools.internal.oprofile.ui,
- org.eclipse.linuxtools.internal.oprofile.ui.view,
- org.eclipse.linuxtools.profiling.launch,
- org.eclipse.ui
-Export-Package: org.eclipse.linuxtools.internal.oprofile.launch;x-friends:="org.eclipse.linuxtools.oprofile.remote.launch",
- org.eclipse.linuxtools.internal.oprofile.launch.configuration;x-friends:="org.eclipse.linuxtools.oprofile.remote.launch",
- org.eclipse.linuxtools.internal.oprofile.launch.launching;x-friends:="org.eclipse.linuxtools.oprofile.remote.launch"
-Automatic-Module-Name: org.eclipse.linuxtools.oprofile.launch
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.launch/about.html b/oprofile/org.eclipse.linuxtools.oprofile.launch/about.html
deleted file mode 100644
index 164f781a8fd2195f87c3d3d49946d56bce58992f..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.launch/about.html
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<title>About</title>
-</head>
-<body lang="EN-US">
- <h2>About This Content</h2>
-
- <p>November 30, 2017</p>
- <h3>License</h3>
-
- <p>
- The Eclipse Foundation makes available all content in this plug-in
- ("Content"). Unless otherwise indicated below, the Content
- is provided to you under the terms and conditions of the Eclipse
- Public License Version 2.0 ("EPL"). A copy of the EPL is
- available at <a href="http://www.eclipse.org/legal/epl-2.0">http://www.eclipse.org/legal/epl-2.0</a>.
- For purposes of the EPL, "Program" will mean the Content.
- </p>
-
- <p>
- If you did not receive this Content directly from the Eclipse
- Foundation, the Content is being redistributed by another party
- ("Redistributor") and different terms and conditions may
- apply to your use of any object code in the Content. Check the
- Redistributor's license that was provided with the Content. If no such
- license exists, contact the Redistributor. Unless otherwise indicated
- below, the terms and conditions of the EPL still apply to any source
- code in the Content and such source code may be obtained at <a
- href="http://www.eclipse.org/">http://www.eclipse.org</a>.
- </p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.launch/build.properties b/oprofile/org.eclipse.linuxtools.oprofile.launch/build.properties
deleted file mode 100644
index 783b22fa30c020819549c7ae70c04465dd85a20b..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.launch/build.properties
+++ /dev/null
@@ -1,10 +0,0 @@
-source.. = src/
-bin.includes = META-INF/,\
- .,\
- plugin.xml,\
- plugin.properties,\
- icons/,\
- about.html
-src.includes = about.html,\
- icons/
-individualSourceBundles=true
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.launch/icons/event_tab.gif b/oprofile/org.eclipse.linuxtools.oprofile.launch/icons/event_tab.gif
deleted file mode 100644
index c91f254ab1728df3d6555002c789ef4519693eb0..0000000000000000000000000000000000000000
Binary files a/oprofile/org.eclipse.linuxtools.oprofile.launch/icons/event_tab.gif and /dev/null differ
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.launch/icons/global_tab.gif b/oprofile/org.eclipse.linuxtools.oprofile.launch/icons/global_tab.gif
deleted file mode 100644
index ec6cca4525bf483077bcc2039eaede6e71258c89..0000000000000000000000000000000000000000
Binary files a/oprofile/org.eclipse.linuxtools.oprofile.launch/icons/global_tab.gif and /dev/null differ
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.launch/icons/profile_manual_run.png b/oprofile/org.eclipse.linuxtools.oprofile.launch/icons/profile_manual_run.png
deleted file mode 100644
index e14bdbeb41a4f32b13712b6ed4bd3abc91ba2395..0000000000000000000000000000000000000000
Binary files a/oprofile/org.eclipse.linuxtools.oprofile.launch/icons/profile_manual_run.png and /dev/null differ
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.launch/icons/profile_run.png b/oprofile/org.eclipse.linuxtools.oprofile.launch/icons/profile_run.png
deleted file mode 100644
index 4f8488f1c0c23bdc8703856b2a3baae022046332..0000000000000000000000000000000000000000
Binary files a/oprofile/org.eclipse.linuxtools.oprofile.launch/icons/profile_run.png and /dev/null differ
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.launch/plugin.properties b/oprofile/org.eclipse.linuxtools.oprofile.launch/plugin.properties
deleted file mode 100644
index 211586e926332c05a75445ee88459e8b9efb34a1..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.launch/plugin.properties
+++ /dev/null
@@ -1,33 +0,0 @@
-#*******************************************************************************
-# Copyright (c) 2008, 2018 Red Hat, Inc.
-#
-# This program and the accompanying materials are made
-# available under the terms of the Eclipse Public License 2.0
-# which is available at https://www.eclipse.org/legal/epl-2.0/
-#
-# SPDX-License-Identifier: EPL-2.0
-#
-# Contributors:
-# Red Hat, Inc. - initial API and implementation
-#*******************************************************************************
-bundleName=OProfile Launch Plug-in
-bundleProvider=Eclipse Linux Tools
-
-pluginName=OProfile Launch Support
-launchconfigurationtype.label=Profile With OProfile
-launchconfigurationtype.manual.label=Profile With OProfile (Manual)
-
-launchgroup.label=OProfile
-launchgroup.titile=Select a run configuration to profile with OProfile
-
-launchmode.label=Profile
-launchmode.launchaslabel=Profile As
-
-launchshortcuts.label=Profile With OProfile
-
-manual.launchconfigurationtype.label=Profile With OProfile (Manual)
-manual.launchshortcuts.label=Profile With OProfile (Manual)
-
-oprofileLaunchConfiguration.name.0=Oprofile
-oprofileLaunchConfiguration.description=Hardware/Software Events Timing
-oprofileLaunchConfiguration.information=Note: requires root password to execute OProfile commands.
\ No newline at end of file
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.launch/plugin.xml b/oprofile/org.eclipse.linuxtools.oprofile.launch/plugin.xml
deleted file mode 100644
index 323651b32a7bb1769004bbe0b3db142dfa2f6a05..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.launch/plugin.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.2"?>
-<plugin>
- <extension
- point="org.eclipse.debug.core.launchConfigurationTypes">
- <launchConfigurationType
- delegate="org.eclipse.linuxtools.internal.oprofile.launch.launching.OprofileLaunchConfigurationDelegate"
- id="org.eclipse.linuxtools.oprofile.launch.oprofile"
- modes="linuxtools"
- name="%launchconfigurationtype.label"
- public="true"
- sourceLocatorId="org.eclipse.cdt.launch.DefaultSourceLocator"
- sourcePathComputerId="org.eclipse.cdt.debug.core.sourcePathComputer">
- </launchConfigurationType>
- </extension>
- <extension
- point="org.eclipse.debug.ui.launchConfigurationTypeImages">
- <launchConfigurationTypeImage
- configTypeID="org.eclipse.linuxtools.oprofile.launch.oprofile"
- icon="icons/profile_run.png"
- id="org.eclipse.linuxtools.oprofile.launch.oprofileImage">
- </launchConfigurationTypeImage>
- </extension>
- <extension
- point="org.eclipse.debug.ui.launchConfigurationTabGroups">
- <launchConfigurationTabGroup
- class="org.eclipse.linuxtools.internal.oprofile.launch.configuration.OprofileLaunchConfigurationTabGroup"
- id="org.eclipse.linuxtools.oprofile.launch.launchConfigurationTabGroup"
- type="org.eclipse.linuxtools.oprofile.launch.oprofile">
- </launchConfigurationTabGroup>
- </extension>
- <extension
- point="org.eclipse.debug.ui.launchShortcuts">
- <shortcut
- class="org.eclipse.linuxtools.internal.oprofile.launch.launching.OprofileLaunchShortcut"
- icon="icons/profile_run.png"
- id="org.eclipse.linuxtools.oprofile.launch.profileshortcut"
- label="%launchshortcuts.label"
- modes="linuxtools">
- <contextualLaunch>
- <enablement>
-<!-- FIXME: this is not a proper enablement condition -->
- <with variable="selection">
- <count value="1"></count>
-
- <iterate>
- <or>
- <instanceof value="org.eclipse.cdt.core.model.IBinary"/>
- <instanceof value="org.eclipse.cdt.core.model.ICProject"/>
- <test property="org.eclipse.cdt.launch.isExecutable"/>
- <test property="org.eclipse.cdt.launch.isCProject"/>
- <and>
- <instanceof value="org.eclipse.ui.IFileEditorInput"/>
- <adapt type="org.eclipse.core.resources.IResource">
- <adapt type="org.eclipse.cdt.core.model.ICElement"/>
- </adapt>
- </and>
- </or>
- </iterate>
-
- </with>
- </enablement>
- </contextualLaunch>
- </shortcut>
- </extension>
- <extension
- point="org.eclipse.linuxtools.profiling.launch.launchProvider">
- <provider
- delegate="org.eclipse.linuxtools.internal.oprofile.launch.launching.OprofileLaunchConfigurationDelegate"
- description="%oprofileLaunchConfiguration.description"
- id="org.eclipse.linuxtools.oprofile.launch.provider"
- information="%oprofileLaunchConfiguration.information"
- name="%oprofileLaunchConfiguration.name.0"
- priority="2"
- shortcut="org.eclipse.linuxtools.internal.oprofile.launch.launching.OprofileLaunchShortcut"
- tabgroup="org.eclipse.linuxtools.internal.oprofile.launch.configuration.OprofileLaunchConfigurationTabGroup"
- type="timing">
- </provider>
- </extension>
-</plugin>
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.launch/pom.xml b/oprofile/org.eclipse.linuxtools.oprofile.launch/pom.xml
deleted file mode 100644
index 846db1dc478a1e47ba96be0a9f8f8e5f4fbef952..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.launch/pom.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (C) 2011, 2018 Red Hat, Inc.
-
- This program and the accompanying materials are made
- available under the terms of the Eclipse Public License 2.0
- which is available at https://www.eclipse.org/legal/epl-2.0/
-
- SPDX-License-Identifier: EPL-2.0
--->
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <artifactId>linuxtools-oprofile-parent</artifactId>
- <groupId>org.eclipse.linuxtools.oprofile</groupId>
- <version>7.4.0</version>
- </parent>
-
- <artifactId>org.eclipse.linuxtools.oprofile.launch</artifactId>
- <version>1.1.0-SNAPSHOT</version>
- <packaging>eclipse-plugin</packaging>
-
- <name>Linux Tools OProfile Launch Plug-in</name>
-</project>
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.launch/src/org/eclipse/linuxtools/internal/oprofile/launch/OprofileLaunchMessages.java b/oprofile/org.eclipse.linuxtools.oprofile.launch/src/org/eclipse/linuxtools/internal/oprofile/launch/OprofileLaunchMessages.java
deleted file mode 100644
index db4682deba5c9068ad8b24454448ea97d7355d5f..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.launch/src/org/eclipse/linuxtools/internal/oprofile/launch/OprofileLaunchMessages.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2018 Red Hat, Inc.
- *
- * This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License 2.0
- * which is available at https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- * Keith Seitz <keiths@redhat.com> - initial API and implementation
- *******************************************************************************/
-package org.eclipse.linuxtools.internal.oprofile.launch;
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-public final class OprofileLaunchMessages {
- private static final String BUNDLE_NAME = "org.eclipse.linuxtools.internal.oprofile.launch.oprofilelaunch"; //$NON-NLS-1$
- private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle.getBundle(BUNDLE_NAME);
-
- private OprofileLaunchMessages() {
- }
-
- public static String getString(String key) {
- try {
- return RESOURCE_BUNDLE.getString(key);
- } catch (MissingResourceException e) {
- return '!' + key + '!';
- }
- }
-}
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.launch/src/org/eclipse/linuxtools/internal/oprofile/launch/OprofileLaunchPlugin.java b/oprofile/org.eclipse.linuxtools.oprofile.launch/src/org/eclipse/linuxtools/internal/oprofile/launch/OprofileLaunchPlugin.java
deleted file mode 100644
index 300ed93fbc5634b41f2fd78c2d8abeab5095a14c..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.launch/src/org/eclipse/linuxtools/internal/oprofile/launch/OprofileLaunchPlugin.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2018 Red Hat, Inc.
- *
- * This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License 2.0
- * which is available at https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- * Keith Seitz <keiths@redhat.com> - initial API and implementation
- * Kent Sebastian <ksebasti@redhat.com>
- *******************************************************************************/
-package org.eclipse.linuxtools.internal.oprofile.launch;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.linuxtools.internal.oprofile.launch.configuration.EventConfigCache;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-
-/**
- * The main plugin class to be used in the desktop.
- */
-public class OprofileLaunchPlugin extends AbstractUIPlugin {
- //The shared instance.
- private static OprofileLaunchPlugin plugin;
- //shared cache instance for configuration
- private static EventConfigCache eventConfigCache = null;
-
- public static final String PLUGIN_ID = "org.eclipse.linuxtools.oprofile.launch"; //$NON-NLS-1$
-
- // The launch type ID for profiling
- public static final String ID_LAUNCH_PROFILE = PLUGIN_ID + ".oprofile"; //$NON-NLS-1$
-
- /* Launch Configuration attributes */
-
- // Global options \\
- public static final String ATTR_KERNEL_IMAGE_FILE = ID_LAUNCH_PROFILE + ".KERNEL_IMAGE"; //$NON-NLS-1$
- public static final String ATTR_SEPARATE_SAMPLES = ID_LAUNCH_PROFILE + ".SEPARATE_SAMPLES"; //$NON-NLS-1$
- public static final String ATTR_USE_DEFAULT_EVENT = ID_LAUNCH_PROFILE + ".USE_DEFAULT_EVENT"; //$NON-NLS-1$
- public static final String ATTR_EXECUTIONS_NUMBER = ID_LAUNCH_PROFILE + ".EXECUTIONS_NUMBER"; //$NON-NLS-1$
-
- /**
- * @since 2.1
- */
- public static final String ATTR_OPROFILE_COMBO_TEXT = ID_LAUNCH_PROFILE + ".OPROFILE_COMBO_TEXT"; //$NON-NLS-1$
-
- // Counter Attributes \\
- private static final String attrCounter(int nr) { return ID_LAUNCH_PROFILE + ".COUNTER_" + nr; } //$NON-NLS-1$
- public static final String attrConterEnabled(int nr) { return attrCounter(nr) + ".ENABLED"; } //$NON-NLS-1$
- public static final String attrConterEvent(int nr, int ev) { return attrCounter(nr) + ".EVENT " + ev; } //$NON-NLS-1$
- public static final String attrCounterProfileKernel(int nr) { return attrCounter(nr) + ".PROFILE_KERNEL"; } //$NON-NLS-1$
- public static final String attrCounterProfileUser(int nr) { return attrCounter(nr) + ".PROFILE_USER"; } //$NON-NLS-1$
- public static final String attrCounterCount(int nr) { return attrCounter(nr) + ".COUNT"; } //$NON-NLS-1$
- public static final String attrCounterUnitMask(int nr) { return attrCounter(nr) + ".UNIT_MASK"; } //$NON-NLS-1$
- public static final String attrCounterUnitMaskName(int nr) { return attrCounter(nr) + ".UNIT_MASK_NAME"; } //$NON-NLS-1$
- public static final String attrNumberOfEvents(int nr) { return attrCounter(nr) + ".EVENTS"; } //$NON-NLS-1$
-
-
- public static final String ICON_PATH = "icons/"; //$NON-NLS-1$
- public static final String ICON_EVENT_TAB = ICON_PATH + "event_tab.gif"; //$NON-NLS-1$
- public static final String ICON_GLOBAL_TAB = ICON_PATH + "global_tab.gif"; //$NON-NLS-1$
-
- @Override
- public void start(BundleContext context) throws Exception {
- super.start(context);
- plugin = this;
- }
-
- @Override
- public void stop(BundleContext context) throws Exception {
- super.stop(context);
- plugin = null;
- }
-
- public static OprofileLaunchPlugin getDefault() {
- return plugin;
- }
-
- public static ImageDescriptor getImageDescriptor(String path) {
- return imageDescriptorFromPlugin(PLUGIN_ID, path);
- }
-
- public static EventConfigCache getCache() {
- if (eventConfigCache == null) {
- eventConfigCache = new EventConfigCache();
- }
-
- return eventConfigCache;
- }
-}
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.launch/src/org/eclipse/linuxtools/internal/oprofile/launch/configuration/AbstractEventConfigTab.java b/oprofile/org.eclipse.linuxtools.oprofile.launch/src/org/eclipse/linuxtools/internal/oprofile/launch/configuration/AbstractEventConfigTab.java
deleted file mode 100644
index ec61d8babdbbdc7d5ae270fab0a5044908b9c951..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.launch/src/org/eclipse/linuxtools/internal/oprofile/launch/configuration/AbstractEventConfigTab.java
+++ /dev/null
@@ -1,1417 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2012, 2018 Red Hat, Inc.
- *
- * This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License 2.0
- * which is available at https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- * Red Hat initial API and implementation
- *******************************************************************************/
-package org.eclipse.linuxtools.internal.oprofile.launch.configuration;
-
-import java.text.MessageFormat;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import org.eclipse.cdt.debug.core.ICDTLaunchConfigurationConstants;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
-import org.eclipse.debug.ui.AbstractLaunchConfigurationTab;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.ILabelProviderListener;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.viewers.ListViewer;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerComparator;
-import org.eclipse.jface.viewers.ViewerFilter;
-import org.eclipse.jface.window.IShellProvider;
-import org.eclipse.linuxtools.internal.oprofile.core.Oprofile.OprofileProject;
-import org.eclipse.linuxtools.internal.oprofile.core.OprofileCorePlugin;
-import org.eclipse.linuxtools.internal.oprofile.core.daemon.OpEvent;
-import org.eclipse.linuxtools.internal.oprofile.core.daemon.OpUnitMask;
-import org.eclipse.linuxtools.internal.oprofile.core.daemon.OprofileDaemonEvent;
-import org.eclipse.linuxtools.internal.oprofile.launch.OprofileLaunchMessages;
-import org.eclipse.linuxtools.internal.oprofile.launch.OprofileLaunchPlugin;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.ScrolledComposite;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.TabFolder;
-import org.eclipse.swt.widgets.TabItem;
-import org.eclipse.swt.widgets.Text;
-
-public abstract class AbstractEventConfigTab extends AbstractLaunchConfigurationTab {
- protected Button defaultEventCheck;
- protected OprofileCounter[] counters = null;
- protected CounterSubTab[] counterSubTabs;
- private Composite top;
-
- /**
- * Essentially the constructor for this tab; creates the 'default event'
- * checkbox and an appropriate number of counter tabs.
- * @param parent the parent composite
- */
- @Override
- public void createControl(Composite parent) {
- Composite top = new Composite(parent, SWT.NONE);
- setControl(top);
- top.setLayout(new GridLayout());
- this.top = top;
- }
- /**
- * @since 1.1
- * @param top
- */
- private void createCounterTabs(Composite top){
- //tabs for each of the counters
- counters = getOprofileCounters(null);
- TabItem[] counterTabs = new TabItem[counters.length];
-
- // create only one counter for operf/opcontrol
- if (counters.length > 0) {
- counterSubTabs = new CounterSubTab[1];
- } else {
- counterSubTabs = new CounterSubTab[0];
- }
-
- TabFolder tabFolder = new TabFolder(top, SWT.NONE);
- tabFolder.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
-
-
- // As per Roland suggestion if we decide to list all the selected events
- // in a separate list viewer, then it makes sense to always show just one tab.
- // This approach would make operf/opcontrol event selection more similar.
- for (int i = 0; i < counters.length; i++) {
- Composite c = new Composite(tabFolder, SWT.NONE);
- CounterSubTab currentTab = new CounterSubTab(c, counters[i]);
- counterSubTabs[i] = currentTab;
-
- counterTabs[i] = new TabItem(tabFolder, SWT.NONE);
- counterTabs[i].setControl(c);
- counterTabs[i].setText(OprofileLaunchMessages.getString("tab.event.counterTab.counterText")); //$NON-NLS-1$
- // just one tab for operf/opcontrol
- break;
- }
-
- getTabFolderComposite();
- }
-
- /**
- * @since 1.1
- */
- private Composite getTabFolderComposite(){
- // check for length and first tab being null to prevent AIOBE
- if(counterSubTabs.length == 0 ||counterSubTabs[0] == null){
- return null;
- } else {
- Composite c = counterSubTabs[0].getTabTopContainer();
- while(c != null && !(c instanceof TabFolder)){
- c = c.getParent();
- }
- return c.getParent();
- }
- }
-
- @Override
- public void initializeFrom(ILaunchConfiguration config) {
-
- IProject previousProject = getOprofileProject();
- IProject project = getProject(config);
- setOprofileProject(project);
-
- updateOprofileInfo();
-
- String previousHost = null;
- if(previousProject != null){
- if(previousProject.getLocationURI() != null){
- previousHost = previousProject.getLocationURI().getHost();
- }
- }
-
- String host;
- if (project != null) {
- host = project.getLocationURI().getHost();
- } else {
- host = null;
- }
-
- // Create the counter tabs if host has changed or if they haven't been created yet
- // Check that initialization is not done for current project.
- // Any calculation based on project doesn't work as the very first time for local project they are both null.
- if(previousProject == null || previousHost != host || host == null || counters == null){
- Control[] children = top.getChildren();
-
- for (Control control : children) {
- control.dispose();
- }
-
- OprofileCounter [] ctrs = getOprofileCounters(null);
- if (getOprofileTimerMode() || (ctrs.length > 0 && ctrs[0].getValidEvents() == null)) {
- Label timerModeLabel = new Label(top, SWT.LEFT);
- timerModeLabel.setText(OprofileLaunchMessages.getString("tab.event.timermode.no.options")); //$NON-NLS-1$
- } else {
- createVerticalSpacer(top, 1);
-
- //default event checkbox
- defaultEventCheck = new Button(top, SWT.CHECK);
- defaultEventCheck.setText(OprofileLaunchMessages.getString("tab.event.defaultevent.button.text")); //$NON-NLS-1$
- defaultEventCheck.setLayoutData(new GridData());
- defaultEventCheck
- .addSelectionListener(SelectionListener.widgetSelectedAdapter(e -> handleEnabledToggle()));
- createVerticalSpacer(top, 1);
- createCounterTabs(top);
- }
-
- }
-
- if(!getOprofileTimerMode()){
- if (counters == null) {
- OprofileCorePlugin.showErrorDialog("countersNotFound", null); //$NON-NLS-1$
- return;
- }
- for (int i = 0; i < counters.length; i++) {
- counters[i].loadConfiguration(config);
- }
-
- for (CounterSubTab tab : counterSubTabs) {
- tab.initializeTab(config);
- tab.createEventsFilter();
- }
- try{
- boolean enabledState = config.getAttribute(OprofileLaunchPlugin.ATTR_USE_DEFAULT_EVENT, true);
- defaultEventCheck.setSelection(enabledState);
- setEnabledState(!enabledState);
- } catch (CoreException e) {
- e.printStackTrace();
- }
- }
-
- }
-
- @Override
- public boolean isValid(ILaunchConfiguration config) {
- IProject project = getProject(config);
- setOprofileProject(project);
-
- OprofileCounter [] ctrs = getOprofileCounters(null);
- if (ctrs.length > 0 && ctrs[0].getValidEvents() == null) {
- return false;
- }
- if (getOprofileTimerMode() || counterSubTabs == null) {
- return true; //no options to check for validity
- } else {
- return validateEvents(config);
- }
- }
-
- /**
- * Validate events specified in the given configuration.
- * @param config
- * @return
- */
- private boolean validateEvents(ILaunchConfiguration config) {
- int numEnabledEvents = 0;
- boolean valid = true;
-
- try {
- if (config.getAttribute(OprofileLaunchPlugin.ATTR_USE_DEFAULT_EVENT, false)) {
- numEnabledEvents = 1;
- } else {
- //This seems like an odd way to validate, but since most of the validation
- // is done with the OprofileDaemonEvent that the counter wraps, this
- // is the easiest way.
- OprofileCounter[] counters = new OprofileCounter[getNumberOfOprofileCounters()];
- for (int i = 0; i < counters.length; i++) {
- counters[i] = getOprofileCounter(i);
- counters[i].loadConfiguration(config);
-
- for (CounterSubTab counterSubTab : counterSubTabs){
- int nr = counterSubTab.counter.getNumber();
- if(counterSubTab.enabledCheck.getSelection() && config.getAttribute(OprofileLaunchPlugin.attrNumberOfEvents(nr), 0) == 0){
- valid = false;
- }
- // if target list is empty valid is false
- // target event list item count
- int count = counterSubTab.selectedEventList.getList().getItemCount();
- if(count == 0)
- {
- valid = false;
- }
- }
-
- if (counters[i].getEnabled()) {
- ++numEnabledEvents;
-
- for (OpEvent event : counters[i].getEvents()) {
- if (event == null) {
- valid = false;
- break;
- }
-
- // First check min count
- int min = event.getMinCount();
- if (counters[i].getCount() < min) {
- setErrorMessage(MessageFormat.format(
- OprofileLaunchMessages.getString("tab.event.counterSettings.count.too-small"), //$NON-NLS-1$
- min));
- valid = false;
- break;
- }
-
- // Next ask oprofile if it is valid
- if (!checkEventSetupValidity(
- counters[i].getNumber(), event.getText(), event.getUnitMask().getMaskValue())) {
- Object[] args = new Object[] { event.getText() };
- setErrorMessage(MessageFormat.format(OprofileLaunchMessages.getString("tab.event.validation.msg"), args)); //$NON-NLS-1$
- valid = false;
- break;
- }
- }
- }
- }
- }
- } catch (CoreException e) {
- e.printStackTrace();
- }
-
- return (numEnabledEvents > 0 && valid);
- }
-
- @Override
- public void performApply(ILaunchConfigurationWorkingCopy config) {
- if (getOprofileTimerMode() || counterSubTabs == null) {
- config.setAttribute(OprofileLaunchPlugin.ATTR_USE_DEFAULT_EVENT, true);
- } else {
- config.setAttribute(OprofileLaunchPlugin.ATTR_USE_DEFAULT_EVENT, defaultEventCheck.getSelection());
- for (CounterSubTab cst : counterSubTabs) {
- cst.performApply(config);
- }
- }
- }
-
- @Override
- public void setDefaults(ILaunchConfigurationWorkingCopy config) {
- boolean useDefault = true;
- IProject project = getProject(config);
- setOprofileProject(project);
-
- counters = getOprofileCounters(config);
-
- // When instantiated, the OprofileCounter will set defaults.
- for (int i = 0; i < counters.length; i++) {
- counters[i].saveConfiguration(config);
- if (counters[i].getEnabled()) {
- useDefault = false;
- }
- }
-
- config.setAttribute(OprofileLaunchPlugin.ATTR_USE_DEFAULT_EVENT, useDefault);
- }
-
- @Override
- public String getName() {
- return OprofileLaunchMessages.getString("tab.event.name"); //$NON-NLS-1$
- }
-
- @Override
- public Image getImage() {
- return OprofileLaunchPlugin.getImageDescriptor(OprofileLaunchPlugin.ICON_EVENT_TAB).createImage();
- }
-
- /**
- * Handles the toggling of the default event check box. Not meant to be called
- * directly.
- */
- private void handleEnabledToggle() {
- setEnabledState(!defaultEventCheck.getSelection());
- updateLaunchConfigurationDialog();
- }
-
- /**
- * Sets the state of the child counter tabs' widgets.
- * @param state true for enabled, false for disabled
- */
- private void setEnabledState(boolean state) {
- for (CounterSubTab cst : counterSubTabs) {
- cst.setEnabledState(state);
- }
- }
-
- /*
- * Extracted methods to be overridden by the test suite.
- */
-
- /**
- * Returns whether the event's unit mask is valid
- * @param counter counter number
- * @param name event name
- * @param maskValue unit mask value
- * @return true if valid config, false otherwise
- */
- protected abstract boolean checkEventSetupValidity(int counter, String name, int maskValue);
-
- /**
- *
- * @param config
- * @return
- * @since 1.1
- */
- private IProject getProject(ILaunchConfiguration config){
- String name = null;
- try {
- name = config.getAttribute(ICDTLaunchConfigurationConstants.ATTR_PROJECT_NAME, ""); //$NON-NLS-1$
- } catch (CoreException e) {
- return null;
- }
- if (name.isEmpty()) {
- return null;
- }
-
- return ResourcesPlugin.getWorkspace().getRoot().getProject(name);
- }
-
- /**
- * Returns counter with corresponding to counter number.
- * @param i the counter number
- */
- public abstract OprofileCounter getOprofileCounter(int i);
-
- /**
- * Returns counters in the given configuration.
- * @param config the launch configuration
- */
- protected abstract OprofileCounter[] getOprofileCounters(ILaunchConfiguration config);
-
- /**
- * Returns the number of hardware counters the cpu has
- * @return int number of counters
- */
- protected abstract int getNumberOfOprofileCounters();
-
- /**
- * Returns whether or not oprofile is operating in timer mode.
- * @return true if oprofile is in timer mode, false otherwise
- */
- protected abstract boolean getOprofileTimerMode();
-
- /**
- * Returns current project to profile by Oprofile.
- */
- protected abstract IProject getOprofileProject();
-
- /**
- * Set project to profile by Oprofile.
- * @param project the project to profile
- */
- protected abstract void setOprofileProject(IProject project);
-
- /**
- * Update generic Oprofile information.
- */
- protected abstract void updateOprofileInfo();
-
- /**
- * A sub-tab of the OprofileEventConfigTab launch configuration tab.
- * Essentially, it is a frontend to an OprofileCounter. This is an
- * inner class because it requires methods from the parent tab (such as
- * updateLaunchConfigurationDialog() when a widget changes state).
- */
- protected class CounterSubTab {
-
- private Button profileKernelCheck;
- private Button profileUserCheck;
- private Label countTextLabel;
- private Text countText;
- private Label eventDescLabel;
- private Text eventDescText;
- private UnitMaskViewer unitMaskViewer;
- private Text eventFilterText;
- private OprofileCounter counter;
-
- private ScrolledComposite scrolledTop;
- protected Composite tabTopContainer;
- protected Button enabledCheck;
- protected ListViewer eventList;
-
- protected Button add;
- protected Button addAll;
- protected Button remove;
- protected Button removeAll;
- protected Button customizeBtn;
- protected ListViewer selectedEventList;
- protected ScrolledComposite unitmaskScrollComposite;
- protected Composite unitMaskSubComposite ;
- private static final int ADD = 1;
- private static final int ADD_ALL = 2;
- private static final int REMOVE = 3;
- private static final int REMOVE_ALL = 4;
- private static final int CUSTOMIZE = 5;
- private List<OpEvent> sourceList = new ArrayList<>(0);
- private List<OpEvent> targetList = new ArrayList<>(0);
-
-
- public Composite getTabTopContainer() {
- return tabTopContainer;
- }
-
- public void setTabTopContainer(Composite tabTopContainer) {
- this.tabTopContainer = tabTopContainer;
- }
-
- /**
- * Constructor for a subtab. Creates the layout and widgets for its content.
- * @param parent composite the widgets will be created in
- * @param counter the associated OprofileCounter object
- */
- public CounterSubTab(Composite parent, OprofileCounter counter) {
- this.counter = counter;
-
- parent.setLayout(new GridLayout());
-
- //scrollable composite on top
- ScrolledComposite scrolledContainer = new ScrolledComposite(parent, SWT.H_SCROLL | SWT.V_SCROLL);
- scrolledContainer.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
- GridLayout layout = new GridLayout();
- layout.marginHeight = 0;
- layout.marginWidth = 0;
- scrolledContainer.setLayout(layout);
- scrolledContainer.setExpandHorizontal(true);
- scrolledContainer.setExpandVertical(true);
-
- //composite to contain the rest of the tab
- Composite tabTopContainer = new Composite(scrolledContainer, SWT.NONE);
- scrolledContainer.setContent(tabTopContainer);
- layout = new GridLayout();
- layout.marginHeight = 0;
- layout.marginWidth = 0;
- layout.numColumns = 2;
- tabTopContainer.setLayout(layout);
- tabTopContainer.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
-
- //top cell
- Composite topCellComp = new Composite(tabTopContainer, SWT.NONE);
- layout = new GridLayout();
- layout.marginHeight = 0;
- layout.marginWidth = 0;
- layout.numColumns = 2;
- topCellComp.setLayout(layout);
- topCellComp.setLayoutData(new GridData(SWT.FILL, SWT.TOP, true, false, 2, 1));
-
- createTopCell(topCellComp);
-
- createVerticalSpacer(tabTopContainer, 2);
-
- //left side composite group for eventList
- Composite eventListComp = new Composite(tabTopContainer, SWT.NONE);
- layout = new GridLayout();
- layout.marginHeight = 0;
- layout.marginWidth = 0;
- layout.numColumns = 3;
- eventListComp.setLayout(layout);
- eventListComp.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
- //layoutdata is set later
-
- createLeftCell(eventListComp);
-
-
- scrolledTop = scrolledContainer;
- this.tabTopContainer = tabTopContainer;
- resizeScrollContainer();
- }
-
- /**
- * Creates the "Enabled" checkbox, and the event description text.
- * @param parent composite these widgets will be created in
- */
- private void createTopCell(Composite parent) {
- //checkbox
- enabledCheck = new Button(parent, SWT.CHECK);
- enabledCheck.setText(OprofileLaunchMessages.getString("tab.event.counterSettings.enabled.button.text")); //$NON-NLS-1$
- enabledCheck.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, false, false, 2, 1));
- enabledCheck.addSelectionListener(SelectionListener.widgetSelectedAdapter(e -> {
- counter.setEnabled(enabledCheck.getSelection());
- internalSetEnabledState(counter.getEnabled());
- updateLaunchConfigurationDialog();
- }));
- enabledCheck.setEnabled(false);
-
- //label for textbox
- eventDescLabel = new Label(parent, SWT.NONE);
- eventDescLabel.setText(OprofileLaunchMessages.getString("tab.event.eventDescription.label.text")); //$NON-NLS-1$
- eventDescLabel.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, false, false));
-
- //textbox
- eventDescText = new Text(parent, SWT.SINGLE | SWT.BORDER | SWT.READ_ONLY);
- eventDescText.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));
- }
-
- /**
- * Creates the event list widget.
- * @param parent composite these widgets will be created in
- */
- private void createLeftCell(Composite parent) {
- // Text box used to filter the event list
- eventFilterText = new Text(parent, SWT.BORDER | SWT.SINGLE | SWT.ICON_CANCEL | SWT.SEARCH);
- eventFilterText.setMessage(OprofileLaunchMessages.getString("tab.event.eventfilter.message")); //$NON-NLS-1$
- GridData eventFilterLayout = new GridData();
- eventFilterLayout.horizontalAlignment = SWT.FILL;
- eventFilterLayout.grabExcessHorizontalSpace = true;
- eventFilterText.setLayoutData(eventFilterLayout);
- eventFilterText.addModifyListener(e -> eventList.refresh(false));
-
- // profile user binary and profile kernel
- createRightCell(parent);
-
- int options = SWT.V_SCROLL | SWT.H_SCROLL | SWT.BORDER;
- if (OprofileProject.getProfilingBinary().equals(OprofileProject.OPERF_BINARY)) {
- options |= SWT.MULTI;
- } else {
- options |= SWT.SINGLE;
- }
- eventList = new ListViewer(parent, options);
- GridData gdata = new GridData(SWT.FILL, SWT.FILL, true, true);
- gdata.verticalSpan = 5;
- eventList.getList().setLayoutData(gdata);
-
- eventList.setLabelProvider(new LabelProvider(){
- @Override
- public String getText(Object element) {
- OpEvent e = (OpEvent) element;
- return e.getText();
- }
- @Override
- public Image getImage(Object element) { return null; }
- @Override
- public boolean isLabelProperty(Object element, String property) { return false; }
- });
-
- eventList.setContentProvider(new IStructuredContentProvider() {
- @Override
- public Object[] getElements(Object inputElement) {
- List<OpEvent> list = (List<OpEvent>)inputElement;
- return list.toArray();
- }
- @Override
- public void dispose() { }
- @Override
- public void inputChanged(Viewer arg0, Object arg1, Object arg2) { }
- });
-
- // sorter
- ListviewerComparator comparator = new ListviewerComparator();
- eventList.setComparator(comparator);
-
- //adds the events to the list from the counter
- sourceList.addAll(Arrays.asList(counter.getValidEvents()));
- eventList.setInput(sourceList);
-
- eventList.addSelectionChangedListener(sce -> handleEventListSelectionChange());
-
- HandleButtonClick listener = new HandleButtonClick();
- add = new Button(parent, SWT.PUSH);
- add.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false));
- add.setText(OprofileLaunchMessages.getString("tab.event.addevent.button.text")); //$NON-NLS-1$
- add.setData(ADD);
- add.addListener(SWT.Selection, listener);
-
- selectedEventList = new ListViewer(parent, options);
- selectedEventList.getList().setLayoutData(gdata);
-
-
- selectedEventList.setLabelProvider(new ILabelProvider(){
- @Override
- public String getText(Object element) {
- OpEvent e = (OpEvent) element;
- return e.getText();
- }
- @Override
- public Image getImage(Object element) { return null; }
- @Override
- public void addListener(ILabelProviderListener listener) { }
- @Override
- public void dispose() { }
- @Override
- public boolean isLabelProperty(Object element, String property) { return false; }
- @Override
- public void removeListener(ILabelProviderListener listener) { }
- });
-
- selectedEventList.setContentProvider(new IStructuredContentProvider() {
- @Override
- public Object[] getElements(Object inputElement) {
- List<OpEvent> list = (List<OpEvent>)inputElement;
- return list.toArray();
- }
- @Override
- public void dispose() { }
- @Override
- public void inputChanged(Viewer arg0, Object arg1, Object arg2) { }
- });
-
- // sorter
- ListviewerComparator viewerComparator = new ListviewerComparator();
- selectedEventList.setComparator(viewerComparator);
-
- //adds the events to the list from the counter
- if(counter.getEvents().length != 0 && null != counter.getEvents()[0])
- {
- targetList.addAll(Arrays.asList(counter.getEvents()));
- }
- selectedEventList.setInput(targetList);
-
- selectedEventList.addSelectionChangedListener(sce -> {
- handleListSelection(selectedEventList);
- eventList.getList().deselectAll();
- updateLaunchConfigurationDialog();
- });
-
-
-
-
-
- addAll = new Button(parent, SWT.PUSH);
- addAll.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false));
- addAll.setText(OprofileLaunchMessages.getString("tab.event.addallevent.button.text")); //$NON-NLS-1$
- addAll.setData(ADD_ALL);
- addAll.addListener(SWT.Selection, listener);
-
-
- remove = new Button(parent, SWT.PUSH);
- remove.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false));
- remove.setText(OprofileLaunchMessages.getString("tab.event.removeevent.button.text")); //$NON-NLS-1$
- remove.setData(REMOVE);
- remove.addListener(SWT.Selection, listener);
-
-
- removeAll = new Button(parent, SWT.PUSH);
- removeAll.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false));
- removeAll.setText(OprofileLaunchMessages.getString("tab.event.removeallevent.button.text")); //$NON-NLS-1$
- removeAll.setData(REMOVE_ALL);
- removeAll.addListener(SWT.Selection, listener);
-
- customizeBtn = new Button(parent, SWT.PUSH);
- customizeBtn.setLayoutData(new GridData(SWT.FILL, SWT.TOP, true, false));
- customizeBtn.setText(OprofileLaunchMessages.getString("tab.event.customizeevent.button.text")); //$NON-NLS-1$
- customizeBtn.addListener(SWT.Selection, listener);
- customizeBtn.setData(CUSTOMIZE);
-
-
- }
-
- /**
- * Creates the 2 profile space checkboxes, event count and unit mask widget.
- * @param parent composite these widgets will be created in
- */
- private void createRightCell(Composite parent) {
- //profile kernel checkbox
- profileKernelCheck = new Button(parent, SWT.CHECK);
- profileKernelCheck.setText(OprofileLaunchMessages.getString("tab.event.counterSettings.profileKernel.check.text")); //$NON-NLS-1$
- profileKernelCheck
- .addSelectionListener(SelectionListener.widgetSelectedAdapter(e -> handleProfileKernelToggle()));
-
- //profile user checkbox -- should this ever be disabled?
- profileUserCheck = new Button(parent, SWT.CHECK);
- profileUserCheck.setText(OprofileLaunchMessages.getString("tab.event.counterSettings.profileUser.check.text")); //$NON-NLS-1$
- profileUserCheck
- .addSelectionListener(SelectionListener.widgetSelectedAdapter(e -> handleProfileUserToggle()));
-
- }
-
- /**
- * Creates a text filter for the events list widget
- */
- private void createEventsFilter(){
- // Event Filter
- ViewerFilter eventFilter = new ViewerFilter() {
-
- @Override
- public Object[] filter(Viewer viewer, Object parent, Object[] elements) {
- Object[] filteredElements = super.filter(viewer,parent,elements);
- handleEventListSelectionChange();
- return filteredElements;
- }
-
- @Override
- public boolean select(Viewer viewer, Object parentElement, Object element) {
- String[] filterTerms = eventFilterText.getText().trim().toLowerCase().split(" "); //$NON-NLS-1$
- String eventName = ((OpEvent)element).getText().toLowerCase();
- String eventDescription = ((OpEvent)element).getTextDescription().toLowerCase();
-
- boolean contains = true;
-
- for (String filterTerm : filterTerms) {
- if(contains){
- contains = eventName.contains(filterTerm) || eventDescription.contains(filterTerm);
- }
- }
- return contains;
- }
- };
- if(eventList != null){
- eventList.addFilter(eventFilter);
- }
- }
-
- /**
- * Initializes the tab on first creation.
- * @param config default configuration for the counter and the associated widgets
- */
- public void initializeTab(ILaunchConfiguration config) {
- //make all controls inactive, since the 'default event' checkbox
- // is checked by default
- try {
- defaultEventCheck.setSelection(config.getAttribute(OprofileLaunchPlugin.ATTR_USE_DEFAULT_EVENT, true));
- } catch (CoreException e) {
- e.printStackTrace();
- }
- setEnabledState(false);
-
- if (config != null) {
- counter.loadConfiguration(config);
- }
-
- boolean enabled = counter.getEnabled();
- enabledCheck.setSelection(enabled);
-
- if (counter.getEvents().length == 0 || counter.getEvents()[0] == null) {
- // Default to first in list
- counter.setEvents(new OpEvent [] {counter.getValidEvents()[0]});
- }
-
- //load default states
- profileKernelCheck.setSelection(counter.getProfileKernel());
- profileUserCheck.setSelection(counter.getProfileUser());
-
- eventDescText.setText(counter.getEvents()[0].getTextDescription());
-
-
- // add opevent to target event list
- ArrayList<OpEvent> tmp = new ArrayList<>(Arrays.asList(counter.getEvents()));
- targetList.addAll(tmp);
- selectedEventList.add(tmp.toArray());
- selectedEventList.refresh();
- selectedEventList.setSelection(new StructuredSelection(tmp.toArray()));
-
- // remove selected opevent from source list
-
- sourceList.removeAll(tmp);
- eventList.remove(tmp.toArray());
- eventList.refresh();
- }
-
- /**
- * Applies the tab's current state to the launch configuration.
- * @param config launch config to apply to
- */
- public void performApply(ILaunchConfigurationWorkingCopy config) {
- counter.saveConfiguration(config);
- }
-
- /**
- * Enables/disables the widgets in this tab.
- * @param state true to enable to the counter's state, false to disable all
- */
- public void setEnabledState(boolean state) {
- enabledCheck.setEnabled(state);
-
- if (state) {
- internalSetEnabledState(counter.getEnabled());
- } else {
- internalSetEnabledState(false);
- }
- }
-
- /**
- * Method split from setEnabledState to avoid code duplication.
- * Not meant to be called directly.
- * @param state true to enable all widgets, false to disable all widgets
- */
- private void internalSetEnabledState(boolean state) {
- profileKernelCheck.setEnabled(state);
- profileUserCheck.setEnabled(state);
- eventDescText.setEnabled(state);
- eventList.getList().setEnabled(state);
- selectedEventList.getList().setEnabled(state);
- eventFilterText.setEnabled(state);
- add.setEnabled(state);
- addAll.setEnabled(state);
- remove.setEnabled(state);
- removeAll.setEnabled(state);
- customizeBtn.setEnabled(state);
-
-
- }
-
- /**
- * Handling method for the event list. Gets the selection from the listviewer
- * and updates the UnitMask and event description text box.
- */
- private void handleEventListSelectionChange() {
- handleListSelection(eventList);
- int[] indices = eventList.getList().getSelectionIndices();
- if (indices.length != 0) {
- customizeBtn.setEnabled(true);
- // unselected other list element
- // to keep customize button enable
- // for both list selection
- selectedEventList.getList().deselectAll();
- }
- updateLaunchConfigurationDialog();
-
- }
-
- /**
- * Generic method for handling source & target selection list
- * @param eventList - list to be handled
- * @since 3.0
- */
- private void handleListSelection(ListViewer eventList)
- {
- setErrorMessage(null);
- int [] indices = eventList.getList().getSelectionIndices();
- if (indices.length != 0) {
- ArrayList<OpEvent> tmp = new ArrayList<> ();
- for (int index : indices) {
- OpEvent event = (OpEvent) eventList.getElementAt(index);
- tmp.add(event);
- eventDescText.setText(event.getTextDescription());
-
- }
-
- // Check the min count to update the error message (events
- // can have
- // different minimum reset counts)
- int min = Integer.MIN_VALUE;
- for (OpEvent ev : tmp) {
- // We want the largest of the min values
- if (ev.getMinCount() > min) {
- min = ev.getMinCount();
- }
- }
- if(counter.getEvents().length == 0 || counter.getEvents()[0] == null)
- {
- counter.setEvents(new OpEvent [] {counter.getValidEvents()[0]});
- }
- if ((counter.getCount() < min)
- && (!defaultEventCheck.getSelection())) {
- setErrorMessage(getMinCountErrorMessage(min));
- }
-
- //counter.setEvents(tmp.toArray(new OpEvent[0]));
- } else {
- eventDescText.setText(""); //$NON-NLS-1$
-
- }
-
-
-
- }
-
- /**
- * Handles the toggling of the "profile user" button.
- */
- private void handleProfileUserToggle() {
- counter.setProfileUser(profileUserCheck.getSelection());
- updateLaunchConfigurationDialog();
- }
-
- /**
- * Handles the toggling of the "profile kernel" button.
- */
- private void handleProfileKernelToggle() {
- counter.setProfileKernel(profileKernelCheck.getSelection());
- updateLaunchConfigurationDialog();
- }
-
- /**
- * Handles text modify events in the count text widget.
- */
- private void handleCountTextModify() {
- String errorMessage = null;
- try {
-
- // This seems counter-intuitive, but we must save the count
- // so that isValid knows this launch config is invalid
- int count = Integer.parseInt(countText.getText());
- counter.setCount(count);
-
- // Check minimum count
- int min = Integer.MIN_VALUE;
- for (OpEvent event : counter.getEvents()) {
- // We want the largest of the min values
- if (event != null && event.getMinCount() > min) {
- min = event.getMinCount();
- }
- }
- if ((count < min) && (!defaultEventCheck.getSelection())) {
- errorMessage = getMinCountErrorMessage(min);
- }
- } catch (NumberFormatException e) {
- errorMessage = OprofileLaunchMessages.getString("tab.event.counterSettings.count.invalid"); //$NON-NLS-1$
- counter.setCount(OprofileDaemonEvent.COUNT_INVALID);
- } finally {
- setErrorMessage(errorMessage);
- updateLaunchConfigurationDialog();
- }
- }
-
- /**
- * Returns a string with the minimum allowed count, suitable foruse with setErrorMessage().
- * @param min minimum count
- * @return a String containing the error message
- */
- private String getMinCountErrorMessage(int min) {
- String msg = OprofileLaunchMessages.getString("tab.event.counterSettings.count.too-small"); //$NON-NLS-1$
- return MessageFormat.format(msg, Integer.valueOf(min));
- }
-
- /**
- * Changes parameters for the top scrolled composite which makes the scroll bars
- * appear when content overflows the visible area. Called by the UnitMaskViewer
- * whenever a new set of unit mask buttons are created, since the number of them is
- * variable and there is no guarantee as to the default size of the launch configuration
- * dialog in general.
- */
- private void resizeScrollContainer() {
- scrolledTop.setMinSize(tabTopContainer.computeSize(SWT.DEFAULT, SWT.DEFAULT));
- }
-
-
- /**
- * This class displays event unit masks via check boxes and appropriate labels.
- */
- protected class UnitMaskViewer {
- private Label unitMaskLabel;
- private Composite top;
- private Composite maskListComp;
- private Button[] unitMaskButtons;
-
- /**
- * Constructor, creates the widget.
- * @param parent composite the widget will be created in
- */
- public UnitMaskViewer(Composite parent) {
- //"Unit Mask:" label
- unitMaskLabel = new Label(parent, SWT.NONE);
- unitMaskLabel.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, false, false));
- unitMaskLabel.setText(OprofileLaunchMessages.getString("unitmaskViewer.label.text")); //$NON-NLS-1$
- unitMaskLabel.setVisible(true);
-
- //composite to contain the button widgets
- Composite top = new Composite(parent, SWT.NONE);
- top.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
- GridLayout layout = new GridLayout();
- layout.marginHeight = 0;
- layout.marginWidth = 0;
- top.setLayout(layout);
- this.top = top;
-
- maskListComp = null;
- unitMaskButtons = null;
- }
-
- /**
- * Handles button toggles; updates the counter's unit mask to the appropriate value.
- * @param maskButton the button object
- * @param index the button's mask index (used in OpUnitMask for a proper mask value)
- */
- private void handleToggle(Button maskButton, int index) {
- OpUnitMask mask = counter.getUnitMask();
- if (mask != null) {
- if (maskButton.getSelection()) {
- mask.setMaskFromIndex(index);
- } else {
- mask.unSetMaskFromIndex(index);
- }
- }
-
- //update the parent tab
- updateLaunchConfigurationDialog();
- }
-
- /**
- * Disposes of the old unit mask check list and creates a new one with
- * the appropriate default value.
- * @param oe the event
- */
- public void displayEvent(OpEvent oe) {
- if (maskListComp != null) {
- maskListComp.dispose();
- }
-
- if(oe == null){
- return;
- }
-
-
- OpUnitMask mask = oe.getUnitMask();
- int totalMasks = mask.getNumMasks();
-
- Composite newMaskComp = new Composite(top, SWT.NONE);
- newMaskComp.setLayout(new GridLayout());
- newMaskComp.setLayoutData(new GridData(SWT.LEFT, SWT.FILL, false, true));
- maskListComp = newMaskComp;
-
- //creates these buttons with the default masks
- mask.setDefaultMaskValue();
-
- ArrayList<Button> maskButtons = new ArrayList<>();
-
- for (int i = 0; i < totalMasks; i++) {
- Button maskButton;
-
- if (mask.getType() == OpUnitMask.INVALID) {
- //big problem, most likely parsing went awry or opxml output mangled
- OprofileCorePlugin.showErrorDialog("opxmlParse", null); //$NON-NLS-1$
- return;
- } else if (mask.getType() == OpUnitMask.MANDATORY) {
- maskButton = new Button(newMaskComp, SWT.RADIO);
- maskButton.setEnabled(false);
- maskButton.setText(mask.getText(i));
- maskButton.setSelection(true);
- } else {
- int buttonType;
- final int maskButtonIndex = i;
- boolean selected = mask.isMaskSetFromIndex(maskButtonIndex);
-
- if (mask.getType() == OpUnitMask.EXCLUSIVE) {
- buttonType = SWT.RADIO;
- } else { //mask type is OpUnitMask.BITMASK
- buttonType = SWT.CHECK;
- }
-
- maskButton = new Button(newMaskComp, buttonType);
- maskButton.setEnabled(true);
- maskButton.setText(mask.getText(i));
- maskButton.setSelection(selected);
- maskButton.addSelectionListener(SelectionListener
- .widgetSelectedAdapter(se -> handleToggle((Button) se.getSource(), maskButtonIndex)));
-
- maskButtons.add(maskButton);
- }
- }
-
- unitMaskButtons = new Button[maskButtons.size()];
- maskButtons.toArray(unitMaskButtons);
-
-
- resizeUnitMaskContainer();
- }
-
- /**
- * Enables and disables the viewer for UI input
- * @param enabled whether this viewer should be enabled
- */
- public void setEnabled(boolean enabled) {
- if (unitMaskButtons != null) {
- for (Button b : unitMaskButtons) {
- if (!b.isDisposed()) {
- b.setEnabled(enabled);
- }
- }
- }
- }
- }
-
- /**
- * Dialog box for unit mask field modification
- * @since 3.0
- *
- */
- protected class UnitMaskDialog extends Dialog {
- private OpEvent event;
- public UnitMaskDialog(IShellProvider parentShell) {
- super(parentShell);
- }
-
- public UnitMaskDialog(Shell parentShell,OpEvent event) {
- super(parentShell);
- this.event = event;
- }
-
- @Override
- protected Control createDialogArea(Composite parent) {
- Composite child = (Composite)super.createDialogArea(parent);
- ScrolledComposite scrolledContainer = new ScrolledComposite(child, SWT.H_SCROLL|SWT.V_SCROLL);
- scrolledContainer.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
- GridLayout layout = new GridLayout();
- layout.marginHeight = 0;
- layout.marginWidth = 0;
- scrolledContainer.setLayout(layout);
- scrolledContainer.setExpandHorizontal(true);
- scrolledContainer.setExpandVertical(true);
- Composite unitMaskSubComposite = new Composite(scrolledContainer, SWT.None);
- unitMaskSubComposite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
- layout = new GridLayout();
- layout.numColumns=2;
- unitMaskSubComposite.setLayout(layout);
- createUnitMaskComponents(unitMaskSubComposite);
- scrolledContainer.setContent(unitMaskSubComposite);
- CounterSubTab.this.unitmaskScrollComposite = scrolledContainer;
- CounterSubTab.this.unitMaskSubComposite = unitMaskSubComposite;
- unitMaskViewer.displayEvent(event);
- return child;
- }
-
- @Override
- protected boolean isResizable() {
- return true;
- }
-
- @Override
- protected void configureShell(Shell newShell) {
- super.configureShell(newShell);
- newShell.setText(event.getText());
- newShell.setSize(400, 400);
- }
- }
-
-
- private void createUnitMaskComponents(Composite parent)
- {
- //event count label/text
- countTextLabel = new Label(parent, SWT.NONE);
- countTextLabel.setText(OprofileLaunchMessages.getString("tab.event.counterSettings.count.label.text")); //$NON-NLS-1$
- countText = new Text(parent, SWT.SINGLE | SWT.BORDER);
- countText.setText(Integer.toString(counter.getCount()));
- countText.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));
- countText.addModifyListener(me -> handleCountTextModify());
-
- //unit mask widget
- Composite unitMaskComp = new Composite(parent, SWT.NONE);
- GridLayout layout = new GridLayout();
- layout.marginHeight = 0;
- layout.marginWidth = 0;
- unitMaskComp.setLayout(layout);
- unitMaskComp.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false, 2, 1));
-
- unitMaskViewer = new UnitMaskViewer(unitMaskComp);
- }
- private void resizeUnitMaskContainer() {
- unitmaskScrollComposite.setMinSize(unitMaskSubComposite.computeSize(SWT.DEFAULT, SWT.DEFAULT));
- }
-
- /**
- * Events selection/removal button listener
- * @since 3.0
- *
- */
- protected class HandleButtonClick implements Listener {
-
- @Override
- public void handleEvent(Event event) {
- int btn_value = (Integer) event.widget.getData();
- switch (btn_value) {
- case ADD:
- addButtonClicked();
- updateLaunchConfigurationDialog();
- break;
- case ADD_ALL:
- addAllButtonClicked();
- updateLaunchConfigurationDialog();
- break;
- case REMOVE:
- removeButtonClicked();
- updateLaunchConfigurationDialog();
- break;
- case REMOVE_ALL:
- removeAllButtonClicked();
- updateLaunchConfigurationDialog();
- break;
- case CUSTOMIZE:
- customizeButtonClicked();
- break;
- default:
- break;
- }
-
- }
-
- private void addButtonClicked() {
- int[] indices = eventList.getList().getSelectionIndices();
- if (indices.length != 0) {
- ArrayList<OpEvent> tmp = new ArrayList<>();
- for (int index : indices) {
- OpEvent event = (OpEvent) eventList.getElementAt(index);
- tmp.add(event);
- }
- // add to target list
- targetList.addAll(tmp);
- selectedEventList.add(tmp.toArray());
-
- sourceList.removeAll(tmp);
- eventList.remove(tmp.toArray());
-
- int count = selectedEventList.getList().getItemCount();
- tmp = new ArrayList<>();
- for (int i = 0; i < count; i++) {
- OpEvent event = (OpEvent) selectedEventList
- .getElementAt(i);
- tmp.add(event);
-
- }
- if (!tmp.isEmpty())
- counter.setEvents(tmp.toArray(new OpEvent[0]));
-
- eventList.refresh();
- selectedEventList.refresh();
-
-
- }
- }
-
- private void addAllButtonClicked() {
- int count = eventList.getList().getItemCount();
- ArrayList<OpEvent> tmp = new ArrayList<>();
- for (int i = 0; i < count; i++) {
- OpEvent event = (OpEvent) eventList.getElementAt(i);
- tmp.add(event);
-
- }
-
- targetList.addAll(tmp);
- selectedEventList.add(tmp.toArray());
- eventList.remove(tmp.toArray());
- sourceList.removeAll(tmp);
-
- count = selectedEventList.getList().getItemCount();
- tmp = new ArrayList<>();
- for (int i = 0; i < count; i++) {
- OpEvent event = (OpEvent) selectedEventList.getElementAt(i);
- tmp.add(event);
-
- }
- if (!tmp.isEmpty())
- counter.setEvents(tmp.toArray(new OpEvent[0]));
-
- eventList.refresh();
- selectedEventList.refresh();
-
-
- }
-
- private void removeButtonClicked() {
- int[] indices = selectedEventList.getList()
- .getSelectionIndices();
- if (indices.length != 0) {
- ArrayList<OpEvent> tmp = new ArrayList<>();
- for (int index : indices) {
- OpEvent event = (OpEvent) selectedEventList
- .getElementAt(index);
- tmp.add(event);
- }
- // add to target list
- sourceList.addAll(tmp);
- eventList.add(tmp.toArray());
-
- targetList.removeAll(tmp);
- selectedEventList.remove(tmp.toArray());
-
- int count = selectedEventList.getList().getItemCount();
- tmp = new ArrayList<>();
- for (int i = 0; i < count; i++) {
- OpEvent event = (OpEvent) selectedEventList
- .getElementAt(i);
- tmp.add(event);
-
- }
- if (!tmp.isEmpty())
- counter.setEvents(tmp.toArray(new OpEvent[0]));
- else
- // add first valid element to counter due to NPE
- counter.setEvents(new OpEvent[]{counter.getValidEvents()[0]});
-
- eventList.refresh();
- selectedEventList.refresh();
-
- }
- }
-
- private void removeAllButtonClicked() {
-
- int count = selectedEventList.getList().getItemCount();
- ArrayList<OpEvent> tmp = new ArrayList<>();
- for (int i = 0; i < count; i++) {
- OpEvent event = (OpEvent) selectedEventList.getElementAt(i);
- tmp.add(event);
-
- }
-
- if (!tmp.isEmpty()) {
- sourceList.addAll(tmp);
- eventList.add(tmp.toArray());
-
- selectedEventList.remove(tmp.toArray());
- targetList.removeAll(tmp);
-
- }
- counter.setEvents(new OpEvent[] { counter.getValidEvents()[0] });
-
- eventList.refresh();
- selectedEventList.refresh();
-
- }
-
- private void customizeButtonClicked() {
- UnitMaskDialog d = null;
-
- if(eventList.getList().getSelectionIndex() != -1)
- {
- d = new UnitMaskDialog(Display.getCurrent()
- .getActiveShell(),
- (OpEvent) eventList.getElementAt(eventList.getList()
- .getSelectionIndex()));
- }
- else if(selectedEventList.getList().getSelectionIndex() != -1)
- {
- d = new UnitMaskDialog(Display.getCurrent()
- .getActiveShell(),
- (OpEvent) selectedEventList.getElementAt(selectedEventList.getList()
- .getSelectionIndex()));
- }
- if(d != null)
- d.open();
- }
-
- }
- }
-
- /**
- *
- * Event sorting for selected as well as all available events
- * @since 3.0
- */
- protected class ListviewerComparator extends ViewerComparator
- {
- @Override
- public int compare(Viewer viewer, Object e1, Object e2) {
- OpEvent op1 = (OpEvent) e1;
- OpEvent op2 = (OpEvent) e2;
- String op1txt = op1.getText();
- String op2txt = op2.getText();
- if(op1txt !=null && op2txt !=null && op1txt.trim().length() !=0 && op2txt.trim().length() !=0)
- return getComparator().compare(op1txt, op2txt);
- return super.compare(viewer, e1, e2);
- }
- }
-}
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.launch/src/org/eclipse/linuxtools/internal/oprofile/launch/configuration/EventConfigCache.java b/oprofile/org.eclipse.linuxtools.oprofile.launch/src/org/eclipse/linuxtools/internal/oprofile/launch/configuration/EventConfigCache.java
deleted file mode 100644
index 2dd097642308821d659f967e1f2722a940f62266..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.launch/src/org/eclipse/linuxtools/internal/oprofile/launch/configuration/EventConfigCache.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2018 Red Hat, Inc.
- *
- * This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License 2.0
- * which is available at https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- * Kent Sebastian <ksebasti@redhat.com> - initial API and implementation
- *
- *******************************************************************************/
-package org.eclipse.linuxtools.internal.oprofile.launch.configuration;
-
-import java.util.HashMap;
-
-import org.eclipse.linuxtools.internal.oprofile.core.Oprofile;
-
-/**
- * Cache class for event configuration. Currently only used to cache the results
- * of an `opxml check-event ..` run, since the isValid() method in the EventConfigTab
- * needlessly spawns opxml dozens of times with the same values. Note that multiple
- * checks of the same value will necessarily return the same result (for a given
- * processor) so there is no worry of an invalid cache entry.
- */
-public class EventConfigCache {
- //a cache entry for an event check, used as the hashmap key
- static class CheckEventEntry {
- public Integer counterNum, maskValue;
- public String eventName;
-
- public CheckEventEntry(int counterNum, String eventName, int maskValue) {
- this.counterNum = Integer.valueOf(counterNum);
- this.eventName = eventName;
- this.maskValue = Integer.valueOf(maskValue);
- }
-
- @Override
- public boolean equals(Object obj) {
- if (obj instanceof CheckEventEntry) {
- CheckEventEntry other = (CheckEventEntry)obj;
- return (counterNum.equals(other.counterNum) && eventName.equals(other.eventName) && maskValue.equals(other.maskValue));
- } else {
- return false;
- }
- }
-
- @Override
- public int hashCode() {
- int prime = 11, result = 3;
- result = prime*result + counterNum.hashCode();
- result = prime*result + eventName.hashCode();
- result = prime*result + maskValue.hashCode();
- return result;
- }
- }
-
- HashMap<CheckEventEntry, Boolean> validEventCache;
-
- /**
- * Default constructor, creates an empty cache.
- */
- public EventConfigCache() {
- validEventCache = new HashMap<>();
- }
-
- /**
- * Method to be used to check the validity of an event. Will check
- * the cache for the result of a previous check of the same values,
- * or otherwise will spawn opxml to check properly.
- * @param counter counter number
- * @param event event name
- * @param mask unit mask value
- * @return true or false, depending if the event config is valid
- */
- public boolean checkEvent(int counter, String event, int mask) {
- CheckEventEntry e = new CheckEventEntry(counter, event, mask);
- Boolean result = null;
-
- result = validEventCache.get(e);
-
- if (result == null) {
- //not in the map, get its value and add it in
- result = Oprofile.checkEvent(counter, event, mask);
-
- //possible to be null if there is no opxmlProvider
- if (result != null) {
- validEventCache.put(e, result);
- }
- }
-
- return (result == null ? false : result);
- }
-}
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.launch/src/org/eclipse/linuxtools/internal/oprofile/launch/configuration/LaunchOptions.java b/oprofile/org.eclipse.linuxtools.oprofile.launch/src/org/eclipse/linuxtools/internal/oprofile/launch/configuration/LaunchOptions.java
deleted file mode 100644
index d9ea4bcb613bc34ce241d007cc1d135cced61e7c..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.launch/src/org/eclipse/linuxtools/internal/oprofile/launch/configuration/LaunchOptions.java
+++ /dev/null
@@ -1,185 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2018 Red Hat, Inc.
- *
- * This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License 2.0
- * which is available at https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- * Keith Seitz <keiths@redhat.com> - initial API and implementation
- * Kent Sebastian <ksebasti@redhat.com> -
- *******************************************************************************/
-
-package org.eclipse.linuxtools.internal.oprofile.launch.configuration;
-
-import org.eclipse.core.filesystem.IFileStore;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
-import org.eclipse.linuxtools.internal.oprofile.core.Oprofile;
-import org.eclipse.linuxtools.internal.oprofile.core.Oprofile.OprofileProject;
-import org.eclipse.linuxtools.internal.oprofile.core.daemon.OprofileDaemonOptions;
-import org.eclipse.linuxtools.internal.oprofile.launch.OprofileLaunchPlugin;
-import org.eclipse.linuxtools.profiling.launch.IRemoteFileProxy;
-import org.eclipse.linuxtools.profiling.launch.RemoteProxyManager;
-
-/**
- * This class wraps OProfile's global launch options for the
- * Eclipse launcher facility.
- */
-public class LaunchOptions {
- // The launch options for the daemon
- private OprofileDaemonOptions options;
- private String oprofileComboText;
- private int executionsNumber;
-
- public LaunchOptions() {
- options = new OprofileDaemonOptions();
- oprofileComboText = OprofileProject.OPERF_BINARY;
- executionsNumber = 1;
- }
-
- /**
- * Determines whether the global oprofile options represented by this
- * object are valid
- * @return whether the options are valid
- */
- public boolean isValid() {
- IRemoteFileProxy proxy = null;
- try {
- proxy = RemoteProxyManager.getInstance().getFileProxy(getOprofileProject());
- } catch (CoreException e) {
- e.printStackTrace();
- }
- // The only point of contention is whether the specified vmlinux *file* exists.
- String fn = options.getKernelImageFile();
- if (fn != null && fn.length() > 0) {
- IFileStore fileStore = proxy.getResource(options.getKernelImageFile());
- return (fileStore.fetchInfo().exists() && !fileStore.fetchInfo().isDirectory());
- }
-
- return true;
- }
-
- /**
- * Get project to profile
- * @return IProject project to profile
- */
- protected IProject getOprofileProject(){
- return Oprofile.OprofileProject.getProject();
- }
-
- /**
- * Saves the global options of this object into the specified launch
- * configuration
- * @param config the launch configuration
- */
- public void saveConfiguration(ILaunchConfigurationWorkingCopy config) {
- config.setAttribute(OprofileLaunchPlugin.ATTR_KERNEL_IMAGE_FILE, options.getKernelImageFile());
- config.setAttribute(OprofileLaunchPlugin.ATTR_SEPARATE_SAMPLES, options.getSeparateProfilesMask());
- config.setAttribute(OprofileLaunchPlugin.ATTR_EXECUTIONS_NUMBER, getExecutionsNumber());
- config.setAttribute(OprofileLaunchPlugin.ATTR_OPROFILE_COMBO_TEXT, getOprofileComboText());
- OprofileProject.setProfilingBinary(getOprofileComboText());
- }
-
- /**
- * Loads this object with the global options in the given launch
- * configuration
- * @param config the launch configuration
- */
- public void loadConfiguration(ILaunchConfiguration config) {
- try {
- options.setKernelImageFile(config.getAttribute(OprofileLaunchPlugin.ATTR_KERNEL_IMAGE_FILE, "")); //$NON-NLS-1$
- options.setSeparateProfilesMask(config.getAttribute(OprofileLaunchPlugin.ATTR_SEPARATE_SAMPLES, OprofileDaemonOptions.SEPARATE_NONE));
- setExecutionsNumber(config.getAttribute(OprofileLaunchPlugin.ATTR_EXECUTIONS_NUMBER, 1));
- setOprofileComboText(config.getAttribute(OprofileLaunchPlugin.ATTR_OPROFILE_COMBO_TEXT, OprofileProject.OPERF_BINARY));
- } catch (CoreException e) {
- }
- }
-
- /**
- * Get the daemon launch options
- * @return the OprofileDaemonOption
- */
- public OprofileDaemonOptions getOprofileDaemonOptions() {
- return options;
- }
-
- /**
- * Method getKernelImageFile.
- * @return the kernel image file
- */
- public String getKernelImageFile() {
- return options.getKernelImageFile();
- }
-
- /**
- * Sets the kernel image file
- * @param image the kernel image file
- */
- public void setKernelImageFile(String image) {
- options.setKernelImageFile(image);
- }
-
- /**
- * Method getSeparateSamples.
- * @return whether and how to separate samples for each distinct application
- */
- public int getSeparateSamples() {
- return options.getSeparateProfilesMask();
- }
-
- /**
- * Sets whether/how to collect separate samples for each distinct application
- * @param how one of SEPARATE_{NONE, LIBRARY, KERNEL, THREAD, CPU}
- */
- public void setSeparateSamples(int how) {
- options.setSeparateProfilesMask(how);
- }
-
- /**
- * Returns the path of the binary to profile.
- * @return the full path to the binary being profile
- */
- public String getBinaryImage() {
- return options.getBinaryImage();
- }
-
- /**
- * Sets the binary to profile in this launch.
- * @param image string of the full path to the binary
- */
- public void setBinaryImage(String image) {
- options.setBinaryImage(image);
- }
-
- public int getExecutionsNumber() {
- return executionsNumber;
- }
-
- public void setExecutionsNumber(int executionsNumber) {
- this.executionsNumber = executionsNumber;
- }
-
- /**
- * Gets OProfile combo box text regarding the binary
- * opcontrol or operf
- * @since 2.1
- */
- public String getOprofileComboText() {
- return oprofileComboText;
- }
-
- /**
- * Sets OProfile combo box text regarding the binary
- * opcontrol or operf
- * @since 2.1
- */
- public void setOprofileComboText(String oprofileComboText) {
- this.oprofileComboText = oprofileComboText;
- }
-
-}
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.launch/src/org/eclipse/linuxtools/internal/oprofile/launch/configuration/OprofileCounter.java b/oprofile/org.eclipse.linuxtools.oprofile.launch/src/org/eclipse/linuxtools/internal/oprofile/launch/configuration/OprofileCounter.java
deleted file mode 100644
index 2eb816feb488becc3fe7df3cf321657b68a746fe..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.launch/src/org/eclipse/linuxtools/internal/oprofile/launch/configuration/OprofileCounter.java
+++ /dev/null
@@ -1,300 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2018 Red Hat, Inc.
- *
- * This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License 2.0
- * which is available at https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- * Keith Seitz <keiths@redhat.com> - initial API and implementation
- * Kent Sebastian <ksebasti@redhat.com>
- *******************************************************************************/
-
-package org.eclipse.linuxtools.internal.oprofile.launch.configuration;
-
-import java.text.MessageFormat;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
-import org.eclipse.linuxtools.internal.oprofile.core.Oprofile;
-import org.eclipse.linuxtools.internal.oprofile.core.daemon.OpEvent;
-import org.eclipse.linuxtools.internal.oprofile.core.daemon.OpUnitMask;
-import org.eclipse.linuxtools.internal.oprofile.core.daemon.OprofileDaemonEvent;
-import org.eclipse.linuxtools.internal.oprofile.launch.OprofileLaunchMessages;
-import org.eclipse.linuxtools.internal.oprofile.launch.OprofileLaunchPlugin;
-
-/**
- * This class represents an oprofile runtime configuration of a counter. It is
- * used to construct arguments for launching op_start on the host. It
- * simply wraps OprofileDaemonEvent.
- */
-public class OprofileCounter {
- private static final String COUNTER_STRING = OprofileLaunchMessages.getString("oprofileCounter.counterString"); //$NON-NLS-1$
-
- // The counter number
- private int number;
-
- // Is this counter enabled?
- private boolean _enabled;
-
- // The event(s) to collect on this counter
- private OprofileDaemonEvent[] daemonEvent;
-
- // List of valid events on this counter
- private OpEvent[] eventList = null;
-
- /**
- * Constructor for OprofileCounter.
- * @param nr the counter number
- */
- public OprofileCounter(int nr) {
- this(nr, Oprofile.getEvents(nr));
- }
-
- /**
- * Constructor for OprofileCounter.
- * @param nr the counter number
- * @param events the given events for counter number <code>nr</code>
- */
- public OprofileCounter(int nr, OpEvent[] events) {
- number = nr;
- _enabled = false;
- eventList = events;
- daemonEvent = new OprofileDaemonEvent [] {new OprofileDaemonEvent()};
- }
-
- /**
- * Constructs all of the counters in the given launch configuration.
- * @param config the launch configuration
- * @return an array of all counters
- */
- public static OprofileCounter[] getCounters(ILaunchConfiguration config) {
- OprofileCounter[] ctrs = new OprofileCounter[Oprofile.getNumberOfCounters()];
- for (int i = 0; i < ctrs.length; i++)
- {
- ctrs[i] = new OprofileCounter(i);
- if (config != null)
- ctrs[i].loadConfiguration(config);
- }
-
- return ctrs;
- }
-
- /**
- * Method setEnabled.
- * @param enabled whether to set this counter as enabled
- */
- public void setEnabled(boolean enabled) {
- this._enabled = enabled;
- }
-
- /**
- * Method setEvent.
- * @param event the event for this counter
- */
- public void setEvents(OpEvent [] events) {
- OprofileDaemonEvent [] newDaemonEvent = new OprofileDaemonEvent[events.length];
- for (int i = 0; i < events.length; i++) {
- if (i > daemonEvent.length - 1) {
- OprofileDaemonEvent de = new OprofileDaemonEvent();
- de.setEvent(events[i]);
- de.setResetCount(daemonEvent[0].getResetCount());
- newDaemonEvent[i] = de;
- } else {
- daemonEvent[i].setEvent(events[i]);
- newDaemonEvent[i] = daemonEvent[i];
- }
- }
- daemonEvent = newDaemonEvent;
- }
-
- /**
- * Method setProfileKernel.
- * @param profileKernel whether this counter should count kernel events
- */
- public void setProfileKernel(boolean profileKernel) {
- for (int i = 0; i < daemonEvent.length; i++) {
- daemonEvent[i].setProfileKernel(profileKernel);
- }
- }
-
- /**
- * Method setProfileUser.
- * @param profileUser whether this counter should count user events
- */
- public void setProfileUser(boolean profileUser) {
- for (int i = 0; i < daemonEvent.length; i++) {
- daemonEvent[i].setProfileUser(profileUser);
- }
- }
-
- /**
- * Method setCount.
- * @param count the number of events between samples for this counter
- */
- public void setCount(int count) {
- for (int i = 0; i < daemonEvent.length; i++) {
- daemonEvent[i].setResetCount(count);
- }
- }
-
- /**
- * Saves this counter's configuration into the specified launch
- * configuration.
- * @param config the launch configuration
- */
- public void saveConfiguration(ILaunchConfigurationWorkingCopy config) {
- config.setAttribute(OprofileLaunchPlugin.attrConterEnabled(number), _enabled);
- config.setAttribute(OprofileLaunchPlugin.attrNumberOfEvents(number), daemonEvent.length);
-
- for (int i = 0; i < daemonEvent.length; i++) {
- if (daemonEvent[i].getEvent() != null) {
- config.setAttribute(OprofileLaunchPlugin.attrConterEvent(number, i), daemonEvent[i].getEvent().getText());
- config.setAttribute(OprofileLaunchPlugin.attrCounterUnitMask(number), daemonEvent[i].getEvent().getUnitMask().getMaskValue());
- config.setAttribute(OprofileLaunchPlugin.attrCounterUnitMaskName(number), daemonEvent[i].getEvent().getUnitMask().getMaskName());
- }
- config.setAttribute(OprofileLaunchPlugin.attrCounterProfileKernel(number), daemonEvent[i].getProfileKernel());
- config.setAttribute(OprofileLaunchPlugin.attrCounterProfileUser(number), daemonEvent[i].getProfileUser());
- config.setAttribute(OprofileLaunchPlugin.attrCounterCount(number), daemonEvent[i].getResetCount());
- }
- }
-
- /**
- * Loads a counter configuration from the specified launch configuration.
- * @param config the launch configuration
- */
- public void loadConfiguration(ILaunchConfiguration config) {
- try {
- _enabled = config.getAttribute(OprofileLaunchPlugin.attrConterEnabled(number), false);
- int numEvents = config.getAttribute(OprofileLaunchPlugin.attrNumberOfEvents(number), 1);
- daemonEvent = new OprofileDaemonEvent[numEvents];
-
- for (int i = 0; i < numEvents; i++) {
- String str = config.getAttribute(OprofileLaunchPlugin.attrConterEvent(number, i), ""); //$NON-NLS-1$
- int maskValue = config.getAttribute(OprofileLaunchPlugin.attrCounterUnitMask(number), OpUnitMask.SET_DEFAULT_MASK);
- String maskName = config.getAttribute(OprofileLaunchPlugin.attrCounterUnitMaskName(number), ""); //$NON-NLS-1$
-
- daemonEvent[i] = new OprofileDaemonEvent();
- daemonEvent[i].setEvent(eventFromString(str));
-
- if (daemonEvent[i].getEvent() == null) {
- continue;
- }
-
- daemonEvent[i].getEvent().getUnitMask().setMaskValue(maskValue);
- daemonEvent[i].getEvent().getUnitMask().setMaskName(maskName);
- daemonEvent[i].setProfileKernel(config.getAttribute(OprofileLaunchPlugin.attrCounterProfileKernel(number), false));
- daemonEvent[i].setProfileUser(config.getAttribute(OprofileLaunchPlugin.attrCounterProfileUser(number), false));
-
- daemonEvent[i].setResetCount(config.getAttribute(OprofileLaunchPlugin.attrCounterCount(number), OprofileDaemonEvent.COUNT_UNINITIALIZED));
- }
- } catch (CoreException ce) {
-
- }
- }
-
- public OpUnitMask getUnitMask() {
- OpEvent event = daemonEvent[0].getEvent();
-
- if (event != null) {
- return event.getUnitMask();
- } else {
- return null;
- }
- }
-
- /**
- * Returns a textual label for this counter (used by UI)
- * @return the label to use in widgets referring to this counter
- */
- public String getText() {
- return MessageFormat.format(COUNTER_STRING, Integer.valueOf(number));
- }
-
- /**
- * Method getNumber.
- * @return the counter's number
- */
- public int getNumber() {
- return number;
- }
-
- /**
- * Method getEnabled.
- * @return whether this counter is enabled
- */
- public boolean getEnabled() {
- return _enabled;
- }
-
- /**
- * Method getEvent.
- * @return the event for this counter
- */
- public OpEvent [] getEvents() {
- List<OpEvent> res = new ArrayList<> ();
- for (OprofileDaemonEvent de : daemonEvent) {
- res.add(de.getEvent());
- }
- return res.toArray(new OpEvent[0]);
- }
-
- /**
- * Method getProfileKernel.
- * @return whether this counter is counting kernel events
- */
- public boolean getProfileKernel() {
- return daemonEvent[0].getProfileKernel();
- }
-
- /**
- * Method getProfileUser.
- * @return whether this counter is counting user events
- */
- public boolean getProfileUser() {
- return daemonEvent[0].getProfileUser();
- }
-
- /**
- * Method getCount.
- * @return the number of events between samples for this counter
- */
- public int getCount() {
- return daemonEvent[0].getResetCount();
- }
-
- /**
- * Method getValidEvents.
- * @return an array of all events that this counter can monitor
- */
- public OpEvent[] getValidEvents() {
- return eventList;
- }
-
- /**
- * Gets the daemon event configuration for this counter.
- * <B>Not</B> valid if this counter is not enabled!
- * @return the OprofileDaemonEvent
- */
- public OprofileDaemonEvent [] getDaemonEvents() {
- return daemonEvent;
- }
-
- // Returns the event with the same label as the parameter STR
- private OpEvent eventFromString(String str) {
- if (eventList != null) {
- for (int i = 0; i < eventList.length; i++) {
- if (eventList[i].getText().equals(str))
- return eventList[i];
- }
- }
-
- return null;
- }
-}
-
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.launch/src/org/eclipse/linuxtools/internal/oprofile/launch/configuration/OprofileEventConfigTab.java b/oprofile/org.eclipse.linuxtools.oprofile.launch/src/org/eclipse/linuxtools/internal/oprofile/launch/configuration/OprofileEventConfigTab.java
deleted file mode 100644
index e280d624bfecb2225502da42c7ac8ce337ba19f9..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.launch/src/org/eclipse/linuxtools/internal/oprofile/launch/configuration/OprofileEventConfigTab.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2018 Red Hat, Inc.
- *
- * This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License 2.0
- * which is available at https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- * Keith Seitz <keiths@redhat.com> - initial API and implementation
- * Kent Sebastian <ksebasti@redhat.com> -
- *******************************************************************************/
-
-package org.eclipse.linuxtools.internal.oprofile.launch.configuration;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.linuxtools.internal.oprofile.core.Oprofile;
-import org.eclipse.linuxtools.internal.oprofile.launch.OprofileLaunchPlugin;
-
-/**
- * Thic class represents the event configuration tab of the launcher dialog.
- * It supplies all functionality dependent on opcontrol and having root access.
- */
-public class OprofileEventConfigTab extends AbstractEventConfigTab {
-
- @Override
- protected boolean getOprofileTimerMode() {
- return Oprofile.getTimerMode();
- }
-
- @Override
- public OprofileCounter getOprofileCounter(int i) {
- return new OprofileCounter(i);
- }
-
- @Override
- protected OprofileCounter[] getOprofileCounters(ILaunchConfiguration config) {
- return OprofileCounter.getCounters(config);
- }
-
- @Override
- protected int getNumberOfOprofileCounters() {
- return Oprofile.getNumberOfCounters();
- }
-
- @Override
- protected IProject getOprofileProject() {
- return Oprofile.OprofileProject.getProject();
- }
-
- @Override
- protected void setOprofileProject(IProject project) {
- Oprofile.OprofileProject.setProject(project);
- }
-
- @Override
- protected void updateOprofileInfo() {
- Oprofile.updateInfo();
- }
-
- @Override
- protected boolean checkEventSetupValidity(int counter, String name,
- int maskValue) {
- return OprofileLaunchPlugin.getCache().checkEvent(counter, name, maskValue);
- }
-
-}
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.launch/src/org/eclipse/linuxtools/internal/oprofile/launch/configuration/OprofileLaunchConfigurationTabGroup.java b/oprofile/org.eclipse.linuxtools.oprofile.launch/src/org/eclipse/linuxtools/internal/oprofile/launch/configuration/OprofileLaunchConfigurationTabGroup.java
deleted file mode 100644
index 4bb0ec9a49e51487826700c36427aee28c71f073..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.launch/src/org/eclipse/linuxtools/internal/oprofile/launch/configuration/OprofileLaunchConfigurationTabGroup.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2018 Red Hat, Inc.
- *
- * This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License 2.0
- * which is available at https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- * Kent Sebastian <ksebasti@redhat.com> - initial API and implementation
- *******************************************************************************/
-package org.eclipse.linuxtools.internal.oprofile.launch.configuration;
-
-import org.eclipse.debug.ui.AbstractLaunchConfigurationTab;
-import org.eclipse.linuxtools.profiling.launch.ProfileLaunchConfigurationTabGroup;
-
-public class OprofileLaunchConfigurationTabGroup extends ProfileLaunchConfigurationTabGroup {
- @Override
- public AbstractLaunchConfigurationTab[] getProfileTabs() {
- return new AbstractLaunchConfigurationTab[] { new OprofileSetupTab(), new OprofileEventConfigTab() };
- }
-}
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.launch/src/org/eclipse/linuxtools/internal/oprofile/launch/configuration/OprofileSetupTab.java b/oprofile/org.eclipse.linuxtools.oprofile.launch/src/org/eclipse/linuxtools/internal/oprofile/launch/configuration/OprofileSetupTab.java
deleted file mode 100644
index 03c157bf746bcb15c32c3ead2be0ebc52ccac5e8..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.launch/src/org/eclipse/linuxtools/internal/oprofile/launch/configuration/OprofileSetupTab.java
+++ /dev/null
@@ -1,371 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2018 Red Hat, Inc.
- *
- * This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License 2.0
- * which is available at https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- * Keith Seitz <keiths@redhat.com> - initial API and implementation
- * Kent Sebastian <ksebasti@redhat.com> -
- *******************************************************************************/
-package org.eclipse.linuxtools.internal.oprofile.launch.configuration;
-
-import java.text.MessageFormat;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import org.eclipse.cdt.debug.core.ICDTLaunchConfigurationConstants;
-import org.eclipse.core.filesystem.IFileStore;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
-import org.eclipse.debug.ui.AbstractLaunchConfigurationTab;
-import org.eclipse.linuxtools.internal.oprofile.core.Oprofile;
-import org.eclipse.linuxtools.internal.oprofile.core.Oprofile.OprofileProject;
-import org.eclipse.linuxtools.internal.oprofile.core.daemon.OprofileDaemonOptions;
-import org.eclipse.linuxtools.internal.oprofile.launch.OprofileLaunchMessages;
-import org.eclipse.linuxtools.internal.oprofile.launch.OprofileLaunchPlugin;
-import org.eclipse.linuxtools.profiling.launch.IRemoteFileProxy;
-import org.eclipse.linuxtools.profiling.launch.RemoteProxyManager;
-import org.eclipse.linuxtools.tools.launch.core.factory.RuntimeProcessFactory;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.CCombo;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.FileDialog;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.MessageBox;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Spinner;
-import org.eclipse.swt.widgets.Text;
-
-/**
- * This tab is used by the launcher to configure global oprofile run options.
- */
-public class OprofileSetupTab extends AbstractLaunchConfigurationTab {
-
- protected Text kernelImageFileText;
- protected CCombo controlCombo;
-
- protected Button checkSeparateLibrary;
- protected Button checkSeparateKernel;
-
- protected LaunchOptions options = null;
-
- protected Spinner executionsSpinner;
- protected Label executionsSpinnerLabel;
-
- private IRemoteFileProxy proxy;
-
- protected Label kernelLabel;
-
- @Override
- public String getName() {
- return OprofileLaunchMessages.getString("tab.global.name"); //$NON-NLS-1$
- }
-
- @Override
- public boolean isValid(ILaunchConfiguration config) {
- return options.isValid();
- }
-
- @Override
- public void performApply(ILaunchConfigurationWorkingCopy config) {
- options.saveConfiguration(config);
- }
-
- @Override
- public void initializeFrom(ILaunchConfiguration config) {
- String name = ""; //$NON-NLS-1$
- /*
- * Update the global OprofileProject object. In many occasions its
- * value is read, which may produce inconsistencies if it is not
- * up-to-date.
- */
- try {
- name = config.getAttribute(ICDTLaunchConfigurationConstants.ATTR_PROJECT_NAME, ""); //$NON-NLS-1$
- if (!name.isEmpty()) {
- IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(name);
- Oprofile.OprofileProject.setProject(project);
- }
- } catch (CoreException e) {
- // Nothing to do
- }
-
- options.loadConfiguration(config);
- controlCombo.setText(options.getOprofileComboText());
-
- kernelImageFileText.setText(options.getKernelImageFile());
- executionsSpinner.setSelection(options.getExecutionsNumber());
-
- int separate = options.getSeparateSamples();
-
- if (separate == OprofileDaemonOptions.SEPARATE_NONE) {
- checkSeparateLibrary.setSelection(false);
- checkSeparateKernel.setSelection(false);
- } else {
- //note that opcontrol will nicely ignore the trailing comma
- if ((separate & OprofileDaemonOptions.SEPARATE_LIBRARY) != 0)
- checkSeparateLibrary.setSelection(true);
- if ((separate & OprofileDaemonOptions.SEPARATE_KERNEL) != 0)
- checkSeparateKernel.setSelection(true);
- }
- enableOptionWidgets();
- }
-
- @Override
- public void setDefaults(ILaunchConfigurationWorkingCopy config) {
- options = new LaunchOptions();
- options.saveConfiguration(config);
- }
-
- @Override
- public Image getImage() {
- return OprofileLaunchPlugin.getImageDescriptor(OprofileLaunchPlugin.ICON_GLOBAL_TAB).createImage();
- }
-
- @Override
- public void createControl(Composite parent) {
- options = new LaunchOptions();
-
- Composite top = new Composite(parent, SWT.NONE);
- setControl(top);
- top.setLayout(new GridLayout());
-
- GridData data;
- GridLayout layout;
- createVerticalSpacer(top, 1);
-
- // Create container for kernel image file selection
- Composite p = new Composite(top, SWT.NONE);
- layout = new GridLayout();
- layout.numColumns = 2;
- layout.marginHeight = 0;
- layout.marginWidth = 0;
- p.setLayout(layout);
- data = new GridData(GridData.FILL_HORIZONTAL);
- p.setLayoutData(data);
-
- Label l2 = new Label(p, SWT.NONE);
- l2.setText(OprofileLaunchMessages.getString("tab.global.select")); //$NON-NLS-1$
- data = new GridData();
- data.horizontalSpan = 2;
- l2.setLayoutData(data);
-
- controlCombo = new CCombo(p, SWT.DROP_DOWN|SWT.READ_ONLY|SWT.BORDER);
- List<String> tools = new ArrayList<>(Arrays.asList(OprofileProject.OPERF_BINARY));
-
- /*
- * Check if tools are installed. Use whichComand() method from
- * RuntimeProcessFactory as it considers the LinuxTools Path.
- */
- IProject project = getOprofileProject();
- try {
- String toolPath = RuntimeProcessFactory.getFactory().whichCommand(OprofileProject.OCOUNT_BINARY, project);
- // Command found
- if (!toolPath.equals(OprofileProject.OCOUNT_BINARY)) {
- tools.add(OprofileProject.OCOUNT_BINARY);
- }
- } catch (Exception e) {
- }
-
- controlCombo.setItems(tools.toArray(new String [0]));
- controlCombo.select(0);
- controlCombo.addModifyListener(mev -> {
- OprofileProject.setProfilingBinary(controlCombo.getText());
- options.setOprofileComboText(controlCombo.getText());
- enableOptionWidgets();
- updateLaunchConfigurationDialog();
- });
- data = new GridData();
- data.horizontalSpan = 2;
- controlCombo.setLayoutData(data);
-
- kernelLabel = new Label(p, SWT.NONE);
- kernelLabel.setText(OprofileLaunchMessages.getString("tab.global.kernelImage.label.text")); //$NON-NLS-1$
- kernelLabel.setEnabled(false);
- data = new GridData();
- data.horizontalSpan = 2;
- kernelLabel.setLayoutData(data);
-
- kernelImageFileText = new Text(p, SWT.SINGLE | SWT.BORDER);
- data = new GridData(GridData.FILL_HORIZONTAL);
- kernelImageFileText.setLayoutData(data);
- kernelImageFileText.addModifyListener(mev -> handleKernelImageFileTextModify(kernelImageFileText));
-
- Button button = createPushButton(p, OprofileLaunchMessages.getString("tab.global.kernelImage.browse.button.text"), null); //$NON-NLS-1$
- final Shell shell = top.getShell();
- button.addSelectionListener(SelectionListener.widgetSelectedAdapter(e -> showFileDialog(shell)));
-
- createVerticalSpacer(top, 1);
-
- // Create checkbox options container
- p = new Composite(top, SWT.NONE);
- layout = new GridLayout();
- layout.numColumns = 1;
- layout.marginHeight = 0;
- layout.marginWidth = 0;
- p.setLayout(layout);
- data = new GridData(GridData.FILL_HORIZONTAL);
- data.horizontalSpan = 2;
- p.setLayoutData(data);
-
- checkSeparateLibrary = myCreateCheckButton(p, OprofileLaunchMessages.getString("tab.global.check.separateLibrary.text")); //$NON-NLS-1$
- checkSeparateKernel = myCreateCheckButton(p, OprofileLaunchMessages.getString("tab.global.check.separateKernel.text")); //$NON-NLS-1$
-
- //Number of executions spinner
- Composite executionsComposite = new Composite(top, SWT.NONE);
- GridLayout gridLayout = new GridLayout(2, false);
- executionsComposite.setLayout(gridLayout);
- executionsSpinnerLabel = new Label(executionsComposite, SWT.LEFT);
- executionsSpinnerLabel.setText(OprofileLaunchMessages.getString("tab.global.executionsNumber.label.text")); //$NON-NLS-1$
- executionsSpinnerLabel.setToolTipText(OprofileLaunchMessages.getString("tab.global.executionsNumber.label.tooltip")); //$NON-NLS-1$
- executionsSpinner = new Spinner(executionsComposite, SWT.BORDER);
- executionsSpinner.setMinimum(1);
- executionsSpinner.addModifyListener(e -> {
- options.setExecutionsNumber(executionsSpinner.getSelection());
- updateLaunchConfigurationDialog();
- });
- }
-
-
-
- // convenience method to create radio buttons with the given label
- private Button myCreateCheckButton(Composite parent, String label) {
- final Button b = new Button(parent, SWT.CHECK);
- b.setText(label);
- b.addSelectionListener(SelectionListener.widgetSelectedAdapter(e -> handleCheckSelected(b)));
-
- return b;
- }
-
- //sets the proper separation mask for sample separation
- private void handleCheckSelected(Button button) {
- int oldSeparate = options.getSeparateSamples();
- int newSeparate = oldSeparate; //initalize
-
- if (button == checkSeparateLibrary) {
- if (button.getSelection()) {
- newSeparate = oldSeparate | OprofileDaemonOptions.SEPARATE_LIBRARY;
- } else {
- newSeparate = oldSeparate & ~OprofileDaemonOptions.SEPARATE_LIBRARY;
- }
- } else if (button == checkSeparateKernel) {
- if (button.getSelection()) {
- newSeparate = oldSeparate | OprofileDaemonOptions.SEPARATE_KERNEL;
- } else {
- newSeparate = oldSeparate & ~OprofileDaemonOptions.SEPARATE_KERNEL;
- }
- }
-
- options.setSeparateSamples(newSeparate);
-
- updateLaunchConfigurationDialog();
- }
-
- // handles text modification events for all text boxes in this tab
- private void handleKernelImageFileTextModify(Text text) {
- String errorMessage = null;
- String filename = text.getText();
-
- if (filename.length() > 0) {
- try {
- proxy = RemoteProxyManager.getInstance().getFileProxy(getOprofileProject());
- } catch (CoreException e) {
- e.printStackTrace();
- }
- IFileStore fileStore = proxy.getResource(filename);
- if (!fileStore.fetchInfo().exists() || fileStore.fetchInfo().isDirectory()){
- String msg = OprofileLaunchMessages.getString("tab.global.kernelImage.kernel.nonexistent"); //$NON-NLS-1$
- errorMessage = MessageFormat.format(msg, filename);
- }
-
- //seems odd, but must set it even if it is invalid so that performApply
- // and isValid work properly
- options.setKernelImageFile(filename);
- } else {
- // no kernel image file
- options.setKernelImageFile(""); //$NON-NLS-1$
- }
-
- // Update dialog and error message
- setErrorMessage(errorMessage);
- updateLaunchConfigurationDialog();
- }
-
- // Displays a file dialog to allow the user to select the kernel image file
- private void showFileDialog(Shell shell) {
- try {
- proxy = RemoteProxyManager.getInstance().getFileProxy(getOprofileProject());
- } catch (CoreException e) {
- e.printStackTrace();
- }
-
- FileDialog d = new FileDialog(shell, SWT.OPEN);
- IFileStore kernel = proxy.getResource(options.getKernelImageFile());
- if (!kernel.fetchInfo().exists()) {
- kernel = proxy.getResource("/boot"); //$NON-NLS-1$
-
- if (!kernel.fetchInfo().exists()) {
- kernel = proxy.getResource("/"); //$NON-NLS-1$
- }
- }
- d.setFileName(kernel.toString());
- d.setText(OprofileLaunchMessages.getString("tab.global.selectKernelDialog.text")); //$NON-NLS-1$
- String newKernel = d.open();
- if (newKernel != null) {
- kernel = proxy.getResource(newKernel);
- if (!kernel.fetchInfo().exists()) {
- MessageBox mb = new MessageBox(shell, SWT.ICON_ERROR | SWT.RETRY | SWT.CANCEL);
- mb.setMessage(OprofileLaunchMessages.getString("tab.global.selectKernelDialog.error.kernelDoesNotExist.text")); //$NON-NLS-1$
- switch (mb.open()) {
- case SWT.RETRY:
- // Ok, it's recursive, but it shouldn't matter
- showFileDialog(shell);
- break;
- default:
- case SWT.CANCEL:
- break;
- }
- } else {
- kernelImageFileText.setText(newKernel);
- }
- }
- }
- // Enable/disable widgets options according to the tool selected.
- private void enableOptionWidgets() {
- if (controlCombo.getText().equals(OprofileProject.OCOUNT_BINARY)) {
- checkSeparateLibrary.setEnabled(false);
- checkSeparateKernel.setEnabled(false);
- kernelImageFileText.setEnabled(false);
- kernelLabel.setEnabled(false);
- executionsSpinnerLabel.setEnabled(false);
- executionsSpinner.setEnabled(false);
- } else {
- checkSeparateLibrary.setEnabled(false);
- checkSeparateKernel.setEnabled(false);
- kernelImageFileText.setEnabled(false);
- kernelLabel.setEnabled(false);
- executionsSpinnerLabel.setEnabled(true);
- executionsSpinner.setEnabled(true);
- }
- }
-
- /**
- * Get project to profile
- * @return IProject project to profile
- */
- protected IProject getOprofileProject(){
- return Oprofile.OprofileProject.getProject();
- }
-}
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.launch/src/org/eclipse/linuxtools/internal/oprofile/launch/launching/AbstractOprofileLaunchConfigurationDelegate.java b/oprofile/org.eclipse.linuxtools.oprofile.launch/src/org/eclipse/linuxtools/internal/oprofile/launch/launching/AbstractOprofileLaunchConfigurationDelegate.java
deleted file mode 100644
index c77b3bc529f007f978b0caa7e52255cfcb91e5ef..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.launch/src/org/eclipse/linuxtools/internal/oprofile/launch/launching/AbstractOprofileLaunchConfigurationDelegate.java
+++ /dev/null
@@ -1,404 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2018 Red Hat, Inc. and others
- *
- * This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License 2.0
- * which is available at https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- * Kent Sebastian <ksebasti@redhat.com> - initial API and implementation
- * Keith Seitz <keiths@redhat.com> - setup code in launch the method, initially
- * written in the now-defunct OprofileSession class
- * QNX Software Systems and others - the section of code marked in the launch
- * method, and the exec method
- *******************************************************************************/
-package org.eclipse.linuxtools.internal.oprofile.launch.launching;
-
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.util.ArrayList;
-import java.util.Arrays;
-
-import org.eclipse.cdt.debug.core.CDebugUtils;
-import org.eclipse.cdt.launch.AbstractCLaunchDelegate;
-import org.eclipse.core.filesystem.EFS;
-import org.eclipse.core.filesystem.IFileStore;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.debug.core.DebugPlugin;
-import org.eclipse.debug.core.ILaunch;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.linuxtools.internal.oprofile.core.Oprofile;
-import org.eclipse.linuxtools.internal.oprofile.core.Oprofile.OprofileProject;
-import org.eclipse.linuxtools.internal.oprofile.core.OprofileCorePlugin;
-import org.eclipse.linuxtools.internal.oprofile.core.daemon.OprofileDaemonEvent;
-import org.eclipse.linuxtools.internal.oprofile.launch.OprofileLaunchMessages;
-import org.eclipse.linuxtools.internal.oprofile.launch.OprofileLaunchPlugin;
-import org.eclipse.linuxtools.internal.oprofile.launch.configuration.LaunchOptions;
-import org.eclipse.linuxtools.internal.oprofile.launch.configuration.OprofileCounter;
-import org.eclipse.linuxtools.internal.oprofile.ui.OprofileUiPlugin;
-import org.eclipse.linuxtools.internal.oprofile.ui.view.OcountView;
-import org.eclipse.linuxtools.internal.oprofile.ui.view.OprofileView;
-import org.eclipse.linuxtools.profiling.launch.IRemoteFileProxy;
-import org.eclipse.linuxtools.profiling.launch.RemoteProxyManager;
-import org.eclipse.linuxtools.tools.launch.core.factory.RuntimeProcessFactory;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.PlatformUI;
-
-public abstract class AbstractOprofileLaunchConfigurationDelegate extends AbstractCLaunchDelegate {
- protected ILaunchConfiguration config;
- private static final String OPROFILE_DATA = "oprofile_data"; //$NON-NLS-1$
- private static final String OCOUNT_DATA = "ocount_data"; //$NON-NLS-1$
- private static final String SESSION_DIR = "--session-dir="; //$NON-NLS-1$
- private static final String OUTPUT_FILE = "--output-file="; //$NON-NLS-1$
- private static final String EVENTS = "--events="; //$NON-NLS-1$
- private static final String APPEND = "--append"; //$NON-NLS-1$
- private static final String OPD_SETUP_EVENT_SEPARATOR = ":"; //$NON-NLS-1$
- private static final String OPD_SETUP_EVENT_TRUE = "1"; //$NON-NLS-1$
- private static final String OPD_SETUP_EVENT_FALSE = "0"; //$NON-NLS-1$
-
- @Override
- public void launch(ILaunchConfiguration config, String mode, ILaunch launch, IProgressMonitor monitor) throws CoreException {
- this.config = config;
- Oprofile.OprofileProject.setProject(getProject());
- LaunchOptions options = new LaunchOptions(); //default options created in the constructor
- options.loadConfiguration(config);
- IPath exePath = getExePath(config);
- options.setBinaryImage(exePath.toOSString());
- Oprofile.OprofileProject.setProfilingBinary(options.getOprofileComboText());
-
- /*
- * Parameters needed for the application under profiling
- */
- String appArgs[] = getProgramArgumentsArray(config);
- String appEnv[] = getEnvironment(config);
-
- //if daemonEvents null or zero size, the default event will be used
- OprofileDaemonEvent[] daemonEvents = null;
- ArrayList<OprofileDaemonEvent> events = new ArrayList<>();
- if (!config.getAttribute(OprofileLaunchPlugin.ATTR_USE_DEFAULT_EVENT, false)) {
- //get the events to profile from the counters
- OprofileCounter[] counters = oprofileCounters(config);
-
- for (int i = 0; i < counters.length; ++i) {
- if (counters[i].getEnabled()) {
- OprofileDaemonEvent[] counterEvents = counters[i].getDaemonEvents();
- events.addAll(Arrays.asList(counterEvents));
- }
- }
-
- daemonEvents = new OprofileDaemonEvent[events.size()];
- events.toArray(daemonEvents);
- }
-
- /*
- * this code written by QNX Software Systems and others and was
- * originally in the CDT under LocalCDILaunchDelegate::RunLocalApplication
- */
-
- if (!preExec(options, daemonEvents, launch)) {
- return;
- }
- Process process = null;
- // Executing operf with the default or specified events,
- // outputing the profiling data to the project dir/OPROFILE_DATA
- if (OprofileProject.getProfilingBinary().equals(OprofileProject.OPERF_BINARY)) {
-
- String eventsString=null;
-
- // Event spec: "EVENT:count:mask:profileKernel:profileUser"
- StringBuilder spec = new StringBuilder();
- spec.append(EVENTS);
- boolean isCommaAllowed = false;
- for (int i=0;i<events.size();i++) {
- OprofileDaemonEvent event = events.get(i);
- if(isCommaAllowed) {
- spec.append(',');
- }
- spec.append(event.getEvent().getText());
- spec.append(OPD_SETUP_EVENT_SEPARATOR);
- spec.append(event.getResetCount());
- spec.append(OPD_SETUP_EVENT_SEPARATOR);
- spec.append(event.getEvent().getUnitMask().getMaskValue());
- // Some platforms allow EXCLUSIVE masks with same bit value, but
- // different names and thus, the name is needed when specifying.
- if (event.getEvent().getUnitMask().getMaskName() != null) {
- spec.append(OPD_SETUP_EVENT_SEPARATOR);
- spec.append(event.getEvent().getUnitMask().getMaskName());
- }
- spec.append(OPD_SETUP_EVENT_SEPARATOR);
- spec.append((event.getProfileKernel() ? OPD_SETUP_EVENT_TRUE : OPD_SETUP_EVENT_FALSE));
- spec.append(OPD_SETUP_EVENT_SEPARATOR);
- spec.append((event.getProfileUser() ? OPD_SETUP_EVENT_TRUE : OPD_SETUP_EVENT_FALSE));
- isCommaAllowed = true;
- }
- eventsString = spec.toString();
-
- ArrayList<String> argArray = new ArrayList<>(Arrays.asList(appArgs));
- // Use remote file proxy to determine data folder since the project may be either local or remote
- IRemoteFileProxy proxy = RemoteProxyManager.getInstance().getFileProxy(OprofileProject.getProject());
- IFileStore dataFolder = proxy.getResource(oprofileWorkingDirURI(config).getPath() + IPath.SEPARATOR + OPROFILE_DATA);
- if(! dataFolder.fetchInfo().exists()) {
- dataFolder.mkdir(EFS.SHALLOW, null);
- }
- argArray.add(0, exePath.toOSString());
- if (events.size()>0) {
- argArray.add(0,eventsString);
- }
- argArray.add(0, SESSION_DIR + oprofileWorkingDirURI(config).getPath() + IPath.SEPARATOR + OPROFILE_DATA);
- argArray.add(0, OprofileProject.OPERF_BINARY);
-
- boolean appended = false;
- for(int i = 0; i < options.getExecutionsNumber(); i++){
- /*
- * If profiling multiple times,
- * append oprofile results from 2nd execution on.
- */
- if (!appended && i!=0) {
- argArray.add(1, APPEND);
- appended = true;
- }
- String[] arguments = new String[argArray.size()];
- arguments = argArray.toArray(arguments);
- try {
- process = RuntimeProcessFactory.getFactory().exec(arguments, appEnv , OprofileProject.getProject());
- } catch (IOException e1) {
- if (process != null)
- process.destroy();
- Status status = new Status(IStatus.ERROR, OprofileLaunchPlugin.PLUGIN_ID, OprofileLaunchMessages.getString("oprofilelaunch.error.interrupted_error.status_message")); //$NON-NLS-1$
- throw new CoreException(status);
- }
- DebugPlugin.newProcess( launch, process, renderProcessLabel( exePath.toOSString() ) );
- try{
- process.waitFor();
- } catch (InterruptedException e){
- if (process != null)
- process.destroy();
- Status status = new Status(IStatus.ERROR, OprofileLaunchPlugin.PLUGIN_ID, OprofileLaunchMessages.getString("oprofilelaunch.error.interrupted_error.status_message")); //$NON-NLS-1$
- throw new CoreException(status);
- }
- }
- }
-
- // Executing ocount with the default or specified events,
- // outputing the profiling data to the project dir/OPROFILE_DATA
- if (OprofileProject.getProfilingBinary().equals(OprofileProject.OCOUNT_BINARY)) {
- String eventsString=null;
- // Event spec: "EVENT:count:mask:profileKernel:profileUser"
- StringBuilder spec = new StringBuilder();
- spec.append(EVENTS);
- boolean isCommaAllowed = false;
- for (int i=0;i<events.size();i++) {
- OprofileDaemonEvent event = events.get(i);
- if(isCommaAllowed) {
- spec.append(',');
- }
- spec.append(event.getEvent().getText());
- spec.append(OPD_SETUP_EVENT_SEPARATOR);
- spec.append(event.getResetCount());
- spec.append(OPD_SETUP_EVENT_SEPARATOR);
- spec.append(event.getEvent().getUnitMask().getMaskValue());
- spec.append(OPD_SETUP_EVENT_SEPARATOR);
- spec.append((event.getProfileKernel() ? OPD_SETUP_EVENT_TRUE : OPD_SETUP_EVENT_FALSE));
- spec.append(OPD_SETUP_EVENT_SEPARATOR);
- spec.append((event.getProfileUser() ? OPD_SETUP_EVENT_TRUE : OPD_SETUP_EVENT_FALSE));
- isCommaAllowed = true;
- }
- eventsString = spec.toString();
-
- ArrayList<String> argArray = new ArrayList<>(Arrays.asList(appArgs));
- argArray.add(0, exePath.toOSString());
- if (events.size()>0) {
- argArray.add(0,eventsString);
- }
- argArray.add(0, OUTPUT_FILE + oprofileWorkingDirURI(config).getPath() + IPath.SEPARATOR + OCOUNT_DATA);
- argArray.add(0, OprofileProject.OCOUNT_BINARY);
-
- String[] arguments = new String[argArray.size()];
- arguments = argArray.toArray(arguments);
- try {
- process = RuntimeProcessFactory.getFactory().exec(arguments, OprofileProject.getProject());
- } catch (IOException e1) {
- process.destroy();
- Status status = new Status(IStatus.ERROR, OprofileLaunchPlugin.PLUGIN_ID, OprofileLaunchMessages.getString("oprofilelaunch.error.interrupted_error.status_message")); //$NON-NLS-1$
- throw new CoreException(status);
- }
- DebugPlugin.newProcess( launch, process, renderProcessLabel( exePath.toOSString() ) );
- try{
- process.waitFor();
-
- // Put the OCount data in a separate view
- StringBuilder buffer = new StringBuilder();
- // Use remote file proxy to operate resources since the project may be either local or remote
- IRemoteFileProxy proxy = RemoteProxyManager.getInstance().getFileProxy(OprofileProject.getProject());
-
- IFileStore ocountDataStore = proxy.getResource(oprofileWorkingDirURI(config).getPath() +
- IPath.SEPARATOR + OCOUNT_DATA);
- try (
- InputStream is = ocountDataStore.openInputStream(EFS.NONE, monitor);
- BufferedReader reader = new BufferedReader(new InputStreamReader(is))
- ) {
- String s = reader.readLine();
- String sep_char = ""; //$NON-NLS-1$
- while (s != null) {
- buffer.append(s);
- buffer.append(sep_char);
- sep_char = "\n"; //$NON-NLS-1$
- s = reader.readLine();
- }
-
- // Open the OCount View and display output from ocount
- final String text = buffer.toString();
- Display.getDefault().syncExec(() -> refreshOcountView(text));
- } catch (IOException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
- } catch (InterruptedException e){
- process.destroy();
- Status status = new Status(IStatus.ERROR, OprofileLaunchPlugin.PLUGIN_ID, OprofileLaunchMessages.getString("oprofilelaunch.error.interrupted_error.status_message")); //$NON-NLS-1$
- throw new CoreException(status);
- }
- return;
- }
-
- postExec(options, daemonEvents, process);
-
- }
-
- protected abstract boolean preExec(LaunchOptions options, OprofileDaemonEvent[] daemonEvents, ILaunch launch);
-
- protected abstract void postExec(LaunchOptions options, OprofileDaemonEvent[] daemonEvents, Process process);
-
- @Override
- protected String getPluginID() {
- return OprofileLaunchPlugin.PLUGIN_ID;
- }
-
- //Helper function to refresh the oprofile view. Opens and focuses the view
- // if it isn't already.
- protected void refreshOprofileView() {
- OprofileView view = OprofileUiPlugin.getDefault().getOprofileView();
- if (view != null) {
- view.refreshView();
- } else {
- try {
- PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().showView(OprofileUiPlugin.ID_OPROFILE_VIEW);
- } catch (PartInitException e2) {
- e2.printStackTrace();
- }
- OprofileUiPlugin.getDefault().getOprofileView().refreshView();
- }
- }
-
- //Helper function to refresh the ocount view. Opens and focuses the view
- // if it isn't already.
- protected void refreshOcountView(String text) {
- OcountView view = OprofileUiPlugin.getDefault().getOcountView();
- if (view == null) {
- try {
- PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().showView(OprofileUiPlugin.ID_OCOUNT_VIEW);
- } catch (PartInitException e2) {
- e2.printStackTrace();
- return;
- }
- view = OprofileUiPlugin.getDefault().getOcountView();
- }
- view.setText(text);
- view.refreshView();
- }
-
- /* all these functions exist to be overridden by the test class in order to allow launch testing */
-
- protected IProject oprofileProject(){
- return Oprofile.OprofileProject.getProject();
- }
-
-
- /**
- * Return the URI of the current working directory from the current
- * project's file proxy.
- *
- * @return URI URI of the working directory.
- * @throws CoreException
- */
- protected URI oprofileWorkingDirURI(ILaunchConfiguration config) throws CoreException{
- File workingDirectory = this.getWorkingDirectory(config);
- if(workingDirectory == null){
- return getProject().getLocationURI();
- } else {
- URI uri = null;
- try {
- uri = new URI(workingDirectory.getAbsolutePath());
- } catch (URISyntaxException e) {
- //Since working directory paths are verified by the launch tab, this exception should never be thrown
- Status status = new Status(IStatus.ERROR, OprofileCorePlugin.getId(),
- OprofileLaunchMessages.getString("oprofilelaunch.error.invalidworkingdir.status_message")); //$NON-NLS-1$
- throw new CoreException(status);
- }
- return uri;
- }
- }
-
- protected OprofileCounter[] oprofileCounters(ILaunchConfiguration config){
- return OprofileCounter.getCounters(config);
- }
-
- /**
- * Runs opcontrol --help. Returns true if there was any output, false
- * otherwise. Return value can be used to tell if the user successfully
- * entered a password.
- * @return true if opcontrol --help was run correctly. False otherwise
- */
- protected boolean oprofileStatus() {
- if (OprofileProject.getProfilingBinary().equals(OprofileProject.OPERF_BINARY)) {
- try {
- Process p = RuntimeProcessFactory.getFactory().exec(new String[] { "operf", "--version" }, //$NON-NLS-1$ //$NON-NLS-2$
- OprofileProject.getProject());
- return (p != null);
- } catch (IOException e) {
- return false;
- }
- } else {
- try {
- Process p = RuntimeProcessFactory.getFactory().exec(new String[] { "ocount", "--version" }, //$NON-NLS-1$ //$NON-NLS-2$
- OprofileProject.getProject());
- return (p != null);
- } catch (IOException e) {
- return false;
- }
- }
- }
-
- protected IProject getProject(){
- try{
- return CDebugUtils.verifyCProject(config).getProject();
- } catch (CoreException e) {
- e.printStackTrace();
- }
- return null;
- }
-
- /**
- *
- * @param config
- * @return
- * @throws CoreException
- * @since 1.1
- */
- protected IPath getExePath(ILaunchConfiguration config) throws CoreException{
- return CDebugUtils.verifyProgramPath( config );
- }
-}
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.launch/src/org/eclipse/linuxtools/internal/oprofile/launch/launching/OprofileLaunchConfigurationDelegate.java b/oprofile/org.eclipse.linuxtools.oprofile.launch/src/org/eclipse/linuxtools/internal/oprofile/launch/launching/OprofileLaunchConfigurationDelegate.java
deleted file mode 100644
index fc1748cf9c70439e6243bc5391fbf8e1e445c073..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.launch/src/org/eclipse/linuxtools/internal/oprofile/launch/launching/OprofileLaunchConfigurationDelegate.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2018 Red Hat, Inc. and others
- *
- * This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License 2.0
- * which is available at https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- * Kent Sebastian <ksebasti@redhat.com> - initial API and implementation
- *******************************************************************************/
-package org.eclipse.linuxtools.internal.oprofile.launch.launching;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.debug.core.DebugPlugin;
-import org.eclipse.debug.core.ILaunch;
-import org.eclipse.debug.core.ILaunchManager;
-import org.eclipse.debug.core.ILaunchesListener2;
-import org.eclipse.linuxtools.internal.oprofile.core.Oprofile;
-import org.eclipse.linuxtools.internal.oprofile.core.Oprofile.OprofileProject;
-import org.eclipse.linuxtools.internal.oprofile.core.OprofileCorePlugin;
-import org.eclipse.linuxtools.internal.oprofile.core.daemon.OprofileDaemonEvent;
-import org.eclipse.linuxtools.internal.oprofile.launch.configuration.LaunchOptions;
-import org.eclipse.swt.widgets.Display;
-
-public class OprofileLaunchConfigurationDelegate extends AbstractOprofileLaunchConfigurationDelegate {
-
- @Override
- protected boolean preExec(LaunchOptions options, OprofileDaemonEvent[] daemonEvents, ILaunch launch) {
- // set up and launch the oprofile daemon
- IProject project = getProject();
- // Set current project to allow using the oprofile path that
- // was chosen for the project
- Oprofile.OprofileProject.setProject(project);
-
- if (!oprofileStatus()) {
- OprofileCorePlugin.showErrorDialog("opcontrolProvider", null); //$NON-NLS-1$
- return false;
- }
-
- // add a listener for termination of the launch prior to execution of launch
- ILaunchManager lmgr = DebugPlugin.getDefault().getLaunchManager();
- lmgr.addLaunchListener(new LaunchTerminationWatcher(launch, options.getExecutionsNumber()));
- return true;
- }
-
- @Override
- protected void postExec(LaunchOptions options, OprofileDaemonEvent[] daemonEvents, Process process) {
- // do nothing here since the termination listener already registered will handle everything needed
- }
-
- //A class used to listen for the termination of the current launch, and
- // run some functions when it is finished.
- class LaunchTerminationWatcher implements ILaunchesListener2 {
- private ILaunch launch;
- private int executions;
- public LaunchTerminationWatcher(ILaunch il, int executions) {
- launch = il;
- this.executions = executions;
- }
- @Override
- public void launchesTerminated(ILaunch[] launches) {
- for (ILaunch l : launches) {
- /**
- * Dump samples from the daemon, shut down the daemon, activate the OProfile
- * view (open it if it isn't already), refresh the view (which parses the
- * data/ui model and displays it).
- */
- if (l.equals(launch) && l.getProcesses().length == executions) {
- // need to run this in the ui thread otherwise get SWT Exceptions
- // based on concurrency issues
- if (!OprofileProject.getProfilingBinary().equals(OprofileProject.OCOUNT_BINARY)) {
- Display.getDefault().syncExec(() -> refreshOprofileView());
- }
- }
- }
- }
- @Override
- public void launchesAdded(ILaunch[] launches) { /* dont care */}
- @Override
- public void launchesChanged(ILaunch[] launches) { /* dont care */ }
- @Override
- public void launchesRemoved(ILaunch[] launches) { /* dont care */ }
- }
-
-}
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.launch/src/org/eclipse/linuxtools/internal/oprofile/launch/launching/OprofileLaunchShortcut.java b/oprofile/org.eclipse.linuxtools.oprofile.launch/src/org/eclipse/linuxtools/internal/oprofile/launch/launching/OprofileLaunchShortcut.java
deleted file mode 100644
index 440ae8cc5319ab238e40a67389ad4b51d8355097..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.launch/src/org/eclipse/linuxtools/internal/oprofile/launch/launching/OprofileLaunchShortcut.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2018 Red Hat, Inc.
- *
- * This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License 2.0
- * which is available at https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- * Kent Sebastian <ksebasti@redhat.com> - initial API and implementation
- *******************************************************************************/
-package org.eclipse.linuxtools.internal.oprofile.launch.launching;
-
-import org.eclipse.cdt.core.model.IBinary;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.core.ILaunchConfigurationType;
-import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
-import org.eclipse.linuxtools.internal.oprofile.launch.OprofileLaunchPlugin;
-import org.eclipse.linuxtools.internal.oprofile.launch.configuration.LaunchOptions;
-import org.eclipse.linuxtools.profiling.launch.ProfileLaunchShortcut;
-
-/**
- * A class that takes care of the right-click -> profile with oprofile
- * shortcut, where the ProfileLaunchShortcut has the logic to automatically
- * find binaries and create a default launch if one doesn't exist.
- */
-public class OprofileLaunchShortcut extends ProfileLaunchShortcut {
- @Override
- protected ILaunchConfigurationType getLaunchConfigType() {
-
- return getLaunchManager().getLaunchConfigurationType(OprofileLaunchPlugin.ID_LAUNCH_PROFILE);
- }
-
- /**
- * Default settings for the OProfile-specific option tabs.
- */
- @Override
- protected void setDefaultProfileAttributes(ILaunchConfigurationWorkingCopy wc) {
- //default global setup options
- LaunchOptions options = new LaunchOptions();
- options.saveConfiguration(wc);
-
- //default event option
- wc.setAttribute(OprofileLaunchPlugin.ATTR_USE_DEFAULT_EVENT, true);
- }
-
- //need to have this here because a saved launch config will have the manual
- // attribute left over, and a previous manual run will still run manually
- // even if launched from the non-manual shortcut
- @Override
- protected ILaunchConfiguration findLaunchConfiguration(IBinary bin, String mode) {
- ILaunchConfiguration config = super.findLaunchConfiguration(bin, mode);
-
- try {
- ILaunchConfigurationWorkingCopy wc = config.getWorkingCopy();
- wc.doSave();
- } catch (CoreException e) {
- e.printStackTrace();
- }
-
- return config;
- }
-}
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.launch/src/org/eclipse/linuxtools/internal/oprofile/launch/oprofilelaunch.properties b/oprofile/org.eclipse.linuxtools.oprofile.launch/src/org/eclipse/linuxtools/internal/oprofile/launch/oprofilelaunch.properties
deleted file mode 100644
index 3d53608268f906c1a4129fc375f5d99441b13059..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.launch/src/org/eclipse/linuxtools/internal/oprofile/launch/oprofilelaunch.properties
+++ /dev/null
@@ -1,84 +0,0 @@
-#####################################################################
-# Copyright (c) 2004, 2018 Red Hat, Inc.
-#
-# This program and the accompanying materials are made
-# available under the terms of the Eclipse Public License 2.0
-# which is available at https://www.eclipse.org/legal/epl-2.0/
-#
-# SPDX-License-Identifier: EPL-2.0
-#
-# Contributors:
-# Keith Seitz <keiths@redhat.com> - initial implementation
-# Kent Sebastian <ksebasti@redhat.com> -
-######################################################################
-tab.claunch.name=&Application
-tab.claunch.launchConfig.label.text=C/C++ Launch &Configuration:
-tab.claunch.launchConfig.button.browse.text=&Browse...
-tab.claunch.launchConfigDialog.title=Launch Configuration Selection
-tab.claunch.launchConfigDialog.message=Choose a C/C++ Application Launch Configuration to profile:
-oprofileCounter.counterString=Counter: {0,number,integer}
-
-tab.event.name=Events
-tab.event.counterSettings.label.text=Counter settings
-tab.event.counterSettings.enabled.button.text=Enabled
-tab.event.eventDescription.label.text=Event Description:
-tab.event.counterSettings.profileKernel.check.text=Profile kernel
-tab.event.counterSettings.profileUser.check.text=Profile user binaries
-tab.event.counterSettings.count.label.text=Count:
-tab.event.counterSettings.count.too-small=Minimum count must be at least {0,number,integer}
-tab.event.counterSettings.count.invalid=Invalid count value, must be an integer
-tab.event.defaultevent.button.text=Use default event
-tab.event.counterTab.counterText=Counter
-tab.event.eventfilter.message=type filter text
-tab.event.timermode.no.options=OProfile is running in timer mode; no event options can be specified.
-tab.event.addevent.button.text=Add >
-tab.event.addallevent.button.text=Add All >
-tab.event.removeevent.button.text= < Remove
-tab.event.removeallevent.button.text= < Remove All
-tab.event.customizeevent.button.text = Customize Event
-tab.event.validation.msg= Event {0} validation failed
-tab.event.opcontrol.validation.msg= Events count must be equal or less then number of counter [hardware counter is {0}]
-
-tab.global.name=Global
-tab.global.select=Profile with:
-tab.global.kernelImage.label.text=&Kernel image file (optional):
-tab.global.kernelImage.kernel.nonexistent=Kernel image \"{0}\" does not exist
-tab.global.kernelImage.browse.button.text=&Browse...
-tab.global.selectKernelDialog.text=Select current kernel file
-tab.global.selectKernelDialog.error.kernelDoesNotExist.text=The selected kernel image file does not exist.
-tab.global.check.separateLibrary.text=Include dependent shared libraries
-tab.global.check.separateKernel.text=Include dependent kernel modules (also includes libraries)
-tab.global.check.separateThread.text=Separate profiles per thread
-tab.global.check.separateCpu.text=Separate profiles per CPU
-tab.global.executionsNumber.label.text=Number of executions
-tab.global.executionsNumber.label.tooltip=Sets the number of times the binary will be executed in order to collect the samples.
-tab.global.check.manualProfile.text=Manual control of OProfile daemon
-
-unitmaskViewer.label.text=Unit mask:
-
-launchshortcut.no_project_error=No project associated with selected element.
-launchshortcut.errordialog.title=OProfile Launcher
-launchshortcut.errordialog.no_launch_error=Error: No launch configurations exist for this project.
-
-launchshortcut.launchselectiondialog.no_project_name=<no name>
-launchshortcut.launchselectiondialog.title=Profile Configuration Selection
-launchshortcut.launchselectiondialog.message=Select a profiling launch configuration:
-
-oprofiledcontroldialog.title=OProfile Control
-oprofiledcontroldialog.buttons.startdaemon=Start Daemon
-oprofiledcontroldialog.buttons.stopdaemon=Stop Daemon
-oprofiledcontroldialog.buttons.refreshview=Refresh View
-oprofiledcontroldialog.buttons.resetsession=Reset Session
-oprofiledcontroldialog.buttons.savesession=Save Session
-oprofiledcontroldialog.feedback.init=Dialog initialized
-oprofiledcontroldialog.feedback.startdaemon=Started OProfile daemon
-oprofiledcontroldialog.feedback.stopdaemon=Stopped OProfile daemon
-oprofiledcontroldialog.feedback.reset=Default session cleared
-oprofiledcontroldialog.feedback.save=Opening session save dialog..
-oprofiledcontroldialog.feedback.dumpsamples=Dumping samples..
-oprofiledcontroldialog.feedback.refreshed=OProfile view refreshed
-
-oprofiledcontroldialog.post.stopdaemon=Ensuring the OProfile daemon is stopped..
-
-oprofilelaunch.error.interrupted_error.status_message=The profile execution was interrupted by another thread
-oprofilelaunch.error.invalidworkingdir.status_message=Invalid working directory
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.remote-feature/.gitignore b/oprofile/org.eclipse.linuxtools.oprofile.remote-feature/.gitignore
deleted file mode 100644
index 8d94ef8debe45a7bc3866f985fdc60d41c12822f..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.remote-feature/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-bin
-@dot
-javaCompiler...args
-build.xml
-target
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.remote-feature/build.properties b/oprofile/org.eclipse.linuxtools.oprofile.remote-feature/build.properties
deleted file mode 100644
index 6498291267cdc52f1d08ba3bd360dcd8f5b46947..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.remote-feature/build.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-bin.includes = feature.xml,\
- feature.properties,\
- p2.inf
-src.includes = feature.properties,\
- feature.xml
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.remote-feature/feature.properties b/oprofile/org.eclipse.linuxtools.oprofile.remote-feature/feature.properties
deleted file mode 100644
index 903b0deab58ac8e4f68e63f15deb4310e7fefc2e..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.remote-feature/feature.properties
+++ /dev/null
@@ -1,16 +0,0 @@
-#*******************************************************************************
-# Copyright (c) 2008, 2018 Red Hat, Inc.
-#
-# This program and the accompanying materials are made
-# available under the terms of the Eclipse Public License 2.0
-# which is available at https://www.eclipse.org/legal/epl-2.0/
-#
-# SPDX-License-Identifier: EPL-2.0
-#
-# Contributors:
-# Red Hat, Inc. - initial API and implementation
-#********************************************************************************
-featureName=Remote OProfile Integration
-description=Plugins to bring remote OProfile-based profiling into the workbench.
-provider=Eclipse Linux Tools
-copyright=Copyright 2008, 2010 Red Hat, Inc.
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.remote-feature/feature.xml b/oprofile/org.eclipse.linuxtools.oprofile.remote-feature/feature.xml
deleted file mode 100644
index 299007a5a1eaa94d0cb9e6864951f352f24e3830..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.remote-feature/feature.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
- id="org.eclipse.linuxtools.oprofile.remote.feature"
- label="%featureName"
- version="7.4.0.qualifier"
- provider-name="%provider"
- os="linux"
- license-feature="org.eclipse.license"
- license-feature-version="0.0.0">
-
- <description>
- %description
- </description>
-
- <copyright>
- %copyright
- </copyright>
-
- <license url="%licenseURL">
- %license
- </license>
-
- <url>
- <update label="Linux Tools Update Site" url="http://download.eclipse.org/linuxtools/update"/>
- </url>
-
- <requires>
- <import plugin="org.eclipse.core.runtime" version="3.4.0" match="greaterOrEqual"/>
- <import plugin="org.eclipse.ui" version="3.4.0" match="greaterOrEqual"/>
- <import plugin="org.eclipse.cdt.core"/>
- <import plugin="org.eclipse.cdt.debug.core"/>
- <import plugin="org.eclipse.cdt.launch"/>
- <import plugin="org.eclipse.core.resources"/>
- <import plugin="org.eclipse.debug.core"/>
- <import plugin="org.eclipse.debug.ui"/>
- <import plugin="org.eclipse.linuxtools.profiling.launch"/>
- <import plugin="org.eclipse.ui.ide"/>
- <import plugin="org.eclipse.jface.text"/>
- <import plugin="org.eclipse.linuxtools.profiling.ui"/>
- <import plugin="org.eclipse.ui.editors" version="3.4.0" match="greaterOrEqual"/>
- <import plugin="org.eclipse.help"/>
- <import feature="org.eclipse.linuxtools.oprofile.feature" version="0.1.0" match="greaterOrEqual"/>
- <import feature="org.eclipse.linuxtools.profiling.remote" version="0.8.0" match="greaterOrEqual"/>
- </requires>
-
- <plugin
- id="org.eclipse.linuxtools.oprofile.remote.launch"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
-</feature>
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.remote-feature/p2.inf b/oprofile/org.eclipse.linuxtools.oprofile.remote-feature/p2.inf
deleted file mode 100644
index 193bce9e3a4b159b05b4d563970bf1841be08404..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.remote-feature/p2.inf
+++ /dev/null
@@ -1,3 +0,0 @@
-instructions.configure=\
-org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(location:http${#58}//download.eclipse.org/linuxtools/update,type:0,name:Linux Tools,enabled:false); \
-org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(location:http${#58}//download.eclipse.org/linuxtools/update,type:1,name:Linux Tools,enabled:false);
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.remote-feature/pom.xml b/oprofile/org.eclipse.linuxtools.oprofile.remote-feature/pom.xml
deleted file mode 100644
index fa86e4c8d3fc57201b08698f7c6860d3c3356ebd..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.remote-feature/pom.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (C) 2011, 2018 Red Hat, Inc.
-
- * This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License 2.0
- * which is available at https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
--->
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <artifactId>linuxtools-oprofile-parent</artifactId>
- <groupId>org.eclipse.linuxtools.oprofile</groupId>
- <version>7.4.0</version>
- </parent>
-
- <artifactId>org.eclipse.linuxtools.oprofile.remote.feature</artifactId>
- <packaging>eclipse-feature</packaging>
- <version>7.4.0-SNAPSHOT</version>
-
- <name>Linux Tools Remote OProfile Integration Feature</name>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.eclipse.tycho.extras</groupId>
- <artifactId>tycho-source-feature-plugin</artifactId>
- <executions>
- <execution>
- <id>source-feature</id>
- <phase>package</phase>
- <goals>
- <goal>source-feature</goal>
- </goals>
- <configuration>
- <excludes>
- <plugin id="org.eclipse.linuxtools.oprofile.doc"/>
- </excludes>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-p2-plugin</artifactId>
- <version>${tycho-version}</version>
- <executions>
- <execution>
- <id>attached-p2-metadata</id>
- <phase>package</phase>
- <goals>
- <goal>p2-metadata</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
-</project>
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.remote.launch/.classpath b/oprofile/org.eclipse.linuxtools.oprofile.remote.launch/.classpath
deleted file mode 100644
index 43b986286a9e5fd1828793fa4b2353d02ab8625f..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.remote.launch/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="output" path="target/classes"/>
-</classpath>
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.remote.launch/.gitignore b/oprofile/org.eclipse.linuxtools.oprofile.remote.launch/.gitignore
deleted file mode 100644
index 8d94ef8debe45a7bc3866f985fdc60d41c12822f..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.remote.launch/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-bin
-@dot
-javaCompiler...args
-build.xml
-target
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.remote.launch/.project b/oprofile/org.eclipse.linuxtools.oprofile.remote.launch/.project
deleted file mode 100644
index ac7d6463644f4d4a1f5e1cef9c70810909285f18..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.remote.launch/.project
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.linuxtools.oprofile.remote.launch</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
- </natures>
-</projectDescription>
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.remote.launch/.settings/org.eclipse.jdt.core.prefs b/oprofile/org.eclipse.linuxtools.oprofile.remote.launch/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index c7a729bc42bdd228bba4cca9bb569b6c8112a3b9..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.remote.launch/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,99 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled
-org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
-org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull
-org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault
-org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
-org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.8
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
-org.eclipse.jdt.core.compiler.problem.deadCode=warning
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=warning
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDefaultCase=ignore
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning
-org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled
-org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=warning
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning
-org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning
-org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error
-org.eclipse.jdt.core.compiler.problem.nullReference=warning
-org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error
-org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
-org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
-org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
-org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=warning
-org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
-org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
-org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=disabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=disabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=enabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning
-org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.8
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.remote.launch/META-INF/MANIFEST.MF b/oprofile/org.eclipse.linuxtools.oprofile.remote.launch/META-INF/MANIFEST.MF
deleted file mode 100644
index 0136db6c89707a83f40ff9e3f32afe838acb663b..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.remote.launch/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,25 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %bundleName
-Bundle-SymbolicName: org.eclipse.linuxtools.oprofile.remote.launch;singleton:=true
-Bundle-Version: 2.0.0.qualifier
-Bundle-Vendor: %bundleProvider
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Require-Bundle: org.eclipse.core.runtime;bundle-version="3.4.0",
- org.eclipse.ui;bundle-version="3.4.0",
- org.eclipse.linuxtools.tools.launch.core
-Bundle-Activator: org.eclipse.linuxtools.internal.oprofile.launch.OprofileLaunchPlugin
-Bundle-ActivationPolicy: lazy
-Bundle-Localization: plugin
-Import-Package: org.eclipse.cdt.debug.core,
- org.eclipse.cdt.launch,
- org.eclipse.core.resources,
- org.eclipse.debug.core,
- org.eclipse.debug.ui,
- org.eclipse.linuxtools.internal.oprofile.core,
- org.eclipse.linuxtools.internal.oprofile.core.linux,
- org.eclipse.linuxtools.internal.oprofile.launch,
- org.eclipse.linuxtools.internal.oprofile.launch.configuration,
- org.eclipse.linuxtools.internal.oprofile.launch.launching,
- org.eclipse.linuxtools.profiling.launch
-Automatic-Module-Name: org.eclipse.linuxtools.oprofile.remote.launch
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.remote.launch/about.html b/oprofile/org.eclipse.linuxtools.oprofile.remote.launch/about.html
deleted file mode 100644
index 164f781a8fd2195f87c3d3d49946d56bce58992f..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.remote.launch/about.html
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<title>About</title>
-</head>
-<body lang="EN-US">
- <h2>About This Content</h2>
-
- <p>November 30, 2017</p>
- <h3>License</h3>
-
- <p>
- The Eclipse Foundation makes available all content in this plug-in
- ("Content"). Unless otherwise indicated below, the Content
- is provided to you under the terms and conditions of the Eclipse
- Public License Version 2.0 ("EPL"). A copy of the EPL is
- available at <a href="http://www.eclipse.org/legal/epl-2.0">http://www.eclipse.org/legal/epl-2.0</a>.
- For purposes of the EPL, "Program" will mean the Content.
- </p>
-
- <p>
- If you did not receive this Content directly from the Eclipse
- Foundation, the Content is being redistributed by another party
- ("Redistributor") and different terms and conditions may
- apply to your use of any object code in the Content. Check the
- Redistributor's license that was provided with the Content. If no such
- license exists, contact the Redistributor. Unless otherwise indicated
- below, the terms and conditions of the EPL still apply to any source
- code in the Content and such source code may be obtained at <a
- href="http://www.eclipse.org/">http://www.eclipse.org</a>.
- </p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.remote.launch/build.properties b/oprofile/org.eclipse.linuxtools.oprofile.remote.launch/build.properties
deleted file mode 100644
index 783b22fa30c020819549c7ae70c04465dd85a20b..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.remote.launch/build.properties
+++ /dev/null
@@ -1,10 +0,0 @@
-source.. = src/
-bin.includes = META-INF/,\
- .,\
- plugin.xml,\
- plugin.properties,\
- icons/,\
- about.html
-src.includes = about.html,\
- icons/
-individualSourceBundles=true
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.remote.launch/icons/event_tab.gif b/oprofile/org.eclipse.linuxtools.oprofile.remote.launch/icons/event_tab.gif
deleted file mode 100644
index c91f254ab1728df3d6555002c789ef4519693eb0..0000000000000000000000000000000000000000
Binary files a/oprofile/org.eclipse.linuxtools.oprofile.remote.launch/icons/event_tab.gif and /dev/null differ
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.remote.launch/icons/global_tab.gif b/oprofile/org.eclipse.linuxtools.oprofile.remote.launch/icons/global_tab.gif
deleted file mode 100644
index ec6cca4525bf483077bcc2039eaede6e71258c89..0000000000000000000000000000000000000000
Binary files a/oprofile/org.eclipse.linuxtools.oprofile.remote.launch/icons/global_tab.gif and /dev/null differ
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.remote.launch/icons/profile_run.png b/oprofile/org.eclipse.linuxtools.oprofile.remote.launch/icons/profile_run.png
deleted file mode 100644
index 4f8488f1c0c23bdc8703856b2a3baae022046332..0000000000000000000000000000000000000000
Binary files a/oprofile/org.eclipse.linuxtools.oprofile.remote.launch/icons/profile_run.png and /dev/null differ
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.remote.launch/plugin.properties b/oprofile/org.eclipse.linuxtools.oprofile.remote.launch/plugin.properties
deleted file mode 100644
index d1746e6e06e700e44221ddaee8ba2dcb22dce5e2..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.remote.launch/plugin.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-#*******************************************************************************
-# Copyright (c) 2008, 2018 Red Hat, Inc.
-#
-# This program and the accompanying materials are made
-# available under the terms of the Eclipse Public License 2.0
-# which is available at https://www.eclipse.org/legal/epl-2.0/
-#
-# SPDX-License-Identifier: EPL-2.0
-#
-# Contributors:
-# Red Hat, Inc. - initial API and implementation
-#*******************************************************************************
-bundleName=OProfile Remote Launch Plug-in (Incubation)
-bundleProvider=Eclipse Linux Tools
-
-pluginName=OProfile Remote Launch Support
-launchconfigurationtype.remote.label=Profile With OProfile (Remote)
-
-launchgroup.label=OProfile
-launchgroup.titile=Select a run configuration to profile with OProfile
-
-launchmode.label=Profile
-launchmode.launchaslabel=Profile As
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.remote.launch/plugin.xml b/oprofile/org.eclipse.linuxtools.oprofile.remote.launch/plugin.xml
deleted file mode 100644
index 12125b0bb4ae58525c868650fea68c6ea9e97556..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.remote.launch/plugin.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.2"?>
-<plugin>
- <extension
- point="org.eclipse.debug.core.launchConfigurationTypes">
- <launchConfigurationType
- delegate="org.eclipse.linuxtools.internal.oprofile.remote.launch.launching.OprofileRemoteLaunchConfigurationDelegate"
- id="org.eclipse.linuxtools.oprofile.launch.oprofile.remote"
- modes="linuxtools"
- name="%launchconfigurationtype.remote.label"
- public="true"
- sourceLocatorId="org.eclipse.cdt.debug.core.sourceLocator"
- sourcePathComputerId="org.eclipse.cdt.debug.core.sourcePathComputer">
- </launchConfigurationType>
- </extension>
- <extension
- point="org.eclipse.debug.ui.launchConfigurationTypeImages">
- <launchConfigurationTypeImage
- configTypeID="org.eclipse.linuxtools.oprofile.launch.oprofile.remote"
- icon="icons/profile_run.png"
- id="org.eclipse.linuxtools.oprofile.launch.oprofileImage">
- </launchConfigurationTypeImage>
- </extension>
- <extension
- point="org.eclipse.debug.ui.launchConfigurationTabGroups">
- <launchConfigurationTabGroup
- class="org.eclipse.linuxtools.internal.oprofile.remote.launch.configuration.OprofileRemoteLaunchConfigurationTabGroup"
- id="org.eclipse.linuxtools.oprofile.launch.remoteLaunchConfigurationTabGroup"
- type="org.eclipse.linuxtools.oprofile.launch.oprofile.remote">
- </launchConfigurationTabGroup>
- </extension>
- <extension
- point="org.eclipse.debug.ui.launchShortcuts">
- </extension>
-</plugin>
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.remote.launch/pom.xml b/oprofile/org.eclipse.linuxtools.oprofile.remote.launch/pom.xml
deleted file mode 100644
index 2299de2e36557e9a9bedd63b9e4d3fc0ed5a1616..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.remote.launch/pom.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <artifactId>linuxtools-oprofile-parent</artifactId>
- <groupId>org.eclipse.linuxtools.oprofile</groupId>
- <version>7.4.0</version>
- </parent>
-
- <artifactId>org.eclipse.linuxtools.oprofile.remote.launch</artifactId>
- <version>2.0.0-SNAPSHOT</version>
- <packaging>eclipse-plugin</packaging>
-
- <name>Linux Tools OProfile Remote Launch Plug-in</name>
-</project>
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.remote.launch/src/org/eclipse/linuxtools/internal/oprofile/remote/launch/configuration/OprofileRemoteLaunchConfigurationTabGroup.java b/oprofile/org.eclipse.linuxtools.oprofile.remote.launch/src/org/eclipse/linuxtools/internal/oprofile/remote/launch/configuration/OprofileRemoteLaunchConfigurationTabGroup.java
deleted file mode 100644
index a6610ab3603f1b6255bb6878ea209af143460911..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.remote.launch/src/org/eclipse/linuxtools/internal/oprofile/remote/launch/configuration/OprofileRemoteLaunchConfigurationTabGroup.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2012, 2018 IBM Corporation
- *
- * This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License 2.0
- * which is available at https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- * Rafael Medeiros Teixeira <rafaelmt@linux.vnet.ibm.com> - initial API and implementation
-*******************************************************************************/
-package org.eclipse.linuxtools.internal.oprofile.remote.launch.configuration;
-
-import org.eclipse.debug.ui.AbstractLaunchConfigurationTab;
-import org.eclipse.linuxtools.internal.oprofile.launch.configuration.OprofileEventConfigTab;
-import org.eclipse.linuxtools.internal.oprofile.launch.configuration.OprofileSetupTab;
-import org.eclipse.linuxtools.profiling.launch.RemoteProxyProfileLaunchConfigurationTabGroup;
-
-/**
- * @since 1.1
- */
-public class OprofileRemoteLaunchConfigurationTabGroup extends RemoteProxyProfileLaunchConfigurationTabGroup {
- @Override
- public AbstractLaunchConfigurationTab[] getProfileTabs() {
- return new AbstractLaunchConfigurationTab[] { new OprofileSetupTab(), new OprofileEventConfigTab() };
- }
-}
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.remote.launch/src/org/eclipse/linuxtools/internal/oprofile/remote/launch/launching/OprofileRemoteLaunchConfigurationDelegate.java b/oprofile/org.eclipse.linuxtools.oprofile.remote.launch/src/org/eclipse/linuxtools/internal/oprofile/remote/launch/launching/OprofileRemoteLaunchConfigurationDelegate.java
deleted file mode 100644
index 13456b121f9cefead49127e01861f3ae268de7f4..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.remote.launch/src/org/eclipse/linuxtools/internal/oprofile/remote/launch/launching/OprofileRemoteLaunchConfigurationDelegate.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2012, 2018 IBM Corporation
- *
- * This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License 2.0
- * which is available at https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- * Rafael Medeiros Teixeira <rafaelmt@linux.vnet.ibm.com> - initial API and implementation
-*******************************************************************************/
-package org.eclipse.linuxtools.internal.oprofile.remote.launch.launching;
-
-import java.net.URI;
-import java.net.URISyntaxException;
-
-import org.eclipse.cdt.debug.core.ICDTLaunchConfigurationConstants;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.linuxtools.internal.oprofile.core.OprofileCorePlugin;
-import org.eclipse.linuxtools.internal.oprofile.launch.OprofileLaunchMessages;
-import org.eclipse.linuxtools.internal.oprofile.launch.launching.OprofileLaunchConfigurationDelegate;
-import org.eclipse.linuxtools.profiling.launch.ProxyLaunchMessages;
-import org.eclipse.linuxtools.profiling.launch.RemoteProxyCMainTab;
-
-
-/**
- * @since 1.1
- */
-public class OprofileRemoteLaunchConfigurationDelegate extends OprofileLaunchConfigurationDelegate {
- private final static String EMPTY_STRING = ""; //$NON-NLS-1$
-
- @Override
- protected IProject getProject() {
- String name = null;
- try {
- name = config.getAttribute(ICDTLaunchConfigurationConstants.ATTR_PROJECT_NAME, EMPTY_STRING);
- } catch (CoreException e) {
- return null;
- }
- if (name == null) {
- return null;
- }
-
- return ResourcesPlugin.getWorkspace().getRoot().getProject(name);
- }
-
- @Override
- protected IPath getExePath(ILaunchConfiguration config)
- throws CoreException {
- String pathString = config.getAttribute(ICDTLaunchConfigurationConstants.ATTR_PROGRAM_NAME, EMPTY_STRING);
- URI uri;
- try {
- uri = new URI(pathString);
- } catch (URISyntaxException e) {
- throw new CoreException(new Status(IStatus.ERROR, OprofileCorePlugin.getId() ,
- ProxyLaunchMessages.uri_of_executable_is_invalid));
- }
- IPath path = new Path(uri.getPath());
-
- return path;
- }
-
- @Override
- protected URI oprofileWorkingDirURI(ILaunchConfiguration config) throws CoreException {
- String workingDirString = config.getAttribute(RemoteProxyCMainTab.ATTR_REMOTE_WORKING_DIRECTORY_NAME, EMPTY_STRING);
- if(workingDirString.equals(EMPTY_STRING)){
- return getProject().getLocationURI();
- } else {
- URI workingDirUri;
- try {
- workingDirUri = new URI(workingDirString);
- } catch (URISyntaxException e) {
- Status status = new Status(
- IStatus.ERROR,
- OprofileCorePlugin.getId(),
- OprofileLaunchMessages
- .getString("oprofilelaunch.error.invalidworkingdir.status_message")); //$NON-NLS-1$
- throw new CoreException(status);
- }
- return workingDirUri;
- }
- }
-
-}
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.tests/.classpath b/oprofile/org.eclipse.linuxtools.oprofile.tests/.classpath
deleted file mode 100644
index 43b986286a9e5fd1828793fa4b2353d02ab8625f..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.tests/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="output" path="target/classes"/>
-</classpath>
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.tests/.gitignore b/oprofile/org.eclipse.linuxtools.oprofile.tests/.gitignore
deleted file mode 100644
index 8d94ef8debe45a7bc3866f985fdc60d41c12822f..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.tests/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-bin
-@dot
-javaCompiler...args
-build.xml
-target
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.tests/.settings/org.eclipse.jdt.core.prefs b/oprofile/org.eclipse.linuxtools.oprofile.tests/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 7a2f00a40cae7ad991f02461d9b87204c844e1d3..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.tests/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,95 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled
-org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
-org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull
-org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault
-org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
-org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
-org.eclipse.jdt.core.compiler.problem.deadCode=warning
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=warning
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDefaultCase=ignore
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning
-org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled
-org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=warning
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning
-org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning
-org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error
-org.eclipse.jdt.core.compiler.problem.nullReference=warning
-org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error
-org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
-org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
-org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
-org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=warning
-org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
-org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
-org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=disabled
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=warning
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=disabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=disabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=enabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning
-org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.8
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.tests/META-INF/MANIFEST.MF b/oprofile/org.eclipse.linuxtools.oprofile.tests/META-INF/MANIFEST.MF
deleted file mode 100644
index 7c5a988341d11783edd710a64cfc7728e0e4795d..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.tests/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,16 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %bundleName
-Bundle-SymbolicName: org.eclipse.linuxtools.oprofile.tests
-Bundle-Version: 1.0.0.qualifier
-Bundle-Vendor: %bundleProvider
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Import-Package: org.eclipse.linuxtools.internal.oprofile.core.opxml,
- org.eclipse.linuxtools.internal.oprofile.core.opxml.modeldata,
- org.eclipse.linuxtools.internal.oprofile.core.model
-Export-Package: org.eclipse.linuxtools.oprofile.tests
-Require-Bundle: org.eclipse.core.runtime;bundle-version="3.4.0"
-Bundle-ActivationPolicy: lazy
-Bundle-Activator: org.eclipse.linuxtools.oprofile.tests.TestPlugin
-Bundle-Localization: plugin
-Automatic-Module-Name: org.eclipse.linuxtools.oprofile.tests
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.tests/about.html b/oprofile/org.eclipse.linuxtools.oprofile.tests/about.html
deleted file mode 100644
index 164f781a8fd2195f87c3d3d49946d56bce58992f..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.tests/about.html
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<title>About</title>
-</head>
-<body lang="EN-US">
- <h2>About This Content</h2>
-
- <p>November 30, 2017</p>
- <h3>License</h3>
-
- <p>
- The Eclipse Foundation makes available all content in this plug-in
- ("Content"). Unless otherwise indicated below, the Content
- is provided to you under the terms and conditions of the Eclipse
- Public License Version 2.0 ("EPL"). A copy of the EPL is
- available at <a href="http://www.eclipse.org/legal/epl-2.0">http://www.eclipse.org/legal/epl-2.0</a>.
- For purposes of the EPL, "Program" will mean the Content.
- </p>
-
- <p>
- If you did not receive this Content directly from the Eclipse
- Foundation, the Content is being redistributed by another party
- ("Redistributor") and different terms and conditions may
- apply to your use of any object code in the Content. Check the
- Redistributor's license that was provided with the Content. If no such
- license exists, contact the Redistributor. Unless otherwise indicated
- below, the terms and conditions of the EPL still apply to any source
- code in the Content and such source code may be obtained at <a
- href="http://www.eclipse.org/">http://www.eclipse.org</a>.
- </p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.tests/build.properties b/oprofile/org.eclipse.linuxtools.oprofile.tests/build.properties
deleted file mode 100644
index f80b4cb2d358734331f60f3074ccd25e878210d0..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.tests/build.properties
+++ /dev/null
@@ -1,9 +0,0 @@
-source.. = src/
-bin.includes = META-INF/,\
- .,\
- resources/,\
- plugin.properties,\
- about.html
-src.includes = resources/,\
- about.html
-individualSourceBundles=true
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.tests/plugin.properties b/oprofile/org.eclipse.linuxtools.oprofile.tests/plugin.properties
deleted file mode 100644
index 248a2e4b1885180f4b549a4cec1fc299cd653226..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.tests/plugin.properties
+++ /dev/null
@@ -1,14 +0,0 @@
-#*******************************************************************************
-# Copyright (c) 2009, 2018 Red Hat, Inc.
-#
-# This program and the accompanying materials are made
-# available under the terms of the Eclipse Public License 2.0
-# which is available at https://www.eclipse.org/legal/epl-2.0/
-#
-# SPDX-License-Identifier: EPL-2.0
-#
-# Contributors:
-# Kent Sebastian <ksebasti@redhat.com> - initial API and implementation
-#*******************************************************************************
-bundleName=OProfile Common Test Plug-in
-bundleProvider=Eclipse Linux Tools
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.tests/pom.xml b/oprofile/org.eclipse.linuxtools.oprofile.tests/pom.xml
deleted file mode 100644
index 7ca0cae3b3e969b1eff5b4568a224aa75266317a..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.tests/pom.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (C) 2011, 2018 Red Hat, Inc.
-
- * This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License 2.0
- * which is available at https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
--->
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <artifactId>linuxtools-oprofile-parent</artifactId>
- <groupId>org.eclipse.linuxtools.oprofile</groupId>
- <version>7.4.0</version>
- </parent>
-
- <artifactId>org.eclipse.linuxtools.oprofile.tests</artifactId>
- <version>1.0.0-SNAPSHOT</version>
- <packaging>eclipse-plugin</packaging>
-
- <name>Linux Tools OProfile Tests Plug-in</name>
-</project>
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.tests/resources/test_model-data.xml b/oprofile/org.eclipse.linuxtools.oprofile.tests/resources/test_model-data.xml
deleted file mode 100644
index 69dffc324061632d0c1441e36d253f346ef723a3..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.tests/resources/test_model-data.xml
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<model-data>
- <image name="/test/path/for/image" count="205000">
- <symbols>
- <symbol name="TestFunction1(int)" file="/test/path/for/src/image.cpp" line="1" count="180000">
- <sample>
- <count>130000</count>
- <file>/test/path/for/src/image.cpp</file>
- <line>42</line>
- </sample>
- <sample>
- <count>40000</count>
- <file>/test/path/for/src/image.cpp</file>
- <line>36</line>
- </sample>
- <sample>
- <count>9999</count>
- <file>/test/path/for/src/image.cpp</file>
- <line>31</line>
- </sample>
- <sample>
- <count>1</count>
- <file>/test/path/for/src/image.cpp</file>
- <line>39</line>
- </sample>
- </symbol>
- <symbol name="TestFunction2(int, int)" file="/test/path/for/src/image2.cpp" line="50" count="20000">
- <sample>
- <count>19998</count>
- <file>/test/path/for/src/image2.cpp</file>
- <line>94</line>
- </sample>
- <sample>
- <count>1</count>
- <file>/test/path/for/src/image2.cpp</file>
- <line>12</line>
- </sample>
- <sample>
- <count>1</count>
- <file>/test/path/for/src/image2.cpp</file>
- <line>55</line>
- </sample>
- </symbol>
- </symbols>
- <dependent count="5000">
- <image name="/no-vmlinux" count="4400">
- </image>
- <image name="/lib64/ld-2.9.so" count="300">
- <symbols>
- <symbol name="do_lookup_x" file="dl-lookup.c" line="0" count="299">
- <sample>
- <count>299</count>
- <file>dl-lookup.c</file>
- <line>0</line>
- </sample>
- </symbol>
- <symbol name="_dl_unload_cache" file="rawmemchr.c" line="0" count="1">
- <sample>
- <count>1</count>
- <file>rawmemchr.c</file>
- <line>0</line>
- </sample>
- </symbol>
- </symbols>
- </image>
- <image name="/usr/lib64/libstdc++.so.6.0.10" count="160">
- </image>
- <image name="/lib64/libc-2.9.so" count="140">
- <symbols>
- <symbol name="_IO_new_file_seekoff" file="" line="0" count="100">
- <sample>
- <count>100</count>
- <file></file>
- <line>0</line>
- </sample>
- </symbol>
- <symbol name="bcopy" file="" line="0" count="40">
- <sample>
- <count>40</count>
- <file></file>
- <line>0</line>
- </sample>
- </symbol>
- </symbols>
- </image>
- </dependent>
- </image>
-</model-data>
\ No newline at end of file
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.tests/resources/test_model-data_multiple_image.xml b/oprofile/org.eclipse.linuxtools.oprofile.tests/resources/test_model-data_multiple_image.xml
deleted file mode 100644
index 485a22971814a21d59fbfdcce2e31b349c9420a9..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.tests/resources/test_model-data_multiple_image.xml
+++ /dev/null
@@ -1,239 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<model-data>
- <image name="/no-vmlinux" count="6844">
- </image>
- <image name="/bin/grep" count="2">
- </image>
- <image name="/bin/gawk" count="8">
- </image>
- <image name="/bin/bash" count="142">
- </image>
- <image name="/lib64/libgobject-2.0.so.0.1800.3" count="61">
- </image>
- <image name="/lib64/libgio-2.0.so.0.1800.3" count="2">
- </image>
- <image name="/lib64/libdl-2.9.so" count="2">
- <symbols>
- <symbol name="__do_global_dtors_aux" file="crtstuff.c" count="2" line="0">
- <sample>
- <count>2</count>
- <line>0</line>
- </sample>
- </symbol>
- </symbols>
- </image>
- <image name="/lib64/ld-2.9.so" count="36">
- <symbols>
- <symbol name="_dl_start" file="rtld.c" count="1" line="0">
- <sample>
- <count>1</count>
- <line>0</line>
- </sample>
- </symbol>
- <symbol name="dl_main" file="rtld.c" count="3" line="0">
- <sample>
- <count>3</count>
- <file>rtld.c</file>
- <line>0</line>
- </sample>
- </symbol>
- <symbol name="init_tls" file="rtld.c" count="1" line="0">
- <sample>
- <count>1</count>
- <file>rtld.c</file>
- <line>0</line>
- </sample>
- </symbol>
- <symbol name="open_verify" file="dl-load.c" count="2" line="0">
- <sample>
- <count>2</count>
- <file>dl-load.c</file>
- <line>0</line>
- </sample>
- </symbol>
- <symbol name="_dl_setup_hash" file="rawmemchr.c" count="1" line="0">
- <sample>
- <count>1</count>
- <file>rawmemchr.c</file>
- <line>0</line>
- </sample>
- </symbol>
- <symbol name="_dl_init_internal" file="rawmemchr.c" count="1" line="0">
- <sample>
- <count>1</count>
- <file>rawmemchr.c</file>
- <line>0</line>
- </sample>
- </symbol>
- <symbol name="_dl_important_hwcaps" file="rawmemchr.c" count="2" line="0">
- <sample>
- <count>2</count>
- <file>rawmemchr.c</file>
- <line>0</line>
- </sample>
- </symbol>
- <symbol name="munmap" file="rawmemchr.c" count="1" line="0">
- <sample>
- <count>1</count>
- <file>rawmemchr.c</file>
- <line>0</line>
- </sample>
- </symbol>
- <symbol name="_dl_load_cache_lookup" file="rawmemchr.c" count="1" line="0">
- <sample>
- <count>1</count>
- <file>rawmemchr.c</file>
- <line>0</line>
- </sample>
- </symbol>
- <symbol name="_dl_fini" file="rawmemchr.c" count="2" line="0">
- <sample>
- <count>2</count>
- <file>rawmemchr.c</file>
- <line>0</line>
- </sample>
- </symbol>
- <symbol name="__GI_memset" file="rawmemchr.c" count="1" line="0">
- <sample>
- <count>1</count>
- <file>rawmemchr.c</file>
- <line>0</line>
- </sample>
- </symbol>
- <symbol name="_dl_init_paths" file="rawmemchr.c" count="3" line="0">
- <sample>
- <count>3</count>
- <file>rawmemchr.c</file>
- <line>0</line>
- </sample>
- </symbol>
- <symbol name="__brk" file="rawmemchr.c" count="1" line="0">
- <sample>
- <count>1</count>
- <file>rawmemchr.c</file>
- <line>0</line>
- </sample>
- </symbol>
- <symbol name="_dl_name_match_p" file="rawmemchr.c" count="1" line="0">
- <sample>
- <count>1</count>
- <file>rawmemchr.c</file>
- <line>0</line>
- </sample>
- </symbol>
- <symbol name="index" file="rawmemchr.c" count="2" line="0">
- <sample>
- <count>2</count>
- <file>rawmemchr.c</file>
- <line>0</line>
- </sample>
- </symbol>
- <symbol name="_dl_resolve_conflicts" file="rawmemchr.c" count="1" line="0">
- <sample>
- <count>1</count>
- <file>rawmemchr.c</file>
- <line>0</line>
- </sample>
- </symbol>
- <symbol name="_dl_cache_libcmp" file="rawmemchr.c" count="2" line="0">
- <sample>
- <count>2</count>
- <file>rawmemchr.c</file>
- <line>0</line>
- </sample>
- </symbol>
- <symbol name="strcmp" file="rawmemchr.c" count="2" line="0">
- <sample>
- <count>2</count>
- <file>rawmemchr.c</file>
- <line>0</line>
- </sample>
- </symbol>
- <symbol name="_dl_start_user" file="rawmemchr.c" count="1" line="0">
- <sample>
- <count>1</count>
- <file>rawmemchr.c</file>
- <line>0</line>
- </sample>
- </symbol>
- <symbol name="strlen" file="rawmemchr.c" count="1" line="0">
- <sample>
- <count>1</count>
- <file>rawmemchr.c</file>
- <line>0</line>
- </sample>
- </symbol>
- <symbol name="_dl_sort_fini" file="rawmemchr.c" count="1" line="0">
- <sample>
- <count>1</count>
- <file>rawmemchr.c</file>
- <line>0</line>
- </sample>
- </symbol>
- <symbol name="_dl_map_object_deps" file="rawmemchr.c" count="4" line="0">
- <sample>
- <count>4</count>
- <file>rawmemchr.c</file>
- <line>0</line>
- </sample>
- </symbol>
- <symbol name="__libc_memalign" file="" count="1" line="0">
- <sample>
- <count>1</count>
- <file></file>
- <line>0</line>
- </sample>
- </symbol>
- </symbols>
- </image>
- <image name="/lib64/libdbus-1.so.3.4.0" count="10">
- </image>
- <image name="/lib64/libfuse.so.2.7.4" count="1">
- </image>
- <image name="/lib64/libm-2.9.so" count="2">
- <symbols>
- <symbol name="__dubsin" file="interp.c" count="2" line="0">
- <sample>
- <count>2</count>
- <line>0</line>
- </sample>
- </symbol>
- </symbols>
- </image>
- <image name="/lib64/libglib-2.0.so.0.1800.3" count="107">
- </image>
- <image name="/lib64/libgthread-2.0.so.0.1800.3" count="3">
- </image>
- <image name="/usr/bin/which" count="1">
- </image>
- <image name="/usr/bin/compiz" count="21">
- </image>
- <image name="/usr/bin/Xorg" count="154">
- <dependent count="6">
- <image name="[vdso]" count="6">
- </image>
- </dependent>
- </image>
- <image name="/usr/bin/ophelp" count="11">
- </image>
- <image name="/usr/bin/qemu-kvm" count="142">
- <dependent count="1">
- <image name="[vdso]" count="1">
- </image>
- </dependent>
- </image>
- <image name="/usr/bin/oprofiled" count="26">
- </image>
- <image name="/usr/sbin/libvirtd" count="3">
- </image>
- <image name="/usr/libexec/multiload-applet-2" count="1">
- </image>
- <image name="/usr/lib/jvm/java-1.6.0-openjdk-1.6.0.0.x86_64/jre/lib/amd64/server/libjvm.so" count="7">
- </image>
- <image name="/usr/lib64/libgtk-x11-2.0.so.0.1400.5" count="22">
- </image>
- <image name="/usr/lib64/libpangocairo-1.0.so.0.2203.0" count="4">
- </image>
- <image name="/usr/lib64/libXrender.so.1.3.0" count="2">
- </image>
-</model-data>
\ No newline at end of file
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.tests/resources/test_model-data_nodepimage.xml b/oprofile/org.eclipse.linuxtools.oprofile.tests/resources/test_model-data_nodepimage.xml
deleted file mode 100644
index 6a35c09f5a154b0b774a70c1c3a5abe6deb29b6d..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.tests/resources/test_model-data_nodepimage.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<model-data>
- <image name="/test/path/for/image" count="200000">
- <symbols>
- <symbol name="TestFunction1(int)" file="/test/path/for/src/image.cpp" line="0" count="180000">
- <sample>
- <count>130000</count>
- <file>/test/path/for/src/image.cpp</file>
- <line>42</line>
- </sample>
- <sample>
- <count>40000</count>
- <file>/test/path/for/src/image.cpp</file>
- <line>36</line>
- </sample>
- <sample>
- <count>9999</count>
- <file>/test/path/for/src/image.cpp</file>
- <line>31</line>
- </sample>
- <sample>
- <count>1</count>
- <file>/test/path/for/src/image.cpp</file>
- <line>39</line>
- </sample>
- </symbol>
- <symbol name="TestFunction2(int, int)" file="/test/path/for/src/image2.cpp" line="0" count="20000">
- <sample>
- <count>19998</count>
- <file>/test/path/for/src/image2.cpp</file>
- <line>94</line>
- </sample>
- <sample>
- <count>1</count>
- <file>/test/path/for/src/image2.cpp</file>
- <line>12</line>
- </sample>
- <sample>
- <count>1</count>
- <file>/test/path/for/src/image2.cpp</file>
- <line>55</line>
- </sample>
- </symbol>
- </symbols>
- </image>
-</model-data>
\ No newline at end of file
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.tests/src/org/eclipse/linuxtools/oprofile/tests/TestPlugin.java b/oprofile/org.eclipse.linuxtools.oprofile.tests/src/org/eclipse/linuxtools/oprofile/tests/TestPlugin.java
deleted file mode 100644
index a36edc2c4b910bd651470137dda75944d12bddbb..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.tests/src/org/eclipse/linuxtools/oprofile/tests/TestPlugin.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2018 Red Hat, Inc.
- *
- * This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License 2.0
- * which is available at https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- * Kent Sebastian <ksebasti@redhat.com> - initial API and implementation
- *******************************************************************************/
-package org.eclipse.linuxtools.oprofile.tests;
-
-import org.eclipse.core.runtime.Plugin;
-import org.osgi.framework.BundleContext;
-
-public class TestPlugin extends Plugin {
-
- // The plug-in ID
- public static final String PLUGIN_ID = "org.eclipse.linuxtools.oprofile.tests"; //$NON-NLS-1$
-
- public static final String SYMBOL1_FILENAME = "/test/path/for/src/image.cpp"; //$NON-NLS-1$
- public static final String SYMBOL2_FILENAME = "/test/path/for/src/image2.cpp"; //$NON-NLS-1$
-
- public static final String DEP2_SYMBOL1_FILENAME = "dl-lookup.c"; //$NON-NLS-1$
- public static final String DEP2_SYMBOL2_FILENAME = "rawmemchr.c"; //$NON-NLS-1$
- public static final String DEP4_SYMBOL_FILENAME = ""; //$NON-NLS-1$
-
- // The shared instance
- private static TestPlugin plugin = null;
-
- /**
- * The constructor
- */
- public TestPlugin() {
- }
-
- @Override
- public void start(BundleContext context) throws Exception {
- super.start(context);
- plugin = this;
- }
-
- @Override
- public void stop(BundleContext context) throws Exception {
- plugin = null;
- super.stop(context);
- }
-
- /**
- * Returns the shared instance
- *
- * @return the shared instance
- */
- public static TestPlugin getDefault() {
- return plugin;
- }
-
-}
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.tests/src/org/eclipse/linuxtools/oprofile/tests/TestingOpModelEvent.java b/oprofile/org.eclipse.linuxtools.oprofile.tests/src/org/eclipse/linuxtools/oprofile/tests/TestingOpModelEvent.java
deleted file mode 100644
index f5b397bb7aa059c4093998de95c3ff0d4aabc905..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.tests/src/org/eclipse/linuxtools/oprofile/tests/TestingOpModelEvent.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2018 Red Hat, Inc.
- *
- * This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License 2.0
- * which is available at https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- * Kent Sebastian <ksebasti@redhat.com> - initial API and implementation
- *******************************************************************************/
-package org.eclipse.linuxtools.oprofile.tests;
-
-import java.io.FileNotFoundException;
-import java.io.FileReader;
-import java.io.IOException;
-
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.parsers.SAXParserFactory;
-
-import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.linuxtools.internal.oprofile.core.model.OpModelEvent;
-import org.eclipse.linuxtools.internal.oprofile.core.model.OpModelImage;
-import org.eclipse.linuxtools.internal.oprofile.core.model.OpModelSession;
-import org.eclipse.linuxtools.internal.oprofile.core.opxml.OprofileSAXHandler;
-import org.eclipse.linuxtools.internal.oprofile.core.opxml.modeldata.ModelDataProcessor;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-import org.xml.sax.XMLReader;
-
-/*
- * A faked OpModelSession object of a typical image + some dependent images.
- */
-public class TestingOpModelEvent extends OpModelEvent {
- private static final String REL_PATH_TO_TEST_XML = "resources/test_model-data.xml"; //$NON-NLS-1$
- public static final String IMAGE_OUTPUT = "/test/path/for/image, Count: 205000, Dependent Count: 5000\nSymbols: TestFunction1(int), File: /test/path/for/src/image.cpp, Count: 180000\n\tSample: Line #: 42, Count: 130000\n\tSample: Line #: 36, Count: 40000\n\tSample: Line #: 31, Count: 9999\n\tSample: Line #: 39, Count: 1\nSymbols: TestFunction2(int, int), File: /test/path/for/src/image2.cpp, Count: 20000\n\tSample: Line #: 94, Count: 19998\n\tSample: Line #: 12, Count: 1\n\tSample: Line #: 55, Count: 1\nDependent Image: /no-vmlinux, Count: 4400\nDependent Image: /lib64/ld-2.9.so, Count: 300\n\tSymbols: do_lookup_x, File: dl-lookup.c, Count: 299\n\t\tSample: Line #: 0, Count: 299\n\tSymbols: _dl_unload_cache, File: rawmemchr.c, Count: 1\n\t\tSample: Line #: 0, Count: 1\nDependent Image: /usr/lib64/libstdc++.so.6.0.10, Count: 160\nDependent Image: /lib64/libc-2.9.so, Count: 140\n\tSymbols: _IO_new_file_seekoff, File: , Count: 100\n\t\tSample: Line #: 0, Count: 100\n\tSymbols: bcopy, File: , Count: 40\n\t\tSample: Line #: 0, Count: 40\n"; //$NON-NLS-1$
- public static final String IMAGE_OUTPUT_WITHTAB = "/test/path/for/image, Count: 205000, Dependent Count: 5000\n\tSymbols: TestFunction1(int), File: /test/path/for/src/image.cpp, Count: 180000\n\t\tSample: Line #: 42, Count: 130000\n\t\tSample: Line #: 36, Count: 40000\n\t\tSample: Line #: 31, Count: 9999\n\t\tSample: Line #: 39, Count: 1\n\tSymbols: TestFunction2(int, int), File: /test/path/for/src/image2.cpp, Count: 20000\n\t\tSample: Line #: 94, Count: 19998\n\t\tSample: Line #: 12, Count: 1\n\t\tSample: Line #: 55, Count: 1\n\tDependent Image: /no-vmlinux, Count: 4400\n\tDependent Image: /lib64/ld-2.9.so, Count: 300\n\t\tSymbols: do_lookup_x, File: dl-lookup.c, Count: 299\n\t\t\tSample: Line #: 0, Count: 299\n\t\tSymbols: _dl_unload_cache, File: rawmemchr.c, Count: 1\n\t\t\tSample: Line #: 0, Count: 1\n\tDependent Image: /usr/lib64/libstdc++.so.6.0.10, Count: 160\n\tDependent Image: /lib64/libc-2.9.so, Count: 140\n\t\tSymbols: _IO_new_file_seekoff, File: , Count: 100\n\t\t\tSample: Line #: 0, Count: 100\n\t\tSymbols: bcopy, File: , Count: 40\n\t\t\tSample: Line #: 0, Count: 40\n"; //$NON-NLS-1$
-
- public TestingOpModelEvent(OpModelSession session, String name) {
- super(session, name);
- }
- @Override
- protected OpModelImage getNewImage() {
- /* this code mostly taken from OpxmlRunner */
- OpModelImage parsedImage = null;
- try {
- XMLReader reader = null;
- parsedImage = new OpModelImage();
- ModelDataProcessor.CallData image = new ModelDataProcessor.CallData(parsedImage);
- OprofileSAXHandler handler = OprofileSAXHandler.getInstance(image);
-
- // Create XMLReader
- SAXParserFactory factory = SAXParserFactory.newInstance();
- reader = factory.newSAXParser().getXMLReader();
-
- // Set content/error handlers
- reader.setContentHandler(handler);
- reader.setErrorHandler(handler);
-
- String filePath = FileLocator.toFileURL(FileLocator.find(TestPlugin.getDefault().getBundle(), new Path(REL_PATH_TO_TEST_XML), null)).getFile();
- reader.parse(new InputSource(new FileReader(filePath)));
- } catch (FileNotFoundException e) {
- e.printStackTrace();
- } catch (IOException e) {
- e.printStackTrace();
- } catch (SAXException e) {
- e.printStackTrace();
- } catch (ParserConfigurationException e) {
- e.printStackTrace();
- }
-
- return parsedImage;
- }
-}
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.tests/src/org/eclipse/linuxtools/oprofile/tests/TestingOpModelEvent2.java b/oprofile/org.eclipse.linuxtools.oprofile.tests/src/org/eclipse/linuxtools/oprofile/tests/TestingOpModelEvent2.java
deleted file mode 100644
index 62444c0a601c0fc7321230a7cc780fd90af36f45..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.tests/src/org/eclipse/linuxtools/oprofile/tests/TestingOpModelEvent2.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2018 Red Hat, Inc.
- *
- * This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License 2.0
- * which is available at https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- * Kent Sebastian <ksebasti@redhat.com> - initial API and implementation
- *******************************************************************************/
-package org.eclipse.linuxtools.oprofile.tests;
-
-import java.io.FileNotFoundException;
-import java.io.FileReader;
-import java.io.IOException;
-
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.parsers.SAXParserFactory;
-
-import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.linuxtools.internal.oprofile.core.model.OpModelEvent;
-import org.eclipse.linuxtools.internal.oprofile.core.model.OpModelImage;
-import org.eclipse.linuxtools.internal.oprofile.core.model.OpModelSession;
-import org.eclipse.linuxtools.internal.oprofile.core.opxml.OprofileSAXHandler;
-import org.eclipse.linuxtools.internal.oprofile.core.opxml.modeldata.ModelDataProcessor;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-import org.xml.sax.XMLReader;
-
-/*
- * A faked OpModelSession object of a typical image with no dependent images.
- */
-public class TestingOpModelEvent2 extends OpModelEvent {
- private static final String REL_PATH_TO_TEST_XML = "resources/test_model-data_nodepimage.xml"; //$NON-NLS-1$
- public static final String IMAGE_OUTPUT = "/test/path/for/image, Count: 205000, Dependent Count: 5000\nSymbols: TestFunction1(int), File: /test/path/for/src/image.cpp, Count: 180000\n\tSample: Line #: 42, Count: 130000\n\tSample: Line #: 36, Count: 40000\n\tSample: Line #: 31, Count: 9999\n\tSample: Line #: 39, Count: 1\nSymbols: TestFunction2(int, int), File: /test/path/for/src/image2.cpp, Count: 20000\n\tSample: Line #: 94, Count: 19998\n\tSample: Line #: 12, Count: 1\n\tSample: Line #: 55, Count: 1\n"; //$NON-NLS-1$
- public static final String IMAGE_OUTPUT_WITHTAB = "/test/path/for/image, Count: 205000, Dependent Count: 5000\n\tSymbols: TestFunction1(int), File: /test/path/for/src/image.cpp, Count: 180000\n\t\tSample: Line #: 42, Count: 130000\n\t\tSample: Line #: 36, Count: 40000\n\t\tSample: Line #: 31, Count: 9999\n\t\tSample: Line #: 39, Count: 1\n\tSymbols: TestFunction2(int, int), File: /test/path/for/src/image2.cpp, Count: 20000\n\t\tSample: Line #: 94, Count: 19998\n\t\tSample: Line #: 12, Count: 1\n\t\tSample: Line #: 55, Count: 1\n"; //$NON-NLS-1$
-
- public TestingOpModelEvent2(OpModelSession session, String name) {
- super(session, name);
- }
- @Override
- protected OpModelImage getNewImage() {
- /* this code mostly taken from OpxmlRunner */
- OpModelImage parsedImage = null;
- try {
- XMLReader reader = null;
- parsedImage = new OpModelImage();
- ModelDataProcessor.CallData image = new ModelDataProcessor.CallData(parsedImage);
- OprofileSAXHandler handler = OprofileSAXHandler.getInstance(image);
-
- // Create XMLReader
- SAXParserFactory factory = SAXParserFactory.newInstance();
- reader = factory.newSAXParser().getXMLReader();
-
- // Set content/error handlers
- reader.setContentHandler(handler);
- reader.setErrorHandler(handler);
-
- String filePath = FileLocator.toFileURL(FileLocator.find(TestPlugin.getDefault().getBundle(), new Path(REL_PATH_TO_TEST_XML), null)).getFile();
- reader.parse(new InputSource(new FileReader(filePath)));
- } catch (FileNotFoundException e) {
- e.printStackTrace();
- } catch (IOException e) {
- e.printStackTrace();
- } catch (SAXException e) {
- e.printStackTrace();
- } catch (ParserConfigurationException e) {
- e.printStackTrace();
- }
-
- return parsedImage;
- }
-}
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.tests/src/org/eclipse/linuxtools/oprofile/tests/TestingOpModelEvent3.java b/oprofile/org.eclipse.linuxtools.oprofile.tests/src/org/eclipse/linuxtools/oprofile/tests/TestingOpModelEvent3.java
deleted file mode 100644
index a586296052f9f04cbfe249fabdc568dbdee37414..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.tests/src/org/eclipse/linuxtools/oprofile/tests/TestingOpModelEvent3.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2018 Red Hat, Inc.
- *
- * This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License 2.0
- * which is available at https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- * Kent Sebastian <ksebasti@redhat.com> - initial API and implementation
- *******************************************************************************/
-package org.eclipse.linuxtools.oprofile.tests;
-
-import java.io.FileNotFoundException;
-import java.io.FileReader;
-import java.io.IOException;
-
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.parsers.SAXParserFactory;
-
-import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.linuxtools.internal.oprofile.core.model.OpModelEvent;
-import org.eclipse.linuxtools.internal.oprofile.core.model.OpModelImage;
-import org.eclipse.linuxtools.internal.oprofile.core.model.OpModelSession;
-import org.eclipse.linuxtools.internal.oprofile.core.opxml.OprofileSAXHandler;
-import org.eclipse.linuxtools.internal.oprofile.core.opxml.modeldata.ModelDataProcessor;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-import org.xml.sax.XMLReader;
-
-/*
- * A faked OpModelSession object when there are multiple images in the session,
- * simulating when the session was not created from within the eclipse plugin.
- */
-public class TestingOpModelEvent3 extends OpModelEvent {
- private static final String REL_PATH_TO_TEST_XML = "resources/test_model-data_multiple_image.xml"; //$NON-NLS-1$
-
- public TestingOpModelEvent3(OpModelSession session, String name) {
- super(session, name);
- }
- @Override
- protected OpModelImage getNewImage() {
- /* this code mostly taken from OpxmlRunner */
- OpModelImage parsedImage = null;
- try {
- XMLReader reader = null;
- parsedImage = new OpModelImage();
- ModelDataProcessor.CallData image = new ModelDataProcessor.CallData(parsedImage);
- OprofileSAXHandler handler = OprofileSAXHandler.getInstance(image);
-
- // Create XMLReader
- SAXParserFactory factory = SAXParserFactory.newInstance();
- reader = factory.newSAXParser().getXMLReader();
-
- // Set content/error handlers
- reader.setContentHandler(handler);
- reader.setErrorHandler(handler);
-
- String filePath = FileLocator.toFileURL(FileLocator.find(TestPlugin.getDefault().getBundle(), new Path(REL_PATH_TO_TEST_XML), null)).getFile();
- reader.parse(new InputSource(new FileReader(filePath)));
- } catch (FileNotFoundException e) {
- e.printStackTrace();
- } catch (IOException e) {
- e.printStackTrace();
- } catch (SAXException e) {
- e.printStackTrace();
- } catch (ParserConfigurationException e) {
- e.printStackTrace();
- }
-
- return parsedImage;
- }
-}
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.tests/src/org/eclipse/linuxtools/oprofile/tests/TestingOpModelEvent4.java b/oprofile/org.eclipse.linuxtools.oprofile.tests/src/org/eclipse/linuxtools/oprofile/tests/TestingOpModelEvent4.java
deleted file mode 100644
index d6a5100fae7b87a2959da0d30c645f1b09185bd3..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.tests/src/org/eclipse/linuxtools/oprofile/tests/TestingOpModelEvent4.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2018 Red Hat, Inc.
- *
- * This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License 2.0
- * which is available at https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- * Kent Sebastian <ksebasti@redhat.com> - initial API and implementation
- *******************************************************************************/
-package org.eclipse.linuxtools.oprofile.tests;
-
-import org.eclipse.linuxtools.internal.oprofile.core.model.OpModelEvent;
-import org.eclipse.linuxtools.internal.oprofile.core.model.OpModelImage;
-import org.eclipse.linuxtools.internal.oprofile.core.model.OpModelSession;
-
-/*
- * A faked OpModelSession object where there is no image.
- * Note: technically this shouldn't really happen in normal operation
- * of the plugin unless there is a major b0rk-up with the xml parsers..
- */
-public class TestingOpModelEvent4 extends OpModelEvent {
- public TestingOpModelEvent4(OpModelSession session, String name) {
- super(session, name);
- }
- @Override
- protected OpModelImage getNewImage() {
- return null;
- }
-}
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.tests/src/org/eclipse/linuxtools/oprofile/tests/TestingOpModelRoot.java b/oprofile/org.eclipse.linuxtools.oprofile.tests/src/org/eclipse/linuxtools/oprofile/tests/TestingOpModelRoot.java
deleted file mode 100644
index c0ac2ef0eee9c925ac0e671e45f760a2911858ed..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.tests/src/org/eclipse/linuxtools/oprofile/tests/TestingOpModelRoot.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2018 Red Hat, Inc.
- *
- * This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License 2.0
- * which is available at https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- * Kent Sebastian <ksebasti@redhat.com> - initial API and implementation
- *******************************************************************************/
-package org.eclipse.linuxtools.oprofile.tests;
-
-import org.eclipse.linuxtools.internal.oprofile.core.model.OpModelEvent;
-import org.eclipse.linuxtools.internal.oprofile.core.model.OpModelRoot;
-import org.eclipse.linuxtools.internal.oprofile.core.model.OpModelSession;
-
-public class TestingOpModelRoot extends OpModelRoot {
- public static final String ROOT_OUTPUT = "Session: testSession1\n\tEvent: testEvent1e1\n\t\tImage: /test/path/for/image, Count: 205000, Dependent Count: 5000\n\t\t\tSymbols: TestFunction1(int), File: /test/path/for/src/image.cpp, Count: 180000\n\t\t\t\tSample: Line #: 42, Count: 130000\n\t\t\t\tSample: Line #: 36, Count: 40000\n\t\t\t\tSample: Line #: 31, Count: 9999\n\t\t\t\tSample: Line #: 39, Count: 1\n\t\t\tSymbols: TestFunction2(int, int), File: /test/path/for/src/image2.cpp, Count: 20000\n\t\t\t\tSample: Line #: 94, Count: 19998\n\t\t\t\tSample: Line #: 12, Count: 1\n\t\t\t\tSample: Line #: 55, Count: 1\n\t\t\tDependent Image: /no-vmlinux, Count: 4400\n\t\t\tDependent Image: /lib64/ld-2.9.so, Count: 300\n\t\t\t\tSymbols: do_lookup_x, File: dl-lookup.c, Count: 299\n\t\t\t\t\tSample: Line #: 0, Count: 299\n\t\t\t\tSymbols: _dl_unload_cache, File: rawmemchr.c, Count: 1\n\t\t\t\t\tSample: Line #: 0, Count: 1\n\t\t\tDependent Image: /usr/lib64/libstdc++.so.6.0.10, Count: 160\n\t\t\tDependent Image: /lib64/libc-2.9.so, Count: 140\n\t\t\t\tSymbols: _IO_new_file_seekoff, File: , Count: 100\n\t\t\t\t\tSample: Line #: 0, Count: 100\n\t\t\t\tSymbols: bcopy, File: , Count: 40\n\t\t\t\t\tSample: Line #: 0, Count: 40\nSession: testSession2\n\tEvent: testEvent1e2\n\t\tImage: /test/path/for/image, Count: 205000, Dependent Count: 5000\n\t\t\tSymbols: TestFunction1(int), File: /test/path/for/src/image.cpp, Count: 180000\n\t\t\t\tSample: Line #: 42, Count: 130000\n\t\t\t\tSample: Line #: 36, Count: 40000\n\t\t\t\tSample: Line #: 31, Count: 9999\n\t\t\t\tSample: Line #: 39, Count: 1\n\t\t\tSymbols: TestFunction2(int, int), File: /test/path/for/src/image2.cpp, Count: 20000\n\t\t\t\tSample: Line #: 94, Count: 19998\n\t\t\t\tSample: Line #: 12, Count: 1\n\t\t\t\tSample: Line #: 55, Count: 1\n\t\t\tDependent Image: /no-vmlinux, Count: 4400\n\t\t\tDependent Image: /lib64/ld-2.9.so, Count: 300\n\t\t\t\tSymbols: do_lookup_x, File: dl-lookup.c, Count: 299\n\t\t\t\t\tSample: Line #: 0, Count: 299\n\t\t\t\tSymbols: _dl_unload_cache, File: rawmemchr.c, Count: 1\n\t\t\t\t\tSample: Line #: 0, Count: 1\n\t\t\tDependent Image: /usr/lib64/libstdc++.so.6.0.10, Count: 160\n\t\t\tDependent Image: /lib64/libc-2.9.so, Count: 140\n\t\t\t\tSymbols: _IO_new_file_seekoff, File: , Count: 100\n\t\t\t\t\tSample: Line #: 0, Count: 100\n\t\t\t\tSymbols: bcopy, File: , Count: 40\n\t\t\t\t\tSample: Line #: 0, Count: 40\n\tEvent: testEvent2e2\n\t\tImage: /test/path/for/image, Count: 200000\n\t\t\tSymbols: TestFunction1(int), File: /test/path/for/src/image.cpp, Count: 180000\n\t\t\t\tSample: Line #: 42, Count: 130000\n\t\t\t\tSample: Line #: 36, Count: 40000\n\t\t\t\tSample: Line #: 31, Count: 9999\n\t\t\t\tSample: Line #: 39, Count: 1\n\t\t\tSymbols: TestFunction2(int, int), File: /test/path/for/src/image2.cpp, Count: 20000\n\t\t\t\tSample: Line #: 94, Count: 19998\n\t\t\t\tSample: Line #: 12, Count: 1\n\t\t\t\tSample: Line #: 55, Count: 1\n\tEvent: testEvent3e2\n\t\tImage: , Count: -1\n\tEvent: testEvent4e2\n"; //$NON-NLS-1$
- public static final String NAME_E1 = "testSession1"; //$NON-NLS-1$
- public static final String NAME_E2 = "testSession2"; //$NON-NLS-1$
- public static final String NAME_E1_S1 = "testEvent1e1"; //$NON-NLS-1$
- public static final String NAME_E2_S1 = "testEvent1e2"; //$NON-NLS-1$
- public static final String NAME_E2_S2 = "testEvent2e2"; //$NON-NLS-1$
- public static final String NAME_E2_S3 = "testEvent3e2"; //$NON-NLS-1$
- public static final String NAME_E2_S4 = "testEvent4e2"; //$NON-NLS-1$
- @Override
- protected OpModelSession[] getNewSessions() {
- //fake running opxml and simply return hand-made events
- OpModelSession[] e = {new OpModelSession(NAME_E1), new OpModelSession(NAME_E2), null};
- e[0].setEvents(new TestingOpModelEvent[] {new TestingOpModelEvent(e[0], NAME_E1_S1)});
- e[1].setEvents(new OpModelEvent[] {
- new TestingOpModelEvent(e[1], NAME_E2_S1),
- new TestingOpModelEvent2(e[1], NAME_E2_S2),
- new TestingOpModelEvent3(e[1], NAME_E2_S3),
- new TestingOpModelEvent4(e[1], NAME_E2_S4)});
- return e;
- }
-}
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.ui.tests/.classpath b/oprofile/org.eclipse.linuxtools.oprofile.ui.tests/.classpath
deleted file mode 100644
index 43b986286a9e5fd1828793fa4b2353d02ab8625f..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.ui.tests/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="output" path="target/classes"/>
-</classpath>
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.ui.tests/.gitignore b/oprofile/org.eclipse.linuxtools.oprofile.ui.tests/.gitignore
deleted file mode 100644
index 8d94ef8debe45a7bc3866f985fdc60d41c12822f..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.ui.tests/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-bin
-@dot
-javaCompiler...args
-build.xml
-target
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.ui.tests/.project b/oprofile/org.eclipse.linuxtools.oprofile.ui.tests/.project
deleted file mode 100644
index cebd05a8ea9fbae28d6f291478211352a8d157ea..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.ui.tests/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.linuxtools.oprofile.ui.tests</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.ui.tests/.settings/org.eclipse.jdt.core.prefs b/oprofile/org.eclipse.linuxtools.oprofile.ui.tests/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index dd1cfb45b2b493044d33fa1db157931cffb2b1fb..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.ui.tests/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,99 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled
-org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
-org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull
-org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault
-org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
-org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.8
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
-org.eclipse.jdt.core.compiler.problem.deadCode=warning
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=warning
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDefaultCase=ignore
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning
-org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled
-org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=warning
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning
-org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning
-org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error
-org.eclipse.jdt.core.compiler.problem.nullReference=warning
-org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error
-org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
-org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
-org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
-org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=warning
-org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
-org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
-org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=disabled
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=warning
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=disabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=disabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=enabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning
-org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.8
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.ui.tests/.settings/org.eclipse.jdt.ui.prefs b/oprofile/org.eclipse.linuxtools.oprofile.ui.tests/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index a432cbf58c4cff159abf3b2349d761896bf761d7..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.ui.tests/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,54 +0,0 @@
-eclipse.preferences.version=1
-editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
-sp_cleanup.add_default_serial_version_id=true
-sp_cleanup.add_generated_serial_version_id=false
-sp_cleanup.add_missing_annotations=true
-sp_cleanup.add_missing_deprecated_annotations=true
-sp_cleanup.add_missing_methods=false
-sp_cleanup.add_missing_nls_tags=false
-sp_cleanup.add_missing_override_annotations=true
-sp_cleanup.add_missing_override_annotations_interface_methods=true
-sp_cleanup.add_serial_version_id=false
-sp_cleanup.always_use_blocks=true
-sp_cleanup.always_use_parentheses_in_expressions=false
-sp_cleanup.always_use_this_for_non_static_field_access=false
-sp_cleanup.always_use_this_for_non_static_method_access=false
-sp_cleanup.convert_to_enhanced_for_loop=false
-sp_cleanup.correct_indentation=false
-sp_cleanup.format_source_code=false
-sp_cleanup.format_source_code_changes_only=false
-sp_cleanup.make_local_variable_final=true
-sp_cleanup.make_parameters_final=false
-sp_cleanup.make_private_fields_final=true
-sp_cleanup.make_type_abstract_if_missing_method=false
-sp_cleanup.make_variable_declarations_final=false
-sp_cleanup.never_use_blocks=false
-sp_cleanup.never_use_parentheses_in_expressions=true
-sp_cleanup.on_save_use_additional_actions=true
-sp_cleanup.organize_imports=true
-sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
-sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
-sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
-sp_cleanup.qualify_static_member_accesses_with_declaring_class=false
-sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
-sp_cleanup.remove_private_constructors=true
-sp_cleanup.remove_trailing_whitespaces=false
-sp_cleanup.remove_trailing_whitespaces_all=true
-sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
-sp_cleanup.remove_unnecessary_casts=true
-sp_cleanup.remove_unnecessary_nls_tags=false
-sp_cleanup.remove_unused_imports=false
-sp_cleanup.remove_unused_local_variables=false
-sp_cleanup.remove_unused_private_fields=true
-sp_cleanup.remove_unused_private_members=false
-sp_cleanup.remove_unused_private_methods=true
-sp_cleanup.remove_unused_private_types=true
-sp_cleanup.sort_members=false
-sp_cleanup.sort_members_all=false
-sp_cleanup.use_blocks=false
-sp_cleanup.use_blocks_only_for_return_and_throw=false
-sp_cleanup.use_parentheses_in_expressions=false
-sp_cleanup.use_this_for_non_static_field_access=false
-sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
-sp_cleanup.use_this_for_non_static_method_access=false
-sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.ui.tests/META-INF/MANIFEST.MF b/oprofile/org.eclipse.linuxtools.oprofile.ui.tests/META-INF/MANIFEST.MF
deleted file mode 100644
index 4cbdd1716065b1e251afdfaf8793693e52101583..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.ui.tests/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,13 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %bundleName
-Bundle-SymbolicName: org.eclipse.linuxtools.oprofile.ui.tests
-Bundle-Version: 1.0.1.qualifier
-Bundle-Vendor: %bundleProvider
-Require-Bundle: org.junit;bundle-version="4.0.0"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Fragment-Host: org.eclipse.linuxtools.oprofile.ui
-Bundle-ActivationPolicy: lazy
-Import-Package: org.eclipse.linuxtools.oprofile.tests
-Bundle-Localization: plugin
-Automatic-Module-Name: org.eclipse.linuxtools.oprofile.ui.tests
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.ui.tests/about.html b/oprofile/org.eclipse.linuxtools.oprofile.ui.tests/about.html
deleted file mode 100644
index 164f781a8fd2195f87c3d3d49946d56bce58992f..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.ui.tests/about.html
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<title>About</title>
-</head>
-<body lang="EN-US">
- <h2>About This Content</h2>
-
- <p>November 30, 2017</p>
- <h3>License</h3>
-
- <p>
- The Eclipse Foundation makes available all content in this plug-in
- ("Content"). Unless otherwise indicated below, the Content
- is provided to you under the terms and conditions of the Eclipse
- Public License Version 2.0 ("EPL"). A copy of the EPL is
- available at <a href="http://www.eclipse.org/legal/epl-2.0">http://www.eclipse.org/legal/epl-2.0</a>.
- For purposes of the EPL, "Program" will mean the Content.
- </p>
-
- <p>
- If you did not receive this Content directly from the Eclipse
- Foundation, the Content is being redistributed by another party
- ("Redistributor") and different terms and conditions may
- apply to your use of any object code in the Content. Check the
- Redistributor's license that was provided with the Content. If no such
- license exists, contact the Redistributor. Unless otherwise indicated
- below, the terms and conditions of the EPL still apply to any source
- code in the Content and such source code may be obtained at <a
- href="http://www.eclipse.org/">http://www.eclipse.org</a>.
- </p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.ui.tests/build.properties b/oprofile/org.eclipse.linuxtools.oprofile.ui.tests/build.properties
deleted file mode 100644
index d219242d5f306c757e12b32b5315163e80b47cb5..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.ui.tests/build.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-source.. = src/
-bin.includes = META-INF/,\
- .,\
- plugin.properties
-individualSourceBundles=true
-src.includes = about.html
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.ui.tests/plugin.properties b/oprofile/org.eclipse.linuxtools.oprofile.ui.tests/plugin.properties
deleted file mode 100644
index a7eef039b212825d791bc7a35349bb74e7a11b70..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.ui.tests/plugin.properties
+++ /dev/null
@@ -1,14 +0,0 @@
-#*******************************************************************************
-# Copyright (c) 2009, 2018 Red Hat, Inc.
-#
-# This program and the accompanying materials are made
-# available under the terms of the Eclipse Public License 2.0
-# which is available at https://www.eclipse.org/legal/epl-2.0/
-#
-# SPDX-License-Identifier: EPL-2.0
-#
-# Contributors:
-# Kent Sebastian <ksebasti@redhat.com> - initial API and implementation
-#*******************************************************************************
-bundleName=OProfile Ui Tests Plug-in
-bundleProvider=Eclipse Linux Tools
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.ui.tests/pom.xml b/oprofile/org.eclipse.linuxtools.oprofile.ui.tests/pom.xml
deleted file mode 100644
index 2d63d742fde941f366efb6834217314b488c1127..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.ui.tests/pom.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (C) 2011, 2018 Red Hat, Inc.
-
- This program and the accompanying materials are made
- available under the terms of the Eclipse Public License 2.0
- which is available at https://www.eclipse.org/legal/epl-2.0/
-
- SPDX-License-Identifier: EPL-2.0
--->
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <artifactId>linuxtools-oprofile-parent</artifactId>
- <groupId>org.eclipse.linuxtools.oprofile</groupId>
- <version>7.4.0</version>
- </parent>
-
- <artifactId>org.eclipse.linuxtools.oprofile.ui.tests</artifactId>
- <version>1.0.1-SNAPSHOT</version>
- <packaging>eclipse-test-plugin</packaging>
-
- <name>Linux Tools OProfile UI Tests Plug-in</name>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-source-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
-
-</project>
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.ui.tests/src/org/eclipse/linuxtools/oprofile/ui/tests/TestUiDataModel.java b/oprofile/org.eclipse.linuxtools.oprofile.ui.tests/src/org/eclipse/linuxtools/oprofile/ui/tests/TestUiDataModel.java
deleted file mode 100644
index 23c5d42cf1d8f4d373fbd092a5f11e012b5e84a0..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.ui.tests/src/org/eclipse/linuxtools/oprofile/ui/tests/TestUiDataModel.java
+++ /dev/null
@@ -1,681 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2018 Red Hat, Inc.
- *
- * This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License 2.0
- * which is available at https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- * Kent Sebastian <ksebasti@redhat.com> - initial API and implementation
- *******************************************************************************/
-package org.eclipse.linuxtools.oprofile.ui.tests;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-
-import org.eclipse.linuxtools.internal.oprofile.core.model.OpModelSession;
-import org.eclipse.linuxtools.oprofile.tests.TestPlugin;
-import org.eclipse.linuxtools.oprofile.tests.TestingOpModelRoot;
-import org.eclipse.linuxtools.oprofile.ui.model.IUiModelElement;
-import org.eclipse.linuxtools.oprofile.ui.model.UiModelRoot;
-import org.eclipse.linuxtools.oprofile.ui.model.UiModelSample;
-import org.eclipse.linuxtools.oprofile.ui.model.UiModelSession;
-import org.eclipse.linuxtools.oprofile.ui.model.UiModelSymbol;
-import org.junit.Before;
-import org.junit.Test;
-
-public class TestUiDataModel {
-
- private static class TestingUiModelRoot extends UiModelRoot {
- @Override
- protected OpModelSession[] getModelDataEvents() {
- TestingOpModelRoot modelRoot = new TestingOpModelRoot();
- modelRoot.refreshModel();
- return modelRoot.getSessions();
- }
- }
-
- private static class TestingUiModelRoot2 extends UiModelRoot {
- @Override
- protected OpModelSession[] getModelDataEvents() {
- return null;
- }
- }
-
- private TestingUiModelRoot _uiModelRoot;
- private TestingUiModelRoot2 _uiModelRoot2;
-
-
- @Before
- public void setUp() {
- _uiModelRoot = new TestingUiModelRoot();
- _uiModelRoot.refreshModel();
-
- _uiModelRoot2 = new TestingUiModelRoot2();
- _uiModelRoot2.refreshModel();
- }
-
- @Test
- public void testParse() {
- /* test UiModelRoot */
- assertNull(_uiModelRoot2.getLabelImage());
- assertNull(_uiModelRoot2.getParent());
- assertNull(_uiModelRoot2.getLabelText());
- assertTrue(_uiModelRoot2.hasChildren());
- IUiModelElement r2_events[] = _uiModelRoot2.getChildren();
- assertNotNull(r2_events);
- assertEquals(1, r2_events.length);
- IUiModelElement r2_event1 = r2_events[0];
- assertFalse(r2_event1.hasChildren());
- assertNull(r2_event1.getChildren());
- assertNull(r2_event1.getParent());
- assertNotNull(r2_event1.getLabelImage());
- assertNotNull(r2_event1.getLabelText());
-
- assertNull(_uiModelRoot.getLabelImage());
- assertNull(_uiModelRoot.getParent());
- assertNull(_uiModelRoot.getLabelText());
- assertTrue(_uiModelRoot.hasChildren());
-
- /* test UiModelSession*/
- IUiModelElement sessions[] = _uiModelRoot.getChildren();
- assertNotNull(sessions);
- assertEquals(3, sessions.length);
- assertNotNull(sessions[0]);
- assertNotNull(sessions[1]);
- assertNotNull(sessions[2]);
-
- assertEquals(TestingOpModelRoot.NAME_E1, sessions[0].toString());
- assertEquals(TestingOpModelRoot.NAME_E1, sessions[0].getLabelText());
- assertTrue(sessions[0].hasChildren());
- assertNull(sessions[0].getParent()); //events are top level tree elements
- assertNotNull(sessions[0].getLabelImage());
-
- assertEquals(TestingOpModelRoot.NAME_E2, sessions[1].toString());
- assertEquals(TestingOpModelRoot.NAME_E2, sessions[1].getLabelText());
- assertTrue(sessions[1].hasChildren());
- assertNull(sessions[1].getParent()); //events are top level tree elements
- assertNotNull(sessions[1].getLabelImage());
-
-
- /* test UiModelEvent */
- IUiModelElement[] e1_events = sessions[0].getChildren(), e2_events = sessions[1].getChildren();
- assertNotNull(e1_events);
- assertNotNull(e2_events);
- assertEquals(1, e1_events.length);
- assertEquals(4, e2_events.length);
- assertNotNull(e1_events[0]);
- assertNotNull(e2_events[0]);
- assertNotNull(e2_events[1]);
- assertNotNull(e2_events[2]);
- assertNotNull(e2_events[3]);
-
- assertEquals(TestingOpModelRoot.NAME_E1_S1, e1_events[0].toString());
- assertEquals(TestingOpModelRoot.NAME_E1_S1, e1_events[0].getLabelText());
- assertFalse(((UiModelSession)e1_events[0].getParent()).isDefaultSession());
- assertTrue(e1_events[0].hasChildren());
- assertEquals(sessions[0], e1_events[0].getParent());
- assertNotNull(e1_events[0].getLabelImage());
-
- assertEquals(TestingOpModelRoot.NAME_E2_S1, e2_events[0].toString());
- assertEquals(TestingOpModelRoot.NAME_E2_S1, e2_events[0].getLabelText());
- assertFalse(((UiModelSession)e2_events[0].getParent()).isDefaultSession());
- assertTrue(e2_events[0].hasChildren());
- assertEquals(sessions[1], e2_events[0].getParent());
- assertNotNull(e2_events[0].getLabelImage());
-
- assertEquals(TestingOpModelRoot.NAME_E2_S2, e2_events[1].toString());
- assertEquals(TestingOpModelRoot.NAME_E2_S2, e2_events[1].getLabelText());
- assertFalse(((UiModelSession)e2_events[1].getParent()).isDefaultSession());
- assertTrue(e2_events[1].hasChildren());
- assertEquals(sessions[1], e2_events[1].getParent());
- assertNotNull(e2_events[1].getLabelImage());
-
- assertEquals(TestingOpModelRoot.NAME_E2_S3, e2_events[2].toString());
- assertEquals(TestingOpModelRoot.NAME_E2_S3, e2_events[2].getLabelText());
- assertFalse(((UiModelSession)e2_events[2].getParent()).isDefaultSession());
- assertTrue(e2_events[2].hasChildren());
- assertEquals(sessions[1], e2_events[2].getParent());
- assertNotNull(e2_events[2].getLabelImage());
-
- assertEquals(TestingOpModelRoot.NAME_E2_S4, e2_events[3].toString());
- assertEquals(TestingOpModelRoot.NAME_E2_S4, e2_events[3].getLabelText());
- assertFalse(((UiModelSession)e2_events[3].getParent()).isDefaultSession());
- assertFalse(e2_events[3].hasChildren());
- assertEquals(sessions[1], e2_events[3].getParent());
- assertNotNull(e2_events[3].getLabelImage());
-
- /* test UiModelImage and UiModelDependent */
- IUiModelElement[] e1_s1_images = e1_events[0].getChildren(),
- e2_s1_images = e2_events[0].getChildren(),
- e2_s2_images = e2_events[1].getChildren(),
- e2_s3_images = e2_events[2].getChildren(),
- e2_s4_images = e2_events[3].getChildren();
-
- assertNotNull(e1_s1_images);
- assertNotNull(e2_s1_images);
- assertNotNull(e2_s2_images);
- assertNotNull(e2_s3_images);
- assertNotNull(e2_s4_images);
- assertEquals(2, e1_s1_images.length); //#2 is a dep image
- assertEquals(2, e2_s1_images.length); //#2 is a dep image
- assertEquals(1, e2_s2_images.length);
- assertEquals(1, e2_s3_images.length);
- assertEquals(1, e2_s4_images.length);
- assertNotNull(e1_s1_images[0]);
- assertNotNull(e1_s1_images[1]);
- assertNotNull(e2_s1_images[0]);
- assertNotNull(e2_s1_images[1]);
- assertNotNull(e2_s2_images[0]);
- assertNotNull(e2_s3_images[0]);
- assertNull(e2_s4_images[0]);
-
- //dont test string output -- strings are i18n'd and L10n'd
- assertNotNull(e1_s1_images[0].toString());
- assertNotNull(e1_s1_images[0].getLabelText());
- assertTrue(e1_s1_images[0].hasChildren());
- assertEquals(e1_events[0], e1_s1_images[0].getParent());
- assertNotNull(e1_s1_images[0].getLabelImage());
-
- assertNotNull(e1_s1_images[1].toString());
- assertNotNull(e1_s1_images[1].getLabelText());
- assertTrue(e1_s1_images[1].hasChildren());
- assertEquals(e1_events[0], e1_s1_images[1].getParent());
- assertNotNull(e1_s1_images[1].getLabelImage());
-
- assertNotNull(e2_s1_images[0].toString());
- assertNotNull(e2_s1_images[0].getLabelText());
- assertTrue(e2_s1_images[0].hasChildren());
- assertEquals(e2_events[0], e2_s1_images[0].getParent());
- assertNotNull(e2_s1_images[0].getLabelImage());
-
- assertNotNull(e2_s1_images[1].toString());
- assertNotNull(e2_s1_images[1].getLabelText());
- assertTrue(e2_s1_images[1].hasChildren());
- assertEquals(e2_events[0], e2_s1_images[1].getParent());
- assertNotNull(e2_s1_images[1].getLabelImage());
-
- assertNotNull(e2_s2_images[0].toString());
- assertNotNull(e2_s2_images[0].getLabelText());
- assertTrue(e2_s2_images[0].hasChildren());
- assertEquals(e2_events[1], e2_s2_images[0].getParent());
- assertNotNull(e2_s2_images[0].getLabelImage());
-
- assertNotNull(e2_s3_images[0].toString());
- assertNotNull(e2_s3_images[0].getLabelText());
- assertFalse(e2_s3_images[0].hasChildren());
- assertEquals(e2_events[2], e2_s3_images[0].getParent());
- assertNotNull(e2_s3_images[0].getLabelImage());
-
- /* test UiModelSymbol */
- IUiModelElement[] e1_s1_i1_symbols = e1_s1_images[0].getChildren(),
- e1_s1_i2_depimages = e1_s1_images[1].getChildren(),
- e2_s1_i1_symbols = e2_s1_images[0].getChildren(),
- e2_s1_i2_depimages = e2_s1_images[1].getChildren(),
- e2_s2_i1_symbols = e2_s2_images[0].getChildren();
-
- assertNotNull(e1_s1_i1_symbols);
- assertNotNull(e1_s1_i2_depimages);
- assertNotNull(e2_s1_i1_symbols);
- assertNotNull(e2_s1_i2_depimages);
- assertNotNull(e2_s2_i1_symbols);
- assertEquals(2, e1_s1_i1_symbols.length);
- assertEquals(4, e1_s1_i2_depimages.length);
- assertEquals(2, e2_s1_i1_symbols.length);
- assertEquals(4, e2_s1_i2_depimages.length);
- assertEquals(2, e2_s2_i1_symbols.length);
- assertNotNull(e1_s1_i1_symbols[0]);
- assertNotNull(e1_s1_i1_symbols[1]);
- assertNotNull(e1_s1_i2_depimages[0]);
- assertNotNull(e1_s1_i2_depimages[1]);
- assertNotNull(e1_s1_i2_depimages[2]);
- assertNotNull(e1_s1_i2_depimages[3]);
- assertNotNull(e2_s1_i1_symbols[0]);
- assertNotNull(e2_s1_i1_symbols[1]);
- assertNotNull(e2_s1_i2_depimages[0]);
- assertNotNull(e2_s1_i2_depimages[1]);
- assertNotNull(e2_s1_i2_depimages[2]);
- assertNotNull(e2_s1_i2_depimages[3]);
- assertNotNull(e2_s2_i1_symbols[0]);
- assertNotNull(e2_s2_i1_symbols[1]);
-
- assertNotNull(e1_s1_i1_symbols[0].toString());
- assertNotNull(e1_s1_i1_symbols[0].getLabelText());
- assertEquals(TestPlugin.SYMBOL1_FILENAME, ((UiModelSymbol)e1_s1_i1_symbols[0]).getFileName());
- assertTrue(e1_s1_i1_symbols[0].hasChildren());
- assertEquals(e1_s1_images[0], e1_s1_i1_symbols[0].getParent());
- assertNotNull(e1_s1_i1_symbols[0].getLabelImage());
-
- assertNotNull(e1_s1_i1_symbols[1].toString());
- assertNotNull(e1_s1_i1_symbols[1].getLabelText());
- assertEquals(TestPlugin.SYMBOL2_FILENAME, ((UiModelSymbol)e1_s1_i1_symbols[1]).getFileName());
- assertTrue(e1_s1_i1_symbols[1].hasChildren());
- assertEquals(e1_s1_images[0], e1_s1_i1_symbols[1].getParent());
- assertNotNull(e1_s1_i1_symbols[1].getLabelImage());
-
- assertNotNull(e1_s1_i2_depimages[0].toString());
- assertNotNull(e1_s1_i2_depimages[0].getLabelText());
- assertFalse(e1_s1_i2_depimages[0].hasChildren());
- assertEquals(e1_s1_images[1], e1_s1_i2_depimages[0].getParent());
- assertNotNull(e1_s1_i2_depimages[0].getLabelImage());
-
- assertNotNull(e1_s1_i2_depimages[1].toString());
- assertNotNull(e1_s1_i2_depimages[1].getLabelText());
- assertTrue(e1_s1_i2_depimages[1].hasChildren());
- assertEquals(e1_s1_images[1], e1_s1_i2_depimages[1].getParent());
- assertNotNull(e1_s1_i2_depimages[1].getLabelImage());
-
- assertNotNull(e1_s1_i2_depimages[2].toString());
- assertNotNull(e1_s1_i2_depimages[2].getLabelText());
- assertFalse(e1_s1_i2_depimages[2].hasChildren());
- assertEquals(e1_s1_images[1], e1_s1_i2_depimages[2].getParent());
- assertNotNull(e1_s1_i2_depimages[2].getLabelImage());
-
- assertNotNull(e1_s1_i2_depimages[3].toString());
- assertNotNull(e1_s1_i2_depimages[3].getLabelText());
- assertTrue(e1_s1_i2_depimages[3].hasChildren());
- assertEquals(e1_s1_images[1], e1_s1_i2_depimages[3].getParent());
- assertNotNull(e1_s1_i2_depimages[3].getLabelImage());
-
- assertNotNull(e2_s1_i1_symbols[0].toString());
- assertNotNull(e2_s1_i1_symbols[0].getLabelText());
- assertEquals(TestPlugin.SYMBOL1_FILENAME, ((UiModelSymbol)e2_s1_i1_symbols[0]).getFileName());
- assertTrue(e2_s1_i1_symbols[0].hasChildren());
- assertEquals(e2_s1_images[0], e2_s1_i1_symbols[0].getParent());
- assertNotNull(e2_s1_i1_symbols[0].getLabelImage());
-
- assertNotNull(e2_s1_i1_symbols[1].toString());
- assertNotNull(e2_s1_i1_symbols[1].getLabelText());
- assertEquals(TestPlugin.SYMBOL2_FILENAME, ((UiModelSymbol)e2_s1_i1_symbols[1]).getFileName());
- assertTrue(e2_s1_i1_symbols[1].hasChildren());
- assertEquals(e2_s1_images[0], e2_s1_i1_symbols[1].getParent());
- assertNotNull(e2_s1_i1_symbols[1].getLabelImage());
-
- assertNotNull(e2_s1_i2_depimages[0].toString());
- assertNotNull(e2_s1_i2_depimages[0].getLabelText());
- assertFalse(e2_s1_i2_depimages[0].hasChildren());
- assertEquals(e2_s1_images[1], e2_s1_i2_depimages[0].getParent());
- assertNotNull(e2_s1_i2_depimages[0].getLabelImage());
-
- assertNotNull(e2_s1_i2_depimages[1].toString());
- assertNotNull(e2_s1_i2_depimages[1].getLabelText());
- assertTrue(e2_s1_i2_depimages[1].hasChildren());
- assertEquals(e2_s1_images[1], e2_s1_i2_depimages[1].getParent());
- assertNotNull(e2_s1_i2_depimages[1].getLabelImage());
-
- assertNotNull(e2_s1_i2_depimages[2].toString());
- assertNotNull(e2_s1_i2_depimages[2].getLabelText());
- assertFalse(e2_s1_i2_depimages[2].hasChildren());
- assertEquals(e2_s1_images[1], e2_s1_i2_depimages[2].getParent());
- assertNotNull(e2_s1_i2_depimages[2].getLabelImage());
-
- assertNotNull(e2_s1_i2_depimages[3].toString());
- assertNotNull(e2_s1_i2_depimages[3].getLabelText());
- assertTrue(e2_s1_i2_depimages[3].hasChildren());
- assertEquals(e2_s1_images[1], e2_s1_i2_depimages[3].getParent());
- assertNotNull(e2_s1_i2_depimages[3].getLabelImage());
-
- assertNotNull(e2_s2_i1_symbols[0].toString());
- assertNotNull(e2_s2_i1_symbols[0].getLabelText());
- assertEquals(TestPlugin.SYMBOL1_FILENAME, ((UiModelSymbol)e2_s2_i1_symbols[0]).getFileName());
- assertTrue(e2_s2_i1_symbols[0].hasChildren());
- assertEquals(e2_s2_images[0], e2_s2_i1_symbols[0].getParent());
- assertNotNull(e2_s2_i1_symbols[0].getLabelImage());
-
- assertNotNull(e2_s2_i1_symbols[1].toString());
- assertNotNull(e2_s2_i1_symbols[1].getLabelText());
- assertEquals(TestPlugin.SYMBOL2_FILENAME, ((UiModelSymbol)e2_s2_i1_symbols[1]).getFileName());
- assertTrue(e2_s2_i1_symbols[1].hasChildren());
- assertEquals(e2_s2_images[0], e2_s2_i1_symbols[1].getParent());
- assertNotNull(e2_s2_i1_symbols[1].getLabelImage());
-
- /* test the symbols from the dep images */
- IUiModelElement[] e1_s1_i2_dep1_symbols = e1_s1_i2_depimages[0].getChildren(),
- e1_s1_i2_dep2_symbols = e1_s1_i2_depimages[1].getChildren(),
- e1_s1_i2_dep3_symbols = e1_s1_i2_depimages[2].getChildren(),
- e1_s1_i2_dep4_symbols = e1_s1_i2_depimages[3].getChildren(),
- e2_s1_i2_dep1_symbols = e2_s1_i2_depimages[0].getChildren(),
- e2_s1_i2_dep2_symbols = e2_s1_i2_depimages[1].getChildren(),
- e2_s1_i2_dep3_symbols = e2_s1_i2_depimages[2].getChildren(),
- e2_s1_i2_dep4_symbols = e2_s1_i2_depimages[3].getChildren();
-
- assertNull(e1_s1_i2_dep1_symbols);
- assertNotNull(e1_s1_i2_dep2_symbols);
- assertNull(e1_s1_i2_dep3_symbols);
- assertNotNull(e1_s1_i2_dep4_symbols);
- assertNull(e2_s1_i2_dep1_symbols);
- assertNotNull(e2_s1_i2_dep2_symbols);
- assertNull(e2_s1_i2_dep3_symbols);
- assertNotNull(e2_s1_i2_dep4_symbols);
- assertEquals(2, e1_s1_i2_dep2_symbols.length);
- assertEquals(2, e1_s1_i2_dep4_symbols.length);
- assertEquals(2, e2_s1_i2_dep2_symbols.length);
- assertEquals(2, e2_s1_i2_dep4_symbols.length);
- assertNotNull(e1_s1_i2_dep2_symbols[0]);
- assertNotNull(e1_s1_i2_dep2_symbols[1]);
- assertNotNull(e1_s1_i2_dep4_symbols[0]);
- assertNotNull(e1_s1_i2_dep4_symbols[1]);
- assertNotNull(e2_s1_i2_dep2_symbols[0]);
- assertNotNull(e2_s1_i2_dep2_symbols[1]);
- assertNotNull(e2_s1_i2_dep4_symbols[0]);
- assertNotNull(e2_s1_i2_dep4_symbols[1]);
-
- assertNotNull(e1_s1_i2_dep2_symbols[0].toString());
- assertNotNull(e1_s1_i2_dep2_symbols[0].getLabelText());
- assertEquals(TestPlugin.DEP2_SYMBOL1_FILENAME, ((UiModelSymbol)e1_s1_i2_dep2_symbols[0]).getFileName());
- assertFalse(e1_s1_i2_dep2_symbols[0].hasChildren());
- assertEquals(e1_s1_i2_depimages[1], e1_s1_i2_dep2_symbols[0].getParent());
- assertNotNull(e1_s1_i2_dep2_symbols[0].getLabelImage());
-
- assertNotNull(e1_s1_i2_dep2_symbols[1].toString());
- assertNotNull(e1_s1_i2_dep2_symbols[1].getLabelText());
- assertEquals(TestPlugin.DEP2_SYMBOL2_FILENAME, ((UiModelSymbol)e1_s1_i2_dep2_symbols[1]).getFileName());
- assertFalse(e1_s1_i2_dep2_symbols[1].hasChildren());
- assertEquals(e1_s1_i2_depimages[1], e1_s1_i2_dep2_symbols[1].getParent());
- assertNotNull(e1_s1_i2_dep2_symbols[1].getLabelImage());
-
- assertNotNull(e1_s1_i2_dep4_symbols[0].toString());
- assertNotNull(e1_s1_i2_dep4_symbols[0].getLabelText());
- assertEquals(TestPlugin.DEP4_SYMBOL_FILENAME, ((UiModelSymbol)e1_s1_i2_dep4_symbols[0]).getFileName());
- assertFalse(e1_s1_i2_dep4_symbols[0].hasChildren());
- assertEquals(e1_s1_i2_depimages[3], e1_s1_i2_dep4_symbols[0].getParent());
- assertNotNull(e1_s1_i2_dep4_symbols[0].getLabelImage());
-
- assertNotNull(e1_s1_i2_dep4_symbols[1].toString());
- assertNotNull(e1_s1_i2_dep4_symbols[1].getLabelText());
- assertEquals(TestPlugin.DEP4_SYMBOL_FILENAME, ((UiModelSymbol)e1_s1_i2_dep4_symbols[1]).getFileName());
- assertFalse(e1_s1_i2_dep4_symbols[1].hasChildren());
- assertEquals(e1_s1_i2_depimages[3], e1_s1_i2_dep4_symbols[1].getParent());
- assertNotNull(e1_s1_i2_dep4_symbols[1].getLabelImage());
-
- assertNotNull(e2_s1_i2_dep2_symbols[0].toString());
- assertNotNull(e2_s1_i2_dep2_symbols[0].getLabelText());
- assertEquals(TestPlugin.DEP2_SYMBOL1_FILENAME, ((UiModelSymbol)e2_s1_i2_dep2_symbols[0]).getFileName());
- assertFalse(e2_s1_i2_dep2_symbols[0].hasChildren());
- assertEquals(e2_s1_i2_depimages[1], e2_s1_i2_dep2_symbols[0].getParent());
- assertNotNull(e2_s1_i2_dep2_symbols[0].getLabelImage());
-
- assertNotNull(e2_s1_i2_dep2_symbols[1].toString());
- assertNotNull(e2_s1_i2_dep2_symbols[1].getLabelText());
- assertEquals(TestPlugin.DEP2_SYMBOL2_FILENAME, ((UiModelSymbol)e2_s1_i2_dep2_symbols[1]).getFileName());
- assertFalse(e2_s1_i2_dep2_symbols[1].hasChildren());
- assertEquals(e2_s1_i2_depimages[1], e2_s1_i2_dep2_symbols[1].getParent());
- assertNotNull(e2_s1_i2_dep2_symbols[1].getLabelImage());
-
- assertNotNull(e2_s1_i2_dep4_symbols[0].toString());
- assertNotNull(e2_s1_i2_dep4_symbols[0].getLabelText());
- assertEquals(TestPlugin.DEP4_SYMBOL_FILENAME, ((UiModelSymbol)e2_s1_i2_dep4_symbols[0]).getFileName());
- assertFalse(e2_s1_i2_dep4_symbols[0].hasChildren());
- assertEquals(e2_s1_i2_depimages[3], e2_s1_i2_dep4_symbols[0].getParent());
- assertNotNull(e2_s1_i2_dep4_symbols[0].getLabelImage());
-
- assertNotNull(e2_s1_i2_dep4_symbols[1].toString());
- assertNotNull(e2_s1_i2_dep4_symbols[1].getLabelText());
- assertEquals(TestPlugin.DEP4_SYMBOL_FILENAME, ((UiModelSymbol)e2_s1_i2_dep4_symbols[1]).getFileName());
- assertFalse(e2_s1_i2_dep4_symbols[1].hasChildren());
- assertEquals(e2_s1_i2_depimages[3], e2_s1_i2_dep4_symbols[1].getParent());
- assertNotNull(e2_s1_i2_dep4_symbols[1].getLabelImage());
-
- /* test UiModelSample */
- IUiModelElement[] e1_s1_i1_s1_samples = e1_s1_i1_symbols[0].getChildren(),
- e1_s1_i1_s2_samples = e1_s1_i1_symbols[1].getChildren(),
- e1_s1_d2_s1_samples = e1_s1_i2_dep2_symbols[0].getChildren(),
- e1_s1_d2_s2_samples = e1_s1_i2_dep2_symbols[1].getChildren(),
- e1_s1_d4_s1_samples = e1_s1_i2_dep4_symbols[0].getChildren(),
- e1_s1_d4_s2_samples = e1_s1_i2_dep4_symbols[1].getChildren(),
- e2_s1_i1_s1_samples = e2_s1_i1_symbols[0].getChildren(),
- e2_s1_i1_s2_samples = e2_s1_i1_symbols[1].getChildren(),
- e2_s1_d2_s1_samples = e2_s1_i2_dep2_symbols[0].getChildren(),
- e2_s1_d2_s2_samples = e2_s1_i2_dep2_symbols[1].getChildren(),
- e2_s1_d4_s1_samples = e2_s1_i2_dep4_symbols[0].getChildren(),
- e2_s1_d4_s2_samples = e2_s1_i2_dep4_symbols[1].getChildren(),
- e2_s2_i1_s1_samples = e2_s2_i1_symbols[0].getChildren(),
- e2_s2_i1_s2_samples = e2_s2_i1_symbols[1].getChildren();
-
- assertNotNull(e1_s1_i1_s1_samples);
- assertNotNull(e1_s1_i1_s2_samples);
- assertNotNull(e1_s1_d2_s1_samples);
- assertNotNull(e1_s1_d2_s2_samples);
- assertNotNull(e1_s1_d4_s1_samples);
- assertNotNull(e1_s1_d4_s2_samples);
- assertNotNull(e2_s1_i1_s1_samples);
- assertNotNull(e2_s1_i1_s2_samples);
- assertNotNull(e2_s1_d2_s1_samples);
- assertNotNull(e2_s1_d2_s2_samples);
- assertNotNull(e2_s1_d4_s1_samples);
- assertNotNull(e2_s1_d4_s2_samples);
- assertNotNull(e2_s2_i1_s1_samples);
- assertNotNull(e2_s2_i1_s2_samples);
- assertEquals(4, e1_s1_i1_s1_samples.length);
- assertEquals(3, e1_s1_i1_s2_samples.length);
- //0 but not null for dep images due to samples with no line #
- assertEquals(0, e1_s1_d2_s1_samples.length);
- assertEquals(0, e1_s1_d2_s2_samples.length);
- assertEquals(0, e1_s1_d4_s1_samples.length);
- assertEquals(0, e1_s1_d4_s2_samples.length);
- assertEquals(4, e2_s1_i1_s1_samples.length);
- assertEquals(3, e2_s1_i1_s2_samples.length);
- assertEquals(0, e2_s1_d2_s1_samples.length);
- assertEquals(0, e2_s1_d2_s2_samples.length);
- assertEquals(0, e2_s1_d4_s1_samples.length);
- assertEquals(0, e2_s1_d4_s2_samples.length);
- assertEquals(4, e2_s2_i1_s1_samples.length);
- assertEquals(3, e2_s2_i1_s2_samples.length);
- assertNotNull(e1_s1_i1_s1_samples[0]);
- assertNotNull(e1_s1_i1_s1_samples[1]);
- assertNotNull(e1_s1_i1_s1_samples[2]);
- assertNotNull(e1_s1_i1_s1_samples[3]);
- assertNotNull(e1_s1_i1_s2_samples[0]);
- assertNotNull(e1_s1_i1_s2_samples[1]);
- assertNotNull(e1_s1_i1_s2_samples[2]);
-
- assertNotNull(e2_s1_i1_s1_samples[0]);
- assertNotNull(e2_s1_i1_s1_samples[1]);
- assertNotNull(e2_s1_i1_s1_samples[2]);
- assertNotNull(e2_s1_i1_s1_samples[3]);
- assertNotNull(e2_s1_i1_s2_samples[0]);
- assertNotNull(e2_s1_i1_s2_samples[1]);
- assertNotNull(e2_s1_i1_s2_samples[2]);
- assertNotNull(e2_s2_i1_s1_samples[0]);
- assertNotNull(e2_s2_i1_s1_samples[1]);
- assertNotNull(e2_s2_i1_s1_samples[2]);
- assertNotNull(e2_s2_i1_s1_samples[3]);
- assertNotNull(e2_s2_i1_s2_samples[0]);
- assertNotNull(e2_s2_i1_s2_samples[1]);
- assertNotNull(e2_s2_i1_s2_samples[2]);
-
- assertNotNull(e1_s1_i1_s1_samples[0].toString());
- assertNotNull(e1_s1_i1_s1_samples[0].getLabelText());
- assertEquals(42, ((UiModelSample)e1_s1_i1_s1_samples[0]).getLine());
- assertEquals(0.6190, ((UiModelSample)e1_s1_i1_s1_samples[0]).getCountPercentage(), 0.0001);
- assertNull(e1_s1_i1_s1_samples[0].getChildren());
- assertFalse(e1_s1_i1_s1_samples[0].hasChildren());
- assertEquals(e1_s1_i1_symbols[0], e1_s1_i1_s1_samples[0].getParent());
- assertNotNull(e1_s1_i1_s1_samples[0].getLabelImage());
-
- assertNotNull(e1_s1_i1_s1_samples[1].toString());
- assertNotNull(e1_s1_i1_s1_samples[1].getLabelText());
- assertEquals(36, ((UiModelSample)e1_s1_i1_s1_samples[1]).getLine());
- assertEquals(0.1904, ((UiModelSample)e1_s1_i1_s1_samples[1]).getCountPercentage(), 0.0001);
- assertNull(e1_s1_i1_s1_samples[1].getChildren());
- assertFalse(e1_s1_i1_s1_samples[1].hasChildren());
- assertEquals(e1_s1_i1_symbols[0], e1_s1_i1_s1_samples[1].getParent());
- assertNotNull(e1_s1_i1_s1_samples[1].getLabelImage());
-
- assertNotNull(e1_s1_i1_s1_samples[2].toString());
- assertNotNull(e1_s1_i1_s1_samples[2].getLabelText());
- assertEquals(31, ((UiModelSample)e1_s1_i1_s1_samples[2]).getLine());
- assertEquals(0.0476, ((UiModelSample)e1_s1_i1_s1_samples[2]).getCountPercentage(), 0.0001);
- assertNull(e1_s1_i1_s1_samples[2].getChildren());
- assertFalse(e1_s1_i1_s1_samples[2].hasChildren());
- assertEquals(e1_s1_i1_symbols[0], e1_s1_i1_s1_samples[2].getParent());
- assertNotNull(e1_s1_i1_s1_samples[2].getLabelImage());
-
- assertNotNull(e1_s1_i1_s1_samples[3].toString());
- assertNotNull(e1_s1_i1_s1_samples[3].getLabelText());
- assertEquals(39, ((UiModelSample)e1_s1_i1_s1_samples[3]).getLine());
- assertEquals(0.0, ((UiModelSample)e1_s1_i1_s1_samples[3]).getCountPercentage(), 0.0001);
- assertNull(e1_s1_i1_s1_samples[3].getChildren());
- assertFalse(e1_s1_i1_s1_samples[3].hasChildren());
- assertEquals(e1_s1_i1_symbols[0], e1_s1_i1_s1_samples[3].getParent());
- assertNotNull(e1_s1_i1_s1_samples[3].getLabelImage());
-
- assertNotNull(e1_s1_i1_s2_samples[0].toString());
- assertNotNull(e1_s1_i1_s2_samples[0].getLabelText());
- assertEquals(94, ((UiModelSample)e1_s1_i1_s2_samples[0]).getLine());
- assertEquals(0.0952, ((UiModelSample)e1_s1_i1_s2_samples[0]).getCountPercentage(), 0.0001);
- assertNull(e1_s1_i1_s2_samples[0].getChildren());
- assertFalse(e1_s1_i1_s2_samples[0].hasChildren());
- assertEquals(e1_s1_i1_symbols[1], e1_s1_i1_s2_samples[0].getParent());
- assertNotNull(e1_s1_i1_s2_samples[0].getLabelImage());
-
- assertNotNull(e1_s1_i1_s2_samples[1].toString());
- assertNotNull(e1_s1_i1_s2_samples[1].getLabelText());
- assertEquals(12, ((UiModelSample)e1_s1_i1_s2_samples[1]).getLine());
- assertEquals(0.0, ((UiModelSample)e1_s1_i1_s2_samples[1]).getCountPercentage(), 0.0001);
- assertNull(e1_s1_i1_s2_samples[1].getChildren());
- assertFalse(e1_s1_i1_s2_samples[1].hasChildren());
- assertEquals(e1_s1_i1_symbols[1], e1_s1_i1_s2_samples[1].getParent());
- assertNotNull(e1_s1_i1_s2_samples[1].getLabelImage());
-
- assertNotNull(e1_s1_i1_s2_samples[2].toString());
- assertNotNull(e1_s1_i1_s2_samples[2].getLabelText());
- assertEquals(55, ((UiModelSample)e1_s1_i1_s2_samples[2]).getLine());
- assertEquals(0.0, ((UiModelSample)e1_s1_i1_s2_samples[2]).getCountPercentage(), 0.0001);
- assertNull(e1_s1_i1_s2_samples[2].getChildren());
- assertFalse(e1_s1_i1_s2_samples[2].hasChildren());
- assertEquals(e1_s1_i1_symbols[1], e1_s1_i1_s2_samples[2].getParent());
- assertNotNull(e1_s1_i1_s2_samples[2].getLabelImage());
-
- assertNotNull(e2_s1_i1_s1_samples[0].toString());
- assertNotNull(e2_s1_i1_s1_samples[0].getLabelText());
- assertEquals(42, ((UiModelSample)e2_s1_i1_s1_samples[0]).getLine());
- assertEquals(0.6190, ((UiModelSample)e2_s1_i1_s1_samples[0]).getCountPercentage(), 0.0001);
- assertNull(e2_s1_i1_s1_samples[0].getChildren());
- assertFalse(e2_s1_i1_s1_samples[0].hasChildren());
- assertEquals(e2_s1_i1_symbols[0], e2_s1_i1_s1_samples[0].getParent());
- assertNotNull(e2_s1_i1_s1_samples[0].getLabelImage());
-
- assertNotNull(e2_s1_i1_s1_samples[1].toString());
- assertNotNull(e2_s1_i1_s1_samples[1].getLabelText());
- assertEquals(36, ((UiModelSample)e2_s1_i1_s1_samples[1]).getLine());
- assertEquals(0.1904, ((UiModelSample)e2_s1_i1_s1_samples[1]).getCountPercentage(), 0.0001);
- assertNull(e2_s1_i1_s1_samples[1].getChildren());
- assertFalse(e2_s1_i1_s1_samples[1].hasChildren());
- assertEquals(e2_s1_i1_symbols[0], e2_s1_i1_s1_samples[1].getParent());
- assertNotNull(e2_s1_i1_s1_samples[1].getLabelImage());
-
- assertNotNull(e2_s1_i1_s1_samples[2].toString());
- assertNotNull(e2_s1_i1_s1_samples[2].getLabelText());
- assertEquals(31, ((UiModelSample)e2_s1_i1_s1_samples[2]).getLine());
- assertEquals(0.0476, ((UiModelSample)e2_s1_i1_s1_samples[2]).getCountPercentage(), 0.0001);
- assertNull(e2_s1_i1_s1_samples[2].getChildren());
- assertFalse(e2_s1_i1_s1_samples[2].hasChildren());
- assertEquals(e2_s1_i1_symbols[0], e2_s1_i1_s1_samples[2].getParent());
- assertNotNull(e2_s1_i1_s1_samples[2].getLabelImage());
-
- assertNotNull(e2_s1_i1_s1_samples[3].toString());
- assertNotNull(e2_s1_i1_s1_samples[3].getLabelText());
- assertEquals(39, ((UiModelSample)e2_s1_i1_s1_samples[3]).getLine());
- assertEquals(0.0, ((UiModelSample)e2_s1_i1_s1_samples[3]).getCountPercentage(), 0.0001);
- assertNull(e2_s1_i1_s1_samples[3].getChildren());
- assertFalse(e2_s1_i1_s1_samples[3].hasChildren());
- assertEquals(e2_s1_i1_symbols[0], e2_s1_i1_s1_samples[3].getParent());
- assertNotNull(e2_s1_i1_s1_samples[3].getLabelImage());
-
- assertNotNull(e2_s1_i1_s2_samples[0].toString());
- assertNotNull(e2_s1_i1_s2_samples[0].getLabelText());
- assertEquals(94, ((UiModelSample)e2_s1_i1_s2_samples[0]).getLine());
- assertEquals(0.0952, ((UiModelSample)e2_s1_i1_s2_samples[0]).getCountPercentage(), 0.0001);
- assertNull(e2_s1_i1_s2_samples[0].getChildren());
- assertFalse(e2_s1_i1_s2_samples[0].hasChildren());
- assertEquals(e2_s1_i1_symbols[1], e2_s1_i1_s2_samples[0].getParent());
- assertNotNull(e2_s1_i1_s2_samples[0].getLabelImage());
-
- assertNotNull(e2_s1_i1_s2_samples[1].toString());
- assertNotNull(e2_s1_i1_s2_samples[1].getLabelText());
- assertEquals(12, ((UiModelSample)e2_s1_i1_s2_samples[1]).getLine());
- assertEquals(0.0, ((UiModelSample)e2_s1_i1_s2_samples[1]).getCountPercentage(), 0.0001);
- assertNull(e2_s1_i1_s2_samples[1].getChildren());
- assertFalse(e2_s1_i1_s2_samples[1].hasChildren());
- assertEquals(e2_s1_i1_symbols[1], e2_s1_i1_s2_samples[1].getParent());
- assertNotNull(e2_s1_i1_s2_samples[1].getLabelImage());
-
- assertNotNull(e2_s1_i1_s2_samples[2].toString());
- assertNotNull(e2_s1_i1_s2_samples[2].getLabelText());
- assertEquals(55, ((UiModelSample)e2_s1_i1_s2_samples[2]).getLine());
- assertEquals(0.0, ((UiModelSample)e2_s1_i1_s2_samples[2]).getCountPercentage(), 0.0001);
- assertNull(e2_s1_i1_s2_samples[2].getChildren());
- assertFalse(e2_s1_i1_s2_samples[2].hasChildren());
- assertEquals(e2_s1_i1_symbols[1], e2_s1_i1_s2_samples[2].getParent());
- assertNotNull(e2_s1_i1_s2_samples[2].getLabelImage());
-
- assertNotNull(e2_s2_i1_s1_samples[0].toString());
- assertNotNull(e2_s2_i1_s1_samples[0].getLabelText());
- assertEquals(42, ((UiModelSample)e2_s2_i1_s1_samples[0]).getLine());
- assertEquals(0.65, ((UiModelSample)e2_s2_i1_s1_samples[0]).getCountPercentage(), 0.0001);
- assertNull(e2_s2_i1_s1_samples[0].getChildren());
- assertFalse(e2_s2_i1_s1_samples[0].hasChildren());
- assertEquals(e2_s2_i1_symbols[0], e2_s2_i1_s1_samples[0].getParent());
- assertNotNull(e2_s2_i1_s1_samples[0].getLabelImage());
-
- assertNotNull(e2_s2_i1_s1_samples[1].toString());
- assertNotNull(e2_s2_i1_s1_samples[1].getLabelText());
- assertEquals(36, ((UiModelSample)e2_s2_i1_s1_samples[1]).getLine());
- assertEquals(0.2, ((UiModelSample)e2_s2_i1_s1_samples[1]).getCountPercentage(), 0.0001);
- assertNull(e2_s2_i1_s1_samples[1].getChildren());
- assertFalse(e2_s2_i1_s1_samples[1].hasChildren());
- assertEquals(e2_s2_i1_symbols[0], e2_s2_i1_s1_samples[1].getParent());
- assertNotNull(e2_s2_i1_s1_samples[1].getLabelImage());
-
- assertNotNull(e2_s2_i1_s1_samples[2].toString());
- assertNotNull(e2_s2_i1_s1_samples[2].getLabelText());
- assertEquals(31, ((UiModelSample)e2_s2_i1_s1_samples[2]).getLine());
- assertEquals(0.05, ((UiModelSample)e2_s2_i1_s1_samples[2]).getCountPercentage(), 0.0001);
- assertNull(e2_s2_i1_s1_samples[2].getChildren());
- assertFalse(e2_s2_i1_s1_samples[2].hasChildren());
- assertEquals(e2_s2_i1_symbols[0], e2_s2_i1_s1_samples[2].getParent());
- assertNotNull(e2_s2_i1_s1_samples[2].getLabelImage());
-
- assertNotNull(e2_s2_i1_s1_samples[3].toString());
- assertNotNull(e2_s2_i1_s1_samples[3].getLabelText());
- assertEquals(39, ((UiModelSample)e2_s2_i1_s1_samples[3]).getLine());
- assertEquals(0.0, ((UiModelSample)e2_s2_i1_s1_samples[3]).getCountPercentage(), 0.0001);
- assertNull(e2_s2_i1_s1_samples[3].getChildren());
- assertFalse(e2_s2_i1_s1_samples[3].hasChildren());
- assertEquals(e2_s2_i1_symbols[0], e2_s2_i1_s1_samples[3].getParent());
- assertNotNull(e2_s2_i1_s1_samples[3].getLabelImage());
-
- assertNotNull(e2_s2_i1_s2_samples[0].toString());
- assertNotNull(e2_s2_i1_s2_samples[0].getLabelText());
- assertEquals(94, ((UiModelSample)e2_s2_i1_s2_samples[0]).getLine());
- assertEquals(0.1, ((UiModelSample)e2_s2_i1_s2_samples[0]).getCountPercentage(), 0.0001);
- assertNull(e2_s2_i1_s2_samples[0].getChildren());
- assertFalse(e2_s2_i1_s2_samples[0].hasChildren());
- assertEquals(e2_s2_i1_symbols[1], e2_s2_i1_s2_samples[0].getParent());
- assertNotNull(e2_s2_i1_s2_samples[0].getLabelImage());
-
- assertNotNull(e2_s2_i1_s2_samples[1].toString());
- assertNotNull(e2_s2_i1_s2_samples[1].getLabelText());
- assertEquals(12, ((UiModelSample)e2_s2_i1_s2_samples[1]).getLine());
- assertEquals(0.0, ((UiModelSample)e2_s2_i1_s2_samples[1]).getCountPercentage(), 0.0001);
- assertNull(e2_s2_i1_s2_samples[1].getChildren());
- assertFalse(e2_s2_i1_s2_samples[1].hasChildren());
- assertEquals(e2_s2_i1_symbols[1], e2_s2_i1_s2_samples[1].getParent());
- assertNotNull(e2_s2_i1_s2_samples[1].getLabelImage());
-
- assertNotNull(e2_s2_i1_s2_samples[2].toString());
- assertNotNull(e2_s2_i1_s2_samples[2].getLabelText());
- assertEquals(55, ((UiModelSample)e2_s2_i1_s2_samples[2]).getLine());
- assertEquals(0.0, ((UiModelSample)e2_s2_i1_s2_samples[2]).getCountPercentage(), 0.0001);
- assertNull(e2_s2_i1_s2_samples[2].getChildren());
- assertFalse(e2_s2_i1_s2_samples[2].hasChildren());
- assertEquals(e2_s2_i1_symbols[1], e2_s2_i1_s2_samples[2].getParent());
- assertNotNull(e2_s2_i1_s2_samples[2].getLabelImage());
- }
-}
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.ui/.classpath b/oprofile/org.eclipse.linuxtools.oprofile.ui/.classpath
deleted file mode 100644
index 43b986286a9e5fd1828793fa4b2353d02ab8625f..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.ui/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="output" path="target/classes"/>
-</classpath>
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.ui/.gitignore b/oprofile/org.eclipse.linuxtools.oprofile.ui/.gitignore
deleted file mode 100644
index 8d94ef8debe45a7bc3866f985fdc60d41c12822f..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.ui/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-bin
-@dot
-javaCompiler...args
-build.xml
-target
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.ui/.project b/oprofile/org.eclipse.linuxtools.oprofile.ui/.project
deleted file mode 100644
index bbab7b20c80803b68da60f9bad97a07561908994..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.ui/.project
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.linuxtools.oprofile.ui</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
- </natures>
-</projectDescription>
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.ui/.settings/org.eclipse.jdt.core.prefs b/oprofile/org.eclipse.linuxtools.oprofile.ui/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 7dfe74003fbd49c4a508fdafcbad33c071b5c520..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.ui/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,117 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled
-org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
-org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull
-org.eclipse.jdt.core.compiler.annotation.nonnull.secondary=
-org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault
-org.eclipse.jdt.core.compiler.annotation.nonnullbydefault.secondary=
-org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
-org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
-org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.8
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.doc.comment.support=enabled
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
-org.eclipse.jdt.core.compiler.problem.deadCode=warning
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=warning
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning
-org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=disabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=disabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=public
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDefaultCase=ignore
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning
-org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled
-org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=warning
-org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=return_tag
-org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsMethodTypeParameters=disabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=public
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning
-org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning
-org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error
-org.eclipse.jdt.core.compiler.problem.nullReference=warning
-org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error
-org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
-org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
-org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
-org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=warning
-org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
-org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
-org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=disabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=disabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=enabled
-org.eclipse.jdt.core.compiler.problem.unusedExceptionParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameter=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error
-org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning
-org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.8
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.ui/META-INF/MANIFEST.MF b/oprofile/org.eclipse.linuxtools.oprofile.ui/META-INF/MANIFEST.MF
deleted file mode 100644
index 3af48a0aeed6b5620e93197493ac9c1df6ae1aa1..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.ui/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,25 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %bundleName
-Bundle-SymbolicName: org.eclipse.linuxtools.oprofile.ui;singleton:=true
-Bundle-Version: 2.2.0.qualifier
-Bundle-Vendor: %bundleProvider
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Require-Bundle: org.eclipse.core.runtime;bundle-version="3.4.0",
- org.eclipse.ui;bundle-version="3.4.0",
- org.eclipse.linuxtools.profiling.launch;bundle-version="0.10.0",
- org.eclipse.core.filesystem;bundle-version="1.3.100",
- org.eclipse.debug.ui
-Bundle-Activator: org.eclipse.linuxtools.internal.oprofile.ui.OprofileUiPlugin
-Bundle-ActivationPolicy: lazy
-Bundle-Localization: plugin
-Export-Package: org.eclipse.linuxtools.internal.oprofile.ui,
- org.eclipse.linuxtools.oprofile.ui.model,
- org.eclipse.linuxtools.internal.oprofile.ui.view
-Import-Package: org.eclipse.core.resources,
- org.eclipse.jface.text,
- org.eclipse.linuxtools.internal.oprofile.core,
- org.eclipse.linuxtools.internal.oprofile.core.model,
- org.eclipse.linuxtools.internal.oprofile.core.opxml.sessions,
- org.eclipse.linuxtools.profiling.ui
-Automatic-Module-Name: org.eclipse.linuxtools.oprofile.ui
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.ui/about.html b/oprofile/org.eclipse.linuxtools.oprofile.ui/about.html
deleted file mode 100644
index 164f781a8fd2195f87c3d3d49946d56bce58992f..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.ui/about.html
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<title>About</title>
-</head>
-<body lang="EN-US">
- <h2>About This Content</h2>
-
- <p>November 30, 2017</p>
- <h3>License</h3>
-
- <p>
- The Eclipse Foundation makes available all content in this plug-in
- ("Content"). Unless otherwise indicated below, the Content
- is provided to you under the terms and conditions of the Eclipse
- Public License Version 2.0 ("EPL"). A copy of the EPL is
- available at <a href="http://www.eclipse.org/legal/epl-2.0">http://www.eclipse.org/legal/epl-2.0</a>.
- For purposes of the EPL, "Program" will mean the Content.
- </p>
-
- <p>
- If you did not receive this Content directly from the Eclipse
- Foundation, the Content is being redistributed by another party
- ("Redistributor") and different terms and conditions may
- apply to your use of any object code in the Content. Check the
- Redistributor's license that was provided with the Content. If no such
- license exists, contact the Redistributor. Unless otherwise indicated
- below, the terms and conditions of the EPL still apply to any source
- code in the Content and such source code may be obtained at <a
- href="http://www.eclipse.org/">http://www.eclipse.org</a>.
- </p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.ui/build.properties b/oprofile/org.eclipse.linuxtools.oprofile.ui/build.properties
deleted file mode 100644
index 783b22fa30c020819549c7ae70c04465dd85a20b..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.ui/build.properties
+++ /dev/null
@@ -1,10 +0,0 @@
-source.. = src/
-bin.includes = META-INF/,\
- .,\
- plugin.xml,\
- plugin.properties,\
- icons/,\
- about.html
-src.includes = about.html,\
- icons/
-individualSourceBundles=true
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.ui/icons/annotate.png b/oprofile/org.eclipse.linuxtools.oprofile.ui/icons/annotate.png
deleted file mode 100644
index 6cef6c72c3eafdebf70c5a92d1957d56a995a5b7..0000000000000000000000000000000000000000
Binary files a/oprofile/org.eclipse.linuxtools.oprofile.ui/icons/annotate.png and /dev/null differ
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.ui/icons/dependent.gif b/oprofile/org.eclipse.linuxtools.oprofile.ui/icons/dependent.gif
deleted file mode 100644
index 122bada5ffde2e46901b19cd3e1626c318568aa5..0000000000000000000000000000000000000000
Binary files a/oprofile/org.eclipse.linuxtools.oprofile.ui/icons/dependent.gif and /dev/null differ
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.ui/icons/dump.gif b/oprofile/org.eclipse.linuxtools.oprofile.ui/icons/dump.gif
deleted file mode 100644
index d5b800141e2957c0ba1d33c54604cd2ac1e32cf9..0000000000000000000000000000000000000000
Binary files a/oprofile/org.eclipse.linuxtools.oprofile.ui/icons/dump.gif and /dev/null differ
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.ui/icons/error.png b/oprofile/org.eclipse.linuxtools.oprofile.ui/icons/error.png
deleted file mode 100644
index 7d94eb1176de39953ef0ea0ee2933f1eb5cdf984..0000000000000000000000000000000000000000
Binary files a/oprofile/org.eclipse.linuxtools.oprofile.ui/icons/error.png and /dev/null differ
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.ui/icons/event.gif b/oprofile/org.eclipse.linuxtools.oprofile.ui/icons/event.gif
deleted file mode 100644
index c91f254ab1728df3d6555002c789ef4519693eb0..0000000000000000000000000000000000000000
Binary files a/oprofile/org.eclipse.linuxtools.oprofile.ui/icons/event.gif and /dev/null differ
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.ui/icons/image.gif b/oprofile/org.eclipse.linuxtools.oprofile.ui/icons/image.gif
deleted file mode 100644
index 8aa0162df05c16227da66fddaa907c9b6cf28e6b..0000000000000000000000000000000000000000
Binary files a/oprofile/org.eclipse.linuxtools.oprofile.ui/icons/image.gif and /dev/null differ
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.ui/icons/oprofile_view.png b/oprofile/org.eclipse.linuxtools.oprofile.ui/icons/oprofile_view.png
deleted file mode 100644
index 4f8488f1c0c23bdc8703856b2a3baae022046332..0000000000000000000000000000000000000000
Binary files a/oprofile/org.eclipse.linuxtools.oprofile.ui/icons/oprofile_view.png and /dev/null differ
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.ui/icons/sample.gif b/oprofile/org.eclipse.linuxtools.oprofile.ui/icons/sample.gif
deleted file mode 100644
index 061161ae1c9e6435863ba173c0b3fed6a239f745..0000000000000000000000000000000000000000
Binary files a/oprofile/org.eclipse.linuxtools.oprofile.ui/icons/sample.gif and /dev/null differ
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.ui/icons/session.gif b/oprofile/org.eclipse.linuxtools.oprofile.ui/icons/session.gif
deleted file mode 100644
index c2b41bda923b87ab63ee4564d9bf7ff6385404e3..0000000000000000000000000000000000000000
Binary files a/oprofile/org.eclipse.linuxtools.oprofile.ui/icons/session.gif and /dev/null differ
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.ui/icons/symbol.gif b/oprofile/org.eclipse.linuxtools.oprofile.ui/icons/symbol.gif
deleted file mode 100644
index 6ae4604cdba44133c67384abbac46e9035200142..0000000000000000000000000000000000000000
Binary files a/oprofile/org.eclipse.linuxtools.oprofile.ui/icons/symbol.gif and /dev/null differ
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.ui/plugin.properties b/oprofile/org.eclipse.linuxtools.oprofile.ui/plugin.properties
deleted file mode 100644
index c50ac740c246b5ca048b03829a08a4a927a0dd22..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.ui/plugin.properties
+++ /dev/null
@@ -1,31 +0,0 @@
-#*******************************************************************************
-# Copyright (c) 2004, 2018 Red Hat, Inc.
-#
-# This program and the accompanying materials are made
-# available under the terms of the Eclipse Public License 2.0
-# which is available at https://www.eclipse.org/legal/epl-2.0/
-#
-# SPDX-License-Identifier: EPL-2.0
-#
-# Contributors:
-# Red Hat, Inc. - initial API and implementation
-#*******************************************************************************
-bundleName=OProfile UI Plug-in
-bundleProvider=Eclipse Linux Tools
-
-view.groupname=C/C++ Profiling
-view.name=OProfile
-OcountView.name=OCount
-
-view.annotate.toggle.label=Toggle Annotation
-view.annotate.toggle.tooltip=Toggle Annotation
-
-annotateCommand.name=Annotate
-lt.min.pct.label=OProfile Annotation: <0.01%
-lt.05.pct.label=OProfile Annotation: 0.01% - 4.99%
-lt.10.pct.label=OProfile Annotation: 05% - 9.99%
-lt.20.pct.label=OProfile Annotation: 10% - 19.99%
-lt.30.pct.label=OProfile Annotation: 20% - 29.99%
-lt.40.pct.label=OProfile Annotation: 30% - 39.99%
-lt.50.pct.label=OProfile Annotation: 40% - 49.99%
-gt.50.pct.label=OProfile Annotation: >50%
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.ui/plugin.xml b/oprofile/org.eclipse.linuxtools.oprofile.ui/plugin.xml
deleted file mode 100644
index f48cf9664db0bef6b5f04de623c337c0db74c826..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.ui/plugin.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.2"?>
-<plugin>
- <extension
- point="org.eclipse.ui.views">
- <view
- category="org.eclipse.linuxtools.profiling.ui"
- class="org.eclipse.linuxtools.internal.oprofile.ui.view.OprofileView"
- icon="icons/oprofile_view.png"
- id="org.eclipse.linuxtools.oprofile.ui.OProfileView"
- name="%view.name"
- restorable="true">
- </view>
- <view
- category="org.eclipse.linuxtools.profiling.ui"
- class="org.eclipse.linuxtools.internal.oprofile.ui.view.OcountView"
- icon="icons/oprofile_view.png"
- id="org.eclipse.linuxtools.oprofile.ui.OCountView"
- name="%OcountView.name"
- restorable="false">
- </view>
- </extension>
-</plugin>
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.ui/pom.xml b/oprofile/org.eclipse.linuxtools.oprofile.ui/pom.xml
deleted file mode 100644
index 2a201db0ff05fca30a912fe27d1633f39f687670..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.ui/pom.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (C) 2011, 2018 Red Hat, Inc.
-
- This program and the accompanying materials are made
- available under the terms of the Eclipse Public License 2.0
- which is available at https://www.eclipse.org/legal/epl-2.0/
-
- SPDX-License-Identifier: EPL-2.0
--->
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <artifactId>linuxtools-oprofile-parent</artifactId>
- <groupId>org.eclipse.linuxtools.oprofile</groupId>
- <version>7.4.0</version>
- </parent>
-
- <artifactId>org.eclipse.linuxtools.oprofile.ui</artifactId>
- <version>2.2.0-SNAPSHOT</version>
- <packaging>eclipse-plugin</packaging>
-
- <name>Linux Tools OProfile UI Plug-in</name>
-</project>
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.ui/src/org/eclipse/linuxtools/internal/oprofile/ui/OprofileUiMessages.java b/oprofile/org.eclipse.linuxtools.oprofile.ui/src/org/eclipse/linuxtools/internal/oprofile/ui/OprofileUiMessages.java
deleted file mode 100644
index 222e0fd6283e5d61e2773b746f1280b6758a7ebc..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.ui/src/org/eclipse/linuxtools/internal/oprofile/ui/OprofileUiMessages.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2018 Red Hat, Inc.
- *
- * This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License 2.0
- * which is available at https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- * Keith Seitz <keiths@redhat.com> - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.linuxtools.internal.oprofile.ui;
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-public final class OprofileUiMessages {
-
- private static final String BUNDLE_NAME = "org.eclipse.linuxtools.internal.oprofile.ui.oprofileui"; //$NON-NLS-1$
-
- private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle.getBundle(BUNDLE_NAME);
-
- private OprofileUiMessages() {
- }
-
- public static String getString(String key) {
- try {
- return RESOURCE_BUNDLE.getString(key);
- } catch (MissingResourceException e) {
- return '!' + key + '!';
- }
- }
-}
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.ui/src/org/eclipse/linuxtools/internal/oprofile/ui/OprofileUiPlugin.java b/oprofile/org.eclipse.linuxtools.oprofile.ui/src/org/eclipse/linuxtools/internal/oprofile/ui/OprofileUiPlugin.java
deleted file mode 100644
index a25b43338eaed1fe0bf4c9f526961c2843c43839..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.ui/src/org/eclipse/linuxtools/internal/oprofile/ui/OprofileUiPlugin.java
+++ /dev/null
@@ -1,147 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2018 Red Hat, Inc.
- *
- * This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License 2.0
- * which is available at https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- * Keith Seitz <keiths@redhat.com> - initial API and implementation
- * Kent Sebastian <ksebasti@redhat.com> -
- *******************************************************************************/
-
-package org.eclipse.linuxtools.internal.oprofile.ui;
-
-import java.text.DecimalFormat;
-import java.text.NumberFormat;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.linuxtools.internal.oprofile.ui.view.OcountView;
-import org.eclipse.linuxtools.internal.oprofile.ui.view.OprofileView;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-
-/**
- * The main plugin class to be used in the desktop.
- */
-public class OprofileUiPlugin extends AbstractUIPlugin {
- //The shared instance.
- private static OprofileUiPlugin plugin;
-
- private OprofileView oprofileview = null;
- private OcountView ocountview = null;
-
- public static final String PLUGIN_ID = "org.eclipse.linuxtools.oprofile.ui"; //$NON-NLS-1$
- public static final String ID_OPROFILE_VIEW = PLUGIN_ID + ".OProfileView"; //$NON-NLS-1$
- public static final String ID_OCOUNT_VIEW = PLUGIN_ID + ".OCountView"; //$NON-NLS-1$
-
- private static final String ICON_PATH = "icons/"; //$NON-NLS-1$
- public static final String SESSION_ICON = ICON_PATH + "session.gif"; //$NON-NLS-1$
- public static final String EVENT_ICON = ICON_PATH + "event.gif"; //$NON-NLS-1$
- public static final String IMAGE_ICON = ICON_PATH + "image.gif"; //$NON-NLS-1$
- public static final String DEPENDENT_ICON = ICON_PATH + "dependent.gif"; //$NON-NLS-1$
- public static final String SYMBOL_ICON = ICON_PATH + "symbol.gif"; //$NON-NLS-1$
- public static final String SAMPLE_ICON = ICON_PATH + "sample.gif"; //$NON-NLS-1$
- public static final String ERROR_ICON = ICON_PATH + "error.png"; //$NON-NLS-1$
-
- public static final double MINIMUM_SAMPLE_PERCENTAGE = 0.0001;
-
- public static final String ANNOTATION_TYPE_LT_MIN_PERCENTAGE = "org.eclipse.linuxtools.oprofile.ui.annotation.lt.min.pct"; //$NON-NLS-1$
- public static final String ANNOTATION_TYPE_LT_05 = "org.eclipse.linuxtools.oprofile.ui.annotation.lt.05.pct"; //$NON-NLS-1$
- public static final String ANNOTATION_TYPE_LT_10 = "org.eclipse.linuxtools.oprofile.ui.annotation.lt.10.pct"; //$NON-NLS-1$
- public static final String ANNOTATION_TYPE_LT_20 = "org.eclipse.linuxtools.oprofile.ui.annotation.lt.20.pct"; //$NON-NLS-1$
- public static final String ANNOTATION_TYPE_LT_30 = "org.eclipse.linuxtools.oprofile.ui.annotation.lt.30.pct"; //$NON-NLS-1$
- public static final String ANNOTATION_TYPE_LT_40 = "org.eclipse.linuxtools.oprofile.ui.annotation.lt.40.pct"; //$NON-NLS-1$
- public static final String ANNOTATION_TYPE_LT_50 = "org.eclipse.linuxtools.oprofile.ui.annotation.lt.50.pct"; //$NON-NLS-1$
- public static final String ANNOTATION_TYPE_GT_50 = "org.eclipse.linuxtools.oprofile.ui.annotation.gt.50.pct"; //$NON-NLS-1$
-
- /**
- * The constructor.
- */
- public OprofileUiPlugin() {
- }
-
- /**
- * This method is called upon plug-in activation
- */
- @Override
- public void start(BundleContext context) throws Exception {
- super.start(context);
- plugin = this;
- }
-
- /**
- * This method is called when the plug-in is stopped
- */
- @Override
- public void stop(BundleContext context) throws Exception {
- super.stop(context);
- plugin = null;
- }
-
-
- /**
- * Returns the shared instance.
- */
- public static OprofileUiPlugin getDefault() {
- return plugin;
- }
-
- /**
- * Returns an image descriptor for the image file at the given
- * plug-in relative path
- *
- * @param path the path
- * @return the image descriptor
- */
- public static ImageDescriptor getImageDescriptor(String path) {
- return imageDescriptorFromPlugin(PLUGIN_ID, path);
- }
-
- public OprofileView getOprofileView() {
- return oprofileview;
- }
-
- public void setOprofileView(OprofileView oprofileview) {
- this.oprofileview = oprofileview;
- }
-
- public OcountView getOcountView() {
- return ocountview;
- }
-
- public void setOcountView(OcountView ocountview) {
- this.ocountview = ocountview;
- }
-
- public static IWorkbenchWindow getActiveWorkbenchWindow() {
- return getDefault().getWorkbench().getActiveWorkbenchWindow();
- }
-
- public static Shell getActiveWorkbenchShell() {
- IWorkbenchWindow window = getActiveWorkbenchWindow();
- if (window != null) {
- return window.getShell();
- }
- return null;
- }
-
- public static String getPercentageString(double percentage) {
- NumberFormat nf = NumberFormat.getPercentInstance();
- if (nf instanceof DecimalFormat) {
- nf.setMinimumFractionDigits(2);
- nf.setMaximumFractionDigits(2);
- }
-
- if (percentage < OprofileUiPlugin.MINIMUM_SAMPLE_PERCENTAGE) {
- return "<" + nf.format(OprofileUiPlugin.MINIMUM_SAMPLE_PERCENTAGE); //$NON-NLS-1$
- } else {
- return nf.format(percentage);
- }
- }
-}
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.ui/src/org/eclipse/linuxtools/internal/oprofile/ui/oprofileui.properties b/oprofile/org.eclipse.linuxtools.oprofile.ui/src/org/eclipse/linuxtools/internal/oprofile/ui/oprofileui.properties
deleted file mode 100644
index 270bbaf981e0b8e6f87055ea4906e90f8fad0609..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.ui/src/org/eclipse/linuxtools/internal/oprofile/ui/oprofileui.properties
+++ /dev/null
@@ -1,51 +0,0 @@
-######################################################################
-# Copyright (c) 2004, 2018 Red Hat, Inc.
-#
-# This program and the accompanying materials are made
-# available under the terms of the Eclipse Public License 2.0
-# which is available at https://www.eclipse.org/legal/epl-2.0/
-#
-# SPDX-License-Identifier: EPL-2.0
-#
-# Contributors:
-# Keith Seitz <keiths@redhat.com> - initial implementation
-# Kent Sebastian <ksebasti@redhat.com>
-######################################################################
-savedialog.title=Save Session
-savedialog.message=Enter the new name of the default session
-savedialog.initial=
-savedialog.validator.invalidChar={0} is an invalid character in session name \"{1}\".
-savedialog.validator.containsWhitespace=Session name \"{0}\" cannot contain whitespace.
-savedialog.validator.exists=Session \"{0}\" already exists.
-
-defaultsessiondialog.nodefaultsession.title=Error Saving Default Session
-defaultsessiondialog.nodefaultsession.message=No default session exists.
-
-view.dialog.parsing.text=Parsing OProfile Data
-view.actions.refresh.label=Refresh View
-view.actions.logreader.label=Open OProfile Daemon Log
-view.actions.savedefaultsession.label=Save Default Session
-view.menu.sortby.label=Sort By
-view.actions.default.label=Default
-view.actions.event.label=Event
-view.actions.session.label=Session
-view.actions.function.label=Function
-view.actions.lib.label=Library
-view.actions.line.label=Line number
-
-
-oprofiled.logreader.dialog.title=OProfiled Log
-oprofiled.logreader.error.fileNotFound=Log file empty or does not exist.
-oprofiled.logreader.error.io=Error reading log file.
-
-uimodel.percentage.in=in
-uimodel.sample.on.line=on line
-uimodel.dependent.dependent.images=dependent images
-UiModelSession_current=current
-
-opxmlParse.error.multipleImages=Error: samples not created from Eclipse-OProfile plugin. Please remove this session.
-
-annotation.text.from=from event
-annotation.text.in=in session
-
-root.error.nosamples=No profiling data is on the system.
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.ui/src/org/eclipse/linuxtools/internal/oprofile/ui/view/OcountView.java b/oprofile/org.eclipse.linuxtools.oprofile.ui/src/org/eclipse/linuxtools/internal/oprofile/ui/view/OcountView.java
deleted file mode 100644
index 148b822b93377eea4c25d394abd6362e16833389..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.ui/src/org/eclipse/linuxtools/internal/oprofile/ui/view/OcountView.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2015, 2018 Red Hat, Inc.
- *
- * This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License 2.0
- * which is available at https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- * Red Hat Inc - initial API and implementation
- *******************************************************************************/
-package org.eclipse.linuxtools.internal.oprofile.ui.view;
-
-import org.eclipse.debug.ui.IDebugUIConstants;
-import org.eclipse.jface.resource.JFaceResources;
-import org.eclipse.jface.text.Document;
-import org.eclipse.jface.text.TextViewer;
-import org.eclipse.linuxtools.internal.oprofile.ui.OprofileUiPlugin;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.part.ViewPart;
-
-/**
- * Simple View to show text output of OCount
- * @author jjohnstn
- *
- */
-public class OcountView extends ViewPart {
-
- String text = ""; //$NON-NLS-1$
- TextViewer viewer;
- Composite parent;
-
- @Override
- public void createPartControl(Composite parent) {
- viewer = new TextViewer(parent, SWT.V_SCROLL | SWT.H_SCROLL);
- viewer.setEditable(false);
- viewer.getTextWidget().setFont(JFaceResources.getFont(IDebugUIConstants.PREF_DETAIL_PANE_FONT));
- Control control=viewer.getControl();
- GridData gd=new GridData(GridData.FILL_BOTH);
- control.setLayoutData(gd);
- Document d = new Document(text);
- viewer.setDocument(d);
- viewer.refresh();
- OprofileUiPlugin.getDefault().setOcountView(this);
- this.parent = parent;
- }
-
- public void setText(String text) {
- Document d = new Document(text);
- viewer.setDocument(d);
- }
- /**
- * Refresh the view or open a new instance if it was closed.
- */
- public void refreshView() {
- // Need to create another view object if it was closed.
- if(parent == null || parent.isDisposed()) {
- try {
- PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().showView(OprofileUiPlugin.ID_OCOUNT_VIEW);
- String currentText = viewer.getDocument().get();
- OprofileUiPlugin.getDefault().getOcountView().setText(currentText);
- return;
- } catch (PartInitException e2) {
- e2.printStackTrace();
- }
- }
- viewer.refresh();
- }
- /**
- * Get the Text Viewer
- *
- * @return the text viewer for this View
- */
- public TextViewer getViewer() {
- return viewer;
- }
-
- @Override
- public void setFocus() {
- // TODO Auto-generated method stub
-
- }
-
-}
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.ui/src/org/eclipse/linuxtools/internal/oprofile/ui/view/OprofileView.java b/oprofile/org.eclipse.linuxtools.oprofile.ui/src/org/eclipse/linuxtools/internal/oprofile/ui/view/OprofileView.java
deleted file mode 100755
index f313a05e40f70e0afa31631461b15db29becd69f..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.ui/src/org/eclipse/linuxtools/internal/oprofile/ui/view/OprofileView.java
+++ /dev/null
@@ -1,177 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2018 Red Hat, Inc.
- *
- * This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License 2.0
- * which is available at https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- * Kent Sebastian <ksebasti@redhat.com> - initial API and implementation
- *******************************************************************************/
-package org.eclipse.linuxtools.internal.oprofile.ui.view;
-
-import java.lang.reflect.InvocationTargetException;
-
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jface.action.MenuManager;
-import org.eclipse.jface.dialogs.ProgressMonitorDialog;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.ITreeSelection;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.linuxtools.internal.oprofile.core.model.OpModelRoot;
-import org.eclipse.linuxtools.internal.oprofile.ui.OprofileUiMessages;
-import org.eclipse.linuxtools.internal.oprofile.ui.OprofileUiPlugin;
-import org.eclipse.linuxtools.oprofile.ui.model.UiModelRoot;
-import org.eclipse.linuxtools.oprofile.ui.model.UiModelSession;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.part.ViewPart;
-
-/**
- * The view for the OProfile plugin. Shows the elements gathered by the data model
- * in a tree viewer, parsed by the ui model (in the model package). The hierarchy
- * (as it is displayed) looks like:
- *
- * UiModelRoot (not shown in the view)
- * \_ UiModelEvent
- * \_ ...
- * \_ UiModelEvent
- * \_ UiModelSession
- * \_ ...
- * \_ UiModelSession
- * \_ UiModelImage
- * | \_ UiModelSymbol
- * | \_ ...
- * | \_ UiModelSymbol
- * | \_ UiModelSample
- * | \_ ...
- * | \_ UiModelSample
- * \_ UiModelDependent
- * \_ UiModelImage
- * | \_ ... (see above)
- * \_ ...
- *
- * The refreshView() function takes care of launching the data model parsing and
- * ui model parsing in a separate thread.
- */
-public class OprofileView extends ViewPart implements ISelectionChangedListener {
- private TreeViewer viewer;
- private IAction deleteSessionAction;
- private IAction saveDefaultSessionAction;
-
- @Override
- public void createPartControl(Composite parent) {
- createTreeViewer(parent);
- createActionMenu();
-
- OprofileUiPlugin.getDefault().setOprofileView(this);
- }
-
- private void createTreeViewer(Composite parent) {
- viewer = new TreeViewer(parent, SWT.SINGLE);
- viewer.setContentProvider(new OprofileViewContentProvider());
- viewer.setLabelProvider(new OprofileViewLabelProvider());
- viewer.addDoubleClickListener(new OprofileViewDoubleClickListener());
- viewer.addSelectionChangedListener(this);
- }
-
- private void createActionMenu() {
- IMenuManager manager = getViewSite().getActionBars().getMenuManager();
-
- manager.add(new OprofileViewLogReaderAction());
- manager.add(new OprofileViewRefreshAction());
- saveDefaultSessionAction = new OprofileViewSaveDefaultSessionAction();
- manager.add(saveDefaultSessionAction);
- deleteSessionAction = new OprofileViewDeleteSessionAction(getTreeViewer());
- manager.add(deleteSessionAction);
-
- MenuManager sortMenu = new MenuManager(
- OprofileUiMessages.getString("view.menu.sortby.label")); //$NON-NLS-1$
-
- for (UiModelRoot.SortType s : UiModelRoot.SortType.values()) {
- sortMenu.add(new OprofileViewSortAction(s,
- OprofileViewSortAction.sortTypeMap.get(s)));
- }
- manager.add(sortMenu);
-
- }
-
- private TreeViewer getTreeViewer() {
- return viewer;
- }
-
- /**
- * Extremely convoluted way of getting the running and parsing to happen in
- * a separate thread, with a progress monitor. In most cases and on fast
- * machines this will probably only be a blip.
- */
- public void refreshView() {
- try {
- PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().showView(OprofileUiPlugin.ID_OPROFILE_VIEW);
- } catch (PartInitException e) {
- e.printStackTrace();
- }
-
- IRunnableWithProgress refreshRunner = monitor -> {
- monitor.beginTask(OprofileUiMessages.getString("view.dialog.parsing.text"), 2); //$NON-NLS-1$
-
- OpModelRoot dataModelRoot = OpModelRoot.getDefault();
- dataModelRoot.refreshModel();
- monitor.worked(1);
-
- final UiModelRoot UiRoot = UiModelRoot.getDefault();
- UiRoot.refreshModel();
-
- Display.getDefault().asyncExec(() -> OprofileUiPlugin.getDefault().getOprofileView().getTreeViewer().setInput(UiRoot));
- monitor.worked(1);
- monitor.done();
- };
-
- ProgressMonitorDialog dialog = new ProgressMonitorDialog(null);
- try {
- dialog.run(true, false, refreshRunner);
- } catch (InvocationTargetException|InterruptedException e) {
- e.printStackTrace();
- }
- }
-
- @Override
- public void selectionChanged(SelectionChangedEvent event) {
- ITreeSelection tsl = viewer.getStructuredSelection();
- if (tsl.getFirstElement() instanceof UiModelSession) {
- if (!deleteSessionAction.isEnabled()) {
- deleteSessionAction.setEnabled(true);
- }
-
- if (((UiModelSession) tsl.getFirstElement()).isDefaultSession()) {
- if (!saveDefaultSessionAction.isEnabled()) {
- saveDefaultSessionAction.setEnabled(true);
- }
- }
- } else {
- deleteSessionAction.setEnabled(false);
- saveDefaultSessionAction.setEnabled(false);
-
- }
-
- }
-
- @Override
- public void setFocus() {
- // TODO Auto-generated method stub
- }
-
- @Override
- public void dispose() {
- super.dispose();
- viewer.removeSelectionChangedListener(this);
- }
-}
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.ui/src/org/eclipse/linuxtools/internal/oprofile/ui/view/OprofileViewContentProvider.java b/oprofile/org.eclipse.linuxtools.oprofile.ui/src/org/eclipse/linuxtools/internal/oprofile/ui/view/OprofileViewContentProvider.java
deleted file mode 100644
index 781dc34a63da7e0ad12a7c0e1ff066f61dd2f60a..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.ui/src/org/eclipse/linuxtools/internal/oprofile/ui/view/OprofileViewContentProvider.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2018 Red Hat, Inc.
- *
- * This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License 2.0
- * which is available at https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- * Kent Sebastian <ksebasti@redhat.com> - initial API and implementation,
- * adapted from Keith Seitz's ProfileContentProvider
- *******************************************************************************/
-package org.eclipse.linuxtools.internal.oprofile.ui.view;
-
-import org.eclipse.core.runtime.Assert;
-import org.eclipse.jface.viewers.ITreeContentProvider;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.linuxtools.oprofile.ui.model.IUiModelElement;
-
-/**
- * Content provider for the OprofileView's tree viewer.
- */
-public class OprofileViewContentProvider implements ITreeContentProvider {
-
- @Override
- public Object[] getChildren(Object element) {
- Assert.isLegal(element instanceof IUiModelElement, "in OprofileViewContentProvider"); //$NON-NLS-1$
- return ((IUiModelElement) element).getChildren();
- }
-
- @Override
- public Object getParent(Object element) {
- Assert.isLegal(element instanceof IUiModelElement, "in OprofileViewContentProvider"); //$NON-NLS-1$
- return ((IUiModelElement) element).getParent();
- }
-
- @Override
- public boolean hasChildren(Object element) {
- Assert.isLegal(element instanceof IUiModelElement, "in OprofileViewContentProvider"); //$NON-NLS-1$
- return ((IUiModelElement) element).hasChildren();
- }
-
- @Override
- public Object[] getElements(Object parentElement) {
- return getChildren(parentElement);
- }
-
- @Override
- public void dispose() {
- // TODO Auto-generated method stub
- }
-
- @Override
- public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
- // TODO Auto-generated method stub
- }
-
-}
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.ui/src/org/eclipse/linuxtools/internal/oprofile/ui/view/OprofileViewDeleteSessionAction.java b/oprofile/org.eclipse.linuxtools.oprofile.ui/src/org/eclipse/linuxtools/internal/oprofile/ui/view/OprofileViewDeleteSessionAction.java
deleted file mode 100755
index 36bcbcc3f26894de74c4bcf959c1f04ad953f542..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.ui/src/org/eclipse/linuxtools/internal/oprofile/ui/view/OprofileViewDeleteSessionAction.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010, 2018 Red Hat, Inc.
- *
- * This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License 2.0
- * which is available at https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- * Red Hat - initial API and implementation
- *******************************************************************************/
-package org.eclipse.linuxtools.internal.oprofile.ui.view;
-
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.viewers.ITreeSelection;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.linuxtools.internal.oprofile.core.Oprofile;
-import org.eclipse.linuxtools.internal.oprofile.core.OprofileCorePlugin;
-import org.eclipse.linuxtools.internal.oprofile.core.opxml.sessions.SessionManager;
-import org.eclipse.linuxtools.internal.oprofile.ui.OprofileUiPlugin;
-import org.eclipse.linuxtools.oprofile.ui.model.IUiModelElement;
-import org.eclipse.linuxtools.oprofile.ui.model.UiModelSession;
-
-public class OprofileViewDeleteSessionAction extends Action {
-
- private TreeViewer treeViewer;
-
- public OprofileViewDeleteSessionAction(TreeViewer tree) {
- super("Delete Session"); //$NON-NLS-1$
- treeViewer = tree;
- setEnabled(false);
- }
-
- @Override
- public void run() {
- ITreeSelection tsl = treeViewer.getStructuredSelection();
- if (tsl.getFirstElement() instanceof UiModelSession) {
- UiModelSession sess = (UiModelSession) tsl.getFirstElement();
- deleteSession(sess);
- }
-
- OprofileUiPlugin.getDefault().getOprofileView().refreshView();
- }
-
- /**
- * Delete the session with the specified name for the specified event
- * @param sessionName The name of the session to delete
- * @param eventName The name of the event containing the session
- */
- private void deleteSession(UiModelSession sess) {
- String sessionName = sess.getLabelText();
- IUiModelElement[] modelEvents = sess.getChildren();
-
- for (int i = 0; i < modelEvents.length; i++) {
- SessionManager.deleteSession(sessionName, modelEvents[i].getLabelText());
- }
- // clear out collected data by this session
- // check if profile is done through operf or oprofile
- if (Oprofile.OprofileProject.getProfilingBinary().equals(Oprofile.OprofileProject.OPERF_BINARY)) {
- // delete operf_data folder
- deleteOperfDataFolder(Oprofile.OprofileProject.getProject().getFolder(Oprofile.OprofileProject.OPERF_DATA));
- }
- }
-
- public static void deleteOperfDataFolder(IFolder operfData) {
- if(operfData.exists()) {
- try {
- operfData.delete(true,null);
- } catch (CoreException e) {
- OprofileCorePlugin.showErrorDialog("opcontrolProvider", e); //$NON-NLS-1$
- }
- }
-
- }
-
-}
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.ui/src/org/eclipse/linuxtools/internal/oprofile/ui/view/OprofileViewDoubleClickListener.java b/oprofile/org.eclipse.linuxtools.oprofile.ui/src/org/eclipse/linuxtools/internal/oprofile/ui/view/OprofileViewDoubleClickListener.java
deleted file mode 100644
index 96c7d9593ee59a7032f95b732039569d2f1dda53..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.ui/src/org/eclipse/linuxtools/internal/oprofile/ui/view/OprofileViewDoubleClickListener.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2018 Red Hat, Inc.
- *
- * This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License 2.0
- * which is available at https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- * Kent Sebastian <ksebasti@redhat.com> - initial API and implementation
- *******************************************************************************/
-package org.eclipse.linuxtools.internal.oprofile.ui.view;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.viewers.DoubleClickEvent;
-import org.eclipse.jface.viewers.IDoubleClickListener;
-import org.eclipse.jface.viewers.ITreeSelection;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.linuxtools.internal.oprofile.core.Oprofile;
-import org.eclipse.linuxtools.oprofile.ui.model.IUiModelElement;
-import org.eclipse.linuxtools.oprofile.ui.model.UiModelEvent;
-import org.eclipse.linuxtools.oprofile.ui.model.UiModelImage;
-import org.eclipse.linuxtools.oprofile.ui.model.UiModelSample;
-import org.eclipse.linuxtools.oprofile.ui.model.UiModelSession;
-import org.eclipse.linuxtools.oprofile.ui.model.UiModelSymbol;
-import org.eclipse.linuxtools.profiling.ui.ProfileUIUtils;
-import org.eclipse.ui.PartInitException;
-
-/**
- * Listener for the oprofile view when a user double clicks on an element in the tree.
- *
- * Different things occur based on the event:
- *
- * UiModelEvent - nothing (?)
- * UiModelSession - save the session to a different name
- * UiModelImage - nothing (?)
- * UiModelSymbol - nothing (?)
- * UiModelSample - go to line number in appropriate file
- */
-public class OprofileViewDoubleClickListener implements IDoubleClickListener {
- @Override
- public void doubleClick(DoubleClickEvent event) {
- TreeViewer tv = (TreeViewer) event.getSource();
- ITreeSelection tsl = tv.getStructuredSelection();
- IUiModelElement element = (IUiModelElement) tsl.getFirstElement();
-
- try {
- if (element instanceof UiModelEvent) {
- // UiModelEvent event = (UiModelEvent)element;
-
- } else if (element instanceof UiModelSession) {
- /* moved into an action menu */
- } else if (element instanceof UiModelImage) {
- // UiModelImage image = (UiModelImage)element;
-
- } else if (element instanceof UiModelSymbol) {
- final UiModelSymbol symbol = (UiModelSymbol) element;
- final String fileName = symbol.getFileName();
- int line = symbol.getLineNumber();
-
- ProfileUIUtils.openEditorAndSelect(fileName, line);
-
- } else if (element instanceof UiModelSample) {
- // jump to line number in the appropriate file
- UiModelSample sample = (UiModelSample) element;
- int line = sample.getLine();
-
- // get file name from the parent sample
- final String fileName = sample.getFile();
- ProfileUIUtils.openEditorAndSelect(fileName, line, getProject());
- }
- } catch (BadLocationException e1) {
- e1.printStackTrace();
- } catch (PartInitException e2) {
- e2.printStackTrace();
- } catch (CoreException e) {
- e.printStackTrace();
- }
- }
-
- /**
- * return the project
- * @since 2.1
- */
- protected IProject getProject() {
- return Oprofile.OprofileProject.getProject();
- }
-
-}
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.ui/src/org/eclipse/linuxtools/internal/oprofile/ui/view/OprofileViewLabelProvider.java b/oprofile/org.eclipse.linuxtools.oprofile.ui/src/org/eclipse/linuxtools/internal/oprofile/ui/view/OprofileViewLabelProvider.java
deleted file mode 100644
index 9bbaba26c9edcf929f8528783c18082c43c1565d..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.ui/src/org/eclipse/linuxtools/internal/oprofile/ui/view/OprofileViewLabelProvider.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2018 Red Hat, Inc.
- *
- * This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License 2.0
- * which is available at https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- * Kent Sebastian <ksebasti@redhat.com> - initial API and implementation,
- * adapted from Keith Seitz's ProfileLabelProvider
- *******************************************************************************/
-package org.eclipse.linuxtools.internal.oprofile.ui.view;
-
-import org.eclipse.core.runtime.Assert;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.linuxtools.oprofile.ui.model.IUiModelElement;
-import org.eclipse.swt.graphics.Image;
-
-/**
- * Content provider for OprofileView's tree viewer.
- */
-public class OprofileViewLabelProvider extends LabelProvider {
-
- @Override
- public Image getImage(Object element) {
- Assert.isLegal(element instanceof IUiModelElement, "in OprofileViewLabelProvider"); //$NON-NLS-1$
- return ((IUiModelElement) element).getLabelImage();
- }
-
- @Override
- public String getText(Object element) {
- Assert.isLegal(element instanceof IUiModelElement, "in OprofileViewLabelProvider"); //$NON-NLS-1$
- return ((IUiModelElement) element).getLabelText();
- }
-
- @Override
- public boolean isLabelProperty(Object element, String property) {
- return false;
- }
-
-}
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.ui/src/org/eclipse/linuxtools/internal/oprofile/ui/view/OprofileViewLogReaderAction.java b/oprofile/org.eclipse.linuxtools.oprofile.ui/src/org/eclipse/linuxtools/internal/oprofile/ui/view/OprofileViewLogReaderAction.java
deleted file mode 100644
index 2ae73d4bd03abc29f2ead868d072015a56657477..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.ui/src/org/eclipse/linuxtools/internal/oprofile/ui/view/OprofileViewLogReaderAction.java
+++ /dev/null
@@ -1,163 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2018 Red Hat, Inc.
- *
- * This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License 2.0
- * which is available at https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- * Kent Sebastian <ksebasti@redhat.com> - initial API and implementation
- * Keith Seitz <keiths@redhat.com> - much of the code in the LogReader class
- *******************************************************************************/
-package org.eclipse.linuxtools.internal.oprofile.ui.view;
-
-import java.io.BufferedReader;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.lang.reflect.InvocationTargetException;
-
-import org.eclipse.core.filesystem.EFS;
-import org.eclipse.core.filesystem.IFileStore;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.dialogs.ProgressMonitorDialog;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.linuxtools.internal.oprofile.core.Oprofile;
-import org.eclipse.linuxtools.internal.oprofile.ui.OprofileUiMessages;
-import org.eclipse.linuxtools.profiling.launch.IRemoteFileProxy;
-import org.eclipse.linuxtools.profiling.launch.RemoteProxyManager;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Layout;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * Log reader action. Reads /var/lib/oprofile/samples/oprofiled.log and displays
- * it in a nice dialog. Although the log is of dubious utility, it might be useful
- * to some.
- */
-public class OprofileViewLogReaderAction extends Action {
- public OprofileViewLogReaderAction() {
- super(OprofileUiMessages.getString("view.actions.logreader.label")); //$NON-NLS-1$
- }
-
- @Override
- public void run() {
- Shell activeShell = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell();
- LogReader log = new LogReader();
-
- try {
- new ProgressMonitorDialog(activeShell).run(true, false, log);
- } catch (InvocationTargetException|InterruptedException e) {
- e.printStackTrace();
- }
-
- //open custom log dialog
- OprofiledLogDialog odlg = new OprofiledLogDialog(activeShell, log.getLogContents());
- odlg.open();
- }
-}
-
-/**
- * A Runnable to read oprofiled's logfile
- */
-class LogReader implements Runnable, IRunnableWithProgress {
- private static long lastModified = -1;
- private static String contents = null;
-
- @Override
- public void run() {
- try {
- IRemoteFileProxy proxy = RemoteProxyManager.getInstance().getFileProxy(
- Oprofile.OprofileProject.getProject());
- IFileStore fileStore = proxy.getResource(Oprofile.getLogFile());
- if (fileStore.fetchInfo().exists()) {
- long modified = fileStore.fetchInfo().getLastModified();
-
- // only reread it if it has been modified since the last run
- if (modified != lastModified) {
- lastModified = modified;
- contents = ""; //$NON-NLS-1$
- }
- try (InputStream is = fileStore.openInputStream(EFS.NONE,
- new NullProgressMonitor());
- BufferedReader bi = new BufferedReader(
- new InputStreamReader(is))) {
- String line;
- while ((line = bi.readLine()) != null) {
- contents += line + "\n"; //$NON-NLS-1$
- }
- bi.close();
- }
- }
- } catch (FileNotFoundException e) {
- // The file doesn't exist or was erased. Try again next time.
- contents = OprofileUiMessages
- .getString("oprofiled.logreader.error.fileNotFound"); //$NON-NLS-1$
- } catch (IOException e) {
- // Error reading log. Try again next time.
- lastModified = 0;
- contents = OprofileUiMessages
- .getString("oprofiled.logreader.error.io"); //$NON-NLS-1$
- } catch (CoreException e) {
- e.printStackTrace();
- }
- }
-
- public String getLogContents() {
- return contents;
- }
-
-
- @Override
- public void run(IProgressMonitor monitor) {
- this.run();
- }
-}
-
-/**
- * A custom dialog box to display the oprofiled log file.
- */
-class OprofiledLogDialog extends MessageDialog {
- //string to contain the log file
- private String textContent = null;
-
- public static final int GRID_WIDTH = 350;
- public static final int GRID_HEIGHT = 400;
-
- public OprofiledLogDialog (Shell parentShell, String dialogMessage) {
- super(parentShell, OprofileUiMessages.getString("oprofiled.logreader.dialog.title"), null, null, MessageDialog.NONE, new String[] { IDialogConstants.OK_LABEL }, 0); //$NON-NLS-1$
- textContent = dialogMessage;
- }
-
- @Override
- protected Control createCustomArea(Composite parent) {
- Composite area = new Composite(parent, 0);
- Layout layout = new GridLayout(1, true);
- GridData gd = new GridData(GRID_WIDTH, GRID_HEIGHT);
-
- area.setLayout(layout);
- area.setLayoutData(gd);
-
- Text txt = new Text(area, SWT.READ_ONLY | SWT.MULTI | SWT.V_SCROLL | SWT.BORDER);
- //Check if the textContent isn't null
- if (textContent != null){
- txt.setText(textContent);
- }
- txt.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
- return area;
- }
-}
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.ui/src/org/eclipse/linuxtools/internal/oprofile/ui/view/OprofileViewRefreshAction.java b/oprofile/org.eclipse.linuxtools.oprofile.ui/src/org/eclipse/linuxtools/internal/oprofile/ui/view/OprofileViewRefreshAction.java
deleted file mode 100644
index 867b823448f9948bd7a03b80544f655a10649f78..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.ui/src/org/eclipse/linuxtools/internal/oprofile/ui/view/OprofileViewRefreshAction.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2018 Red Hat, Inc.
- *
- * This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License 2.0
- * which is available at https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- * Kent Sebastian <ksebasti@redhat.com> - initial API and implementation
- *******************************************************************************/
-package org.eclipse.linuxtools.internal.oprofile.ui.view;
-
-import org.eclipse.jface.action.Action;
-import org.eclipse.linuxtools.internal.oprofile.ui.OprofileUiMessages;
-import org.eclipse.linuxtools.internal.oprofile.ui.OprofileUiPlugin;
-
-/**
- * Refresh menu item.
- */
-public class OprofileViewRefreshAction extends Action {
- public OprofileViewRefreshAction() {
- super(OprofileUiMessages.getString("view.actions.refresh.label")); //$NON-NLS-1$
- }
-
- @Override
- public void run() {
- OprofileUiPlugin.getDefault().getOprofileView().refreshView();
- }
-}
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.ui/src/org/eclipse/linuxtools/internal/oprofile/ui/view/OprofileViewSaveDefaultSessionAction.java b/oprofile/org.eclipse.linuxtools.oprofile.ui/src/org/eclipse/linuxtools/internal/oprofile/ui/view/OprofileViewSaveDefaultSessionAction.java
deleted file mode 100755
index ca8e3509c3c9177b44e7f2f619b15ee6d4e40fd9..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.ui/src/org/eclipse/linuxtools/internal/oprofile/ui/view/OprofileViewSaveDefaultSessionAction.java
+++ /dev/null
@@ -1,177 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2018 Red Hat, Inc.
- *
- * This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License 2.0
- * which is available at https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- * Kent Sebastian <ksebasti@redhat.com> - initial API and implementation
- * Keith Seitz <keiths@redhat.com> - SaveSessionValidator code
- *******************************************************************************/
-package org.eclipse.linuxtools.internal.oprofile.ui.view;
-
-import java.text.MessageFormat;
-
-import org.eclipse.core.filesystem.IFileStore;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.dialogs.IInputValidator;
-import org.eclipse.jface.dialogs.InputDialog;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.window.Window;
-import org.eclipse.linuxtools.internal.oprofile.core.Oprofile;
-import org.eclipse.linuxtools.internal.oprofile.core.opxml.sessions.SessionManager;
-import org.eclipse.linuxtools.internal.oprofile.ui.OprofileUiMessages;
-import org.eclipse.linuxtools.internal.oprofile.ui.OprofileUiPlugin;
-import org.eclipse.linuxtools.oprofile.ui.model.IUiModelElement;
-import org.eclipse.linuxtools.oprofile.ui.model.UiModelError;
-import org.eclipse.linuxtools.oprofile.ui.model.UiModelRoot;
-import org.eclipse.linuxtools.oprofile.ui.model.UiModelSession;
-import org.eclipse.linuxtools.profiling.launch.IRemoteFileProxy;
-import org.eclipse.linuxtools.profiling.launch.RemoteProxyManager;
-
-/**
- * Menu item to save the default session. Moved from a double-click in the view
- * on the default session for consistency (since non-default sessions can't be
- * saved).
- */
-public class OprofileViewSaveDefaultSessionAction extends Action {
- private IRemoteFileProxy proxy;
-
- public OprofileViewSaveDefaultSessionAction() {
- super(OprofileUiMessages
- .getString("view.actions.savedefaultsession.label")); //$NON-NLS-1$
- }
-
- @Override
- public void run() {
- boolean defaultSessionExists = false;
- UiModelRoot modelRoot = UiModelRoot.getDefault();
- String defaultSessionName = null;
- IUiModelElement[] modelEvents = null;
-
- if (modelRoot.hasChildren()) {
- IUiModelElement[] sessions = modelRoot.getChildren();
- for (IUiModelElement e : sessions) {
- if (e instanceof UiModelError)
- break;
-
- if (e instanceof UiModelSession) {
-
- if (((UiModelSession) e).isDefaultSession()) {
- defaultSessionExists = true;
- defaultSessionName = e.getLabelText();
- modelEvents = ((UiModelSession) e).getChildren();
- break;
- }
-
- if (defaultSessionExists)
- break;
- }
- }
-
- if (defaultSessionExists) {
- // the following code was originially written by Keith Seitz
- InputDialog dialog = new InputDialog(
- OprofileUiPlugin.getActiveWorkbenchShell(),
- OprofileUiMessages.getString("savedialog.title"), //$NON-NLS-1$
- OprofileUiMessages.getString("savedialog.message"), //$NON-NLS-1$
- OprofileUiMessages.getString("savedialog.initial"), //$NON-NLS-1$
- new SaveSessionValidator());
-
- int result = dialog.open();
- if (result == Window.OK) {
- SessionManager.saveSession(dialog.getValue());
-
- // remove the default session
- for (int i = 0; i < modelEvents.length; i++) {
- SessionManager.deleteSession(defaultSessionName, modelEvents[i].getLabelText());
- }
-
- if (Oprofile.OprofileProject.OPERF_BINARY.equals(Oprofile.OprofileProject.getProfilingBinary())) {
- // remove oprofile_data so current event no longer
- // be there
- OprofileViewDeleteSessionAction.deleteOperfDataFolder(
- Oprofile.OprofileProject.getProject().getFolder(Oprofile.OprofileProject.OPERF_DATA));
- }
- OprofileUiPlugin.getDefault().getOprofileView().refreshView();
- }
- } else {
- MessageDialog
- .openError(
- OprofileUiPlugin.getActiveWorkbenchShell(),
- OprofileUiMessages
- .getString("defaultsessiondialog.nodefaultsession.title"), //$NON-NLS-1$
- OprofileUiMessages
- .getString("defaultsessiondialog.nodefaultsession.message")); //$NON-NLS-1$
- }
- }
- }
-
- // Original author: Keith Seitz <keiths@redhat.com>
- private class SaveSessionValidator implements IInputValidator {
-
- private SessionManager session = null;
-
- public SaveSessionValidator() {
- session = new SessionManager(SessionManager.SESSION_LOCATION);
- }
-
- @Override
- public String isValid(String newText) {
- // Sanity check
- if (newText.length() == 0) {
- return ""; //$NON-NLS-1$
- }
-
- // Cannot contain invalid characters
- int index = newText.indexOf('/');
- if (index == -1) {
- index = newText.indexOf('\\');
- }
-
- if (index != -1) {
- String format = OprofileUiMessages
- .getString("savedialog.validator.invalidChar"); //$NON-NLS-1$
- return MessageFormat.format(format, newText.substring(index, index + 1), newText);
- }
-
- // Cannot contain whitespace
- if (newText.contains(" ") || newText.contains("\t")) { //$NON-NLS-1$ //$NON-NLS-2$
- String format = OprofileUiMessages
- .getString("savedialog.validator.containsWhitespace"); //$NON-NLS-1$
- return MessageFormat.format(format, newText);
- }
-
- if (session.existsSession(newText)) {
- String format = OprofileUiMessages
- .getString("savedialog.validator.exists"); //$NON-NLS-1$
- return MessageFormat.format(format, newText);
- }
-
- // Must not already exist (opcontrol doesn't allow it)
-
- try {
- proxy = RemoteProxyManager.getInstance().getFileProxy(
- Oprofile.OprofileProject.getProject());
- } catch (CoreException e) {
- e.printStackTrace();
- }
-
- IFileStore fileStore = proxy.getResource(Oprofile
- .getDefaultSamplesDirectory() + newText);
- if (fileStore.fetchInfo().exists()) {
- String format = OprofileUiMessages
- .getString("savedialog.validator.exists"); //$NON-NLS-1$
- return MessageFormat.format(format, newText);
- }
-
- // Everything OK
- return null;
- }
- }
-
-}
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.ui/src/org/eclipse/linuxtools/internal/oprofile/ui/view/OprofileViewSortAction.java b/oprofile/org.eclipse.linuxtools.oprofile.ui/src/org/eclipse/linuxtools/internal/oprofile/ui/view/OprofileViewSortAction.java
deleted file mode 100644
index 6c63d7258a0e69bf5b4977d5e63abd5cf9bf89b6..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.ui/src/org/eclipse/linuxtools/internal/oprofile/ui/view/OprofileViewSortAction.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2014, 2018 IBM Corporation.
- *
- * This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License 2.0
- * which is available at https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- * Brajesh K Rathore <brrathor@linux.vnet.ibm.com> - initial API and implementation
- *******************************************************************************/
-package org.eclipse.linuxtools.internal.oprofile.ui.view;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.jface.action.Action;
-import org.eclipse.linuxtools.internal.oprofile.ui.OprofileUiMessages;
-import org.eclipse.linuxtools.internal.oprofile.ui.OprofileUiPlugin;
-import org.eclipse.linuxtools.oprofile.ui.model.UiModelRoot;
-
-/**
- *
- * Action handler for tree sorting.
- * tree can be sort by session,event,Lib,function and line number.
- * @since 3.0
- *
- */
-public class OprofileViewSortAction extends Action {
-
- public static Map<UiModelRoot.SortType, String> sortTypeMap = new HashMap<>();
- static{
- sortTypeMap.put(UiModelRoot.SortType.DEFAULT, OprofileUiMessages.getString("view.actions.default.label")); //$NON-NLS-1$
- sortTypeMap.put(UiModelRoot.SortType.SESSION, OprofileUiMessages.getString("view.actions.session.label")); //$NON-NLS-1$
- sortTypeMap.put(UiModelRoot.SortType.EVENT, OprofileUiMessages.getString("view.actions.event.label")); //$NON-NLS-1$
- sortTypeMap.put(UiModelRoot.SortType.LIB, OprofileUiMessages.getString("view.actions.lib.label")); //$NON-NLS-1$
- sortTypeMap.put(UiModelRoot.SortType.FUNCTION, OprofileUiMessages.getString("view.actions.function.label")); //$NON-NLS-1$
- sortTypeMap.put(UiModelRoot.SortType.LINE_NO, OprofileUiMessages.getString("view.actions.line.label")); //$NON-NLS-1$
- }
- private UiModelRoot.SortType sortType;
-
- public OprofileViewSortAction(UiModelRoot.SortType sortType, String text) {
- super(text);
- this.sortType = sortType;
- }
-
- @Override
- public void run() {
- UiModelRoot.setSortingType(sortType);
- OprofileUiPlugin.getDefault().getOprofileView().refreshView();
- }
-
-}
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.ui/src/org/eclipse/linuxtools/oprofile/ui/model/IUiModelElement.java b/oprofile/org.eclipse.linuxtools.oprofile.ui/src/org/eclipse/linuxtools/oprofile/ui/model/IUiModelElement.java
deleted file mode 100644
index 2baf6fe3ba01da6c14b67979077814b012bb8be9..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.ui/src/org/eclipse/linuxtools/oprofile/ui/model/IUiModelElement.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2018 Red Hat, Inc.
- *
- * This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License 2.0
- * which is available at https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- * Kent Sebastian <ksebasti@redhat.com> - initial API and implementation
- *******************************************************************************/
-package org.eclipse.linuxtools.oprofile.ui.model;
-
-import org.eclipse.swt.graphics.Image;
-
-/**
- * Interface for all model elements to ease use with the tree viewer.
- * @since 1.1
- */
-public interface IUiModelElement {
- /**
- * Returns the text to display in the tree viewer as required by the label provider.
- * @return text describing this element
- */
- String getLabelText();
-
- /**
- * Returns the children of this element.
- * @return an array of IUiModelElements
- */
- IUiModelElement[] getChildren();
-
- /**
- * Returns if this element has any children. Unless there is no data in
- * a session, only samples should not have any children.
- * @return true if children, false if no children
- */
- boolean hasChildren();
-
- /**
- * Returns the parent element.
- * @return the parent element
- */
- IUiModelElement getParent();
-
- /**
- * Returns the Image to display next to the text in the tree viewer.
- * @return an Image object of the icon
- */
- Image getLabelImage();
-}
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.ui/src/org/eclipse/linuxtools/oprofile/ui/model/UiModelDependent.java b/oprofile/org.eclipse.linuxtools.oprofile.ui/src/org/eclipse/linuxtools/oprofile/ui/model/UiModelDependent.java
deleted file mode 100644
index 86486a27ffb07e281940301a5a5fdf443a8f2bc1..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.ui/src/org/eclipse/linuxtools/oprofile/ui/model/UiModelDependent.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2018 Red Hat, Inc.
- *
- * This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License 2.0
- * which is available at https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- * Kent Sebastian <ksebasti@redhat.com> - initial API and implementation
- *******************************************************************************/
-package org.eclipse.linuxtools.oprofile.ui.model;
-
-import java.util.Arrays;
-
-import org.eclipse.linuxtools.internal.oprofile.core.model.OpModelImage;
-import org.eclipse.linuxtools.internal.oprofile.ui.OprofileUiMessages;
-import org.eclipse.linuxtools.internal.oprofile.ui.OprofileUiPlugin;
-import org.eclipse.swt.graphics.Image;
-
-/**
- * @since 1.1
- */
-public class UiModelDependent implements IUiModelElement {
- private IUiModelElement parent;
- private OpModelImage dataModelDependents[];
- private UiModelImage dependents[];
- private int totalCount;
- private int depCount;
-
- /**
- * Constructor to this UiModelDependent class
- * @param parent The parent element
- * @param dependents The dependent images
- * @param totalCount The total count of samples for the parent session
- * @param depCount The count for all dependent images
- */
- public UiModelDependent(IUiModelElement parent, OpModelImage dependents[], int totalCount, int depCount) {
- this.parent = parent;
- this.dataModelDependents = dependents;
- this.dependents = null;
- this.totalCount = totalCount+depCount;
- this.depCount = depCount;
- refreshModel();
- }
-
- private void refreshModel() {
- dependents = new UiModelImage[dataModelDependents.length];
-
- for (int i = 0; i < dataModelDependents.length; i++) {
- dependents[i] = new UiModelImage(this, dataModelDependents[i], totalCount, 0);
- }
- }
-
- @Override
- public String toString() {
- double countPercentage = (double)depCount / (double)totalCount;
- String percentage = OprofileUiPlugin.getPercentageString(countPercentage);
-
- return percentage + " " + OprofileUiMessages.getString("uimodel.percentage.in")+" " + OprofileUiMessages.getString("uimodel.dependent.dependent.images"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
- }
-
- /** IUiModelElement functions **/
- @Override
- public String getLabelText() {
- return toString();
- }
-
- /**
- * Returns the children of this element.
- * @return An array of child elements or null
- */
- @Override
- public IUiModelElement[] getChildren() {
-
- if (UiModelRoot.SortType.LIB == UiModelRoot.getSortingType()) {
- Arrays.sort(dependents, UiModelSorting.getInstance());
- return dependents;
- }
-
- return dependents;
- }
-
- /**
- * Returns if the element has any children.
- * @return true if the element has children, false otherwise
- */
- @Override
- public boolean hasChildren() {
- return true; //must have children, or this object wouldn't be created
- }
-
- /**
- * Returns the parent element.
- * @return the parent element or null
- */
- @Override
- public IUiModelElement getParent() {
- return parent;
- }
-
- /**
- * Returns the Image to display next to the text in the tree viewer.
- * @return an Image object of the icon
- */
- @Override
- public Image getLabelImage() {
- return OprofileUiPlugin.getImageDescriptor(OprofileUiPlugin.DEPENDENT_ICON).createImage();
- }
-}
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.ui/src/org/eclipse/linuxtools/oprofile/ui/model/UiModelError.java b/oprofile/org.eclipse.linuxtools.oprofile.ui/src/org/eclipse/linuxtools/oprofile/ui/model/UiModelError.java
deleted file mode 100644
index b203d525bc461c650f3375d6b338691bd680723b..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.ui/src/org/eclipse/linuxtools/oprofile/ui/model/UiModelError.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2018 Red Hat, Inc.
- *
- * This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License 2.0
- * which is available at https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- * Kent Sebastian <ksebasti@redhat.com> - initial API and implementation
- *******************************************************************************/
-package org.eclipse.linuxtools.oprofile.ui.model;
-
-import org.eclipse.linuxtools.internal.oprofile.ui.OprofileUiMessages;
-import org.eclipse.linuxtools.internal.oprofile.ui.OprofileUiPlugin;
-import org.eclipse.swt.graphics.Image;
-
-/**
- * This is an error element
- * @since 1.1
- */
-public class UiModelError implements IUiModelElement {
- public static final UiModelError NO_SAMPLES_ERROR = new UiModelError(OprofileUiMessages.getString("root.error.nosamples")); //$NON-NLS-1$
-
- private String errorMessage;
-
- /**
- * Constructor to the UiModelError class
- * @param message Error message
- */
- public UiModelError(String message) {
- errorMessage = message;
- }
-
- /** IUiModelElement functions **/
- @Override
- public String getLabelText() {
- return errorMessage;
- }
-
- /**
- * Returns the children of this element.
- * @return An array of child elements or null
- */
- @Override
- public IUiModelElement[] getChildren() {
- return null;
- }
-
- /**
- * Return whether the element has any children
- * @return true if the element has any children, false otherwise
- */
- @Override
- public boolean hasChildren() {
- return false;
- }
-
- /**
- * Returns the element's parent.
- * @return The parent element or null
- */
- @Override
- public IUiModelElement getParent() {
- return null;
- }
-
- /**
- * Returns the Image to display next to the text in the tree viewer.
- * In this case it is an error icon.
- * @return an Image object of the icon
- */
- @Override
- public Image getLabelImage() {
- return OprofileUiPlugin.getImageDescriptor(OprofileUiPlugin.ERROR_ICON).createImage();
- }
-}
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.ui/src/org/eclipse/linuxtools/oprofile/ui/model/UiModelEvent.java b/oprofile/org.eclipse.linuxtools.oprofile.ui/src/org/eclipse/linuxtools/oprofile/ui/model/UiModelEvent.java
deleted file mode 100644
index e2d9fa8eaa67cf0e70050819b4f2dbca3bde18d1..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.ui/src/org/eclipse/linuxtools/oprofile/ui/model/UiModelEvent.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2018 Red Hat, Inc.
- *
- * This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License 2.0
- * which is available at https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- * Kent Sebastian <ksebasti@redhat.com> - initial API and implementation
- *******************************************************************************/
-package org.eclipse.linuxtools.oprofile.ui.model;
-
-import org.eclipse.linuxtools.internal.oprofile.core.model.OpModelEvent;
-import org.eclipse.linuxtools.internal.oprofile.core.model.OpModelImage;
-import org.eclipse.linuxtools.internal.oprofile.ui.OprofileUiPlugin;
-import org.eclipse.swt.graphics.Image;
-
-/**
- * Top level elements displayed in the view -- events that oprofile
- * has profiled. Must have children sessions.
- * @since 1.1
- */
-public class UiModelEvent implements IUiModelElement {
- private IUiModelElement parent = null; //parent node -- necessary?
- private OpModelEvent event; //the node in the data model
-
- private UiModelImage image; //this node's child
- private UiModelDependent dependent; //dependent images of the OpModelImage
-
- public UiModelEvent(IUiModelElement parent, OpModelEvent event) {
- this.parent = parent;
- this.event = event;
- this.image = null;
- this.dependent = null;
- refreshModel();
- }
-
- /**
- * Create the ui sessions from the data model.
- */
- private void refreshModel() {
- OpModelImage dataModelImage = event.getImage();
- if (dataModelImage != null) {
- image = new UiModelImage(this, dataModelImage, dataModelImage.getCount(), dataModelImage.getDepCount());
-
- if (dataModelImage.hasDependents()) {
- dependent = new UiModelDependent(this, dataModelImage.getDependents(), dataModelImage.getCount(), dataModelImage.getDepCount());
- }
- }
- }
-
- @Override
- public String toString() {
- return (event == null ? "" : event.getName()); //$NON-NLS-1$
- }
-
- /** IUiModelElement functions **/
- @Override
- public String getLabelText() {
- return toString();
- }
-
- /**
- * Returns the children of this element.
- * @return An array of child elements or null
- */
- @Override
- public IUiModelElement[] getChildren() {
- if (dependent != null) {
- return new IUiModelElement[] {image, dependent};
- } else {
- return new IUiModelElement[] {image};
- }
- }
-
- /**
- * Returns if the element has any children.
- * @return true if the element has children, false otherwise
- */
- @Override
- public boolean hasChildren() {
- return (image != null);
- }
-
- /**
- * Returns the element's parent.
- * @return parent The parent element or null
- */
- @Override
- public IUiModelElement getParent() {
- return parent;
- }
-
- /**
- * Returns the Image to display next to the text in the tree viewer.
- * @return an Image object of the icon
- */
- @Override
- public Image getLabelImage() {
- return OprofileUiPlugin.getImageDescriptor(OprofileUiPlugin.EVENT_ICON).createImage();
- }
-}
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.ui/src/org/eclipse/linuxtools/oprofile/ui/model/UiModelImage.java b/oprofile/org.eclipse.linuxtools.oprofile.ui/src/org/eclipse/linuxtools/oprofile/ui/model/UiModelImage.java
deleted file mode 100644
index aa488079e29157660e95e968f7ab4592293528da..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.ui/src/org/eclipse/linuxtools/oprofile/ui/model/UiModelImage.java
+++ /dev/null
@@ -1,131 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2018 Red Hat, Inc.
- *
- * This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License 2.0
- * which is available at https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- * Kent Sebastian <ksebasti@redhat.com> - initial API and implementation
- *******************************************************************************/
-package org.eclipse.linuxtools.oprofile.ui.model;
-
-import java.util.Arrays;
-
-import org.eclipse.linuxtools.internal.oprofile.core.model.OpModelImage;
-import org.eclipse.linuxtools.internal.oprofile.core.model.OpModelSymbol;
-import org.eclipse.linuxtools.internal.oprofile.ui.OprofileUiMessages;
-import org.eclipse.linuxtools.internal.oprofile.ui.OprofileUiPlugin;
-import org.eclipse.swt.graphics.Image;
-
-/**
- * Children of sessions in the view -- the binary which was profiled.
- * May or may not have child symbols. Note that although the dependent
- * images are children of OpModelImages in the data model, for usability's
- * sake they are children of the parent session in the tree.
- * @since 1.1
- */
-public class UiModelImage implements IUiModelElement {
- private IUiModelElement parent; //parent element, may be UiModelSession or UiModelDependent
- private OpModelImage image; //the node in the data model
- private UiModelSymbol symbols[]; //this node's child (symbols)
- private int totalCount; //total number of samples
-
- /**
- * Constructor to the UiModelImage class
- * @param parent The parent element
- * @param image The image node object in the data model
- * @param totalCount The total number of samples
- * @param depCount The number of samples from dependent images
- */
- public UiModelImage(IUiModelElement parent, OpModelImage image, int totalCount, int depCount) {
- this.parent = parent;
- this.image = image;
- this.symbols = null;
- this.totalCount = totalCount+depCount;//totalCount;
- refreshModel();
- }
- /**
- * Create the ui symbols from the data model.
- */
- private void refreshModel() {
- OpModelSymbol[] dataModelSymbols = image.getSymbols();
-
- //dependent images may not have symbols
- if (dataModelSymbols != null) {
- symbols = new UiModelSymbol[dataModelSymbols.length];
-
- for (int i = 0; i < dataModelSymbols.length; i++) {
- symbols[i] = new UiModelSymbol(this, dataModelSymbols[i], totalCount);
- }
- }
- }
-
- @Override
- public String toString() {
- if (image.getCount() == OpModelImage.IMAGE_PARSE_ERROR) {
- return OprofileUiMessages.getString("opxmlParse.error.multipleImages"); //$NON-NLS-1$
- } else {
- double countPercentage = (double)(image.getCount() ) / (double)totalCount;
- String percentage = OprofileUiPlugin.getPercentageString(countPercentage);
-
- return percentage + " " + OprofileUiMessages.getString("uimodel.percentage.in")+" " + image.getName(); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- }
- }
-
- /** IUiModelElement functions **/
- @Override
- public String getLabelText() {
- return toString();
- }
-
- /**
- * Returns the children of this element.
- * @return An array of child elements or null
- */
- @Override
- public IUiModelElement[] getChildren() {
- IUiModelElement children[] = null;
-
- if (symbols != null) {
- children = new IUiModelElement[symbols.length];
-
- for (int i = 0; i < symbols.length; i++) {
- children[i] = symbols[i];
- }
- }
- if (UiModelRoot.SortType.FUNCTION == UiModelRoot.getSortingType()) {
- Arrays.sort(children, UiModelSorting.getInstance());
- return children;
- }
- return children;
- }
- /**
- * Returns if the element has any children.
- * @return true if the element has children, false otherwise
- */
- @Override
- public boolean hasChildren() {
- return (symbols == null || symbols.length == 0 ? false : true);
- }
-
- /**
- * Returns the element's parent.
- * @return parent The parent element or null
- */
- @Override
- public IUiModelElement getParent() {
- return parent;
- }
-
- /**
- * Returns the Image to display next to the text in the tree viewer.
- * @return an Image object of the icon
- */
- @Override
- public Image getLabelImage() {
- return OprofileUiPlugin.getImageDescriptor(OprofileUiPlugin.IMAGE_ICON).createImage();
- }
-}
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.ui/src/org/eclipse/linuxtools/oprofile/ui/model/UiModelRoot.java b/oprofile/org.eclipse.linuxtools.oprofile.ui/src/org/eclipse/linuxtools/oprofile/ui/model/UiModelRoot.java
deleted file mode 100644
index 6d92dbecc69ac31a0e6cf804b2f22bc17f1eb0a7..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.ui/src/org/eclipse/linuxtools/oprofile/ui/model/UiModelRoot.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2018 Red Hat, Inc.
- *
- * This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License 2.0
- * which is available at https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- * Kent Sebastian <ksebasti@redhat.com> - initial API and implementation
- *******************************************************************************/
-package org.eclipse.linuxtools.oprofile.ui.model;
-
-import java.util.Arrays;
-
-import org.eclipse.linuxtools.internal.oprofile.core.model.OpModelRoot;
-import org.eclipse.linuxtools.internal.oprofile.core.model.OpModelSession;
-import org.eclipse.swt.graphics.Image;
-
-/**
- * Convenience class for creating the UI model from the oprofile data model,
- * via a single point of access.
- * @since 1.1
- */
-public class UiModelRoot implements IUiModelElement {
- private static UiModelRoot uiModelRoot = new UiModelRoot(); //singleton
-
- private UiModelError rootError;
- private UiModelSession[] session; //this node's children
-
- /** constructor, private for singleton use **/
- protected UiModelRoot() {
- session = null;
- rootError = null;
- }
-
- /**
- * Get the instance of this ui model root.
- * @return the ui model root object
- */
- public static UiModelRoot getDefault() {
- return uiModelRoot;
- }
-
- /**
- * Kick off creating the UI model from the data model. Meant to
- * be called from UI code. The refreshModel() method is called for
- * the child elements from their constructor.
- */
- public void refreshModel() {
- OpModelSession dataModelEvents[] = getModelDataEvents();
-
-
- rootError = null;
- session = null;
-
- if (dataModelEvents == null || dataModelEvents.length == 0) {
- rootError = UiModelError.NO_SAMPLES_ERROR;
- } else {
- session = new UiModelSession[dataModelEvents.length];
- for (int i = 0; i < dataModelEvents.length; i++) {
- session[i] = new UiModelSession(dataModelEvents[i]);
- }
- }
- }
-
- protected OpModelSession[] getModelDataEvents() {
- OpModelRoot modelRoot = OpModelRoot.getDefault();
- return modelRoot.getSessions();
- }
-
- /** IUiModelElement functions **/
- @Override
- public String getLabelText() {
- return null;
- }
-
- /**
- * Returns the children of this element.
- * @return An array of child elements or null
- */
- @Override
- public IUiModelElement[] getChildren() {
- if (session != null && session.length != 0) {
- if (UiModelRoot.SortType.SESSION == UiModelRoot.getSortingType()) {
- Arrays.sort(session, UiModelSorting.getInstance());
- return session;
- }
-
- else {
- return session;
- }
-
- } else
- return new IUiModelElement[] { rootError };
- }
- /**
- * Returns if the element has any children.
- * @return true if the element has children, false otherwise
- */
- @Override
- public boolean hasChildren() {
- return true;
- }
-
- /**
- * Returns the element's parent.
- * @return The parent element or null
- */
- @Override
- public IUiModelElement getParent() {
- return null;
- }
-
- @Override
- public Image getLabelImage() {
- return null;
- }
-
- /**
- *
- * Adding sorting feature in tree.
- * @since 3.0
- *
- */
- public static enum SortType{DEFAULT,SESSION,EVENT,LIB,FUNCTION,LINE_NO}
- private static SortType sortType;
- public static void setSortingType(SortType sortType) {
- UiModelRoot.sortType = sortType;
- }
-
- public static SortType getSortingType() {
- return UiModelRoot.sortType;
- }
-}
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.ui/src/org/eclipse/linuxtools/oprofile/ui/model/UiModelSample.java b/oprofile/org.eclipse.linuxtools.oprofile.ui/src/org/eclipse/linuxtools/oprofile/ui/model/UiModelSample.java
deleted file mode 100644
index e7807bd1ec9d5b74e2d73b1c4263f70fb6c316eb..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.ui/src/org/eclipse/linuxtools/oprofile/ui/model/UiModelSample.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2018 Red Hat, Inc.
- *
- * This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License 2.0
- * which is available at https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- * Kent Sebastian <ksebasti@redhat.com> - initial API and implementation
- *******************************************************************************/
-package org.eclipse.linuxtools.oprofile.ui.model;
-
-import org.eclipse.linuxtools.internal.oprofile.core.model.OpModelSample;
-import org.eclipse.linuxtools.internal.oprofile.ui.OprofileUiMessages;
-import org.eclipse.linuxtools.internal.oprofile.ui.OprofileUiPlugin;
-import org.eclipse.swt.graphics.Image;
-
-/**
- * @since 1.1
- */
-public class UiModelSample implements IUiModelElement {
- private IUiModelElement parent; //parent element
- private OpModelSample sample; //the node in the data model
- private int totalCount; //total sample count for the parent session
-
- /**
- * Constructor to the UiModelSample class
- * @param parent The parent element
- * @param sample Oprofile sample node in the data model
- * @param totalCount The total sample count for the parent session
- */
- public UiModelSample(IUiModelElement parent, OpModelSample sample, int totalCount) {
- this.parent = parent;
- this.sample = sample;
- this.totalCount = totalCount;
- }
-
- @Override
- public String toString() {
- double countPercentage = (double)sample.getCount() / (double)totalCount;
- String percentage = OprofileUiPlugin.getPercentageString(countPercentage);
-
- return percentage + " " + OprofileUiMessages.getString("uimodel.sample.on.line")+" " + Integer.toString(sample.getLine()); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- }
-
- /**
- * Return the sample line
- * @return the sample line
- */
- public int getLine() {
- return sample.getLine();
- }
-
- /**
- * Return the path to the sample node
- * @return node path
- */
- public String getFile(){
- return sample.getFilePath();
- }
-
- /**
- * Returns the count percentage for the sample node
- * @return count percentage for the sample node
- */
- public double getCountPercentage() {
- return (double)sample.getCount() / (double)totalCount;
- }
-
- /** IUiModelElement functions **/
- @Override
- public String getLabelText() {
- return toString();
- }
-
- /**
- * Returns the children of this element.
- * @return An array of child elements or null
- */
- @Override
- public IUiModelElement[] getChildren() {
- return null;
- }
- /**
- * Returns if the element has any children.
- * @return true if the element has children, false otherwise
- */
- @Override
- public boolean hasChildren() {
- return false; //bottom level element
- }
-
- /**
- * Returns the element's parent.
- * @return parent The parent element
- */
- @Override
- public IUiModelElement getParent() {
- return parent;
- }
-
- /**
- * Returns the Image to display next to the text in the tree viewer.
- * @return an Image object of the icon
- */
- @Override
- public Image getLabelImage() {
- return OprofileUiPlugin.getImageDescriptor(OprofileUiPlugin.SAMPLE_ICON).createImage();
- }
-}
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.ui/src/org/eclipse/linuxtools/oprofile/ui/model/UiModelSession.java b/oprofile/org.eclipse.linuxtools.oprofile.ui/src/org/eclipse/linuxtools/oprofile/ui/model/UiModelSession.java
deleted file mode 100644
index 588077e3fbd15648dcb6cf0615971c976ab33cb0..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.ui/src/org/eclipse/linuxtools/oprofile/ui/model/UiModelSession.java
+++ /dev/null
@@ -1,124 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2018 Red Hat, Inc.
- *
- * This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License 2.0
- * which is available at https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- * Kent Sebastian <ksebasti@redhat.com> - initial API and implementation
- *******************************************************************************/
-package org.eclipse.linuxtools.oprofile.ui.model;
-
-import java.util.Arrays;
-
-import org.eclipse.linuxtools.internal.oprofile.core.model.OpModelEvent;
-import org.eclipse.linuxtools.internal.oprofile.core.model.OpModelSession;
-import org.eclipse.linuxtools.internal.oprofile.ui.OprofileUiMessages;
-import org.eclipse.linuxtools.internal.oprofile.ui.OprofileUiPlugin;
-import org.eclipse.swt.graphics.Image;
-
-/**
- * Children of events in the view -- sessions containing images/symbols
- * for its parent event. Must have a child image. May also have dependent
- * images, which are children of the Image in the data model, but are
- * displayed as children of the session in the view.
- * @since 1.1
- */
-public class UiModelSession implements IUiModelElement {
- private OpModelSession session; //the node in the data model
-
- private UiModelEvent events[];
-
- //OProfile's default session name
- private static final String DEFAULT_SESSION_NAME = "current"; //$NON-NLS-1$
-
- /**
- * Constructor to the UiModelSession class
- * @param session Oprofile session node in the data model
- */
- public UiModelSession(OpModelSession session) {
- if (session != null) {
- this.session = session;
- refreshModel();
- }
- }
-
- private void refreshModel() {
-
- OpModelEvent dataModelEvents[] = session.getEvents();
- events = new UiModelEvent[dataModelEvents.length];
- for (int i = 0; i < dataModelEvents.length; i++) {
- events[i] = new UiModelEvent(this, dataModelEvents[i]);
- }
-
- }
-
- @Override
- public String toString() {
- return session.getName();
- }
-
- /**
- * Check if this is Oprofile's default session name
- * @return true whether this is Oprofile's default session, false otherwise
- */
- public boolean isDefaultSession() {
- return session.getName().equalsIgnoreCase(DEFAULT_SESSION_NAME);
- }
-
- /** IUiModelElement functions
- * Returns the text to display in the tree viewer as required by the label provider.
- * @return text Text string describing this element
- */
- @Override
- public String getLabelText() {
- if (session.getName().equals(DEFAULT_SESSION_NAME)){
- return OprofileUiMessages.getString("UiModelSession_current"); //$NON-NLS-1$
- }
- return toString();
- }
-
- /**
- * Returns the children of this element.
- * @return An array of child elements
- */
- @Override
- public IUiModelElement[] getChildren() {
- if (UiModelRoot.SortType.EVENT == UiModelRoot.getSortingType()) {
- Arrays.sort(events, UiModelSorting.getInstance());
- return events;
- }
-
- return events;
- }
-
- /**
- * Returns if the element has any children.
- * @return true if the element has children, false otherwise
- */
- @Override
- public boolean hasChildren() {
- return (events == null || events.length == 0 ? false : true);
- }
-
- /**
- * Returns the element's parent.
- * @return parent The parent element
- */
- @Override
- public IUiModelElement getParent() {
- return null;
- }
-
- /**
- * Returns the Image to display next to the text in the tree viewer.
- * @return an Image object of the icon
- */
- @Override
- public Image getLabelImage() {
- return OprofileUiPlugin.getImageDescriptor(OprofileUiPlugin.SESSION_ICON).createImage();
- }
-}
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.ui/src/org/eclipse/linuxtools/oprofile/ui/model/UiModelSorting.java b/oprofile/org.eclipse.linuxtools.oprofile.ui/src/org/eclipse/linuxtools/oprofile/ui/model/UiModelSorting.java
deleted file mode 100644
index ddc9a4f238050ccfb55b2e307ef094425b7ac269..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.ui/src/org/eclipse/linuxtools/oprofile/ui/model/UiModelSorting.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2014, 2018 IBM Corporation and others.
- *
- * This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License 2.0
- * which is available at https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- * Brajesh K Rathore <brrathor@linux.vnet.ibm.com> - initial API and implementation
- *******************************************************************************/
-package org.eclipse.linuxtools.oprofile.ui.model;
-
-import java.text.Collator;
-import java.util.Comparator;
-
-/**
- * Comparator for sorting tree elements.
- *
- * @since 3.0
- */
-public class UiModelSorting implements Comparator<IUiModelElement> {
- private static UiModelSorting instance = new UiModelSorting();
-
- private Collator collator;
-
- private UiModelSorting() {
- collator = Collator.getInstance();
- }
-
- public static UiModelSorting getInstance() {
- return instance;
- }
-
- @Override
- public int compare(IUiModelElement o1, IUiModelElement o2) {
-
- // compare line no.
- if (o1 instanceof UiModelSample && o2 instanceof UiModelSample) {
- return ((UiModelSample) o1).getLine()
- - ((UiModelSample) o2).getLine();
- } else if (o1 instanceof UiModelSymbol && o2 instanceof UiModelSymbol) {
- // compare function name
- return collator.compare(((UiModelSymbol) o1).getFunctionName(),
- ((UiModelSymbol) o2).getFunctionName());
- } else if (o1 instanceof UiModelImage && o2 instanceof UiModelImage) {
- // comapre lib name
- return collator.compare(getLibraryName(o1.getLabelText()),
- getLibraryName(o2.getLabelText()));
- }
- // default comparison based on display label
- return collator.compare(o1.getLabelText(), o2.getLabelText());
- }
-
- private String getLibraryName(String lib) {
- // /lib64/libc-2.12.so - libc-2.12.s0
- String libName = ""; //$NON-NLS-1$
- int index = 0;
- if (null != lib && lib.trim().length() != 0) {
- index = lib.lastIndexOf('/');
- if (index != -1) {
- libName = lib.substring(index + 1, lib.length());
- }
-
- }
- return libName;
- }
-}
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.ui/src/org/eclipse/linuxtools/oprofile/ui/model/UiModelSymbol.java b/oprofile/org.eclipse.linuxtools.oprofile.ui/src/org/eclipse/linuxtools/oprofile/ui/model/UiModelSymbol.java
deleted file mode 100644
index 1da6901de08950739ee0bc51c5deb69a15c15f61..0000000000000000000000000000000000000000
--- a/oprofile/org.eclipse.linuxtools.oprofile.ui/src/org/eclipse/linuxtools/oprofile/ui/model/UiModelSymbol.java
+++ /dev/null
@@ -1,173 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2018 Red Hat, Inc.
- *
- * This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License 2.0
- * which is available at https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- * Kent Sebastian <ksebasti@redhat.com> - initial API and implementation
- *******************************************************************************/
-package org.eclipse.linuxtools.oprofile.ui.model;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Arrays;
-
-import org.eclipse.linuxtools.internal.oprofile.core.model.OpModelSample;
-import org.eclipse.linuxtools.internal.oprofile.core.model.OpModelSymbol;
-import org.eclipse.linuxtools.internal.oprofile.ui.OprofileUiMessages;
-import org.eclipse.linuxtools.internal.oprofile.ui.OprofileUiPlugin;
-import org.eclipse.swt.graphics.Image;
-
-/**
- * Children of images in the view -- a function name in the profiled image's
- * source code. May or may not have child samples.
- *
- * @since 1.1
- */
-public class UiModelSymbol implements IUiModelElement {
- private IUiModelElement parent; // parent element
- private OpModelSymbol symbol; // the node in the data model
- private UiModelSample samples[]; // this node's children
- private int totalCount; // total count of samples for the parent session
-
- /**
- * Constructor to the UiModelSymbol class
- *
- * @param parent
- * The parent element
- * @param symbol
- * The debugging symbol node object in the data model
- * @param totalCount
- * The total count of samples for the parent session
- */
- public UiModelSymbol(IUiModelElement parent, OpModelSymbol symbol,
- int totalCount) {
- this.parent = parent;
- this.symbol = symbol;
- this.samples = null;
- this.totalCount = totalCount;
- refreshModel();
- }
-
- /**
- * Creates the ui samples from the data model
- */
- private void refreshModel() {
- ArrayList<UiModelSample> sampleList = new ArrayList<>();
- OpModelSample dataModelSamples[] = symbol.getSamples();
-
- for (int i = 0; i < dataModelSamples.length; i++) {
- // dont display samples with line number of 0, meaning no line
- // number
- // was correlated, more likely that no source file exists
- if (dataModelSamples[i].getLine() != 0) {
- sampleList.add(new UiModelSample(this, dataModelSamples[i],
- totalCount));
- }
- }
-
- samples = new UiModelSample[sampleList.size()];
- sampleList.toArray(samples);
- }
-
- @Override
- public String toString() {
- double countPercentage = (double) symbol.getCount()
- / (double) totalCount;
- String percentage = OprofileUiPlugin
- .getPercentageString(countPercentage);
-
- // a hack to get `basename` type functionality
- String fileName = (new File(symbol.getFilePath())).getName();
-
- return percentage
- + " " + OprofileUiMessages.getString("uimodel.percentage.in") + " " + symbol.getName() + (fileName.length() == 0 ? "" : " [" + fileName + "]"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$
- }
-
- /**
- * Return the file path for the current debugging symbol
- *
- * @return the file path
- */
- public String getFileName() {
- return symbol.getFilePath();
- }
-
- /**
- * Return the debugging symbol function name
- *
- * @return the function name
- */
- public String getFunctionName() {
- return symbol.getName();
- }
-
- /**
- * Return the debugging symbol line number
- *
- * @return the line number
- */
- public int getLineNumber() {
- return symbol.getLine();
- }
-
- /**
- * IUiModelElement functions Returns the text to display in the tree viewer
- * as required by the label provider.
- *
- * @return text describing this element
- */
- @Override
- public String getLabelText() {
- return toString();
- }
-
- /**
- * Returns the children of this element.
- *
- * @return An array of child elements or null
- */
- @Override
- public IUiModelElement[] getChildren() {
- if (UiModelRoot.SortType.LINE_NO == UiModelRoot.getSortingType()) {
- Arrays.sort(samples, UiModelSorting.getInstance());
- return samples;
- }
- return samples;
- }
-
- /**
- * Returns if the element has any children.
- *
- * @return true if the element has children, false otherwise
- */
- @Override
- public boolean hasChildren() {
- return (samples == null || samples.length == 0 ? false : true);
- }
-
- /**
- * Returns the element's parent.
- *
- * @return parent The parent element
- */
- @Override
- public IUiModelElement getParent() {
- return parent;
- }
-
- /**
- * Returns the Image to display next to the text in the tree viewer.
- *
- * @return an Image object of the icon
- */
- @Override
- public Image getLabelImage() {
- return OprofileUiPlugin
- .getImageDescriptor(OprofileUiPlugin.SYMBOL_ICON).createImage();
- }
-}
diff --git a/oprofile/pom.xml b/oprofile/pom.xml
deleted file mode 100644
index e691e506c8f836ec0fa8a8396879de28f1235904..0000000000000000000000000000000000000000
--- a/oprofile/pom.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (C) 2011, 2018 Red Hat, Inc.
-
- This program and the accompanying materials are made
- available under the terms of the Eclipse Public License 2.0
- which is available at https://www.eclipse.org/legal/epl-2.0/
-
- SPDX-License-Identifier: EPL-2.0
--->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.eclipse.linuxtools</groupId>
- <artifactId>linuxtools-parent</artifactId>
- <version>7.4.0</version>
- </parent>
-
- <groupId>org.eclipse.linuxtools.oprofile</groupId>
- <artifactId>linuxtools-oprofile-parent</artifactId>
- <packaging>pom</packaging>
-
- <name>Linux Tools OProfile Parent</name>
-
- <modules>
- <module>org.eclipse.linuxtools.oprofile.core</module>
- <module>org.eclipse.linuxtools.oprofile.core.tests</module>
- <module>org.eclipse.linuxtools.oprofile.doc</module>
- <module>org.eclipse.linuxtools.oprofile-feature</module>
- <module>org.eclipse.linuxtools.oprofile.remote-feature</module>
- <module>org.eclipse.linuxtools.oprofile.launch</module>
- <module>org.eclipse.linuxtools.oprofile.remote.launch</module>
- <module>org.eclipse.linuxtools.oprofile.launch.tests</module>
- <module>org.eclipse.linuxtools.oprofile.tests</module>
- <module>org.eclipse.linuxtools.oprofile.ui</module>
- <module>org.eclipse.linuxtools.oprofile.ui.tests</module>
- </modules>
-
-</project>
diff --git a/perf/org.eclipse.linuxtools.perf-feature/feature.xml b/perf/org.eclipse.linuxtools.perf-feature/feature.xml
index 28e2b4edec538b0fe0567607807ae175e0704c8e..b5a218cc2711c6cfd202305aa2fbda4fffebf3df 100644
--- a/perf/org.eclipse.linuxtools.perf-feature/feature.xml
+++ b/perf/org.eclipse.linuxtools.perf-feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.linuxtools.perf.feature"
label="%featureName"
- version="7.4.0.qualifier"
+ version="8.1.0.qualifier"
provider-name="%provider"
os="linux"
license-feature="org.eclipse.license"
diff --git a/perf/org.eclipse.linuxtools.perf-feature/pom.xml b/perf/org.eclipse.linuxtools.perf-feature/pom.xml
index 1155ca750da5e073efe8754b2ee0776c901ae4b4..1b5272731d89f869a59603965d826e6533602b34 100644
--- a/perf/org.eclipse.linuxtools.perf-feature/pom.xml
+++ b/perf/org.eclipse.linuxtools.perf-feature/pom.xml
@@ -15,12 +15,12 @@
<parent>
<artifactId>linuxtools-perf-parent</artifactId>
<groupId>org.eclipse.linuxtools.perf-parent</groupId>
- <version>7.4.0</version>
+ <version>8.1.0</version>
</parent>
<artifactId>org.eclipse.linuxtools.perf.feature</artifactId>
<packaging>eclipse-feature</packaging>
- <version>7.4.0-SNAPSHOT</version>
+ <version>8.1.0-SNAPSHOT</version>
<name>Linux Tools Perf Integration Feature</name>
diff --git a/perf/org.eclipse.linuxtools.perf.doc/pom.xml b/perf/org.eclipse.linuxtools.perf.doc/pom.xml
index 083f99d5a1c1edfa72dd2fdaad230f9b1b9b0539..7aa66f1ebed3fda7cf6fd39cb37bce223403d000 100644
--- a/perf/org.eclipse.linuxtools.perf.doc/pom.xml
+++ b/perf/org.eclipse.linuxtools.perf.doc/pom.xml
@@ -16,7 +16,7 @@
<parent>
<artifactId>linuxtools-perf-parent</artifactId>
<groupId>org.eclipse.linuxtools.perf-parent</groupId>
- <version>7.4.0</version>
+ <version>8.1.0</version>
</parent>
<artifactId>org.eclipse.linuxtools.perf.doc</artifactId>
diff --git a/perf/org.eclipse.linuxtools.perf.remote-feature/feature.xml b/perf/org.eclipse.linuxtools.perf.remote-feature/feature.xml
index 550d3a4c7f98009ae21b8b6d1ebf36b0cd63b394..9d6a14d3a41746b316328f7d538050e710eafdab 100644
--- a/perf/org.eclipse.linuxtools.perf.remote-feature/feature.xml
+++ b/perf/org.eclipse.linuxtools.perf.remote-feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.linuxtools.perf.remote.feature"
label="%featureName"
- version="7.4.0.qualifier"
+ version="8.1.0.qualifier"
provider-name="%provider"
os="linux"
license-feature="org.eclipse.license"
diff --git a/perf/org.eclipse.linuxtools.perf.remote-feature/pom.xml b/perf/org.eclipse.linuxtools.perf.remote-feature/pom.xml
index ef4a3fea26e1f383acb725d465ca9631e56718aa..74521df3dce1f93479f3a15731f82c9e419d73bc 100644
--- a/perf/org.eclipse.linuxtools.perf.remote-feature/pom.xml
+++ b/perf/org.eclipse.linuxtools.perf.remote-feature/pom.xml
@@ -15,12 +15,12 @@
<parent>
<artifactId>linuxtools-perf-parent</artifactId>
<groupId>org.eclipse.linuxtools.perf-parent</groupId>
- <version>7.4.0</version>
+ <version>8.1.0</version>
</parent>
<artifactId>org.eclipse.linuxtools.perf.remote.feature</artifactId>
<packaging>eclipse-feature</packaging>
- <version>7.4.0-SNAPSHOT</version>
+ <version>8.1.0-SNAPSHOT</version>
<name>Linux Tools Remote Perf Integration Feature</name>
diff --git a/perf/org.eclipse.linuxtools.perf.swtbot.tests/.classpath b/perf/org.eclipse.linuxtools.perf.swtbot.tests/.classpath
index 43b986286a9e5fd1828793fa4b2353d02ab8625f..a621c21ac550d71458aac26221ac3641277a488d 100644
--- a/perf/org.eclipse.linuxtools.perf.swtbot.tests/.classpath
+++ b/perf/org.eclipse.linuxtools.perf.swtbot.tests/.classpath
@@ -1,7 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="src" path="src"/>
+ <classpathentry kind="src" path="src">
+ <attributes>
+ <attribute name="test" value="true"/>
+ </attributes>
+ </classpathentry>
<classpathentry kind="output" path="target/classes"/>
</classpath>
diff --git a/perf/org.eclipse.linuxtools.perf.swtbot.tests/.settings/org.eclipse.jdt.core.prefs b/perf/org.eclipse.linuxtools.perf.swtbot.tests/.settings/org.eclipse.jdt.core.prefs
index 9a0f142d6e629be05012bcb2633b8b3145cea60f..624ca8aa1e4c686aa973fc260d62355212ae2af6 100644
--- a/perf/org.eclipse.linuxtools.perf.swtbot.tests/.settings/org.eclipse.jdt.core.prefs
+++ b/perf/org.eclipse.linuxtools.perf.swtbot.tests/.settings/org.eclipse.jdt.core.prefs
@@ -7,9 +7,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nul
org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.compliance=11
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -23,6 +23,7 @@ org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=warning
org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
@@ -66,6 +67,7 @@ org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=warn
org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
@@ -97,4 +99,5 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11
diff --git a/perf/org.eclipse.linuxtools.perf.swtbot.tests/META-INF/MANIFEST.MF b/perf/org.eclipse.linuxtools.perf.swtbot.tests/META-INF/MANIFEST.MF
index 7d6b69e58abe5b59770478dc9b2b1a7ca7ea3688..b5577a8054bda6f642c2e2bc534edc01bc3cf1f6 100644
--- a/perf/org.eclipse.linuxtools.perf.swtbot.tests/META-INF/MANIFEST.MF
+++ b/perf/org.eclipse.linuxtools.perf.swtbot.tests/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-Name: %Bundle-Name
Bundle-Vendor: %Bundle-Vendor
Bundle-SymbolicName: org.eclipse.linuxtools.perf.swtbot.tests
Bundle-Version: 1.0.0.qualifier
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
Bundle-ActivationPolicy: lazy
Bundle-Localization: plugin
Fragment-Host: org.eclipse.linuxtools.perf
diff --git a/perf/org.eclipse.linuxtools.perf.tests/.classpath b/perf/org.eclipse.linuxtools.perf.tests/.classpath
index 43b986286a9e5fd1828793fa4b2353d02ab8625f..a621c21ac550d71458aac26221ac3641277a488d 100644
--- a/perf/org.eclipse.linuxtools.perf.tests/.classpath
+++ b/perf/org.eclipse.linuxtools.perf.tests/.classpath
@@ -1,7 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="src" path="src"/>
+ <classpathentry kind="src" path="src">
+ <attributes>
+ <attribute name="test" value="true"/>
+ </attributes>
+ </classpathentry>
<classpathentry kind="output" path="target/classes"/>
</classpath>
diff --git a/perf/org.eclipse.linuxtools.perf.tests/.settings/org.eclipse.jdt.core.prefs b/perf/org.eclipse.linuxtools.perf.tests/.settings/org.eclipse.jdt.core.prefs
index b2f17a8d45cf5a0aa4a012a10a3629d1b41c9452..25624d12af6445593e1f5c931487c28348a3c42b 100644
--- a/perf/org.eclipse.linuxtools.perf.tests/.settings/org.eclipse.jdt.core.prefs
+++ b/perf/org.eclipse.linuxtools.perf.tests/.settings/org.eclipse.jdt.core.prefs
@@ -6,9 +6,9 @@ org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annota
org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.compliance=11
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -22,6 +22,7 @@ org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=warning
org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
@@ -65,6 +66,7 @@ org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=warn
org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
@@ -96,4 +98,5 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11
diff --git a/perf/org.eclipse.linuxtools.perf.tests/META-INF/MANIFEST.MF b/perf/org.eclipse.linuxtools.perf.tests/META-INF/MANIFEST.MF
index 559dee6e500e09531cbca6bbfa9a312abd945882..9b421ab8e666ffc0a317cfb26ff66df38ca863b6 100644
--- a/perf/org.eclipse.linuxtools.perf.tests/META-INF/MANIFEST.MF
+++ b/perf/org.eclipse.linuxtools.perf.tests/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.linuxtools.perf.tests
Bundle-Version: 1.0.0.qualifier
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
Bundle-ActivationPolicy: lazy
Fragment-Host: org.eclipse.linuxtools.perf
Require-Bundle:
diff --git a/perf/org.eclipse.linuxtools.perf.tests/pom.xml b/perf/org.eclipse.linuxtools.perf.tests/pom.xml
index 814874951165d307a13a553b685dbf9898f226f0..165a52d5ea5385c8f9018cefa0be92282cba722f 100644
--- a/perf/org.eclipse.linuxtools.perf.tests/pom.xml
+++ b/perf/org.eclipse.linuxtools.perf.tests/pom.xml
@@ -15,7 +15,7 @@
<parent>
<artifactId>linuxtools-perf-parent</artifactId>
<groupId>org.eclipse.linuxtools.perf-parent</groupId>
- <version>7.4.0</version>
+ <version>8.1.0</version>
</parent>
<artifactId>org.eclipse.linuxtools.perf.tests</artifactId>
diff --git a/perf/org.eclipse.linuxtools.perf/.classpath b/perf/org.eclipse.linuxtools.perf/.classpath
index 43b986286a9e5fd1828793fa4b2353d02ab8625f..1db08c6b4ce2fb50395b2f9c9a50c140a0bab199 100644
--- a/perf/org.eclipse.linuxtools.perf/.classpath
+++ b/perf/org.eclipse.linuxtools.perf/.classpath
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="target/classes"/>
diff --git a/perf/org.eclipse.linuxtools.perf/.settings/org.eclipse.jdt.core.prefs b/perf/org.eclipse.linuxtools.perf/.settings/org.eclipse.jdt.core.prefs
index 60d805a02b12ba0e0974cd504ed3d40235e72172..cab8e0287adca7a6165a2d4301e6e782cfd8f43b 100644
--- a/perf/org.eclipse.linuxtools.perf/.settings/org.eclipse.jdt.core.prefs
+++ b/perf/org.eclipse.linuxtools.perf/.settings/org.eclipse.jdt.core.prefs
@@ -6,9 +6,9 @@ org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annota
org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.compliance=11
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -22,6 +22,7 @@ org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=warning
org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
@@ -65,6 +66,7 @@ org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=warn
org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
@@ -97,4 +99,5 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11
diff --git a/perf/org.eclipse.linuxtools.perf/META-INF/MANIFEST.MF b/perf/org.eclipse.linuxtools.perf/META-INF/MANIFEST.MF
index 4aa324617ebb860aff409fa13f6421ef66405430..ca715ea400ffcc534b743b929a577c40666b6170 100644
--- a/perf/org.eclipse.linuxtools.perf/META-INF/MANIFEST.MF
+++ b/perf/org.eclipse.linuxtools.perf/META-INF/MANIFEST.MF
@@ -19,7 +19,7 @@ Require-Bundle: org.eclipse.ui,
org.eclipse.linuxtools.profiling.ui;bundle-version="0.9.0",
org.eclipse.ui.ide,
org.eclipse.team.ui;bundle-version="3.7.1"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
Bundle-ActivationPolicy: lazy
Import-Package: org.eclipse.compare,
org.eclipse.compare.structuremergeviewer,
diff --git a/perf/org.eclipse.linuxtools.perf/pom.xml b/perf/org.eclipse.linuxtools.perf/pom.xml
index 6b4699767ec9d353e41d1c04175b28160f1766d4..d8e6d0756a8768a3c2867e3fcf782b006cbbf074 100644
--- a/perf/org.eclipse.linuxtools.perf/pom.xml
+++ b/perf/org.eclipse.linuxtools.perf/pom.xml
@@ -15,7 +15,7 @@
<parent>
<artifactId>linuxtools-perf-parent</artifactId>
<groupId>org.eclipse.linuxtools.perf-parent</groupId>
- <version>7.4.0</version>
+ <version>8.1.0</version>
</parent>
<artifactId>org.eclipse.linuxtools.perf</artifactId>
diff --git a/perf/org.eclipse.linuxtools.perf/src/org/eclipse/linuxtools/internal/perf/PerfCore.java b/perf/org.eclipse.linuxtools.perf/src/org/eclipse/linuxtools/internal/perf/PerfCore.java
index 10b36a489757a3d52cdbd6797e5f10b53127e209..0697d7e553fb0b671fa5531a5870ea39163e1aeb 100644
--- a/perf/org.eclipse.linuxtools.perf/src/org/eclipse/linuxtools/internal/perf/PerfCore.java
+++ b/perf/org.eclipse.linuxtools.perf/src/org/eclipse/linuxtools/internal/perf/PerfCore.java
@@ -182,7 +182,7 @@ public class PerfCore {
try {
// Process list of events. Each line is of the form <event>\s+<category>.
while (( line = input.readLine()) != null){
- if (line.contains("[")) { //$NON-NLS-1$
+ if (line.matches("\\s*\\S+\\s*\\[.*\\]")) { //$NON-NLS-1$
String event;
String category;
if (line.contains(PerfPlugin.STRINGS_HWBREAKPOINTS)) {
diff --git a/perf/org.eclipse.linuxtools.perf/src/org/eclipse/linuxtools/internal/perf/PerfPlugin.java b/perf/org.eclipse.linuxtools.perf/src/org/eclipse/linuxtools/internal/perf/PerfPlugin.java
index 713f8994db147857b100d82845d0934255085c7b..81339d447a649c02491fde45494b93f5a70eb3de 100644
--- a/perf/org.eclipse.linuxtools.perf/src/org/eclipse/linuxtools/internal/perf/PerfPlugin.java
+++ b/perf/org.eclipse.linuxtools.perf/src/org/eclipse/linuxtools/internal/perf/PerfPlugin.java
@@ -28,6 +28,7 @@ import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
import org.eclipse.jface.dialogs.ErrorDialog;
import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.jface.resource.ResourceLocator;
import org.eclipse.linuxtools.internal.perf.model.TreeParent;
import org.eclipse.linuxtools.profiling.launch.IRemoteFileProxy;
import org.eclipse.linuxtools.profiling.launch.RemoteProxyManager;
@@ -256,7 +257,7 @@ public class PerfPlugin extends AbstractUIPlugin {
* @return the image descriptor
*/
public static ImageDescriptor getImageDescriptor(String path) {
- return imageDescriptorFromPlugin(PLUGIN_ID, path);
+ return ResourceLocator.imageDescriptorFromBundle(PLUGIN_ID, path).get();
}
/**
diff --git a/perf/pom.xml b/perf/pom.xml
index f231984c761b40470d9ac00360471bbb3356052f..4dae07df6273467c8e670b01735dbc6a44f14f27 100644
--- a/perf/pom.xml
+++ b/perf/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.eclipse.linuxtools</groupId>
<artifactId>linuxtools-parent</artifactId>
- <version>7.4.0</version>
+ <version>8.1.0</version>
</parent>
<groupId>org.eclipse.linuxtools.perf-parent</groupId>
diff --git a/pom.xml b/pom.xml
index c852e30d86acbf07ecc80f27b58c98edf800fb04..7e942bed30031b65bc5243d16e67dbff0f268827 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,11 +17,11 @@
<modelVersion>4.0.0</modelVersion>
<prerequisites>
- <maven>3.3.9</maven>
+ <maven>3.6.3</maven>
</prerequisites>
<groupId>org.eclipse.linuxtools</groupId>
<artifactId>linuxtools-parent</artifactId>
- <version>7.4.0</version>
+ <version>8.1.0</version>
<packaging>pom</packaging>
<name>Eclipse Linux Tools Parent</name>
@@ -48,12 +48,11 @@
</distributionManagement>
<properties>
- <mirror-repo-name>update-7.4.0</mirror-repo-name>
- <mirror-docker-repo-name>update-docker-4.4.0</mirror-docker-repo-name>
- <mirror-mylyn-repo-name>updates-mylyn-2.4.0</mirror-mylyn-repo-name>
- <tycho-version>1.4.0</tycho-version>
- <tycho-extras-version>1.4.0</tycho-extras-version>
- <target-platform>linuxtools-e4.13</target-platform>
+ <mirror-repo-name>update-8.1.0</mirror-repo-name>
+ <mirror-docker-repo-name>update-docker-5.1.0</mirror-docker-repo-name>
+ <mirror-mylyn-repo-name>update-mylyn-3.1.0</mirror-mylyn-repo-name>
+ <tycho-version>2.1.0</tycho-version>
+ <target-platform>linuxtools-e4.18</target-platform>
<sonar.core.codeCoveragePlugin>jacoco</sonar.core.codeCoveragePlugin>
<sonar.dynamicAnalysis>reuseReports</sonar.dynamicAnalysis>
<sonar.jacoco.reportPath>${project.basedir}/../../target/jacoco.exec</sonar.jacoco.reportPath>
@@ -118,12 +117,12 @@
<plugin>
<groupId>org.sonarsource.scanner.maven</groupId>
<artifactId>sonar-maven-plugin</artifactId>
- <version>3.3.0.603</version>
+ <version>3.7.0.1746</version>
</plugin>
<plugin>
<groupId>org.eclipse.tycho.extras</groupId>
<artifactId>tycho-pack200b-plugin</artifactId>
- <version>${tycho-extras-version}</version>
+ <version>${tycho-version}</version>
<executions>
<execution>
<id>pack200-pack</id>
@@ -269,7 +268,7 @@
<dependency>
<groupId>org.eclipse.mylyn.docs</groupId>
<artifactId>org.eclipse.mylyn.wikitext.mediawiki.ant</artifactId>
- <version>3.0.33</version>
+ <version>3.0.38</version>
</dependency>
</dependencies>
</plugin>
@@ -288,7 +287,6 @@
<module>libhover</module>
<module>javadocs</module>
<module>man</module>
- <module>oprofile</module>
<module>perf</module>
<module>rpm</module>
<module>systemtap</module>
@@ -338,7 +336,7 @@
<plugin>
<groupId>org.eclipse.tycho.extras</groupId>
<artifactId>tycho-source-feature-plugin</artifactId>
- <version>${tycho-extras-version}</version>
+ <version>${tycho-version}</version>
<configuration>
<includeBinaryFeature>false</includeBinaryFeature>
</configuration>
@@ -368,7 +366,7 @@
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
- <version>0.8.4</version>
+ <version>0.8.5</version>
<executions>
<execution>
<id>pre-test</id>
@@ -444,22 +442,22 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
- <version>1.8</version>
+ <version>3.0.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
- <version>3.8.2</version>
+ <version>3.9.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
- <version>3.0.0</version>
+ <version>3.1.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>3.1.1</version>
+ <version>3.2.0</version>
<configuration>
<excludePackageNames>org.eclipse.linuxtools.internal.*:*.test*:org.eclipse.linuxtools.docker.reddeer*</excludePackageNames>
</configuration>
diff --git a/profiling/org.eclipse.linuxtools.binutils/.classpath b/profiling/org.eclipse.linuxtools.binutils/.classpath
index 43b986286a9e5fd1828793fa4b2353d02ab8625f..1db08c6b4ce2fb50395b2f9c9a50c140a0bab199 100644
--- a/profiling/org.eclipse.linuxtools.binutils/.classpath
+++ b/profiling/org.eclipse.linuxtools.binutils/.classpath
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="target/classes"/>
diff --git a/profiling/org.eclipse.linuxtools.binutils/.settings/org.eclipse.jdt.core.prefs b/profiling/org.eclipse.linuxtools.binutils/.settings/org.eclipse.jdt.core.prefs
index a2ad975f85858fc7919d3db0a0e966e7e90125d3..02a000188452aa1633a7bda834b3273c718fab58 100644
--- a/profiling/org.eclipse.linuxtools.binutils/.settings/org.eclipse.jdt.core.prefs
+++ b/profiling/org.eclipse.linuxtools.binutils/.settings/org.eclipse.jdt.core.prefs
@@ -7,9 +7,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nul
org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.compliance=11
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -24,6 +24,7 @@ org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=warning
org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
@@ -80,6 +81,7 @@ org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=warn
org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
@@ -111,4 +113,5 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core/.settings/org.eclipse.jdt.ui.prefs b/profiling/org.eclipse.linuxtools.binutils/.settings/org.eclipse.jdt.ui.prefs
similarity index 84%
rename from oprofile/org.eclipse.linuxtools.oprofile.core/.settings/org.eclipse.jdt.ui.prefs
rename to profiling/org.eclipse.linuxtools.binutils/.settings/org.eclipse.jdt.ui.prefs
index 0dd4c10d821aece38ff795501a68949db01b7605..690dcacd30cc11dee03802b183eab9def580a34c 100644
--- a/oprofile/org.eclipse.linuxtools.oprofile.core/.settings/org.eclipse.jdt.ui.prefs
+++ b/profiling/org.eclipse.linuxtools.binutils/.settings/org.eclipse.jdt.ui.prefs
@@ -13,11 +13,11 @@ sp_cleanup.always_use_blocks=true
sp_cleanup.always_use_parentheses_in_expressions=false
sp_cleanup.always_use_this_for_non_static_field_access=false
sp_cleanup.always_use_this_for_non_static_method_access=false
-sp_cleanup.convert_functional_interfaces=false
-sp_cleanup.convert_to_enhanced_for_loop=false
+sp_cleanup.convert_functional_interfaces=true
+sp_cleanup.convert_to_enhanced_for_loop=true
sp_cleanup.correct_indentation=false
sp_cleanup.format_source_code=true
-sp_cleanup.format_source_code_changes_only=false
+sp_cleanup.format_source_code_changes_only=true
sp_cleanup.insert_inferred_type_arguments=false
sp_cleanup.make_local_variable_final=true
sp_cleanup.make_parameters_final=false
@@ -28,16 +28,20 @@ sp_cleanup.never_use_blocks=false
sp_cleanup.never_use_parentheses_in_expressions=true
sp_cleanup.on_save_use_additional_actions=true
sp_cleanup.organize_imports=true
+sp_cleanup.push_down_negation=false
sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
sp_cleanup.qualify_static_member_accesses_with_declaring_class=false
sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
sp_cleanup.remove_private_constructors=true
-sp_cleanup.remove_redundant_type_arguments=false
-sp_cleanup.remove_trailing_whitespaces=false
+sp_cleanup.remove_redundant_modifiers=true
+sp_cleanup.remove_redundant_semicolons=true
+sp_cleanup.remove_redundant_type_arguments=true
+sp_cleanup.remove_trailing_whitespaces=true
sp_cleanup.remove_trailing_whitespaces_all=true
sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
+sp_cleanup.remove_unnecessary_array_creation=true
sp_cleanup.remove_unnecessary_casts=true
sp_cleanup.remove_unnecessary_nls_tags=false
sp_cleanup.remove_unused_imports=true
@@ -49,12 +53,13 @@ sp_cleanup.remove_unused_private_types=true
sp_cleanup.sort_members=false
sp_cleanup.sort_members_all=false
sp_cleanup.use_anonymous_class_creation=false
+sp_cleanup.use_autoboxing=false
sp_cleanup.use_blocks=false
sp_cleanup.use_blocks_only_for_return_and_throw=false
-sp_cleanup.use_lambda=false
+sp_cleanup.use_lambda=true
sp_cleanup.use_parentheses_in_expressions=false
sp_cleanup.use_this_for_non_static_field_access=false
sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
sp_cleanup.use_this_for_non_static_method_access=false
sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
-sp_cleanup.use_type_arguments=false
+sp_cleanup.use_unboxing=false
diff --git a/profiling/org.eclipse.linuxtools.binutils/META-INF/MANIFEST.MF b/profiling/org.eclipse.linuxtools.binutils/META-INF/MANIFEST.MF
index 1bd00fc18e4c09581720f1a8231689ee39e1a7df..4f7449d3a067e6815e30fdbf8a7db94515fe0f26 100644
--- a/profiling/org.eclipse.linuxtools.binutils/META-INF/MANIFEST.MF
+++ b/profiling/org.eclipse.linuxtools.binutils/META-INF/MANIFEST.MF
@@ -19,6 +19,6 @@ Require-Bundle: org.eclipse.ui,
Bundle-ActivationPolicy: lazy
Export-Package: org.eclipse.linuxtools.binutils.link2source,
org.eclipse.linuxtools.binutils.utils
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
Bundle-Localization: plugin
Automatic-Module-Name: org.eclipse.linuxtools.binutils
diff --git a/profiling/org.eclipse.linuxtools.binutils/pom.xml b/profiling/org.eclipse.linuxtools.binutils/pom.xml
index f752b734d7fbddcd22af50d9861c7808118e107d..5295b5eab55b27c2bd18dec6a7e7ae7b0616457c 100644
--- a/profiling/org.eclipse.linuxtools.binutils/pom.xml
+++ b/profiling/org.eclipse.linuxtools.binutils/pom.xml
@@ -15,7 +15,7 @@
<parent>
<artifactId>linuxtools-profiling-parent</artifactId>
<groupId>org.eclipse.linuxtools.profiling</groupId>
- <version>7.4.0</version>
+ <version>8.1.0</version>
</parent>
<artifactId>org.eclipse.linuxtools.binutils</artifactId>
diff --git a/profiling/org.eclipse.linuxtools.binutils/src/org/eclipse/linuxtools/binutils/link2source/STCSourceNotFoundEditorInput.java b/profiling/org.eclipse.linuxtools.binutils/src/org/eclipse/linuxtools/binutils/link2source/STCSourceNotFoundEditorInput.java
index f05a6a70cb551b5017873a698984f9f2ec4debcd..b613fcd75967dafe8e69e46509dd6ebedcd40272 100644
--- a/profiling/org.eclipse.linuxtools.binutils/src/org/eclipse/linuxtools/binutils/link2source/STCSourceNotFoundEditorInput.java
+++ b/profiling/org.eclipse.linuxtools.binutils/src/org/eclipse/linuxtools/binutils/link2source/STCSourceNotFoundEditorInput.java
@@ -1,6 +1,6 @@
/*******************************************************************************
* Copyright (c) 2009, 2018 STMicroelectronics and others.
- *
+ *
* This program and the accompanying materials are made
* available under the terms of the Eclipse Public License 2.0
* which is available at https://www.eclipse.org/legal/epl-2.0/
@@ -15,10 +15,10 @@ package org.eclipse.linuxtools.binutils.link2source;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.runtime.IPath;
import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.jface.resource.ResourceLocator;
import org.eclipse.linuxtools.internal.Activator;
import org.eclipse.ui.IEditorInput;
import org.eclipse.ui.IPersistableElement;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
/**
* Editor Input used for source not found
@@ -49,7 +49,7 @@ public class STCSourceNotFoundEditorInput implements IEditorInput {
@Override
public ImageDescriptor getImageDescriptor() {
- return AbstractUIPlugin.imageDescriptorFromPlugin(Activator.PLUGIN_ID, "icons/c_file_obj.gif"); //$NON-NLS-1$
+ return ResourceLocator.imageDescriptorFromBundle(Activator.PLUGIN_ID, "icons/c_file_obj.gif").get(); //$NON-NLS-1$
}
@Override
diff --git a/profiling/org.eclipse.linuxtools.binutils/src/org/eclipse/linuxtools/binutils/link2source/STLink2SourceSupport.java b/profiling/org.eclipse.linuxtools.binutils/src/org/eclipse/linuxtools/binutils/link2source/STLink2SourceSupport.java
index 15c41a46f8636c74682cdda8774a1983413f9da2..8b6a5bcfef8568cdf8afef23797afe2f9908b8be 100644
--- a/profiling/org.eclipse.linuxtools.binutils/src/org/eclipse/linuxtools/binutils/link2source/STLink2SourceSupport.java
+++ b/profiling/org.eclipse.linuxtools.binutils/src/org/eclipse/linuxtools/binutils/link2source/STLink2SourceSupport.java
@@ -1,6 +1,6 @@
/*******************************************************************************
- * Copyright (c) 2009, 2018 STMicroelectronics and others.
- *
+ * Copyright (c) 2009, 2019 STMicroelectronics and others.
+ *
* This program and the accompanying materials are made
* available under the terms of the Eclipse Public License 2.0
* which is available at https://www.eclipse.org/legal/epl-2.0/
@@ -66,16 +66,15 @@ public final class STLink2SourceSupport {
}
/**
- * Open a C Editor at the given location.
- *
- * @param binaryLoc A path to a binary file.
- * @param sourceLoc The location of the source file.
- * @param lineNumber The line to open at.
- * @return <code>true</code> if the link-to-source was successful, <code>false</code> otherwise
- */
+ * Open a C Editor at the given location.
+ *
+ * @param binaryLoc A path to a binary file.
+ * @param sourceLoc The location of the source file.
+ * @param lineNumber The line to open at.
+ * @return <code>true</code> if the link-to-source was successful,
+ * <code>false</code> otherwise
+ */
private static boolean openSourceFileAtLocation(IPath binaryLoc, IPath sourceLoc, int lineNumber) {
- IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
- //FIXME EK-LINUXTOOLS: IFile binary = root.getFileForLocation(binaryLoc);
IFile binary = STSymbolManager.sharedInstance.findFileFromPath(binaryLoc);
IProject project = null;
if (binary != null) {
@@ -237,7 +236,7 @@ public final class STLink2SourceSupport {
public IResource getResource() {
return resource;
}
-
+
@Override
public boolean visit(IResourceProxy proxy) {
// To correctly find a file in a linked directory, we cannot just look at the isLinked() attribute
@@ -255,7 +254,7 @@ public final class STLink2SourceSupport {
}
}
-
+
private static IFile getFileForPathImpl(IPath path, IProject project) {
IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
if (path.isAbsolute()) {
@@ -294,7 +293,7 @@ public final class STLink2SourceSupport {
}
}
}
-
+
// no match found...try and see if we are dealing with a link
IPath realPath = project.getLocation().append(path).makeAbsolute();
URI realURI = URIUtil.toURI(realPath.toString());
diff --git a/profiling/org.eclipse.linuxtools.dataviewers-feature/feature.xml b/profiling/org.eclipse.linuxtools.dataviewers-feature/feature.xml
index 49eb12bb7bc483e671c44bd870d73cd695cb8937..c80a48113ac4e182e5a2338920b70ba9254f8c62 100644
--- a/profiling/org.eclipse.linuxtools.dataviewers-feature/feature.xml
+++ b/profiling/org.eclipse.linuxtools.dataviewers-feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.linuxtools.dataviewers.feature"
label="%featureName"
- version="7.4.0.qualifier"
+ version="8.1.0.qualifier"
provider-name="%featureProvider"
license-feature="org.eclipse.license"
license-feature-version="0.0.0">
@@ -35,8 +35,7 @@
<import plugin="org.eclipse.cdt.ui"/>
<import plugin="org.eclipse.cdt.core"/>
<import plugin="org.eclipse.core.resources" version="3.4.2" match="greaterOrEqual"/>
- <import plugin="com.ibm.icu"/>
- <import plugin="org.swtchart"/>
+ <import plugin="org.eclipse.swtchart"/>
</requires>
<plugin
diff --git a/profiling/org.eclipse.linuxtools.dataviewers-feature/pom.xml b/profiling/org.eclipse.linuxtools.dataviewers-feature/pom.xml
index 0c989f7681bc7805b3c0c09ad4b70ccef58e06d1..1ecd052b3eb91e104d08e57c6ecba1eecc738b1d 100644
--- a/profiling/org.eclipse.linuxtools.dataviewers-feature/pom.xml
+++ b/profiling/org.eclipse.linuxtools.dataviewers-feature/pom.xml
@@ -15,12 +15,12 @@
<parent>
<artifactId>linuxtools-profiling-parent</artifactId>
<groupId>org.eclipse.linuxtools.profiling</groupId>
- <version>7.4.0</version>
+ <version>8.1.0</version>
</parent>
<artifactId>org.eclipse.linuxtools.dataviewers.feature</artifactId>
<packaging>eclipse-feature</packaging>
- <version>7.4.0-SNAPSHOT</version>
+ <version>8.1.0-SNAPSHOT</version>
<name>Linux Tools Dataviewers Feature</name>
diff --git a/profiling/org.eclipse.linuxtools.dataviewers.charts/.classpath b/profiling/org.eclipse.linuxtools.dataviewers.charts/.classpath
index 43b986286a9e5fd1828793fa4b2353d02ab8625f..1db08c6b4ce2fb50395b2f9c9a50c140a0bab199 100755
--- a/profiling/org.eclipse.linuxtools.dataviewers.charts/.classpath
+++ b/profiling/org.eclipse.linuxtools.dataviewers.charts/.classpath
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="target/classes"/>
diff --git a/profiling/org.eclipse.linuxtools.dataviewers.charts/.settings/org.eclipse.jdt.core.prefs b/profiling/org.eclipse.linuxtools.dataviewers.charts/.settings/org.eclipse.jdt.core.prefs
index fcac9d2a76e09709913f3aa3184c2c82ffbea2e6..44fccc8cbbf418879a04e23fed9d3613c7592794 100644
--- a/profiling/org.eclipse.linuxtools.dataviewers.charts/.settings/org.eclipse.jdt.core.prefs
+++ b/profiling/org.eclipse.linuxtools.dataviewers.charts/.settings/org.eclipse.jdt.core.prefs
@@ -6,9 +6,9 @@ org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annota
org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.compliance=11
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -23,6 +23,7 @@ org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=warning
org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
@@ -79,6 +80,7 @@ org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=warn
org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
@@ -110,4 +112,5 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11
diff --git a/profiling/org.eclipse.linuxtools.dataviewers.charts/.settings/org.eclipse.jdt.ui.prefs b/profiling/org.eclipse.linuxtools.dataviewers.charts/.settings/org.eclipse.jdt.ui.prefs
new file mode 100644
index 0000000000000000000000000000000000000000..ea88167ddc8e3d597a8fd149004b63ae5eb8c0cf
--- /dev/null
+++ b/profiling/org.eclipse.linuxtools.dataviewers.charts/.settings/org.eclipse.jdt.ui.prefs
@@ -0,0 +1,72 @@
+eclipse.preferences.version=1
+editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
+sp_cleanup.add_default_serial_version_id=true
+sp_cleanup.add_generated_serial_version_id=false
+sp_cleanup.add_missing_annotations=true
+sp_cleanup.add_missing_deprecated_annotations=true
+sp_cleanup.add_missing_methods=false
+sp_cleanup.add_missing_nls_tags=false
+sp_cleanup.add_missing_override_annotations=true
+sp_cleanup.add_missing_override_annotations_interface_methods=true
+sp_cleanup.add_serial_version_id=false
+sp_cleanup.always_use_blocks=true
+sp_cleanup.always_use_parentheses_in_expressions=false
+sp_cleanup.always_use_this_for_non_static_field_access=false
+sp_cleanup.always_use_this_for_non_static_method_access=false
+sp_cleanup.convert_functional_interfaces=true
+sp_cleanup.convert_to_enhanced_for_loop=true
+sp_cleanup.convert_to_enhanced_for_loop_if_loop_var_used=false
+sp_cleanup.correct_indentation=false
+sp_cleanup.format_source_code=true
+sp_cleanup.format_source_code_changes_only=true
+sp_cleanup.insert_inferred_type_arguments=false
+sp_cleanup.lazy_logical_operator=false
+sp_cleanup.make_local_variable_final=true
+sp_cleanup.make_parameters_final=false
+sp_cleanup.make_private_fields_final=true
+sp_cleanup.make_type_abstract_if_missing_method=false
+sp_cleanup.make_variable_declarations_final=false
+sp_cleanup.merge_conditional_blocks=false
+sp_cleanup.never_use_blocks=false
+sp_cleanup.never_use_parentheses_in_expressions=true
+sp_cleanup.number_suffix=false
+sp_cleanup.on_save_use_additional_actions=true
+sp_cleanup.organize_imports=true
+sp_cleanup.push_down_negation=false
+sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
+sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
+sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
+sp_cleanup.qualify_static_member_accesses_with_declaring_class=false
+sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
+sp_cleanup.remove_private_constructors=true
+sp_cleanup.remove_redundant_modifiers=true
+sp_cleanup.remove_redundant_semicolons=true
+sp_cleanup.remove_redundant_type_arguments=true
+sp_cleanup.remove_trailing_whitespaces=true
+sp_cleanup.remove_trailing_whitespaces_all=true
+sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
+sp_cleanup.remove_unnecessary_array_creation=true
+sp_cleanup.remove_unnecessary_casts=true
+sp_cleanup.remove_unnecessary_nls_tags=true
+sp_cleanup.remove_unused_imports=false
+sp_cleanup.remove_unused_local_variables=false
+sp_cleanup.remove_unused_private_fields=true
+sp_cleanup.remove_unused_private_members=false
+sp_cleanup.remove_unused_private_methods=true
+sp_cleanup.remove_unused_private_types=true
+sp_cleanup.simplify_lambda_expression_and_method_ref=true
+sp_cleanup.sort_members=false
+sp_cleanup.sort_members_all=false
+sp_cleanup.use_anonymous_class_creation=false
+sp_cleanup.use_autoboxing=false
+sp_cleanup.use_blocks=false
+sp_cleanup.use_blocks_only_for_return_and_throw=false
+sp_cleanup.use_directly_map_method=false
+sp_cleanup.use_lambda=true
+sp_cleanup.use_parentheses_in_expressions=false
+sp_cleanup.use_this_for_non_static_field_access=false
+sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
+sp_cleanup.use_this_for_non_static_method_access=false
+sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+sp_cleanup.use_unboxing=false
+sp_cleanup.use_var=false
diff --git a/profiling/org.eclipse.linuxtools.dataviewers.charts/META-INF/MANIFEST.MF b/profiling/org.eclipse.linuxtools.dataviewers.charts/META-INF/MANIFEST.MF
index d75627384333922f43601bc8d09b665ec78afbe5..b268386aae76f3373d19e38e11cc43615a756279 100755
--- a/profiling/org.eclipse.linuxtools.dataviewers.charts/META-INF/MANIFEST.MF
+++ b/profiling/org.eclipse.linuxtools.dataviewers.charts/META-INF/MANIFEST.MF
@@ -2,17 +2,19 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %bundleName
Bundle-SymbolicName: org.eclipse.linuxtools.dataviewers.charts;singleton:=true
-Bundle-Version: 6.0.0.qualifier
+Bundle-Version: 7.0.0.qualifier
Bundle-Activator: org.eclipse.linuxtools.internal.dataviewers.charts.Activator
Bundle-Vendor: %bundleProvider
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
org.eclipse.linuxtools.dataviewers;bundle-version="4.0.0"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
Bundle-ActivationPolicy: lazy
Export-Package: org.eclipse.linuxtools.dataviewers.charts.actions,
org.eclipse.linuxtools.dataviewers.charts.provider
Import-Package: org.eclipse.linuxtools.dataviewers.piechart,
- org.swtchart
+ org.eclipse.linuxtools.internal.dataviewers.piechart,
+ org.eclipse.swtchart,
+ org.eclipse.swtchart.extensions.charts
Bundle-Localization: plugin
Automatic-Module-Name: org.eclipse.linuxtools.dataviewers.charts
diff --git a/profiling/org.eclipse.linuxtools.dataviewers.charts/pom.xml b/profiling/org.eclipse.linuxtools.dataviewers.charts/pom.xml
index ee138686d06c8209e298beac1936ec4611246be8..f8db8a1d80d37723c2f94bc3f936b33def9b9dff 100644
--- a/profiling/org.eclipse.linuxtools.dataviewers.charts/pom.xml
+++ b/profiling/org.eclipse.linuxtools.dataviewers.charts/pom.xml
@@ -15,11 +15,11 @@
<parent>
<artifactId>linuxtools-profiling-parent</artifactId>
<groupId>org.eclipse.linuxtools.profiling</groupId>
- <version>7.4.0</version>
+ <version>8.1.0</version>
</parent>
<artifactId>org.eclipse.linuxtools.dataviewers.charts</artifactId>
- <version>6.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
<name>Linux Tools Data Viewers Charts Plug-in</name>
diff --git a/profiling/org.eclipse.linuxtools.dataviewers.charts/src/org/eclipse/linuxtools/dataviewers/charts/actions/ChartAction.java b/profiling/org.eclipse.linuxtools.dataviewers.charts/src/org/eclipse/linuxtools/dataviewers/charts/actions/ChartAction.java
index 0bc979ef8000b28761dc955f427bfaa6274ec158..c1fe9793fb39b2f988e0cca449baa80c8a005ce4 100755
--- a/profiling/org.eclipse.linuxtools.dataviewers.charts/src/org/eclipse/linuxtools/dataviewers/charts/actions/ChartAction.java
+++ b/profiling/org.eclipse.linuxtools.dataviewers.charts/src/org/eclipse/linuxtools/dataviewers/charts/actions/ChartAction.java
@@ -1,6 +1,6 @@
/*******************************************************************************
* Copyright (c) 2009, 2018 STMicroelectronics and others.
- *
+ *
* This program and the accompanying materials are made
* available under the terms of the Eclipse Public License 2.0
* which is available at https://www.eclipse.org/legal/epl-2.0/
@@ -13,23 +13,25 @@
package org.eclipse.linuxtools.dataviewers.charts.actions;
import org.eclipse.jface.action.Action;
+import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.linuxtools.dataviewers.abstractviewers.AbstractSTViewer;
import org.eclipse.linuxtools.internal.dataviewers.charts.Activator;
import org.eclipse.linuxtools.internal.dataviewers.charts.Messages;
-import org.eclipse.linuxtools.internal.dataviewers.charts.dialogs.ChartDialog;
+import org.eclipse.linuxtools.internal.dataviewers.charts.dialogs.ChartDialog2;
import org.eclipse.linuxtools.internal.dataviewers.charts.view.ChartView;
import org.eclipse.swt.widgets.Shell;
-import org.swtchart.Chart;
/**
* An action that open a chart dialog from an <code>AbstractSTViewer</code>.
*
* @see AbstractSTViewer
+ * @deprecated Functionality to be moved to Eclipse.org SWTChart project.
*/
+@Deprecated
public class ChartAction extends Action {
/** The dialog */
- private final ChartDialog dialog;
+ private final Dialog dialog;
/**
* The constructor.
@@ -41,7 +43,7 @@ public class ChartAction extends Action {
*/
public ChartAction(Shell shell, AbstractSTViewer viewer) {
super(Messages.ChartConstants_CREATE_CHART, Activator.getImageDescriptor("icons/chart_icon.png")); //$NON-NLS-1$
- dialog = new ChartDialog(shell, viewer);
+ dialog = new ChartDialog2(shell, viewer);
setEnabled(!viewer.getViewer().getSelection().isEmpty());
viewer.getViewer().addSelectionChangedListener(event -> setEnabled(!event.getSelection().isEmpty()));
}
@@ -49,10 +51,6 @@ public class ChartAction extends Action {
@Override
public void run() {
dialog.open();
- Chart chart = dialog.getValue();
- if (chart != null) {
- ChartView.createChartView(chart);
-
- }
+ ChartView.createChartView();
}
}
diff --git a/profiling/org.eclipse.linuxtools.dataviewers.charts/src/org/eclipse/linuxtools/dataviewers/charts/actions/SaveChartAction.java b/profiling/org.eclipse.linuxtools.dataviewers.charts/src/org/eclipse/linuxtools/dataviewers/charts/actions/SaveChartAction.java
deleted file mode 100755
index 3e9d85001f022f70ac523079d80fb24b19cb2779..0000000000000000000000000000000000000000
--- a/profiling/org.eclipse.linuxtools.dataviewers.charts/src/org/eclipse/linuxtools/dataviewers/charts/actions/SaveChartAction.java
+++ /dev/null
@@ -1,228 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2014, 2018 Red Hat, Inc. and others.
- *
- * This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License 2.0
- * which is available at https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- * Marzia Maugeri <marzia.maugeri@st.com> - initial API and implementation
- * Red Hat (various) - ongoing maintenance
- *******************************************************************************/
-package org.eclipse.linuxtools.dataviewers.charts.actions;
-
-import java.io.File;
-import java.text.MessageFormat;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.dialogs.ErrorDialog;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.linuxtools.internal.dataviewers.charts.Activator;
-import org.eclipse.linuxtools.internal.dataviewers.charts.Messages;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.GC;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.graphics.ImageData;
-import org.eclipse.swt.graphics.ImageLoader;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.FileDialog;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.PlatformUI;
-import org.swtchart.Chart;
-
-/**
- * An action to save any {@link Composite} (typically a {@link Chart}) as an image (jpeg/jpg, bmp, png).
- *
- * @since 6.0
- */
-public class SaveChartAction extends Action {
-
- private static final String[] EXTENSIONS =
- { "*.png", "*.bmp", "*.jpg", "*.jpeg", "*.*" }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
- private static final String DEFAULT_EXT = "png"; //$NON-NLS-1$
- private static final String DEFAULT_TITLE = "newChart"; //$NON-NLS-1$
- private static final Map<String, Integer> EXTENSION_MAP = new HashMap<>();
-
- private Composite contents = null;
- private String title = null;
-
- static {
- EXTENSION_MAP.put("png", SWT.IMAGE_PNG); //$NON-NLS-1$
- EXTENSION_MAP.put("bmp", SWT.IMAGE_BMP); //$NON-NLS-1$
- EXTENSION_MAP.put("jpeg", SWT.IMAGE_JPEG); //$NON-NLS-1$
- EXTENSION_MAP.put("jpg", SWT.IMAGE_JPEG); //$NON-NLS-1$
- }
-
- public SaveChartAction() {
- super(Messages.ChartConstants_SAVE_CHART_AS, Activator.getImageDescriptor("icons/chart-save.png")); //$NON-NLS-1$
- this.setEnabled(false);
- }
-
- /**
- * Sets the image plugin on the contents and enables the action if contents are not null.
- * Also, a default title for the file to be saved is generated.
- * @param contents The image contents to be saved.
- */
- public void setChart(Composite contents) {
- setChart(contents, null);
- }
-
- /**
- * The same as {@link #setChart(Composite)}, but allows specification of a custom default
- * title for the image file to be saved.
- * @param contents The image contents to be saved.
- * @param title The default title of the image file when it is saved. Set this to <code>null</code>
- * if a title should be generated from the {@link #contents}.
- */
- public void setChart(Composite contents, String title) {
- this.contents = contents;
- if (contents != null) {
- this.title = title != null ? title : getDefaultName();
- setEnabled(true);
- } else {
- setEnabled(false);
- }
- }
-
- private String getDefaultName() {
- if (contents instanceof Chart) {
- return ((Chart) contents).getTitle().getText().replaceAll(" ", "_"); //$NON-NLS-1$ //$NON-NLS-2$
- } else {
- return DEFAULT_TITLE;
- }
- }
-
- /**
- * Open a dialog with which to save the contents at a user-specified path.
- */
- @Override
- public void run() {
- if (problemExists()) {
- return;
- }
- File file = askForAndPrepareFile();
- if (file == null) {
- return; // Cancelled
- }
- generateImageFile(file);
- }
-
- /**
- * Save the previously-set contents as an image without the need for user input.
- * @param path The path to save the image to.
- */
- public void run(String path) {
- if (problemExists()) {
- return;
- }
- File file = new File(makePathWithVerifiedExt(path));
- if (shouldOverwrite(file, null)) {
- generateImageFile(new File(path));
- }
- }
-
- private boolean problemExists() {
- IStatus status = null;
- if (!isEnabled()) {
- status = new Status(IStatus.ERROR, Activator.PLUGIN_ID,
- Messages.ChartConstants_ERROR_CHART_CLOSED);
- } else if (contents.isDisposed()) {
- status = new Status(IStatus.ERROR, Activator.PLUGIN_ID,
- Messages.ChartConstants_ERROR_CHART_DISPOSED);
- }
-
- if (status != null) {
- ErrorDialog.openError(getWorkbenchShell(),
- Messages.ChartConstants_ERROR_SAVING_CHART,
- Messages.ChartConstants_ERROR_SAVING_CHART_MESSAGE, status);
- return true;
- }
- return false;
- }
-
- /**
- * Ask the user for the path to save the file at, and check if this path overwrites any existing file.
- * (Note that using dialog.setOverwrite(true) is insufficient, as the path name may be appended with a
- * file extension after the standard overwrite checks occur.)
- * @return A file with the specified pathname, appended with an appropriate extension.
- */
- private File askForAndPrepareFile() {
- final Shell shell = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell();
- final FileDialog dialog = new FileDialog(shell, SWT.SAVE);
- dialog.setFilterExtensions(EXTENSIONS);
- dialog.setText(Messages.ChartConstants_SAVE_CHART_DIALOG_TEXT);
- dialog.setFileName(title);
-
- do {
- String path = dialog.open();
- if (path == null) {
- return null; // Cancelled
- }
-
- path = makePathWithVerifiedExt(path);
-
- File file = new File(path);
- if (shouldOverwrite(file, shell)) {
- return file;
- }
- // If not overwriting, bring up dialog again (loop)
- dialog.setFileName(file.getName());
- } while (true);
- }
-
- private boolean shouldOverwrite(File file, Shell shell) {
- if (!file.exists()) {
- return true;
- }
- if (MessageDialog.openQuestion(shell != null ? shell :
- PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(),
- Messages.ChartConstants_CONFIRM_OVERWRITE_TITLE,
- MessageFormat.format(Messages.ChartConstants_CONFIRM_OVERWRITE_MSG, file))) {
- file.delete();
- return true;
- }
- return false;
- }
-
- /**
- * Checks if the provided path has a valid file extension supported by {@link ImageLoader#save(String, int)}.
- * If not, a copy of the path is returned, with its extension replaced with a default one.
- */
- private String makePathWithVerifiedExt(String path) {
- String pathExt = Path.fromOSString(path).getFileExtension();
- if (pathExt == null) {
- return path.concat('.' + DEFAULT_EXT);
- }
- if (EXTENSION_MAP.containsKey(pathExt)) {
- return path;
- }
- return path.replaceAll(pathExt.concat("$"), DEFAULT_EXT); //$NON-NLS-1$
- }
-
- private void generateImageFile(File file) {
- // Extension is chosen based on the file name, not the dialog filter selection.
- int extension = EXTENSION_MAP.get(Path.fromOSString(file.getName()).getFileExtension());
-
- Display dsp = Display.getCurrent();
- GC gc = new GC(contents);
- Image img = new Image(dsp, contents.getSize().x, contents.getSize().y);
- gc.copyArea(img, 0, 0);
- gc.dispose();
- ImageLoader imageLoader = new ImageLoader();
- imageLoader.data = new ImageData[] { img.getImageData() };
- imageLoader.save(file.getAbsolutePath(), extension);
- }
-
- private Shell getWorkbenchShell() {
- return PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell();
- }
-
-}
diff --git a/profiling/org.eclipse.linuxtools.dataviewers.charts/src/org/eclipse/linuxtools/dataviewers/charts/provider/IChartField.java b/profiling/org.eclipse.linuxtools.dataviewers.charts/src/org/eclipse/linuxtools/dataviewers/charts/provider/IChartField.java
index 20918970e2a81b768d167e56692cedb4902b862d..38e2e28d8bbd1a1712b9696243fe51fa1b0ee3a0 100755
--- a/profiling/org.eclipse.linuxtools.dataviewers.charts/src/org/eclipse/linuxtools/dataviewers/charts/provider/IChartField.java
+++ b/profiling/org.eclipse.linuxtools.dataviewers.charts/src/org/eclipse/linuxtools/dataviewers/charts/provider/IChartField.java
@@ -16,7 +16,9 @@ import org.eclipse.linuxtools.dataviewers.abstractviewers.ISTDataViewersField;
/**
* The interface used by the charts to get a <code>Number</code> data from a field.
+ *
*/
+@Deprecated
public interface IChartField extends ISTDataViewersField {
/**
diff --git a/profiling/org.eclipse.linuxtools.dataviewers.charts/src/org/eclipse/linuxtools/internal/dataviewers/charts/Activator.java b/profiling/org.eclipse.linuxtools.dataviewers.charts/src/org/eclipse/linuxtools/internal/dataviewers/charts/Activator.java
index 9d1cba2824a81ad7b2e4e5eecb7ce286606a7e4b..478c2d847508f0a0b78311ef54445c5edead44a8 100755
--- a/profiling/org.eclipse.linuxtools.dataviewers.charts/src/org/eclipse/linuxtools/internal/dataviewers/charts/Activator.java
+++ b/profiling/org.eclipse.linuxtools.dataviewers.charts/src/org/eclipse/linuxtools/internal/dataviewers/charts/Activator.java
@@ -13,6 +13,7 @@
package org.eclipse.linuxtools.internal.dataviewers.charts;
import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.jface.resource.ResourceLocator;
import org.eclipse.swt.graphics.Image;
import org.eclipse.ui.plugin.AbstractUIPlugin;
import org.osgi.framework.BundleContext;
@@ -57,7 +58,7 @@ public class Activator extends AbstractUIPlugin {
* @return the image descriptor
*/
public static ImageDescriptor getImageDescriptor(String path) {
- return imageDescriptorFromPlugin(PLUGIN_ID, path);
+ return ResourceLocator.imageDescriptorFromBundle(PLUGIN_ID, path).get();
}
/**
diff --git a/profiling/org.eclipse.linuxtools.dataviewers.charts/src/org/eclipse/linuxtools/internal/dataviewers/charts/dialogs/ChartDialog.java b/profiling/org.eclipse.linuxtools.dataviewers.charts/src/org/eclipse/linuxtools/internal/dataviewers/charts/dialogs/ChartDialog2.java
old mode 100755
new mode 100644
similarity index 97%
rename from profiling/org.eclipse.linuxtools.dataviewers.charts/src/org/eclipse/linuxtools/internal/dataviewers/charts/dialogs/ChartDialog.java
rename to profiling/org.eclipse.linuxtools.dataviewers.charts/src/org/eclipse/linuxtools/internal/dataviewers/charts/dialogs/ChartDialog2.java
index b344d3a97ad82ca21dbbcd2d2dc6aa74145160a9..a009c8637d03d395f6b48cc1c9ca36f8a6c16c93
--- a/profiling/org.eclipse.linuxtools.dataviewers.charts/src/org/eclipse/linuxtools/internal/dataviewers/charts/dialogs/ChartDialog.java
+++ b/profiling/org.eclipse.linuxtools.dataviewers.charts/src/org/eclipse/linuxtools/internal/dataviewers/charts/dialogs/ChartDialog2.java
@@ -23,10 +23,10 @@ import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.viewers.StructuredSelection;
import org.eclipse.linuxtools.dataviewers.abstractviewers.AbstractSTViewer;
import org.eclipse.linuxtools.dataviewers.abstractviewers.ISTDataViewersField;
-import org.eclipse.linuxtools.dataviewers.charts.provider.ChartFactory;
import org.eclipse.linuxtools.dataviewers.charts.provider.IChartField;
import org.eclipse.linuxtools.internal.dataviewers.charts.Activator;
import org.eclipse.linuxtools.internal.dataviewers.charts.Messages;
+import org.eclipse.linuxtools.internal.dataviewers.charts.view.ChartFactory;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.SelectionEvent;
import org.eclipse.swt.events.SelectionListener;
@@ -41,12 +41,12 @@ import org.eclipse.swt.widgets.Group;
import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.swt.widgets.Text;
-import org.swtchart.Chart;
+import org.eclipse.swtchart.extensions.charts.InteractiveChart;
/**
* The dialog used to customize the chart before creating it.
*/
-public class ChartDialog extends Dialog {
+public class ChartDialog2 extends Dialog {
/** The section name of the viewer's dialog settings where the chart dialog save its state */
private static final String TAG_SECTION_CHARTS_STATE = "charts_section"; //$NON-NLS-1$
@@ -68,7 +68,7 @@ public class ChartDialog extends Dialog {
private static final boolean DEFAULT_VERTICAL_BARS_BUTTON = false;
private final AbstractSTViewer stViewer;
- private Chart chart;
+ private InteractiveChart chart;
private Text errorMessageText;
private Button verticalBarsButton;
@@ -83,7 +83,7 @@ public class ChartDialog extends Dialog {
* @param shell Parent shell.
* @param stViewer The viewer this dialog fetch data from.
*/
- public ChartDialog(Shell shell, AbstractSTViewer stViewer) {
+ public ChartDialog2(Shell shell, AbstractSTViewer stViewer) {
super(shell);
this.stViewer = stViewer;
}
@@ -304,7 +304,7 @@ public class ChartDialog extends Dialog {
*
* @return the chart
*/
- public Chart getValue() {
+ public InteractiveChart getValue() {
return chart;
}
@@ -356,7 +356,7 @@ public class ChartDialog extends Dialog {
*
* @return a new chart
*/
- private Chart produceChart() {
+ private InteractiveChart produceChart() {
IStructuredSelection selection = stViewer.getViewer().getStructuredSelection();
if (selection == StructuredSelection.EMPTY)
return null;
diff --git a/profiling/org.eclipse.linuxtools.dataviewers.charts/src/org/eclipse/linuxtools/dataviewers/charts/provider/ChartFactory.java b/profiling/org.eclipse.linuxtools.dataviewers.charts/src/org/eclipse/linuxtools/internal/dataviewers/charts/view/ChartFactory.java
similarity index 88%
rename from profiling/org.eclipse.linuxtools.dataviewers.charts/src/org/eclipse/linuxtools/dataviewers/charts/provider/ChartFactory.java
rename to profiling/org.eclipse.linuxtools.dataviewers.charts/src/org/eclipse/linuxtools/internal/dataviewers/charts/view/ChartFactory.java
index e304cbf38d2f089408a03a981d0b28146c4f5313..028d5071313843fe7a0d09478e8ddf29cb8688b9 100755
--- a/profiling/org.eclipse.linuxtools.dataviewers.charts/src/org/eclipse/linuxtools/dataviewers/charts/provider/ChartFactory.java
+++ b/profiling/org.eclipse.linuxtools.dataviewers.charts/src/org/eclipse/linuxtools/internal/dataviewers/charts/view/ChartFactory.java
@@ -10,29 +10,30 @@
* Contributors:
* Marzia Maugeri <marzia.maugeri@st.com> - initial API and implementation
*******************************************************************************/
-package org.eclipse.linuxtools.dataviewers.charts.provider;
+package org.eclipse.linuxtools.internal.dataviewers.charts.view;
import java.util.List;
import org.eclipse.linuxtools.dataviewers.abstractviewers.ISTDataViewersField;
-import org.eclipse.linuxtools.dataviewers.piechart.PieChart;
+import org.eclipse.linuxtools.dataviewers.charts.provider.IChartField;
import org.eclipse.linuxtools.internal.dataviewers.charts.Activator;
-import org.eclipse.linuxtools.internal.dataviewers.charts.view.ChartView;
+import org.eclipse.linuxtools.internal.dataviewers.piechart.PieChart;
import org.eclipse.swt.SWT;
import org.eclipse.swt.graphics.Color;
import org.eclipse.swt.widgets.Display;
+import org.eclipse.swtchart.IAxis;
+import org.eclipse.swtchart.IBarSeries;
+import org.eclipse.swtchart.ISeries.SeriesType;
+import org.eclipse.swtchart.ITitle;
+import org.eclipse.swtchart.LineStyle;
+import org.eclipse.swtchart.extensions.charts.InteractiveChart;
import org.eclipse.ui.IWorkbenchPage;
import org.eclipse.ui.PartInitException;
import org.eclipse.ui.PlatformUI;
-import org.swtchart.Chart;
-import org.swtchart.IAxis;
-import org.swtchart.IBarSeries;
-import org.swtchart.ISeries.SeriesType;
-import org.swtchart.ITitle;
-import org.swtchart.LineStyle;
/**
* A utility class that handles the charts creation (pie chart and bar chart)
+ *
*/
public final class ChartFactory {
@@ -50,7 +51,7 @@ public final class ChartFactory {
* @param title Title of the chart.
* @return a new pie chart
*/
- public static Chart producePieChart(Object[] objects, ISTDataViewersField nameField,
+ public static InteractiveChart producePieChart(Object[] objects, ISTDataViewersField nameField,
List<IChartField> valFields, String title) {
ChartView view;
@@ -64,7 +65,7 @@ public final class ChartFactory {
PieChart chart = new PieChart(view.getParent(), SWT.NONE);
chart.setBackground(WHITE);
- chart.setBackgroundInPlotArea(GRAD);
+ chart.getPlotArea().setBackground(GRAD);
chart.getTitle().setText(title);
chart.getTitle().setForeground(BLACK);
@@ -115,7 +116,7 @@ public final class ChartFactory {
* @return a new 2D bar chart
*/
- public static Chart produceBarChart(Object[] objects, final ISTDataViewersField nameField,
+ public static InteractiveChart produceBarChart(Object[] objects, final ISTDataViewersField nameField,
List<IChartField> valFields, String title, boolean horizontal) {
ChartView view;
try {
@@ -125,13 +126,14 @@ public final class ChartFactory {
view = (ChartView) PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage()
.showView(ChartView.VIEW_ID, String.valueOf(ChartView.getSecId()), IWorkbenchPage.VIEW_ACTIVATE);
- Chart chart = new Chart(view.getParent(), SWT.NONE);
+ InteractiveChart chart = new InteractiveChart(view.getParent(), SWT.NONE);
chart.setBackground(WHITE);
- chart.setBackgroundInPlotArea(GRAD);
+ chart.getPlotArea().setBackground(GRAD);
chart.getTitle().setText(title);
chart.getTitle().setForeground(BLACK);
+ chart.setProposedSaveAsFilename(title.replace(' ', '_'));
// this is correct (refers to orientation of x-axis, not bars)
if (horizontal) {
diff --git a/profiling/org.eclipse.linuxtools.dataviewers.charts/src/org/eclipse/linuxtools/internal/dataviewers/charts/view/ChartView.java b/profiling/org.eclipse.linuxtools.dataviewers.charts/src/org/eclipse/linuxtools/internal/dataviewers/charts/view/ChartView.java
index 6389c3fd81f55c6e51af884860f149de0ee2d084..29c55781870e0e9631d43dc3f9df2fa2c3b2ea58 100755
--- a/profiling/org.eclipse.linuxtools.dataviewers.charts/src/org/eclipse/linuxtools/internal/dataviewers/charts/view/ChartView.java
+++ b/profiling/org.eclipse.linuxtools.dataviewers.charts/src/org/eclipse/linuxtools/internal/dataviewers/charts/view/ChartView.java
@@ -1,6 +1,6 @@
/*******************************************************************************
* Copyright (c) 2009, 2018 STMicroelectronics and others.
- *
+ *
* This program and the accompanying materials are made
* available under the terms of the Eclipse Public License 2.0
* which is available at https://www.eclipse.org/legal/epl-2.0/
@@ -15,16 +15,12 @@ package org.eclipse.linuxtools.internal.dataviewers.charts.view;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.action.IToolBarManager;
-import org.eclipse.linuxtools.dataviewers.charts.actions.SaveChartAction;
import org.eclipse.linuxtools.internal.dataviewers.charts.Activator;
import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.IActionBars;
import org.eclipse.ui.IWorkbenchPage;
import org.eclipse.ui.PartInitException;
import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.part.ViewPart;
-import org.swtchart.Chart;
/**
* The chart view.
@@ -47,8 +43,6 @@ public class ChartView extends ViewPart {
private Composite parent;
- private SaveChartAction saveChartAction;
-
/**
* Create and open a new chart view <br/>
* <br/>
@@ -56,15 +50,13 @@ public class ChartView extends ViewPart {
* thread execution is synchronized on internal Integer SEC_ID which is the secondary id of the chart view. Each new
* chart view has a secondary id equal to SEC_ID++.
*
- * @param chart The chart to create view for.
*/
- public static void createChartView(final Chart chart) {
+ public static void createChartView() {
PlatformUI.getWorkbench().getDisplay().syncExec(() -> {
try {
synchronized (lock) {
- ChartView view = (ChartView) PlatformUI.getWorkbench().getActiveWorkbenchWindow()
+ PlatformUI.getWorkbench().getActiveWorkbenchWindow()
.getActivePage().showView(VIEW_ID, String.valueOf(SEC_ID++), IWorkbenchPage.VIEW_ACTIVATE);
- view.setChart(chart);
}
} catch (PartInitException e) {
@@ -78,18 +70,6 @@ public class ChartView extends ViewPart {
@Override
public void createPartControl(Composite parent) {
this.parent = parent;
- createActions();
- IActionBars actionBars = getViewSite().getActionBars();
- initToolBar(actionBars.getToolBarManager());
- }
-
- private void createActions() {
- saveChartAction = new SaveChartAction();
- }
-
- protected void initToolBar(IToolBarManager manager) {
- manager.add(saveChartAction);
- manager.update(true);
}
@Override
@@ -99,15 +79,6 @@ public class ChartView extends ViewPart {
}
}
- /**
- * Set the chart in this view
- *
- * @param chart
- */
- private void setChart(Chart chart) {
- saveChartAction.setChart(chart);
- }
-
public Composite getParent() {
return parent;
}
diff --git a/profiling/org.eclipse.linuxtools.dataviewers.piechart/.classpath b/profiling/org.eclipse.linuxtools.dataviewers.piechart/.classpath
index 43b986286a9e5fd1828793fa4b2353d02ab8625f..1db08c6b4ce2fb50395b2f9c9a50c140a0bab199 100644
--- a/profiling/org.eclipse.linuxtools.dataviewers.piechart/.classpath
+++ b/profiling/org.eclipse.linuxtools.dataviewers.piechart/.classpath
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="target/classes"/>
diff --git a/profiling/org.eclipse.linuxtools.dataviewers.piechart/.settings/org.eclipse.jdt.core.prefs b/profiling/org.eclipse.linuxtools.dataviewers.piechart/.settings/org.eclipse.jdt.core.prefs
index c6519a5b63a253c7839628e3c21747ae7ca711ce..9d8a94bc9d7e7ae0255b29086a4236fee8e90ced 100644
--- a/profiling/org.eclipse.linuxtools.dataviewers.piechart/.settings/org.eclipse.jdt.core.prefs
+++ b/profiling/org.eclipse.linuxtools.dataviewers.piechart/.settings/org.eclipse.jdt.core.prefs
@@ -6,8 +6,8 @@ org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annota
org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
+org.eclipse.jdt.core.compiler.compliance=11
org.eclipse.jdt.core.compiler.doc.comment.support=enabled
org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
@@ -19,6 +19,7 @@ org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=warning
org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
@@ -75,6 +76,7 @@ org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=warn
org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
@@ -106,4 +108,5 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11
diff --git a/profiling/org.eclipse.linuxtools.dataviewers.piechart/META-INF/MANIFEST.MF b/profiling/org.eclipse.linuxtools.dataviewers.piechart/META-INF/MANIFEST.MF
index 2a7436f465c00e0133a5c7af82ce6229057aca97..d61033c441fcda0a8e3b52e45299e4d9395a5e03 100644
--- a/profiling/org.eclipse.linuxtools.dataviewers.piechart/META-INF/MANIFEST.MF
+++ b/profiling/org.eclipse.linuxtools.dataviewers.piechart/META-INF/MANIFEST.MF
@@ -2,12 +2,13 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %bundleName
Bundle-SymbolicName: org.eclipse.linuxtools.dataviewers.piechart
-Bundle-Version: 2.0.1.qualifier
+Bundle-Version: 3.0.0.qualifier
Bundle-Vendor: %bundleProvider
Bundle-Localization: plugin
Require-Bundle: org.eclipse.ui,
- org.swtchart
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+ org.eclipse.swtchart
+Bundle-RequiredExecutionEnvironment: JavaSE-11
Bundle-ActivationPolicy: lazy
-Export-Package: org.eclipse.linuxtools.dataviewers.piechart
+Export-Package: org.eclipse.linuxtools.dataviewers.piechart, org.eclipse.linuxtools.internal.dataviewers.piechart;x-internal:=true
Automatic-Module-Name: org.eclipse.linuxtools.dataviewers.piechart
+Import-Package: org.eclipse.swtchart.extensions.charts
diff --git a/profiling/org.eclipse.linuxtools.dataviewers.piechart/pom.xml b/profiling/org.eclipse.linuxtools.dataviewers.piechart/pom.xml
index 3f4356fb10ab85fb0580c295f6b8a3bafee9125b..45bd15d8b07f7b51b6f7726bfd6547d3862e9a7c 100644
--- a/profiling/org.eclipse.linuxtools.dataviewers.piechart/pom.xml
+++ b/profiling/org.eclipse.linuxtools.dataviewers.piechart/pom.xml
@@ -15,11 +15,11 @@
<parent>
<artifactId>linuxtools-profiling-parent</artifactId>
<groupId>org.eclipse.linuxtools.profiling</groupId>
- <version>7.4.0</version>
+ <version>8.1.0</version>
</parent>
<artifactId>org.eclipse.linuxtools.dataviewers.piechart</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>3.0.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
<name>Linux Tools PieChart plug-in</name>
diff --git a/profiling/org.eclipse.linuxtools.dataviewers.piechart/src/org/eclipse/linuxtools/dataviewers/piechart/PieChart.java b/profiling/org.eclipse.linuxtools.dataviewers.piechart/src/org/eclipse/linuxtools/internal/dataviewers/piechart/PieChart.java
similarity index 92%
rename from profiling/org.eclipse.linuxtools.dataviewers.piechart/src/org/eclipse/linuxtools/dataviewers/piechart/PieChart.java
rename to profiling/org.eclipse.linuxtools.dataviewers.piechart/src/org/eclipse/linuxtools/internal/dataviewers/piechart/PieChart.java
index 4ae832febbd31fe9b6e1a8c532835ccdc588a509..814325b505e5a526aeea031bb66332c4dbf8151d 100644
--- a/profiling/org.eclipse.linuxtools.dataviewers.piechart/src/org/eclipse/linuxtools/dataviewers/piechart/PieChart.java
+++ b/profiling/org.eclipse.linuxtools.dataviewers.piechart/src/org/eclipse/linuxtools/internal/dataviewers/piechart/PieChart.java
@@ -10,23 +10,24 @@
* Contributors:
* IBM Corporation - Renato Stoffalette Joao <rsjoao@br.ibm.com>
*******************************************************************************/
-package org.eclipse.linuxtools.dataviewers.piechart;
+package org.eclipse.linuxtools.internal.dataviewers.piechart;
import java.util.ArrayList;
import java.util.List;
+import org.eclipse.linuxtools.dataviewers.piechart.IColorsConstants;
import org.eclipse.swt.events.PaintListener;
import org.eclipse.swt.graphics.Color;
import org.eclipse.swt.graphics.RGB;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
-import org.swtchart.Chart;
-import org.swtchart.IAxis;
-import org.swtchart.IBarSeries;
-import org.swtchart.ISeries;
-import org.swtchart.ITitle;
+import org.eclipse.swtchart.IAxis;
+import org.eclipse.swtchart.IBarSeries;
+import org.eclipse.swtchart.ISeries;
+import org.eclipse.swtchart.ITitle;
+import org.eclipse.swtchart.extensions.charts.InteractiveChart;
-public class PieChart extends Chart {
+public class PieChart extends InteractiveChart {
protected List<RGB> colorList = new ArrayList<>();
private Color[] customColors = null;
@@ -38,7 +39,7 @@ public class PieChart extends Chart {
for (IAxis axis : getAxisSet().getAxes()) {
axis.getTitle().setVisible(false);
}
- getPlotArea().setVisible(false);
+ getPlotArea().getControl().setVisible(false);
// Make the title draw after the pie-chart itself so we can modify the title
// to center over the pie-chart area
ITitle title = getTitle();
@@ -61,7 +62,7 @@ public class PieChart extends Chart {
@Override
public void addPaintListener(PaintListener listener) {
- if (!listener.getClass().getName().startsWith("org.swtchart.internal.axis")) { //$NON-NLS-1$
+ if (!listener.getClass().getName().startsWith("org.eclipse.swtchart.internal.axis")) { //$NON-NLS-1$
super.addPaintListener(listener);
}
}
diff --git a/profiling/org.eclipse.linuxtools.dataviewers.piechart/src/org/eclipse/linuxtools/dataviewers/piechart/PieChartPaintListener.java b/profiling/org.eclipse.linuxtools.dataviewers.piechart/src/org/eclipse/linuxtools/internal/dataviewers/piechart/PieChartPaintListener.java
similarity index 97%
rename from profiling/org.eclipse.linuxtools.dataviewers.piechart/src/org/eclipse/linuxtools/dataviewers/piechart/PieChartPaintListener.java
rename to profiling/org.eclipse.linuxtools.dataviewers.piechart/src/org/eclipse/linuxtools/internal/dataviewers/piechart/PieChartPaintListener.java
index b47f787eb32676e6b4d94a3b3ce4057e4ab90529..09e4ae6376c3ae8be45aedf5878dff5e51d4dcbf 100644
--- a/profiling/org.eclipse.linuxtools.dataviewers.piechart/src/org/eclipse/linuxtools/dataviewers/piechart/PieChartPaintListener.java
+++ b/profiling/org.eclipse.linuxtools.dataviewers.piechart/src/org/eclipse/linuxtools/internal/dataviewers/piechart/PieChartPaintListener.java
@@ -10,7 +10,7 @@
* Contributors:
* IBM Corporation - Renato Stoffalette Joao <rsjoao@br.ibm.com>
*******************************************************************************/
-package org.eclipse.linuxtools.dataviewers.piechart;
+package org.eclipse.linuxtools.internal.dataviewers.piechart;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.PaintEvent;
@@ -22,10 +22,10 @@ import org.eclipse.swt.graphics.Point;
import org.eclipse.swt.graphics.Rectangle;
import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Display;
-import org.swtchart.IBarSeries;
-import org.swtchart.ISeries;
-import org.swtchart.ITitle;
-import org.swtchart.Range;
+import org.eclipse.swtchart.IBarSeries;
+import org.eclipse.swtchart.ISeries;
+import org.eclipse.swtchart.ITitle;
+import org.eclipse.swtchart.Range;
public class PieChartPaintListener implements PaintListener {
@@ -53,7 +53,7 @@ public class PieChartPaintListener implements PaintListener {
*/
public PieChartPaintListener(PieChart chart) {
this.chart = chart;
- this.plotArea = chart.getPlotArea();
+ this.plotArea = chart.getPlotArea().getControl();
}
@Override
diff --git a/profiling/org.eclipse.linuxtools.dataviewers/.classpath b/profiling/org.eclipse.linuxtools.dataviewers/.classpath
index 18afde316976e5218b88424e7f98ebf8b4ec6db6..bad53d2e5dcd5d71a5765169bfecb549d5301daa 100644
--- a/profiling/org.eclipse.linuxtools.dataviewers/.classpath
+++ b/profiling/org.eclipse.linuxtools.dataviewers/.classpath
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins">
<accessrules>
<accessrule kind="accessible" pattern="*"/>
diff --git a/profiling/org.eclipse.linuxtools.dataviewers/.settings/org.eclipse.jdt.core.prefs b/profiling/org.eclipse.linuxtools.dataviewers/.settings/org.eclipse.jdt.core.prefs
index c49b94164dfd6357683e646f0c1d4f88b94aeebf..f40c3ed16c8e185223514ccb38f67a86b7079634 100644
--- a/profiling/org.eclipse.linuxtools.dataviewers/.settings/org.eclipse.jdt.core.prefs
+++ b/profiling/org.eclipse.linuxtools.dataviewers/.settings/org.eclipse.jdt.core.prefs
@@ -7,9 +7,9 @@ org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annota
org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.compliance=11
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -24,6 +24,7 @@ org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=warning
org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
@@ -80,6 +81,7 @@ org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=warn
org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
@@ -111,4 +113,5 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11
diff --git a/profiling/org.eclipse.linuxtools.dataviewers/META-INF/MANIFEST.MF b/profiling/org.eclipse.linuxtools.dataviewers/META-INF/MANIFEST.MF
index 96ebfa0bb59766b70e3249000f095183b3a1dccd..6fedb465c751093148f066a3b6e87b9a1f45c335 100644
--- a/profiling/org.eclipse.linuxtools.dataviewers/META-INF/MANIFEST.MF
+++ b/profiling/org.eclipse.linuxtools.dataviewers/META-INF/MANIFEST.MF
@@ -17,6 +17,6 @@ Export-Package: org.eclipse.linuxtools.dataviewers,
org.eclipse.linuxtools.dataviewers.actions,
org.eclipse.linuxtools.dataviewers.dialogs,
org.eclipse.linuxtools.dataviewers.listeners
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
Bundle-Localization: plugin
Automatic-Module-Name: org.eclipse.linuxtools.dataviewers
diff --git a/profiling/org.eclipse.linuxtools.dataviewers/pom.xml b/profiling/org.eclipse.linuxtools.dataviewers/pom.xml
index 6bf976b183023dff0b2088bdf4e55e52f246c6f3..fc0063cd87b9a06a617dda31480f5730548bdd9c 100644
--- a/profiling/org.eclipse.linuxtools.dataviewers/pom.xml
+++ b/profiling/org.eclipse.linuxtools.dataviewers/pom.xml
@@ -15,7 +15,7 @@
<parent>
<artifactId>linuxtools-profiling-parent</artifactId>
<groupId>org.eclipse.linuxtools.profiling</groupId>
- <version>7.4.0</version>
+ <version>8.1.0</version>
</parent>
<artifactId>org.eclipse.linuxtools.dataviewers</artifactId>
diff --git a/profiling/org.eclipse.linuxtools.dataviewers/src/org/eclipse/linuxtools/dataviewers/actions/STCollapseAllTreeAction.java b/profiling/org.eclipse.linuxtools.dataviewers/src/org/eclipse/linuxtools/dataviewers/actions/STCollapseAllTreeAction.java
index 2aee7a72345850f825dc9c71860098b0629c8881..576d7a671e069a13b161b73459bfd131bebf657a 100644
--- a/profiling/org.eclipse.linuxtools.dataviewers/src/org/eclipse/linuxtools/dataviewers/actions/STCollapseAllTreeAction.java
+++ b/profiling/org.eclipse.linuxtools.dataviewers/src/org/eclipse/linuxtools/dataviewers/actions/STCollapseAllTreeAction.java
@@ -13,10 +13,10 @@
package org.eclipse.linuxtools.dataviewers.actions;
import org.eclipse.jface.action.Action;
+import org.eclipse.jface.resource.ResourceLocator;
import org.eclipse.linuxtools.dataviewers.STDataViewersActivator;
import org.eclipse.linuxtools.dataviewers.abstractviewers.AbstractSTTreeViewer;
import org.eclipse.linuxtools.dataviewers.abstractviewers.STDataViewersMessages;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
/**
* This action collapse all the tree
@@ -33,10 +33,9 @@ public class STCollapseAllTreeAction extends Action {
* the stViewer to collapse
*/
public STCollapseAllTreeAction(AbstractSTTreeViewer stViewer) {
- super(STDataViewersMessages.collapseAllAction_title,
- AbstractUIPlugin.imageDescriptorFromPlugin(STDataViewersActivator.PLUGIN_ID,
- "icons/collapse_all.gif")); //$NON-NLS-1$
- this.stViewer = stViewer;
+ super(STDataViewersMessages.collapseAllAction_title, ResourceLocator
+ .imageDescriptorFromBundle(STDataViewersActivator.PLUGIN_ID, "icons/collapse_all.gif").get()); //$NON-NLS-1$
+ this.stViewer = stViewer;
}
@Override
diff --git a/profiling/org.eclipse.linuxtools.dataviewers/src/org/eclipse/linuxtools/dataviewers/actions/STCollapseSelectionAction.java b/profiling/org.eclipse.linuxtools.dataviewers/src/org/eclipse/linuxtools/dataviewers/actions/STCollapseSelectionAction.java
index 9338259967df58f9517ee60791263b0b17b40691..b9fc0a6b0bb912619ecfeb2683a7650e78521f85 100644
--- a/profiling/org.eclipse.linuxtools.dataviewers/src/org/eclipse/linuxtools/dataviewers/actions/STCollapseSelectionAction.java
+++ b/profiling/org.eclipse.linuxtools.dataviewers/src/org/eclipse/linuxtools/dataviewers/actions/STCollapseSelectionAction.java
@@ -15,13 +15,13 @@ package org.eclipse.linuxtools.dataviewers.actions;
import java.util.Iterator;
import org.eclipse.jface.action.Action;
+import org.eclipse.jface.resource.ResourceLocator;
import org.eclipse.jface.viewers.AbstractTreeViewer;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.viewers.TreeSelection;
import org.eclipse.linuxtools.dataviewers.STDataViewersActivator;
import org.eclipse.linuxtools.dataviewers.abstractviewers.AbstractSTTreeViewer;
import org.eclipse.linuxtools.dataviewers.abstractviewers.STDataViewersMessages;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
/**
* This action collapse the selected items of the tree
@@ -38,9 +38,8 @@ public class STCollapseSelectionAction extends Action {
* the stViewer to collapse
*/
public STCollapseSelectionAction(AbstractSTTreeViewer stViewer) {
- super(STDataViewersMessages.collapseSelectionAction_title,
- AbstractUIPlugin.imageDescriptorFromPlugin(STDataViewersActivator.PLUGIN_ID,
- "icons/collapse_all.gif")); //$NON-NLS-1$
+ super(STDataViewersMessages.collapseSelectionAction_title, ResourceLocator
+ .imageDescriptorFromBundle(STDataViewersActivator.PLUGIN_ID, "icons/collapse_all.gif").get()); //$NON-NLS-1$
this.stViewer = stViewer;
}
diff --git a/profiling/org.eclipse.linuxtools.dataviewers/src/org/eclipse/linuxtools/dataviewers/actions/STDataViewersSortAction.java b/profiling/org.eclipse.linuxtools.dataviewers/src/org/eclipse/linuxtools/dataviewers/actions/STDataViewersSortAction.java
index 0abcafba76c455ef94c30016cb4524d4526b512c..0f0713d8d49e2813b3341cf5ff8684bea1702a00 100644
--- a/profiling/org.eclipse.linuxtools.dataviewers/src/org/eclipse/linuxtools/dataviewers/actions/STDataViewersSortAction.java
+++ b/profiling/org.eclipse.linuxtools.dataviewers/src/org/eclipse/linuxtools/dataviewers/actions/STDataViewersSortAction.java
@@ -13,13 +13,13 @@
package org.eclipse.linuxtools.dataviewers.actions;
import org.eclipse.jface.action.Action;
+import org.eclipse.jface.resource.ResourceLocator;
import org.eclipse.jface.window.Window;
import org.eclipse.linuxtools.dataviewers.STDataViewersActivator;
import org.eclipse.linuxtools.dataviewers.abstractviewers.AbstractSTViewer;
import org.eclipse.linuxtools.dataviewers.abstractviewers.STDataViewersMessages;
import org.eclipse.linuxtools.dataviewers.dialogs.STDataViewersSortDialog;
import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
/**
* This action allows the user to sort the data in the viewer
@@ -36,9 +36,8 @@ public class STDataViewersSortAction extends Action {
* @param stViewer The AbstractSTViewer to create the action for.
*/
public STDataViewersSortAction(AbstractSTViewer stViewer) {
- super(STDataViewersMessages.sortAction_title,
- AbstractUIPlugin.imageDescriptorFromPlugin(STDataViewersActivator.PLUGIN_ID,
- "icons/sort.gif")); //$NON-NLS-1$
+ super(STDataViewersMessages.sortAction_title,
+ ResourceLocator.imageDescriptorFromBundle(STDataViewersActivator.PLUGIN_ID, "icons/sort.gif").get()); //$NON-NLS-1$
super.setToolTipText(STDataViewersMessages.sortAction_tooltip);
this.stViewer = stViewer;
diff --git a/profiling/org.eclipse.linuxtools.dataviewers/src/org/eclipse/linuxtools/dataviewers/actions/STExpandAllTreeAction.java b/profiling/org.eclipse.linuxtools.dataviewers/src/org/eclipse/linuxtools/dataviewers/actions/STExpandAllTreeAction.java
index aa459b67ef5fa485b09afbc3a77d3cde88b688a7..3c2226359dbd92db9c0e2c66e6a5dcc6d1f21360 100644
--- a/profiling/org.eclipse.linuxtools.dataviewers/src/org/eclipse/linuxtools/dataviewers/actions/STExpandAllTreeAction.java
+++ b/profiling/org.eclipse.linuxtools.dataviewers/src/org/eclipse/linuxtools/dataviewers/actions/STExpandAllTreeAction.java
@@ -13,10 +13,10 @@
package org.eclipse.linuxtools.dataviewers.actions;
import org.eclipse.jface.action.Action;
+import org.eclipse.jface.resource.ResourceLocator;
import org.eclipse.linuxtools.dataviewers.STDataViewersActivator;
import org.eclipse.linuxtools.dataviewers.abstractviewers.AbstractSTTreeViewer;
import org.eclipse.linuxtools.dataviewers.abstractviewers.STDataViewersMessages;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
/**
* This action expands all the tree
@@ -33,10 +33,9 @@ public class STExpandAllTreeAction extends Action {
* the stViewer to expand
*/
public STExpandAllTreeAction(AbstractSTTreeViewer stViewer) {
- super(STDataViewersMessages.expandAllAction_title,
- AbstractUIPlugin.imageDescriptorFromPlugin(STDataViewersActivator.PLUGIN_ID,
- "icons/expand_all.gif")); //$NON-NLS-1$
- this.stViewer = stViewer;
+ super(STDataViewersMessages.expandAllAction_title, ResourceLocator
+ .imageDescriptorFromBundle(STDataViewersActivator.PLUGIN_ID, "icons/expand_all.gif").get()); //$NON-NLS-1$
+ this.stViewer = stViewer;
}
@Override
diff --git a/profiling/org.eclipse.linuxtools.dataviewers/src/org/eclipse/linuxtools/dataviewers/actions/STExpandSelectionAction.java b/profiling/org.eclipse.linuxtools.dataviewers/src/org/eclipse/linuxtools/dataviewers/actions/STExpandSelectionAction.java
index 34a04600bc9f3b844fec1e356ec2d0e9baadd21b..15601b2ca5ff5898d382ab9eb8d0bb5a4baf90d0 100644
--- a/profiling/org.eclipse.linuxtools.dataviewers/src/org/eclipse/linuxtools/dataviewers/actions/STExpandSelectionAction.java
+++ b/profiling/org.eclipse.linuxtools.dataviewers/src/org/eclipse/linuxtools/dataviewers/actions/STExpandSelectionAction.java
@@ -15,13 +15,13 @@ package org.eclipse.linuxtools.dataviewers.actions;
import java.util.Iterator;
import org.eclipse.jface.action.Action;
+import org.eclipse.jface.resource.ResourceLocator;
import org.eclipse.jface.viewers.AbstractTreeViewer;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.viewers.TreeSelection;
import org.eclipse.linuxtools.dataviewers.STDataViewersActivator;
import org.eclipse.linuxtools.dataviewers.abstractviewers.AbstractSTTreeViewer;
import org.eclipse.linuxtools.dataviewers.abstractviewers.STDataViewersMessages;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
/**
* This action expands the selected items of the tree
@@ -38,9 +38,8 @@ public class STExpandSelectionAction extends Action {
* the stViewer to expand
*/
public STExpandSelectionAction(AbstractSTTreeViewer stViewer) {
- super(STDataViewersMessages.expandSelectionAction_title,
- AbstractUIPlugin.imageDescriptorFromPlugin(STDataViewersActivator.PLUGIN_ID,
- "icons/expand_all.gif")); //$NON-NLS-1$
+ super(STDataViewersMessages.expandSelectionAction_title, ResourceLocator
+ .imageDescriptorFromBundle(STDataViewersActivator.PLUGIN_ID, "icons/expand_all.gif").get()); //$NON-NLS-1$
this.stViewer = stViewer;
}
diff --git a/profiling/org.eclipse.linuxtools.dataviewers/src/org/eclipse/linuxtools/dataviewers/actions/STExportToCSVAction.java b/profiling/org.eclipse.linuxtools.dataviewers/src/org/eclipse/linuxtools/dataviewers/actions/STExportToCSVAction.java
index 6614c25d4f6566d88c14ad0b8ed147bfd89f615a..fd03092b1f8d17ed63e45683ccb24eb64f7f6ef6 100644
--- a/profiling/org.eclipse.linuxtools.dataviewers/src/org/eclipse/linuxtools/dataviewers/actions/STExportToCSVAction.java
+++ b/profiling/org.eclipse.linuxtools.dataviewers/src/org/eclipse/linuxtools/dataviewers/actions/STExportToCSVAction.java
@@ -17,13 +17,13 @@ import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.jface.action.Action;
+import org.eclipse.jface.resource.ResourceLocator;
import org.eclipse.jface.window.Window;
import org.eclipse.linuxtools.dataviewers.STDataViewersActivator;
import org.eclipse.linuxtools.dataviewers.abstractviewers.AbstractSTViewer;
import org.eclipse.linuxtools.dataviewers.abstractviewers.STDataViewersCSVExporter;
import org.eclipse.linuxtools.dataviewers.abstractviewers.STDataViewersMessages;
import org.eclipse.linuxtools.dataviewers.dialogs.STDataViewersExportToCSVDialog;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
/**
* This action export the STViewers data to CSV format file
@@ -47,9 +47,8 @@ public class STExportToCSVAction extends Action {
* the stViewer to export
*/
public STExportToCSVAction(AbstractSTViewer stViewer) {
- super(STDataViewersMessages.exportToCSVAction_title,
- AbstractUIPlugin.imageDescriptorFromPlugin(STDataViewersActivator.PLUGIN_ID,
- "icons/export.gif")); //$NON-NLS-1$
+ super(STDataViewersMessages.exportToCSVAction_title,
+ ResourceLocator.imageDescriptorFromBundle(STDataViewersActivator.PLUGIN_ID, "icons/export.gif").get()); //$NON-NLS-1$
this.stViewer = stViewer;
this.exporter = new STDataViewersCSVExporter(stViewer);
diff --git a/profiling/org.eclipse.linuxtools.dataviewers/src/org/eclipse/linuxtools/dataviewers/actions/STHideShowColAction.java b/profiling/org.eclipse.linuxtools.dataviewers/src/org/eclipse/linuxtools/dataviewers/actions/STHideShowColAction.java
index a13b07b5d24f097703e4103865876805b46fddd3..cebb4f43f35a1acdbb76ef26ac3503088ca312df 100644
--- a/profiling/org.eclipse.linuxtools.dataviewers/src/org/eclipse/linuxtools/dataviewers/actions/STHideShowColAction.java
+++ b/profiling/org.eclipse.linuxtools.dataviewers/src/org/eclipse/linuxtools/dataviewers/actions/STHideShowColAction.java
@@ -13,12 +13,12 @@
package org.eclipse.linuxtools.dataviewers.actions;
import org.eclipse.jface.action.Action;
+import org.eclipse.jface.resource.ResourceLocator;
import org.eclipse.jface.window.Window;
import org.eclipse.linuxtools.dataviewers.STDataViewersActivator;
import org.eclipse.linuxtools.dataviewers.abstractviewers.AbstractSTViewer;
import org.eclipse.linuxtools.dataviewers.abstractviewers.STDataViewersMessages;
import org.eclipse.linuxtools.dataviewers.dialogs.STDataViewersHideShowColumnsDialog;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
/**
* This action allows the user to hide/show some columns.
@@ -32,12 +32,11 @@ public class STHideShowColAction extends Action {
*
* @param stViewer The AbstractSTViewer to create the action for.
*/
- public STHideShowColAction(AbstractSTViewer stViewer) {
- super(STDataViewersMessages.hideshowAction_title,
- AbstractUIPlugin.imageDescriptorFromPlugin(STDataViewersActivator.PLUGIN_ID,
- "icons/prop_edt.gif")); //$NON-NLS-1$
- this.stViewer = stViewer;
- setEnabled(true);
+ public STHideShowColAction(AbstractSTViewer stViewer) {
+ super(STDataViewersMessages.hideshowAction_title, ResourceLocator
+ .imageDescriptorFromBundle(STDataViewersActivator.PLUGIN_ID, "icons/prop_edt.gif").get()); //$NON-NLS-1$
+ this.stViewer = stViewer;
+ setEnabled(true);
}
@Override
diff --git a/profiling/org.eclipse.linuxtools.profiling-feature/feature.xml b/profiling/org.eclipse.linuxtools.profiling-feature/feature.xml
index 965078983bee0dec0b698915de8c187fdd45ec37..404fcdb4b679bff824e5aa8176d3f5fd6bc96d64 100644
--- a/profiling/org.eclipse.linuxtools.profiling-feature/feature.xml
+++ b/profiling/org.eclipse.linuxtools.profiling-feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.linuxtools.profiling"
label="%featureName"
- version="7.4.0.qualifier"
+ version="8.1.0.qualifier"
provider-name="%featureProvider"
license-feature="org.eclipse.license"
license-feature-version="0.0.0">
diff --git a/profiling/org.eclipse.linuxtools.profiling-feature/pom.xml b/profiling/org.eclipse.linuxtools.profiling-feature/pom.xml
index d1f504e547ce94582edba44e9b31b9c31c6d6bea..59362706ac47036bf8d212f2f66924df085b6af6 100644
--- a/profiling/org.eclipse.linuxtools.profiling-feature/pom.xml
+++ b/profiling/org.eclipse.linuxtools.profiling-feature/pom.xml
@@ -15,12 +15,12 @@
<parent>
<artifactId>linuxtools-profiling-parent</artifactId>
<groupId>org.eclipse.linuxtools.profiling</groupId>
- <version>7.4.0</version>
+ <version>8.1.0</version>
</parent>
<artifactId>org.eclipse.linuxtools.profiling</artifactId>
<packaging>eclipse-feature</packaging>
- <version>7.4.0-SNAPSHOT</version>
+ <version>8.1.0-SNAPSHOT</version>
<name>Linux Tools Profiling Framework Feature</name>
diff --git a/profiling/org.eclipse.linuxtools.profiling.docs/pom.xml b/profiling/org.eclipse.linuxtools.profiling.docs/pom.xml
index 0837267994891f81a8895b1cf52f78d72eb6658e..5442861d32bee406843d2bad0315cc179846ddae 100644
--- a/profiling/org.eclipse.linuxtools.profiling.docs/pom.xml
+++ b/profiling/org.eclipse.linuxtools.profiling.docs/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.eclipse.linuxtools.profiling</groupId>
<artifactId>linuxtools-profiling-parent</artifactId>
- <version>7.4.0</version>
+ <version>8.1.0</version>
</parent>
<artifactId>org.eclipse.linuxtools.profiling.docs</artifactId>
diff --git a/profiling/org.eclipse.linuxtools.profiling.launch.ui.rdt.proxy/.classpath b/profiling/org.eclipse.linuxtools.profiling.launch.ui.rdt.proxy/.classpath
index 43b986286a9e5fd1828793fa4b2353d02ab8625f..1db08c6b4ce2fb50395b2f9c9a50c140a0bab199 100644
--- a/profiling/org.eclipse.linuxtools.profiling.launch.ui.rdt.proxy/.classpath
+++ b/profiling/org.eclipse.linuxtools.profiling.launch.ui.rdt.proxy/.classpath
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="target/classes"/>
diff --git a/profiling/org.eclipse.linuxtools.profiling.launch.ui.rdt.proxy/.settings/org.eclipse.jdt.core.prefs b/profiling/org.eclipse.linuxtools.profiling.launch.ui.rdt.proxy/.settings/org.eclipse.jdt.core.prefs
index ef45da68164f478d6f2cc923282e3a8e4c75b821..169586ce81263da309b5765dc484de872d702f46 100644
--- a/profiling/org.eclipse.linuxtools.profiling.launch.ui.rdt.proxy/.settings/org.eclipse.jdt.core.prefs
+++ b/profiling/org.eclipse.linuxtools.profiling.launch.ui.rdt.proxy/.settings/org.eclipse.jdt.core.prefs
@@ -6,8 +6,8 @@ org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annota
org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
+org.eclipse.jdt.core.compiler.compliance=11
org.eclipse.jdt.core.compiler.doc.comment.support=enabled
org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
@@ -19,6 +19,7 @@ org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=warning
org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
@@ -75,6 +76,7 @@ org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=warn
org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
@@ -106,4 +108,5 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11
diff --git a/profiling/org.eclipse.linuxtools.profiling.launch.ui.rdt.proxy/META-INF/MANIFEST.MF b/profiling/org.eclipse.linuxtools.profiling.launch.ui.rdt.proxy/META-INF/MANIFEST.MF
index 171fdc64a32966e02552645e29b9083c7c40c0f3..3c1b5a7eaf0f396cdf696df25b2841b9ca15f3f3 100644
--- a/profiling/org.eclipse.linuxtools.profiling.launch.ui.rdt.proxy/META-INF/MANIFEST.MF
+++ b/profiling/org.eclipse.linuxtools.profiling.launch.ui.rdt.proxy/META-INF/MANIFEST.MF
@@ -11,6 +11,6 @@ Require-Bundle: org.eclipse.ui,
org.eclipse.remote.core;bundle-version="2.0.0",
org.eclipse.remote.ui;bundle-version="2.0.0",
org.eclipse.linuxtools.profiling.launch;bundle-version="1.2.0"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
Bundle-ActivationPolicy: lazy
Automatic-Module-Name: org.eclipse.linuxtools.profiling.launch.ui.rdt.proxy
diff --git a/profiling/org.eclipse.linuxtools.profiling.launch.ui.rdt.proxy/pom.xml b/profiling/org.eclipse.linuxtools.profiling.launch.ui.rdt.proxy/pom.xml
index 7305dfa3397cf8df8ca7d1659ab78fc9229d36ac..737d50b57e9e3c88696513d22514fb19829b885b 100644
--- a/profiling/org.eclipse.linuxtools.profiling.launch.ui.rdt.proxy/pom.xml
+++ b/profiling/org.eclipse.linuxtools.profiling.launch.ui.rdt.proxy/pom.xml
@@ -16,7 +16,7 @@
<parent>
<artifactId>linuxtools-profiling-parent</artifactId>
<groupId>org.eclipse.linuxtools.profiling</groupId>
- <version>7.4.0</version>
+ <version>8.1.0</version>
</parent>
<artifactId>org.eclipse.linuxtools.profiling.launch.ui.rdt.proxy</artifactId>
diff --git a/profiling/org.eclipse.linuxtools.profiling.launch/.classpath b/profiling/org.eclipse.linuxtools.profiling.launch/.classpath
index 43b986286a9e5fd1828793fa4b2353d02ab8625f..1db08c6b4ce2fb50395b2f9c9a50c140a0bab199 100644
--- a/profiling/org.eclipse.linuxtools.profiling.launch/.classpath
+++ b/profiling/org.eclipse.linuxtools.profiling.launch/.classpath
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="target/classes"/>
diff --git a/profiling/org.eclipse.linuxtools.profiling.launch/.settings/org.eclipse.jdt.core.prefs b/profiling/org.eclipse.linuxtools.profiling.launch/.settings/org.eclipse.jdt.core.prefs
index e26ebfbfe0566b4d42989df2919b0c28c3386a96..fe1be6217187ba73fb178c625ab98f70089bbbd2 100644
--- a/profiling/org.eclipse.linuxtools.profiling.launch/.settings/org.eclipse.jdt.core.prefs
+++ b/profiling/org.eclipse.linuxtools.profiling.launch/.settings/org.eclipse.jdt.core.prefs
@@ -6,9 +6,9 @@ org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annota
org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.compliance=11
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -23,6 +23,7 @@ org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=warning
org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
@@ -79,6 +80,7 @@ org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=warn
org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
@@ -110,4 +112,5 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11
diff --git a/profiling/org.eclipse.linuxtools.profiling.launch/META-INF/MANIFEST.MF b/profiling/org.eclipse.linuxtools.profiling.launch/META-INF/MANIFEST.MF
index 469d23ffa1726b18301bf6c5092b74dbb0a12179..5689f1f5a4c530cf3a12ad771603b77d91010e39 100644
--- a/profiling/org.eclipse.linuxtools.profiling.launch/META-INF/MANIFEST.MF
+++ b/profiling/org.eclipse.linuxtools.profiling.launch/META-INF/MANIFEST.MF
@@ -12,7 +12,7 @@ Require-Bundle: org.eclipse.ui,
org.eclipse.swt;bundle-version="3.106.0",
org.eclipse.core.expressions
Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
Import-Package: org.eclipse.cdt.debug.core,
org.eclipse.cdt.ui,
org.eclipse.cdt.ui.newui,
diff --git a/profiling/org.eclipse.linuxtools.profiling.launch/plugin.xml b/profiling/org.eclipse.linuxtools.profiling.launch/plugin.xml
index 974de4555318c4eb15b9f31168bebe22c15d05e2..1f1376af6a7f1555d20b3c05cfedc5f5f6eff418 100644
--- a/profiling/org.eclipse.linuxtools.profiling.launch/plugin.xml
+++ b/profiling/org.eclipse.linuxtools.profiling.launch/plugin.xml
@@ -456,7 +456,7 @@
id="org.eclipse.linuxtools.profiling.launch.profileApplicationLaunch.mainTab"
group="org.eclipse.cdt.launch.applicationProfileLaunchTabGroup"
name="%MainTab.name"
- class="org.eclipse.cdt.launch.ui.CMainTab">
+ class="org.eclipse.cdt.launch.ui.CMainTab2">
<associatedDelegate delegate="org.eclipse.linuxtools.profiling.launch.profilingDelegate"/>
</tab>
<tab
diff --git a/profiling/org.eclipse.linuxtools.profiling.launch/pom.xml b/profiling/org.eclipse.linuxtools.profiling.launch/pom.xml
index 34248da68295074cac80dcbb4c5065ca075eab98..3924862030fbc5690018436f768cef81df65eadd 100644
--- a/profiling/org.eclipse.linuxtools.profiling.launch/pom.xml
+++ b/profiling/org.eclipse.linuxtools.profiling.launch/pom.xml
@@ -15,7 +15,7 @@
<parent>
<artifactId>linuxtools-profiling-parent</artifactId>
<groupId>org.eclipse.linuxtools.profiling</groupId>
- <version>7.4.0</version>
+ <version>8.1.0</version>
</parent>
<artifactId>org.eclipse.linuxtools.profiling.launch</artifactId>
diff --git a/profiling/org.eclipse.linuxtools.profiling.launch/src/org/eclipse/linuxtools/internal/profiling/launch/CProfilingOptionsTab.java b/profiling/org.eclipse.linuxtools.profiling.launch/src/org/eclipse/linuxtools/internal/profiling/launch/CProfilingOptionsTab.java
index ed2ab8eb3c90eabd2496b4371dcf3b405191e740..dc85e184fffa4fd43e544c48097ad169f94e58ad 100644
--- a/profiling/org.eclipse.linuxtools.profiling.launch/src/org/eclipse/linuxtools/internal/profiling/launch/CProfilingOptionsTab.java
+++ b/profiling/org.eclipse.linuxtools.profiling.launch/src/org/eclipse/linuxtools/internal/profiling/launch/CProfilingOptionsTab.java
@@ -14,9 +14,9 @@ package org.eclipse.linuxtools.internal.profiling.launch;
import java.util.SortedMap;
+import org.eclipse.jface.resource.ResourceLocator;
import org.eclipse.linuxtools.internal.profiling.launch.provider.launch.ProviderFramework;
import org.eclipse.swt.graphics.Image;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
// Special profiling options tab to use with the org.eclipse.cdt.launch.profilingProvider extension
// to extend the Local C/C++ Application configuration to handle profiling. We do not rename
@@ -74,8 +74,8 @@ public class CProfilingOptionsTab extends AbstractProfilingOptionsTab {
@Override
public Image getImage() {
if (img == null)
- img = AbstractUIPlugin.imageDescriptorFromPlugin(ProfileLaunchPlugin.PLUGIN_ID,
- "icons/time_obj.gif").createImage(); //$NON-NLS-1$
+ img = ResourceLocator.imageDescriptorFromBundle(ProfileLaunchPlugin.PLUGIN_ID,
+ "icons/time_obj.gif").get().createImage(); //$NON-NLS-1$
return img;
}
}
diff --git a/profiling/org.eclipse.linuxtools.profiling.launch/src/org/eclipse/linuxtools/internal/profiling/launch/ProfileLaunchPlugin.java b/profiling/org.eclipse.linuxtools.profiling.launch/src/org/eclipse/linuxtools/internal/profiling/launch/ProfileLaunchPlugin.java
index 62f8f5d7418e7a3f9ca6bdb3e6e5e6fa4ce71745..a4b8548545bb0377bb44029f7d1bbb5a6ba73e9e 100644
--- a/profiling/org.eclipse.linuxtools.profiling.launch/src/org/eclipse/linuxtools/internal/profiling/launch/ProfileLaunchPlugin.java
+++ b/profiling/org.eclipse.linuxtools.profiling.launch/src/org/eclipse/linuxtools/internal/profiling/launch/ProfileLaunchPlugin.java
@@ -16,6 +16,7 @@ import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.ui.IWorkbenchWindow;
+import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.plugin.AbstractUIPlugin;
import org.osgi.framework.BundleContext;
@@ -74,7 +75,7 @@ public class ProfileLaunchPlugin extends AbstractUIPlugin {
}
public static Shell getActiveWorkbenchShell() {
- IWorkbenchWindow window = getDefault().getWorkbench().getActiveWorkbenchWindow();
+ IWorkbenchWindow window = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
if (window != null) {
return window.getShell();
}
@@ -85,7 +86,7 @@ public class ProfileLaunchPlugin extends AbstractUIPlugin {
if (getActiveWorkbenchShell() != null) {
return getActiveWorkbenchShell();
}
- IWorkbenchWindow[] windows = getDefault().getWorkbench().getWorkbenchWindows();
+ IWorkbenchWindow[] windows = PlatformUI.getWorkbench().getWorkbenchWindows();
return windows[0].getShell();
}
diff --git a/profiling/org.eclipse.linuxtools.profiling.launch/src/org/eclipse/linuxtools/profiling/launch/RemoteProxyCMainTab.java b/profiling/org.eclipse.linuxtools.profiling.launch/src/org/eclipse/linuxtools/profiling/launch/RemoteProxyCMainTab.java
index ebbaa00b9b02662f20aaf6ff755137730983cfd9..4b1231f7f54cf085f83b8b8278a4d2ebbde2c658 100644
--- a/profiling/org.eclipse.linuxtools.profiling.launch/src/org/eclipse/linuxtools/profiling/launch/RemoteProxyCMainTab.java
+++ b/profiling/org.eclipse.linuxtools.profiling.launch/src/org/eclipse/linuxtools/profiling/launch/RemoteProxyCMainTab.java
@@ -59,6 +59,7 @@ import org.eclipse.swt.widgets.Button;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Text;
+import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.dialogs.TwoPaneElementSelector;
@@ -132,15 +133,10 @@ public class RemoteProxyCMainTab extends CAbstractMainTab {
Composite comp = new Composite(parent, SWT.NONE);
setControl(comp);
- ProfileLaunchPlugin
- .getDefault()
- .getWorkbench()
- .getHelpSystem()
- .setHelp(
- getControl(),
- ICDTLaunchHelpContextIds.LAUNCH_CONFIGURATION_DIALOG_MAIN_TAB);
+ PlatformUI.getWorkbench().getHelpSystem().setHelp(getControl(),
+ ICDTLaunchHelpContextIds.LAUNCH_CONFIGURATION_DIALOG_MAIN_TAB);
- GridLayout topLayout = new GridLayout();
+ GridLayout topLayout = new GridLayout();
comp.setLayout(topLayout);
createVerticalSpacer(comp, 1);
diff --git a/profiling/org.eclipse.linuxtools.profiling.provider.tests/.classpath b/profiling/org.eclipse.linuxtools.profiling.provider.tests/.classpath
index 43b986286a9e5fd1828793fa4b2353d02ab8625f..a621c21ac550d71458aac26221ac3641277a488d 100644
--- a/profiling/org.eclipse.linuxtools.profiling.provider.tests/.classpath
+++ b/profiling/org.eclipse.linuxtools.profiling.provider.tests/.classpath
@@ -1,7 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="src" path="src"/>
+ <classpathentry kind="src" path="src">
+ <attributes>
+ <attribute name="test" value="true"/>
+ </attributes>
+ </classpathentry>
<classpathentry kind="output" path="target/classes"/>
</classpath>
diff --git a/profiling/org.eclipse.linuxtools.profiling.provider.tests/.settings/org.eclipse.jdt.core.prefs b/profiling/org.eclipse.linuxtools.profiling.provider.tests/.settings/org.eclipse.jdt.core.prefs
index 59a1463b475c79cede03c004363c2a9125ddfa9e..388b95fe1ff8d54ca58657f900fda1632bdf8d4d 100644
--- a/profiling/org.eclipse.linuxtools.profiling.provider.tests/.settings/org.eclipse.jdt.core.prefs
+++ b/profiling/org.eclipse.linuxtools.profiling.provider.tests/.settings/org.eclipse.jdt.core.prefs
@@ -6,8 +6,8 @@ org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annota
org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
+org.eclipse.jdt.core.compiler.compliance=11
org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
@@ -18,6 +18,7 @@ org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=warning
org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
@@ -61,6 +62,7 @@ org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=warn
org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
@@ -92,4 +94,5 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11
diff --git a/profiling/org.eclipse.linuxtools.profiling.provider.tests/META-INF/MANIFEST.MF b/profiling/org.eclipse.linuxtools.profiling.provider.tests/META-INF/MANIFEST.MF
index 09b5dd0a2d0a878ce1c40c264d96fb4d5a42d8f7..b92ae51a1ebeae8500c52fc6307fe46fec0fbc2d 100644
--- a/profiling/org.eclipse.linuxtools.profiling.provider.tests/META-INF/MANIFEST.MF
+++ b/profiling/org.eclipse.linuxtools.profiling.provider.tests/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.linuxtools.profiling.provider.tests;singleton:=true
Bundle-Version: 1.2.0.qualifier
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
Fragment-Host: org.eclipse.linuxtools.profiling.launch
Require-Bundle: org.junit;bundle-version="4.0.0",
org.hamcrest.core,
diff --git a/profiling/org.eclipse.linuxtools.profiling.provider.tests/pom.xml b/profiling/org.eclipse.linuxtools.profiling.provider.tests/pom.xml
index 6415758a748f089c507364bf2a97ed9f4f229620..f2c1a0be0f23776d9eae57ac2919e4add8f2687a 100644
--- a/profiling/org.eclipse.linuxtools.profiling.provider.tests/pom.xml
+++ b/profiling/org.eclipse.linuxtools.profiling.provider.tests/pom.xml
@@ -15,7 +15,7 @@
<parent>
<artifactId>linuxtools-profiling-parent</artifactId>
<groupId>org.eclipse.linuxtools.profiling</groupId>
- <version>7.4.0</version>
+ <version>8.1.0</version>
</parent>
<artifactId>org.eclipse.linuxtools.profiling.provider.tests</artifactId>
diff --git a/profiling/org.eclipse.linuxtools.profiling.remote-feature/feature.xml b/profiling/org.eclipse.linuxtools.profiling.remote-feature/feature.xml
index 9f1a2c7ae757e797472e3f250bbb333cc082c043..b97592163e53b6db18a63bbe45da07d35bd72be6 100644
--- a/profiling/org.eclipse.linuxtools.profiling.remote-feature/feature.xml
+++ b/profiling/org.eclipse.linuxtools.profiling.remote-feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.linuxtools.profiling.remote"
label="%featureName"
- version="7.4.0.qualifier"
+ version="8.1.0.qualifier"
provider-name="%featureProvider"
license-feature="org.eclipse.license"
license-feature-version="0.0.0">
diff --git a/profiling/org.eclipse.linuxtools.profiling.remote-feature/pom.xml b/profiling/org.eclipse.linuxtools.profiling.remote-feature/pom.xml
index 4c76c4f224e47af3c6a8e208b4eb44dc4554c902..3a41a22a3af05236b93ea5f6d8630c89ecf94147 100644
--- a/profiling/org.eclipse.linuxtools.profiling.remote-feature/pom.xml
+++ b/profiling/org.eclipse.linuxtools.profiling.remote-feature/pom.xml
@@ -15,12 +15,12 @@
<parent>
<artifactId>linuxtools-profiling-parent</artifactId>
<groupId>org.eclipse.linuxtools.profiling</groupId>
- <version>7.4.0</version>
+ <version>8.1.0</version>
</parent>
<artifactId>org.eclipse.linuxtools.profiling.remote</artifactId>
<packaging>eclipse-feature</packaging>
- <version>7.4.0-SNAPSHOT</version>
+ <version>8.1.0-SNAPSHOT</version>
<name>Linux Tools Profiling Remote Capabilities Feature</name>
diff --git a/profiling/org.eclipse.linuxtools.profiling.tests/.classpath b/profiling/org.eclipse.linuxtools.profiling.tests/.classpath
index 43b986286a9e5fd1828793fa4b2353d02ab8625f..a621c21ac550d71458aac26221ac3641277a488d 100644
--- a/profiling/org.eclipse.linuxtools.profiling.tests/.classpath
+++ b/profiling/org.eclipse.linuxtools.profiling.tests/.classpath
@@ -1,7 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="src" path="src"/>
+ <classpathentry kind="src" path="src">
+ <attributes>
+ <attribute name="test" value="true"/>
+ </attributes>
+ </classpathentry>
<classpathentry kind="output" path="target/classes"/>
</classpath>
diff --git a/profiling/org.eclipse.linuxtools.profiling.tests/.settings/org.eclipse.jdt.core.prefs b/profiling/org.eclipse.linuxtools.profiling.tests/.settings/org.eclipse.jdt.core.prefs
index 373593c6da958672f64843b4361b066133093015..ca17ceef41b4ae37e1ff6f785e8197c38328c27a 100644
--- a/profiling/org.eclipse.linuxtools.profiling.tests/.settings/org.eclipse.jdt.core.prefs
+++ b/profiling/org.eclipse.linuxtools.profiling.tests/.settings/org.eclipse.jdt.core.prefs
@@ -6,8 +6,8 @@ org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annota
org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
+org.eclipse.jdt.core.compiler.compliance=11
org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
@@ -18,6 +18,7 @@ org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=warning
org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
@@ -61,6 +62,7 @@ org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=warn
org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
@@ -92,4 +94,5 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11
diff --git a/profiling/org.eclipse.linuxtools.profiling.tests/META-INF/MANIFEST.MF b/profiling/org.eclipse.linuxtools.profiling.tests/META-INF/MANIFEST.MF
index f907ad3139cf7a06e7c8022ac642b668abda0bc5..2f52d2aed8aa46b84154845381f98c0fc50a1143 100644
--- a/profiling/org.eclipse.linuxtools.profiling.tests/META-INF/MANIFEST.MF
+++ b/profiling/org.eclipse.linuxtools.profiling.tests/META-INF/MANIFEST.MF
@@ -11,7 +11,7 @@ Require-Bundle: org.eclipse.ui,
org.eclipse.ui.ide,
org.eclipse.remote.core;bundle-version="2.0.0",
org.eclipse.remote.jsch.core
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
Bundle-ActivationPolicy: lazy
Bundle-Localization: plugin
Export-Package:
diff --git a/profiling/org.eclipse.linuxtools.profiling.tests/pom.xml b/profiling/org.eclipse.linuxtools.profiling.tests/pom.xml
index 90295fd6922de122e068029338a4f80689ee99cb..fe0ba8bab57f5e9c683047832a7a77eb762bd3c5 100644
--- a/profiling/org.eclipse.linuxtools.profiling.tests/pom.xml
+++ b/profiling/org.eclipse.linuxtools.profiling.tests/pom.xml
@@ -15,7 +15,7 @@
<parent>
<artifactId>linuxtools-profiling-parent</artifactId>
<groupId>org.eclipse.linuxtools.profiling</groupId>
- <version>7.4.0</version>
+ <version>8.1.0</version>
</parent>
<artifactId>org.eclipse.linuxtools.profiling.tests</artifactId>
diff --git a/profiling/org.eclipse.linuxtools.profiling.ui.capability/.classpath b/profiling/org.eclipse.linuxtools.profiling.ui.capability/.classpath
index 323b07b3591898c6242fa831edebaecaf0b602db..8d4e5e84834419b4d4315bee099d96aff69c69eb 100644
--- a/profiling/org.eclipse.linuxtools.profiling.ui.capability/.classpath
+++ b/profiling/org.eclipse.linuxtools.profiling.ui.capability/.classpath
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
diff --git a/profiling/org.eclipse.linuxtools.profiling.ui.capability/.settings/org.eclipse.jdt.core.prefs b/profiling/org.eclipse.linuxtools.profiling.ui.capability/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index c6b9e91814a4ea9654c4383fe2fda64e366dc06d..0000000000000000000000000000000000000000
--- a/profiling/org.eclipse.linuxtools.profiling.ui.capability/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,95 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled
-org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
-org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull
-org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault
-org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
-org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
-org.eclipse.jdt.core.compiler.problem.deadCode=warning
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=warning
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDefaultCase=ignore
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning
-org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled
-org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning
-org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error
-org.eclipse.jdt.core.compiler.problem.nullReference=warning
-org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error
-org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
-org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
-org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
-org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=warning
-org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
-org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
-org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=disabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=disabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=enabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning
-org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.8
diff --git a/profiling/org.eclipse.linuxtools.profiling.ui.capability/META-INF/MANIFEST.MF b/profiling/org.eclipse.linuxtools.profiling.ui.capability/META-INF/MANIFEST.MF
index 3cf34ad576d8434771792386662bbe4ddeea0480..0a3466b4387929e51b39cc7d4294a35b805542a8 100644
--- a/profiling/org.eclipse.linuxtools.profiling.ui.capability/META-INF/MANIFEST.MF
+++ b/profiling/org.eclipse.linuxtools.profiling.ui.capability/META-INF/MANIFEST.MF
@@ -6,7 +6,6 @@ Bundle-Version: 1.0.0.qualifier
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime
Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-Vendor: %Bundle-Vendor
Bundle-Localization: plugin
Automatic-Module-Name: org.eclipse.linuxtools.profiling.ui.capability
diff --git a/profiling/org.eclipse.linuxtools.profiling.ui.capability/pom.xml b/profiling/org.eclipse.linuxtools.profiling.ui.capability/pom.xml
index c574cd45418dddeb0a0210c7fff265c84cb239de..3f8f7d1f8cdae41c06e5c7ef9c90c9a4d3795cde 100644
--- a/profiling/org.eclipse.linuxtools.profiling.ui.capability/pom.xml
+++ b/profiling/org.eclipse.linuxtools.profiling.ui.capability/pom.xml
@@ -15,7 +15,7 @@
<parent>
<artifactId>linuxtools-profiling-parent</artifactId>
<groupId>org.eclipse.linuxtools.profiling</groupId>
- <version>7.4.0</version>
+ <version>8.1.0</version>
</parent>
<artifactId>org.eclipse.linuxtools.profiling.ui.capability</artifactId>
diff --git a/profiling/org.eclipse.linuxtools.profiling.ui/.classpath b/profiling/org.eclipse.linuxtools.profiling.ui/.classpath
index 43b986286a9e5fd1828793fa4b2353d02ab8625f..1db08c6b4ce2fb50395b2f9c9a50c140a0bab199 100644
--- a/profiling/org.eclipse.linuxtools.profiling.ui/.classpath
+++ b/profiling/org.eclipse.linuxtools.profiling.ui/.classpath
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="target/classes"/>
diff --git a/profiling/org.eclipse.linuxtools.profiling.ui/.settings/org.eclipse.jdt.core.prefs b/profiling/org.eclipse.linuxtools.profiling.ui/.settings/org.eclipse.jdt.core.prefs
index 4e96af8453d6171c13712d74b9c20b8ee787d03e..d4e1a82b6b4ffc348cb4734b6efb7b7d1fd278b2 100644
--- a/profiling/org.eclipse.linuxtools.profiling.ui/.settings/org.eclipse.jdt.core.prefs
+++ b/profiling/org.eclipse.linuxtools.profiling.ui/.settings/org.eclipse.jdt.core.prefs
@@ -7,9 +7,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nul
org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.compliance=11
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -24,6 +24,7 @@ org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=warning
org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
@@ -80,6 +81,7 @@ org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=warn
org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
@@ -111,4 +113,5 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11
diff --git a/profiling/org.eclipse.linuxtools.profiling.ui/META-INF/MANIFEST.MF b/profiling/org.eclipse.linuxtools.profiling.ui/META-INF/MANIFEST.MF
index 80a8698d3fdc98c50a4eb74524b6084bdc9438ee..e5be77a81e270d9cc4d60edfa55971f670f3e57d 100644
--- a/profiling/org.eclipse.linuxtools.profiling.ui/META-INF/MANIFEST.MF
+++ b/profiling/org.eclipse.linuxtools.profiling.ui/META-INF/MANIFEST.MF
@@ -10,7 +10,7 @@ Require-Bundle: org.eclipse.ui,
org.eclipse.cdt.managedbuilder.core,
org.eclipse.cdt.autotools.core,
org.eclipse.cdt.core
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
Bundle-ActivationPolicy: lazy
Bundle-Localization: plugin
Export-Package: org.eclipse.linuxtools.profiling.ui
diff --git a/profiling/org.eclipse.linuxtools.profiling.ui/pom.xml b/profiling/org.eclipse.linuxtools.profiling.ui/pom.xml
index e68b3a84c2f2cba03f26e471f5c2c9dad018a731..209ded1c6d6e84addf8a50045b827e938f881162 100644
--- a/profiling/org.eclipse.linuxtools.profiling.ui/pom.xml
+++ b/profiling/org.eclipse.linuxtools.profiling.ui/pom.xml
@@ -15,7 +15,7 @@
<parent>
<artifactId>linuxtools-profiling-parent</artifactId>
<groupId>org.eclipse.linuxtools.profiling</groupId>
- <version>7.4.0</version>
+ <version>8.1.0</version>
</parent>
<artifactId>org.eclipse.linuxtools.profiling.ui</artifactId>
diff --git a/profiling/org.eclipse.linuxtools.profiling.ui/src/org/eclipse/linuxtools/internal/profiling/ui/ProfileUIPlugin.java b/profiling/org.eclipse.linuxtools.profiling.ui/src/org/eclipse/linuxtools/internal/profiling/ui/ProfileUIPlugin.java
index 7a09377061b417fd588e60a323743b2182e9a85f..6785570160f2456b74f0392177d2cfe4ed8d7bd8 100644
--- a/profiling/org.eclipse.linuxtools.profiling.ui/src/org/eclipse/linuxtools/internal/profiling/ui/ProfileUIPlugin.java
+++ b/profiling/org.eclipse.linuxtools.profiling.ui/src/org/eclipse/linuxtools/internal/profiling/ui/ProfileUIPlugin.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2008, 2018 Red Hat, Inc.
+ * Copyright (c) 2008, 2019 Red Hat, Inc.
*
* This program and the accompanying materials are made
* available under the terms of the Eclipse Public License 2.0
@@ -14,6 +14,7 @@ package org.eclipse.linuxtools.internal.profiling.ui;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.ui.IWorkbenchWindow;
+import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.plugin.AbstractUIPlugin;
import org.osgi.framework.BundleContext;
@@ -56,7 +57,7 @@ public class ProfileUIPlugin extends AbstractUIPlugin {
}
public static Shell getActiveWorkbenchShell() {
- IWorkbenchWindow window = getDefault().getWorkbench().getActiveWorkbenchWindow();
+ IWorkbenchWindow window = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
if (window != null) {
return window.getShell();
}
diff --git a/profiling/org.eclipse.linuxtools.profiling.ui/src/org/eclipse/linuxtools/profiling/ui/CProjectBuildHelpers.java b/profiling/org.eclipse.linuxtools.profiling.ui/src/org/eclipse/linuxtools/profiling/ui/CProjectBuildHelpers.java
index 29d25fc514e0836ee56ed18ac1c21e2ca4d1a0dd..12147ce0fca54d7b65c4484065e6fa885c80011d 100644
--- a/profiling/org.eclipse.linuxtools.profiling.ui/src/org/eclipse/linuxtools/profiling/ui/CProjectBuildHelpers.java
+++ b/profiling/org.eclipse.linuxtools.profiling.ui/src/org/eclipse/linuxtools/profiling/ui/CProjectBuildHelpers.java
@@ -118,6 +118,9 @@ public class CProjectBuildHelpers {
}
IConfiguration defaultConfiguration = helperGetActiveConfiguration(project);
+ if (defaultConfiguration == null) {
+ return ProjectBuildType.OTHER;
+ }
IBuilder builder = defaultConfiguration.getBuilder();
Boolean projIsManaged = builder.isManagedBuildOn();
diff --git a/profiling/org.eclipse.linuxtools.profiling.ui/src/org/eclipse/linuxtools/profiling/ui/ProfileUIUtils.java b/profiling/org.eclipse.linuxtools.profiling.ui/src/org/eclipse/linuxtools/profiling/ui/ProfileUIUtils.java
index b3794f8ca9f76ffb00fc47110bcd232bbf790664..0dd150804836c5b74b76a1dcdf42111347a2f61b 100644
--- a/profiling/org.eclipse.linuxtools.profiling.ui/src/org/eclipse/linuxtools/profiling/ui/ProfileUIUtils.java
+++ b/profiling/org.eclipse.linuxtools.profiling.ui/src/org/eclipse/linuxtools/profiling/ui/ProfileUIUtils.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2008, 2018 Red Hat, Inc.
+ * Copyright (c) 2008, 2019 Red Hat, Inc.
*
* This program and the accompanying materials are made
* available under the terms of the Eclipse Public License 2.0
@@ -48,13 +48,13 @@ import org.eclipse.debug.ui.sourcelookup.ISourceLookupResult;
import org.eclipse.jface.text.BadLocationException;
import org.eclipse.jface.text.IDocument;
import org.eclipse.jface.text.IRegion;
-import org.eclipse.linuxtools.internal.profiling.ui.ProfileUIPlugin;
import org.eclipse.linuxtools.profiling.launch.IRemoteFileProxy;
import org.eclipse.linuxtools.profiling.launch.RemoteProxyManager;
import org.eclipse.ui.IEditorInput;
import org.eclipse.ui.IEditorPart;
import org.eclipse.ui.IWorkbenchPage;
import org.eclipse.ui.PartInitException;
+import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.ide.IDE;
import org.eclipse.ui.texteditor.IDocumentProvider;
import org.eclipse.ui.texteditor.ITextEditor;
@@ -73,7 +73,7 @@ public class ProfileUIUtils {
Path p = new Path(path);
if (p.toFile().exists()) {
- IWorkbenchPage activePage = ProfileUIPlugin.getDefault().getWorkbench().getActiveWorkbenchWindow().getActivePage();
+ IWorkbenchPage activePage = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
IFileStore file = EFS.getLocalFileSystem().getStore(p);
IEditorPart editor = IDE.openEditorOnFileStore(activePage, file);
@@ -103,7 +103,7 @@ public class ProfileUIUtils {
* @since 3.1
*/
public static void openEditorAndSelect(String path, int line, IProject project) throws PartInitException, BadLocationException, CoreException {
- IWorkbenchPage activePage = ProfileUIPlugin.getDefault().getWorkbench().getActiveWorkbenchWindow().getActivePage();
+ IWorkbenchPage activePage = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
IRemoteFileProxy proxy = null;
proxy = RemoteProxyManager.getInstance().getFileProxy(project);
IFileStore file = proxy.getResource(path);
@@ -135,7 +135,7 @@ public class ProfileUIUtils {
*/
public static void openEditorAndSelect(IFile file, int line) throws PartInitException, BadLocationException {
if (file.exists()) {
- IWorkbenchPage activePage = ProfileUIPlugin.getDefault().getWorkbench().getActiveWorkbenchWindow().getActivePage();
+ IWorkbenchPage activePage = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
IEditorPart editor = IDE.openEditor(activePage, file);
if (editor instanceof ITextEditor) {
@@ -189,7 +189,7 @@ public class ProfileUIUtils {
}
if (input != null && editorID != null) {
// Open the editor
- IWorkbenchPage activePage = ProfileUIPlugin.getDefault().getWorkbench().getActiveWorkbenchWindow().getActivePage();
+ IWorkbenchPage activePage = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
IEditorPart editor = IDE.openEditor(activePage, input, editorID);
// Select the line
@@ -219,7 +219,7 @@ public class ProfileUIUtils {
Path p = new Path (path);
if (p.toFile().exists()) {
- IWorkbenchPage activePage = ProfileUIPlugin.getDefault().getWorkbench().getActiveWorkbenchWindow().getActivePage();
+ IWorkbenchPage activePage = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
IFileStore fileStore = EFS.getLocalFileSystem().getStore(p);
IEditorPart editor = IDE.openEditorOnFileStore(activePage, fileStore);
diff --git a/profiling/org.eclipse.linuxtools.rdt.proxy.tests/.classpath b/profiling/org.eclipse.linuxtools.rdt.proxy.tests/.classpath
index eca7bdba8f03f22510b7980a94dbfe10c16c0901..a42a828e04a56494db334010723fbea280ad90dd 100644
--- a/profiling/org.eclipse.linuxtools.rdt.proxy.tests/.classpath
+++ b/profiling/org.eclipse.linuxtools.rdt.proxy.tests/.classpath
@@ -1,7 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="src" path="src"/>
+ <classpathentry kind="src" path="src">
+ <attributes>
+ <attribute name="test" value="true"/>
+ </attributes>
+ </classpathentry>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/profiling/org.eclipse.linuxtools.rdt.proxy.tests/.settings/org.eclipse.jdt.core.prefs b/profiling/org.eclipse.linuxtools.rdt.proxy.tests/.settings/org.eclipse.jdt.core.prefs
index 0c68a61dca867ceb49e79d2402935261ec3e3809..7adc0fb9a0d32bd6b4e3ce6f305ab7165208865c 100644
--- a/profiling/org.eclipse.linuxtools.rdt.proxy.tests/.settings/org.eclipse.jdt.core.prefs
+++ b/profiling/org.eclipse.linuxtools.rdt.proxy.tests/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,10 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
+org.eclipse.jdt.core.compiler.compliance=11
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11
diff --git a/profiling/org.eclipse.linuxtools.rdt.proxy.tests/META-INF/MANIFEST.MF b/profiling/org.eclipse.linuxtools.rdt.proxy.tests/META-INF/MANIFEST.MF
index 6769d877b572de8e4d566ac098c22b4955455d18..c13a802785d3ff5d8434ef729da99165ad33c151 100644
--- a/profiling/org.eclipse.linuxtools.rdt.proxy.tests/META-INF/MANIFEST.MF
+++ b/profiling/org.eclipse.linuxtools.rdt.proxy.tests/META-INF/MANIFEST.MF
@@ -5,7 +5,7 @@ Bundle-SymbolicName: org.eclipse.linuxtools.rdt.proxy.tests
Bundle-Version: 1.0.0.qualifier
Bundle-Vendor: Eclipse Linux Tools
Fragment-Host: org.eclipse.linuxtools.rdt.proxy;bundle-version="2.0.0"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
Require-Bundle: org.junit;bundle-version="4.12.0",
org.eclipse.linuxtools.remote.proxy.tests;bundle-version="1.0.0",
org.eclipse.ptp.rdt.sync.core;bundle-version="5.0.0",
diff --git a/profiling/org.eclipse.linuxtools.rdt.proxy.tests/pom.xml b/profiling/org.eclipse.linuxtools.rdt.proxy.tests/pom.xml
index 576e6bcc5cc70e312546666901df0d894e452c4d..3b23c5eaa065a1025193e31149bfc94a79b89bac 100644
--- a/profiling/org.eclipse.linuxtools.rdt.proxy.tests/pom.xml
+++ b/profiling/org.eclipse.linuxtools.rdt.proxy.tests/pom.xml
@@ -5,7 +5,7 @@
<parent>
<artifactId>linuxtools-profiling-parent</artifactId>
<groupId>org.eclipse.linuxtools.profiling</groupId>
- <version>7.4.0</version>
+ <version>8.1.0</version>
</parent>
<artifactId>org.eclipse.linuxtools.rdt.proxy.tests</artifactId>
diff --git a/profiling/org.eclipse.linuxtools.rdt.proxy.tests/src/org/eclipse/linuxtools/rdt/proxy/tests/AllTests.java b/profiling/org.eclipse.linuxtools.rdt.proxy.tests/src/org/eclipse/linuxtools/rdt/proxy/tests/AllTests.java
index 14b31fb96d18b473be611e6a7a7c2babf93cbbfa..7f2c9b23c37b702ea9bb4b5dc160043df5f46550 100644
--- a/profiling/org.eclipse.linuxtools.rdt.proxy.tests/src/org/eclipse/linuxtools/rdt/proxy/tests/AllTests.java
+++ b/profiling/org.eclipse.linuxtools.rdt.proxy.tests/src/org/eclipse/linuxtools/rdt/proxy/tests/AllTests.java
@@ -9,9 +9,6 @@
*******************************************************************************/
package org.eclipse.linuxtools.rdt.proxy.tests;
-import org.eclipse.linuxtools.rdt.proxy.tests.CommandLauncherProxyTest;
-import org.eclipse.linuxtools.rdt.proxy.tests.FileProxyTest;
-import org.eclipse.linuxtools.rdt.proxy.tests.RemoteProxyManagerTest;
import org.junit.runner.RunWith;
import org.junit.runners.Suite;
import org.junit.runners.Suite.SuiteClasses;
diff --git a/profiling/org.eclipse.linuxtools.rdt.proxy/.classpath b/profiling/org.eclipse.linuxtools.rdt.proxy/.classpath
index 43b986286a9e5fd1828793fa4b2353d02ab8625f..1db08c6b4ce2fb50395b2f9c9a50c140a0bab199 100644
--- a/profiling/org.eclipse.linuxtools.rdt.proxy/.classpath
+++ b/profiling/org.eclipse.linuxtools.rdt.proxy/.classpath
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="target/classes"/>
diff --git a/profiling/org.eclipse.linuxtools.rdt.proxy/.settings/org.eclipse.jdt.core.prefs b/profiling/org.eclipse.linuxtools.rdt.proxy/.settings/org.eclipse.jdt.core.prefs
index ecff7d582515f88ebaa8444814236ece900976b6..479172bc651a02f94063445402a620b71f9d3bde 100644
--- a/profiling/org.eclipse.linuxtools.rdt.proxy/.settings/org.eclipse.jdt.core.prefs
+++ b/profiling/org.eclipse.linuxtools.rdt.proxy/.settings/org.eclipse.jdt.core.prefs
@@ -6,9 +6,9 @@ org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annota
org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.compliance=11
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -22,6 +22,7 @@ org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=warning
org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
@@ -65,6 +66,7 @@ org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=warn
org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=warning
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
@@ -96,4 +98,5 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11
diff --git a/profiling/org.eclipse.linuxtools.rdt.proxy/META-INF/MANIFEST.MF b/profiling/org.eclipse.linuxtools.rdt.proxy/META-INF/MANIFEST.MF
index 2d88901934d9b3e3941590e0ce8d5bc9b44fec12..dbb96078f18678f90c113f9d4f26dde50e1f89d1 100644
--- a/profiling/org.eclipse.linuxtools.rdt.proxy/META-INF/MANIFEST.MF
+++ b/profiling/org.eclipse.linuxtools.rdt.proxy/META-INF/MANIFEST.MF
@@ -11,7 +11,7 @@ Require-Bundle: org.eclipse.ui,
org.eclipse.core.resources;bundle-version="3.7.100",
org.eclipse.core.filesystem;bundle-version="1.3.100"
Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
Bundle-Localization: plugin
Bundle-Vendor: %provider
Import-Package: org.eclipse.cdt.utils.pty
diff --git a/profiling/org.eclipse.linuxtools.rdt.proxy/pom.xml b/profiling/org.eclipse.linuxtools.rdt.proxy/pom.xml
index a7feb26d0a034bf15db5e9ba006698f09f1655b3..d488daef6c6be4eac1ea8bbeb501dfa1a200153a 100644
--- a/profiling/org.eclipse.linuxtools.rdt.proxy/pom.xml
+++ b/profiling/org.eclipse.linuxtools.rdt.proxy/pom.xml
@@ -15,7 +15,7 @@
<parent>
<artifactId>linuxtools-profiling-parent</artifactId>
<groupId>org.eclipse.linuxtools.profiling</groupId>
- <version>7.4.0</version>
+ <version>8.1.0</version>
</parent>
<artifactId>org.eclipse.linuxtools.rdt.proxy</artifactId>
diff --git a/profiling/org.eclipse.linuxtools.remote.proxy.tests/.classpath b/profiling/org.eclipse.linuxtools.remote.proxy.tests/.classpath
index 43b986286a9e5fd1828793fa4b2353d02ab8625f..a621c21ac550d71458aac26221ac3641277a488d 100644
--- a/profiling/org.eclipse.linuxtools.remote.proxy.tests/.classpath
+++ b/profiling/org.eclipse.linuxtools.remote.proxy.tests/.classpath
@@ -1,7 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="src" path="src"/>
+ <classpathentry kind="src" path="src">
+ <attributes>
+ <attribute name="test" value="true"/>
+ </attributes>
+ </classpathentry>
<classpathentry kind="output" path="target/classes"/>
</classpath>
diff --git a/profiling/org.eclipse.linuxtools.remote.proxy.tests/.settings/org.eclipse.jdt.core.prefs b/profiling/org.eclipse.linuxtools.remote.proxy.tests/.settings/org.eclipse.jdt.core.prefs
index fc262faca2efa5a4514aa08af783d17d1e1243f9..e60dd8dd4f3c34636ccfdc188c6f1f9ceceb2176 100644
--- a/profiling/org.eclipse.linuxtools.remote.proxy.tests/.settings/org.eclipse.jdt.core.prefs
+++ b/profiling/org.eclipse.linuxtools.remote.proxy.tests/.settings/org.eclipse.jdt.core.prefs
@@ -7,9 +7,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nul
org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.compliance=11
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -23,6 +23,7 @@ org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=warning
org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
@@ -66,6 +67,7 @@ org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=warn
org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
@@ -98,4 +100,5 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11
diff --git a/profiling/org.eclipse.linuxtools.remote.proxy.tests/META-INF/MANIFEST.MF b/profiling/org.eclipse.linuxtools.remote.proxy.tests/META-INF/MANIFEST.MF
index b8f75d5e75a376b90145fdc5f32a17fcde261f2d..d1b1571f17b9e619490ae3c687df2a8e758a82d6 100644
--- a/profiling/org.eclipse.linuxtools.remote.proxy.tests/META-INF/MANIFEST.MF
+++ b/profiling/org.eclipse.linuxtools.remote.proxy.tests/META-INF/MANIFEST.MF
@@ -15,7 +15,7 @@ Require-Bundle: org.eclipse.core.runtime,
org.eclipse.core.filesystem,
org.eclipse.ptp.rdt.sync.core,
org.eclipse.ptp.rdt.sync.git.core;bundle-version="2.0.0"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
Bundle-ActivationPolicy: lazy
Export-Package: org.eclipse.linuxtools.remote.proxy.tests;
x-friends:="org.eclipse.linuxtools.tools.launch.core.tests,
diff --git a/profiling/org.eclipse.linuxtools.remote.proxy.tests/pom.xml b/profiling/org.eclipse.linuxtools.remote.proxy.tests/pom.xml
index 24a35dd211756e2fab2066a9aaad3a1f9ca7c7cd..81b2b4a6c283e66a9b247d322a57224a35592e08 100644
--- a/profiling/org.eclipse.linuxtools.remote.proxy.tests/pom.xml
+++ b/profiling/org.eclipse.linuxtools.remote.proxy.tests/pom.xml
@@ -5,7 +5,7 @@
<parent>
<artifactId>linuxtools-profiling-parent</artifactId>
<groupId>org.eclipse.linuxtools.profiling</groupId>
- <version>7.4.0</version>
+ <version>8.1.0</version>
</parent>
<artifactId>org.eclipse.linuxtools.remote.proxy.tests</artifactId>
diff --git a/profiling/org.eclipse.linuxtools.remote.proxy.tests/src/org/eclipse/linuxtools/remote/proxy/tests/AbstractProxyTest.java b/profiling/org.eclipse.linuxtools.remote.proxy.tests/src/org/eclipse/linuxtools/remote/proxy/tests/AbstractProxyTest.java
index d3f5fb4b73c089ceca627103b1eeae2b6d0beb2b..076c63ef0becda7b1f54f06deccf3dc06502160a 100644
--- a/profiling/org.eclipse.linuxtools.remote.proxy.tests/src/org/eclipse/linuxtools/remote/proxy/tests/AbstractProxyTest.java
+++ b/profiling/org.eclipse.linuxtools.remote.proxy.tests/src/org/eclipse/linuxtools/remote/proxy/tests/AbstractProxyTest.java
@@ -21,7 +21,7 @@ import org.eclipse.ptp.rdt.sync.core.SyncConfigManager;
import org.eclipse.ptp.rdt.sync.core.SyncFlag;
import org.eclipse.ptp.rdt.sync.core.SyncManager;
import org.eclipse.cdt.core.model.ICProject;
-import org.eclipse.cdt.utils.Platform;
+import org.eclipse.core.runtime.Platform;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.debug.core.ILaunchConfigurationType;
import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
diff --git a/profiling/org.eclipse.linuxtools.ssh.proxy/.classpath b/profiling/org.eclipse.linuxtools.ssh.proxy/.classpath
index 43b986286a9e5fd1828793fa4b2353d02ab8625f..1db08c6b4ce2fb50395b2f9c9a50c140a0bab199 100644
--- a/profiling/org.eclipse.linuxtools.ssh.proxy/.classpath
+++ b/profiling/org.eclipse.linuxtools.ssh.proxy/.classpath
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="target/classes"/>
diff --git a/profiling/org.eclipse.linuxtools.ssh.proxy/.settings/org.eclipse.jdt.core.prefs b/profiling/org.eclipse.linuxtools.ssh.proxy/.settings/org.eclipse.jdt.core.prefs
index d95d6765afe0450dc0aeb0cbfc760702e85eb3c4..b4c66793cf8ffe0c1b978d57bec04cef27afc260 100644
--- a/profiling/org.eclipse.linuxtools.ssh.proxy/.settings/org.eclipse.jdt.core.prefs
+++ b/profiling/org.eclipse.linuxtools.ssh.proxy/.settings/org.eclipse.jdt.core.prefs
@@ -6,9 +6,9 @@ org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annota
org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.compliance=11
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -23,6 +23,7 @@ org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=warning
org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
@@ -79,6 +80,7 @@ org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=warn
org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
@@ -110,4 +112,5 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11
diff --git a/profiling/org.eclipse.linuxtools.ssh.proxy/META-INF/MANIFEST.MF b/profiling/org.eclipse.linuxtools.ssh.proxy/META-INF/MANIFEST.MF
index 0cb264145d48b9f02225f8dccd8a88b1962aaabe..abeb783a0b2368e3c231ae07188b455d624593d9 100644
--- a/profiling/org.eclipse.linuxtools.ssh.proxy/META-INF/MANIFEST.MF
+++ b/profiling/org.eclipse.linuxtools.ssh.proxy/META-INF/MANIFEST.MF
@@ -12,7 +12,7 @@ Require-Bundle: org.eclipse.ui,
com.jcraft.jsch;bundle-version="0.1.44",
org.eclipse.remote.jsch.core
Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
Bundle-Localization: plugin
Bundle-Vendor: %provider
Import-Package: org.eclipse.cdt.utils.pty
diff --git a/profiling/org.eclipse.linuxtools.ssh.proxy/pom.xml b/profiling/org.eclipse.linuxtools.ssh.proxy/pom.xml
index 5413b8d3c72778fb49e21cb26fa029a05e34706c..ad7e66e81d3791c8f8b2b4ebc89ac8c937037530 100644
--- a/profiling/org.eclipse.linuxtools.ssh.proxy/pom.xml
+++ b/profiling/org.eclipse.linuxtools.ssh.proxy/pom.xml
@@ -15,7 +15,7 @@
<parent>
<artifactId>linuxtools-profiling-parent</artifactId>
<groupId>org.eclipse.linuxtools.profiling</groupId>
- <version>7.4.0</version>
+ <version>8.1.0</version>
</parent>
<artifactId>org.eclipse.linuxtools.ssh.proxy</artifactId>
diff --git a/profiling/org.eclipse.linuxtools.tools.launch.core.tests/.classpath b/profiling/org.eclipse.linuxtools.tools.launch.core.tests/.classpath
index eca7bdba8f03f22510b7980a94dbfe10c16c0901..a42a828e04a56494db334010723fbea280ad90dd 100644
--- a/profiling/org.eclipse.linuxtools.tools.launch.core.tests/.classpath
+++ b/profiling/org.eclipse.linuxtools.tools.launch.core.tests/.classpath
@@ -1,7 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="src" path="src"/>
+ <classpathentry kind="src" path="src">
+ <attributes>
+ <attribute name="test" value="true"/>
+ </attributes>
+ </classpathentry>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/profiling/org.eclipse.linuxtools.tools.launch.core.tests/.settings/org.eclipse.jdt.core.prefs b/profiling/org.eclipse.linuxtools.tools.launch.core.tests/.settings/org.eclipse.jdt.core.prefs
index 0c68a61dca867ceb49e79d2402935261ec3e3809..7adc0fb9a0d32bd6b4e3ce6f305ab7165208865c 100644
--- a/profiling/org.eclipse.linuxtools.tools.launch.core.tests/.settings/org.eclipse.jdt.core.prefs
+++ b/profiling/org.eclipse.linuxtools.tools.launch.core.tests/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,10 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
+org.eclipse.jdt.core.compiler.compliance=11
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11
diff --git a/profiling/org.eclipse.linuxtools.tools.launch.core.tests/META-INF/MANIFEST.MF b/profiling/org.eclipse.linuxtools.tools.launch.core.tests/META-INF/MANIFEST.MF
index fa377303bd0750b0edd500f0c1c6616c00f0a8c1..0a06bc06dd3816a67d234c006a9c7bedb21a0135 100644
--- a/profiling/org.eclipse.linuxtools.tools.launch.core.tests/META-INF/MANIFEST.MF
+++ b/profiling/org.eclipse.linuxtools.tools.launch.core.tests/META-INF/MANIFEST.MF
@@ -10,7 +10,7 @@ Require-Bundle: org.eclipse.core.runtime,
org.eclipse.core.resources;bundle-version="3.11.0",
org.eclipse.linuxtools.profiling.tests;bundle-version="1.1.0",
org.eclipse.cdt.core
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
Import-Package: org.eclipse.debug.core,
org.eclipse.linuxtools.remote.proxy.tests
Automatic-Module-Name: org.eclipse.linuxtools.tools.launch.core.tests
diff --git a/profiling/org.eclipse.linuxtools.tools.launch.core.tests/pom.xml b/profiling/org.eclipse.linuxtools.tools.launch.core.tests/pom.xml
index 4ba08c45d7c9f7a566edbcfa89ce8408e2bb79ef..13c1f4ac3ee39ef29aa75cd2cf8b33927b874080 100644
--- a/profiling/org.eclipse.linuxtools.tools.launch.core.tests/pom.xml
+++ b/profiling/org.eclipse.linuxtools.tools.launch.core.tests/pom.xml
@@ -5,7 +5,7 @@
<parent>
<artifactId>linuxtools-profiling-parent</artifactId>
<groupId>org.eclipse.linuxtools.profiling</groupId>
- <version>7.4.0</version>
+ <version>8.1.0</version>
</parent>
<artifactId>org.eclipse.linuxtools.tools.launch.core.tests</artifactId>
diff --git a/profiling/org.eclipse.linuxtools.tools.launch.core/.classpath b/profiling/org.eclipse.linuxtools.tools.launch.core/.classpath
index 43b986286a9e5fd1828793fa4b2353d02ab8625f..1db08c6b4ce2fb50395b2f9c9a50c140a0bab199 100644
--- a/profiling/org.eclipse.linuxtools.tools.launch.core/.classpath
+++ b/profiling/org.eclipse.linuxtools.tools.launch.core/.classpath
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="target/classes"/>
diff --git a/profiling/org.eclipse.linuxtools.tools.launch.core/.settings/org.eclipse.jdt.core.prefs b/profiling/org.eclipse.linuxtools.tools.launch.core/.settings/org.eclipse.jdt.core.prefs
index 23c31dd4af50c5ef349b2d356fd118e3cabe8579..0a1912d325fd3bafc6a963e6cd3f2658f04bfc34 100644
--- a/profiling/org.eclipse.linuxtools.tools.launch.core/.settings/org.eclipse.jdt.core.prefs
+++ b/profiling/org.eclipse.linuxtools.tools.launch.core/.settings/org.eclipse.jdt.core.prefs
@@ -7,9 +7,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nul
org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.compliance=11
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -24,6 +24,7 @@ org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=warning
org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
@@ -80,6 +81,7 @@ org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=warn
org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
@@ -111,4 +113,5 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11
diff --git a/profiling/org.eclipse.linuxtools.tools.launch.core/META-INF/MANIFEST.MF b/profiling/org.eclipse.linuxtools.tools.launch.core/META-INF/MANIFEST.MF
index aab2ae789c602529ec54a49f6934f729b97bdc5a..d8859e877275bf7b058459eeefbd9c14eceef2a2 100644
--- a/profiling/org.eclipse.linuxtools.tools.launch.core/META-INF/MANIFEST.MF
+++ b/profiling/org.eclipse.linuxtools.tools.launch.core/META-INF/MANIFEST.MF
@@ -12,7 +12,7 @@ Require-Bundle: org.eclipse.core.runtime,
org.eclipse.linuxtools.profiling.launch;bundle-version="0.10.0",
org.eclipse.core.filesystem;bundle-version="1.3.100",
com.jcraft.jsch
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
Bundle-ActivationPolicy: lazy
Export-Package: org.eclipse.linuxtools.tools.launch.core,org.eclipse.l
inuxtools.tools.launch.core.factory,org.eclipse.linuxtools.tools.laun
diff --git a/profiling/org.eclipse.linuxtools.tools.launch.core/pom.xml b/profiling/org.eclipse.linuxtools.tools.launch.core/pom.xml
index e93fc216b297dd0190d7b6777d284f181a7ceee9..a9991dd0383cd1965af96e634574a35f2263ca0b 100644
--- a/profiling/org.eclipse.linuxtools.tools.launch.core/pom.xml
+++ b/profiling/org.eclipse.linuxtools.tools.launch.core/pom.xml
@@ -15,7 +15,7 @@
<parent>
<artifactId>linuxtools-profiling-parent</artifactId>
<groupId>org.eclipse.linuxtools.profiling</groupId>
- <version>7.4.0</version>
+ <version>8.1.0</version>
</parent>
<artifactId>org.eclipse.linuxtools.tools.launch.core</artifactId>
diff --git a/profiling/org.eclipse.linuxtools.tools.launch.ui/.classpath b/profiling/org.eclipse.linuxtools.tools.launch.ui/.classpath
index 43b986286a9e5fd1828793fa4b2353d02ab8625f..1db08c6b4ce2fb50395b2f9c9a50c140a0bab199 100644
--- a/profiling/org.eclipse.linuxtools.tools.launch.ui/.classpath
+++ b/profiling/org.eclipse.linuxtools.tools.launch.ui/.classpath
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="target/classes"/>
diff --git a/profiling/org.eclipse.linuxtools.tools.launch.ui/.settings/org.eclipse.jdt.core.prefs b/profiling/org.eclipse.linuxtools.tools.launch.ui/.settings/org.eclipse.jdt.core.prefs
index 89403a77994b785316070de748ba8557617d10d2..649554d9b3307e8870e94c442906bcfe4a4e8e83 100644
--- a/profiling/org.eclipse.linuxtools.tools.launch.ui/.settings/org.eclipse.jdt.core.prefs
+++ b/profiling/org.eclipse.linuxtools.tools.launch.ui/.settings/org.eclipse.jdt.core.prefs
@@ -6,8 +6,8 @@ org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annota
org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
+org.eclipse.jdt.core.compiler.compliance=11
org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
@@ -18,6 +18,7 @@ org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=warning
org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
@@ -61,6 +62,7 @@ org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=warn
org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
@@ -92,4 +94,5 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11
diff --git a/profiling/org.eclipse.linuxtools.tools.launch.ui/META-INF/MANIFEST.MF b/profiling/org.eclipse.linuxtools.tools.launch.ui/META-INF/MANIFEST.MF
index 21e2ddf819cf073689566168a0f2c818842be60b..50d65b078005a8c8b12f801768f2b8e3b2f7c9db 100644
--- a/profiling/org.eclipse.linuxtools.tools.launch.ui/META-INF/MANIFEST.MF
+++ b/profiling/org.eclipse.linuxtools.tools.launch.ui/META-INF/MANIFEST.MF
@@ -9,6 +9,6 @@ Require-Bundle: org.eclipse.ui;bundle-version="3.109.100",
org.eclipse.core.runtime,
org.eclipse.core.resources,
org.eclipse.linuxtools.tools.launch.core
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
Bundle-ActivationPolicy: lazy
Automatic-Module-Name: org.eclipse.linuxtools.tools.launch.ui
diff --git a/profiling/org.eclipse.linuxtools.tools.launch.ui/pom.xml b/profiling/org.eclipse.linuxtools.tools.launch.ui/pom.xml
index 4a014f1c977af5a45dc57e338021ef9ad42d2dd6..e01c3fda1966538080d4648176a372659a864bea 100644
--- a/profiling/org.eclipse.linuxtools.tools.launch.ui/pom.xml
+++ b/profiling/org.eclipse.linuxtools.tools.launch.ui/pom.xml
@@ -15,7 +15,7 @@
<parent>
<artifactId>linuxtools-profiling-parent</artifactId>
<groupId>org.eclipse.linuxtools.profiling</groupId>
- <version>7.4.0</version>
+ <version>8.1.0</version>
</parent>
<artifactId>org.eclipse.linuxtools.tools.launch.ui</artifactId>
diff --git a/profiling/pom.xml b/profiling/pom.xml
index 0e7979acd30c842f36fb5934ebbf6ca0793e3f42..ca320b382d79c6a249fb8740103dbab8f60c806b 100644
--- a/profiling/pom.xml
+++ b/profiling/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.eclipse.linuxtools</groupId>
<artifactId>linuxtools-parent</artifactId>
- <version>7.4.0</version>
+ <version>8.1.0</version>
</parent>
<groupId>org.eclipse.linuxtools.profiling</groupId>
diff --git a/releng/container-build/Dockerfile b/releng/container-build/Dockerfile
new file mode 100644
index 0000000000000000000000000000000000000000..853ef3b56065dabd5bf4ea3f62b02b47d7fed68d
--- /dev/null
+++ b/releng/container-build/Dockerfile
@@ -0,0 +1,41 @@
+FROM eclipsecbi/fedora-gtk3-mutter:31-gtk3.24
+
+# Back to root for install
+USER 0
+
+ARG REMOTING_VERSION=3.27
+
+# https://github.com/jenkinsci/docker-jnlp-slave/
+ARG JNLP_AGENT_SCRIPT_VERSION=3.27-1
+
+RUN curl --create-dirs -sSLo /usr/share/jenkins/slave.jar https://repo.jenkins-ci.org/public/org/jenkins-ci/main/remoting/${REMOTING_VERSION}/remoting-${REMOTING_VERSION}.jar \
+ && chmod 755 /usr/share/jenkins \
+ && chmod 644 /usr/share/jenkins/slave.jar
+
+ADD https://raw.githubusercontent.com/jenkinsci/docker-jnlp-slave/${JNLP_AGENT_SCRIPT_VERSION}/jenkins-slave /usr/local/bin/jenkins-slave
+RUN chmod 555 /usr/local/bin/jenkins-slave && \
+ chgrp 0 /usr/local/bin/jenkins-slave && \
+ mkdir -p /home/jenkins/.jenkins && \
+ mkdir -p /home/jenkins/agent
+
+ENTRYPOINT [ "uid_entrypoint", "jenkins-slave" ]
+
+# Permit installation of docs
+RUN sed -i '/tsflags=nodocs/ d' /etc/dnf/dnf.conf
+
+RUN dnf -y update && dnf -y install \
+ java-11-openjdk-devel maven webkit2gtk3 \
+ gcc-c++ perf systemtap rpmdevtools valgrind \
+ gtk3-devel-docs createrepo_c \
+ npm \
+ && dnf clean all
+
+#Back to named user
+USER 1000
+
+ENV JENKINS_AGENT_WORKDIR=${HOME}/agent
+ENV JAVA_OPTS=""
+ENV JAVA_HOME=/usr/lib/jvm/java-11
+ENV PATH=/usr/lib/jvm/java-11/bin:$PATH
+ENV JNLP_PROTOCOL_OPTS="-XshowSettings:vm -Xmx256m -Djdk.nativeCrypto=false -Dsun.zip.disableMemoryMapping=true -Dorg.jenkinsci.remoting.engine.JnlpProtocol3.disabled=true"
+
diff --git a/releng/org.eclipse.linuxtools.docker-site/category.xml b/releng/org.eclipse.linuxtools.docker-site/category.xml
index 9c41bc20a9b8ee91394d11de7316da4f940c82d8..e7e2ffd1433ae35e7506bbd65a58871867c1c567 100644
--- a/releng/org.eclipse.linuxtools.docker-site/category.xml
+++ b/releng/org.eclipse.linuxtools.docker-site/category.xml
@@ -10,6 +10,9 @@
<feature url="features/org.eclipse.linuxtools.jdt.docker.launcher.feature_0.0.0.qualifier.jar" id="org.eclipse.linuxtools.jdt.docker.launcher.feature" version="0.0.0">
<category name="Linux Tools"/>
</feature>
+ <feature url="features/org.eclipse.linuxtools.docker.editor.ls.feature_0.0.0.qualifier.jar" id="org.eclipse.linuxtools.docker.editor.ls.feature" version="0.0.0">
+ <category name="Linux Tools"/>
+ </feature>
<feature url="features/org.eclipse.linuxtools.docker.tests.feature_0.0.0.qualifier.jar" id="org.eclipse.linuxtools.docker.tests.feature" version="0.0.0">
<category name="Linux Tools"/>
</feature>
@@ -81,11 +84,19 @@
<category name="Docker Test Dependencies"/>
</iu>
+ <!-- Docker Editor Dependencies -->
+ <iu id="org.eclipse.lsp4e" version="0.0.0">
+ <category name="Docker Editor Dependencies"/>
+ </iu>
+ <iu id="org.eclipse.wildwebdeveloper.embedder.node" version="0.0.0">
+ <category name="Docker Editor Dependencies"/>
+ </iu>
+
<!-- Orbit Dependencies -->
- <iu id="com.spotify.docker.client" version="0.0.0">
+ <iu id="org.mandas.docker-client" version="0.0.0">
<category name="Docker Client Dependencies"/>
</iu>
- <iu id="com.spotify.docker.client.source" version="0.0.0">
+ <iu id="org.mandas.docker-client.source" version="0.0.0">
<category name="Docker Client Dependencies"/>
</iu>
@@ -116,12 +127,15 @@
<iu id="javax.ws.rs" version="0.0.0">
<category name="Docker Client Dependencies"/>
</iu>
- <iu id="javax.xml.bind" version="0.0.0">
+ <iu id="jakarta.xml.bind" version="0.0.0">
<category name="Docker Client Dependencies"/>
</iu>
<iu id="javax.xml.stream" version="0.0.0">
<category name="Docker Client Dependencies"/>
</iu>
+ <iu id="javax.annotation" version="0.0.0">
+ <category name="Docker Client Dependencies"/>
+ </iu>
<iu id="com.github.jnr.jffi" version="0.0.0">
<category name="Docker Client Dependencies"/>
</iu>
@@ -143,7 +157,7 @@
<iu id="com.github.jnr.unixsocket" version="0.0.0">
<category name="Docker Client Dependencies"/>
</iu>
- <iu id="jnr.x86asm" version="0.0.0">
+ <iu id="com.github.jnr.x86asm" version="0.0.0">
<category name="Docker Client Dependencies"/>
</iu>
<iu id="org.bouncycastle.bcprov" version="0.0.0">
@@ -167,9 +181,6 @@
<iu id="org.glassfish.jersey.apache.connector" version="0.0.0">
<category name="Docker Client Dependencies"/>
</iu>
- <iu id="org.glassfish.jersey.bundles.repackaged.jersey-guava" version="0.0.0">
- <category name="Docker Client Dependencies"/>
- </iu>
<iu id="org.glassfish.jersey.core.jersey-client" version="0.0.0">
<category name="Docker Client Dependencies"/>
</iu>
@@ -185,12 +196,48 @@
<iu id="org.glassfish.jersey.core.jersey-server" version="0.0.0">
<category name="Docker Client Dependencies"/>
</iu>
+ <iu id="org.glassfish.jersey.containers.servlet.core" version="0.0.0">
+ <category name="Docker Client Dependencies"/>
+ </iu>
+ <iu id="org.glassfish.jersey.containers.servlet" version="0.0.0">
+ <category name="Docker Client Dependencies"/>
+ </iu>
+ <iu id="org.glassfish.jersey.inject.jersey-hk2" version="0.0.0">
+ <category name="Docker Client Dependencies"/>
+ </iu>
<iu id="javassist" version="0.0.0">
<category name="Docker Client Dependencies"/>
</iu>
<iu id="com.google.guava" version="0.0.0">
<category name="Docker Client Dependencies"/>
</iu>
+ <iu id="com.google.auth.google-auth-library-credentials" version="0.0.0">
+ <category name="Docker Client Dependencies"/>
+ </iu>
+ <iu id="com.google.auth.oauth2-http" version="0.0.0">
+ <category name="Docker Client Dependencies"/>
+ </iu>
+ <iu id="com.google.http-client.google-http-client" version="0.0.0">
+ <category name="Docker Client Dependencies"/>
+ </iu>
+ <iu id="com.google.http-client.google-http-client-jackson2" version="0.0.0">
+ <category name="Docker Client Dependencies"/>
+ </iu>
+ <iu id="com.google.auto.value.auto-value-annotations" version="0.0.0">
+ <category name="Docker Client Dependencies"/>
+ </iu>
+ <iu id="com.google.j2objc.j2objc-annotations" version="0.0.0">
+ <category name="Docker Client Dependencies"/>
+ </iu>
+ <iu id="io.grpc.grpc-context" version="0.0.0">
+ <category name="Docker Client Dependencies"/>
+ </iu>
+ <iu id="io.opencensus.opencensus-api" version="0.0.0">
+ <category name="Docker Client Dependencies"/>
+ </iu>
+ <iu id="io.opencensus.opencensus-contrib-http-util" version="0.0.0">
+ <category name="Docker Client Dependencies"/>
+ </iu>
<iu id="org.slf4j.api" version="0.0.0">
<category name="Docker Client Dependencies"/>
</iu>
@@ -230,6 +277,11 @@
Eclipse Linux Tools Docker Client Dependencies
</description>
</category-def>
+ <category-def name="Docker Editor Dependencies" label="Docker Editor Dependencies">
+ <description>
+ Eclipse Linux Tools Docker Editor Dependencies
+ </description>
+ </category-def>
<category-def name="Docker Test Dependencies" label="Docker Test Dependencies">
<description>
Eclipse Linux Tools Docker Integration Test Dependencies
diff --git a/releng/org.eclipse.linuxtools.docker-site/pom.xml b/releng/org.eclipse.linuxtools.docker-site/pom.xml
index 2b8efaec6bbdac335e8b0ed798f0c4a5268ca78c..d5d6a9200f607440c241c0346c40eaf175c0d085 100644
--- a/releng/org.eclipse.linuxtools.docker-site/pom.xml
+++ b/releng/org.eclipse.linuxtools.docker-site/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.eclipse.linuxtools.releng</groupId>
<artifactId>linuxtools-releng-parent</artifactId>
- <version>7.4.0</version>
+ <version>8.1.0</version>
</parent>
<artifactId>org.eclipse.linuxtools.docker-site</artifactId>
diff --git a/releng/org.eclipse.linuxtools.releng-site/category.xml b/releng/org.eclipse.linuxtools.releng-site/category.xml
index d885995ebaac17eb37fa4f491914d867b029c1e8..a8b8f89d4dead66991c62cd5b2aa3300d65879c4 100644
--- a/releng/org.eclipse.linuxtools.releng-site/category.xml
+++ b/releng/org.eclipse.linuxtools.releng-site/category.xml
@@ -34,9 +34,6 @@
<feature url="features/org.eclipse.linuxtools.man_0.0.0.qualifier.jar" id="org.eclipse.linuxtools.man" version="0.0.0">
<category name="Linux Tools"/>
</feature>
- <feature url="features/org.eclipse.linuxtools.oprofile_0.0.0.qualifier.jar" id="org.eclipse.linuxtools.oprofile.feature" version="0.0.0">
- <category name="Linux Tools"/>
- </feature>
<feature url="features/org.eclipse.linuxtools.profiling_0.0.0.qualifier.jar" id="org.eclipse.linuxtools.profiling" version="0.0.0">
<category name="Linux Tools"/>
</feature>
@@ -64,14 +61,14 @@
<feature url="features/org.eclipse.linuxtools.valgrind.remote_0.0.0.qualifier.jar" id="org.eclipse.linuxtools.valgrind.remote" version="0.0.0">
<category name="Linux Tools"/>
</feature>
- <feature url="features/org.eclipse.linuxtools.oprofile.remote_0.0.0.qualifier.jar" id="org.eclipse.linuxtools.oprofile.remote.feature" version="0.0.0">
- <category name="Linux Tools"/>
- </feature>
<feature url="features/org.eclipse.linuxtools.perf.remote_0.0.0.qualifier.jar" id="org.eclipse.linuxtools.perf.remote.feature" version="0.0.0">
<category name="Linux Tools"/>
</feature>
<!-- Orbit Dependencies -->
- <iu id="org.swtchart" version="0.0.0">
+ <iu id="org.eclipse.swtchart" version="0.0.0">
+ <category name="Linux Tools"/>
+ </iu>
+ <iu id="org.eclipse.swtchart.extensions" version="0.0.0">
<category name="Linux Tools"/>
</iu>
<iu id="org.cyberneko.html" version="0.0.0">
@@ -116,9 +113,6 @@
<feature url="features/org.eclipse.linuxtools.man.source_0.0.0.qualifier.jar" id="org.eclipse.linuxtools.man.source" version="0.0.0">
<category name="Linux Tools Sources"/>
</feature>
- <feature url="features/org.eclipse.linuxtools.oprofile.source_0.0.0.qualifier.jar" id="org.eclipse.linuxtools.oprofile.feature.source" version="0.0.0">
- <category name="Linux Tools Sources"/>
- </feature>
<feature url="features/org.eclipse.linuxtools.profiling.source_0.0.0.qualifier.jar" id="org.eclipse.linuxtools.profiling.source" version="0.0.0">
<category name="Linux Tools Sources"/>
</feature>
@@ -146,9 +140,6 @@
<feature url="features/org.eclipse.linuxtools.valgrind.remote.source_0.0.0.qualifier.jar" id="org.eclipse.linuxtools.valgrind.remote.source" version="0.0.0">
<category name="Linux Tools Sources"/>
</feature>
- <feature url="features/org.eclipse.linuxtools.oprofile.remote.source_0.0.0.qualifier.jar" id="org.eclipse.linuxtools.oprofile.remote.feature.source" version="0.0.0">
- <category name="Linux Tools Sources"/>
- </feature>
<feature url="features/org.eclipse.linuxtools.perf.remote.source_0.0.0.qualifier.jar" id="org.eclipse.linuxtools.perf.remote.feature.source" version="0.0.0">
<category name="Linux Tools Sources"/>
</feature>
diff --git a/releng/org.eclipse.linuxtools.releng-site/pom.xml b/releng/org.eclipse.linuxtools.releng-site/pom.xml
index b332152bab9d4c1b3beaf8a681123c4674ba6041..bd8258f607486e447a58e545f99222ffb626b1f0 100644
--- a/releng/org.eclipse.linuxtools.releng-site/pom.xml
+++ b/releng/org.eclipse.linuxtools.releng-site/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.eclipse.linuxtools.releng</groupId>
<artifactId>linuxtools-releng-parent</artifactId>
- <version>7.4.0</version>
+ <version>8.1.0</version>
</parent>
<artifactId>org.eclipse.linuxtools.releng-site</artifactId>
diff --git a/releng/org.eclipse.linuxtools.target/.project b/releng/org.eclipse.linuxtools.target/.project
index 085f734c6ce8155bd6143437239e52d6769266a0..7ea15ad813cd439239cdd306b190b8279a938225 100644
--- a/releng/org.eclipse.linuxtools.target/.project
+++ b/releng/org.eclipse.linuxtools.target/.project
@@ -5,13 +5,7 @@
<projects>
</projects>
<buildSpec>
- <buildCommand>
- <name>org.eclipse.m2e.core.maven2Builder</name>
- <arguments>
- </arguments>
- </buildCommand>
</buildSpec>
<natures>
- <nature>org.eclipse.m2e.core.maven2Nature</nature>
</natures>
</projectDescription>
diff --git a/releng/org.eclipse.linuxtools.target/linuxtools-e4.12.target b/releng/org.eclipse.linuxtools.target/linuxtools-e4.12.target
deleted file mode 100644
index 502001ef88c514efca2f02f54cb27d98939c26e3..0000000000000000000000000000000000000000
--- a/releng/org.eclipse.linuxtools.target/linuxtools-e4.12.target
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde version="3.8"?><target name="linuxtools-e4.12" sequenceNumber="1">
-<locations>
-<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="com.fasterxml.jackson.core.jackson-annotations" version="2.9.2.v20180207-1730"/>
-<unit id="com.fasterxml.jackson.core.jackson-core" version="2.9.2.v20180207-1730"/>
-<unit id="com.fasterxml.jackson.core.jackson-databind" version="2.9.2.v20180207-1730"/>
-<unit id="com.fasterxml.jackson.datatype.jackson-datatype-guava" version="2.9.2.v20180207-1730"/>
-<unit id="com.fasterxml.jackson.jaxrs.jackson-jaxrs-base" version="2.9.2.v20180207-1730"/>
-<unit id="com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider" version="2.9.2.v20180207-1730"/>
-<unit id="com.github.jnr.constants" version="0.9.8.v20180207-1730"/>
-<unit id="com.github.jnr.enxio" version="0.16.0.v20180207-1730"/>
-<unit id="com.github.jnr.ffi" version="2.1.4.v20180207-1730"/>
-<unit id="com.github.jnr.jffi" version="1.2.15.v20180207-1730"/>
-<unit id="com.github.jnr.jffi.native" version="1.2.15.v20180207-1730"/>
-<unit id="com.github.jnr.posix" version="3.0.35.v20180207-1730"/>
-<unit id="com.github.jnr.unixsocket" version="0.18.0.v20180207-1730"/>
-<unit id="com.google.gson" version="2.8.2.v20180104-1110"/>
-<unit id="com.google.guava" version="21.0.0.v20170206-1425"/>
-<unit id="com.spotify.docker.client" version="8.11.7.v20180731-1413"/>
-<unit id="com.spotify.docker.client.source" version="8.11.7.v20180731-1413"/>
-<unit id="javassist" version="3.13.0.GA_v201209210905"/>
-<unit id="javax.ws.rs" version="2.0.1.v201504171603"/>
-<unit id="javax.xml.bind" version="2.2.0.v201105210648"/>
-<unit id="javax.xml.stream" version="1.0.1.v201004272200"/>
-<unit id="jnr.x86asm" version="1.0.2.v201505052040"/>
-<unit id="org.aopalliance" version="1.0.0.v201105210816"/>
-<unit id="org.apache.commons.codec" version="1.10.0.v20180409-1845"/>
-<unit id="org.apache.commons.compress" version="1.18.0.v20181121-2221"/>
-<unit id="org.apache.commons.io" version="2.6.0.v20190123-2029"/>
-<unit id="org.apache.commons.lang3" version="3.1.0.v201403281430"/>
-<unit id="org.apache.httpcomponents.httpclient" version="4.5.6.v20190503-0009"/>
-<unit id="org.apache.httpcomponents.httpcore" version="4.4.10.v20190123-2214"/>
-<unit id="org.apache.xerces" version="2.9.0.v201101211617"/>
-<unit id="org.assertj" version="1.7.1.v20170413-2026"/>
-<unit id="org.bouncycastle.bcpkix" version="1.61.0.v20190602-1335"/>
-<unit id="org.bouncycastle.bcprov" version="1.61.0.v20190602-1335"/>
-<unit id="org.cyberneko.html" version="1.9.14.v201105210654"/>
-<unit id="org.glassfish.hk2.api" version="2.5.0.v20161103-0227"/>
-<unit id="org.glassfish.hk2.locator" version="2.5.0.v20161103-0227"/>
-<unit id="org.glassfish.hk2.osgi-resource-locator" version="2.5.0.v20161103-1916"/>
-<unit id="org.glassfish.hk2.utils" version="2.5.0.v20160210-1508"/>
-<unit id="org.glassfish.jersey.apache.connector" version="2.22.1.v20161103-1916"/>
-<unit id="org.glassfish.jersey.bundles.repackaged.jersey-guava" version="2.22.1.v20161103-1916"/>
-<unit id="org.glassfish.jersey.core.jersey-client" version="2.22.1.v20161103-1916"/>
-<unit id="org.glassfish.jersey.core.jersey-common" version="2.22.1.v20181004-1955"/>
-<unit id="org.glassfish.jersey.core.jersey-server" version="2.22.1.v20181004-1955"/>
-<unit id="org.glassfish.jersey.ext.entityfiltering" version="2.22.1.v20181004-1955"/>
-<unit id="org.glassfish.jersey.media.jersey-media-json-jackson" version="2.22.1.v20161117-2005"/>
-<unit id="org.mockito" version="2.23.0.v20190527-1420"/>
-<unit id="org.objectweb.asm" version="7.1.0.v20190412-2143"/>
-<unit id="org.objectweb.asm.analysis" version="7.1.0.v20190412-2143"/>
-<unit id="org.objectweb.asm.tree" version="7.1.0.v20190412-2143"/>
-<unit id="org.objectweb.asm.util" version="7.1.0.v20190412-2143"/>
-<unit id="org.slf4j.api" version="1.7.10.v20170428-1633"/>
-<unit id="org.swtchart" version="0.10.0.v201605200358"/>
-<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20190602212107/repository"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.jdt.annotation" version="0.0.0"/>
-<unit id="org.eclipse.jdt.core" version="0.0.0"/>
-<unit id="org.eclipse.jdt.debug.ui" version="0.0.0"/>
-<unit id="org.eclipse.jdt.ui" version="0.0.0"/>
-<unit id="org.eclipse.pde.runtime" version="0.0.0"/>
-<unit id="org.eclipse.platform.ide" version="0.0.0"/>
-<unit id="org.eclipse.equinox.core.feature.feature.group" version="0.0.0"/>
-<repository location="http://download.eclipse.org/eclipse/updates/4.12/"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.license.feature.group" version="0.0.0"/>
-<repository location="http://download.eclipse.org/cbi/updates/license"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.swtbot.eclipse.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.swtbot.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.dstore.core" version="0.0.0"/>
-<unit id="org.eclipse.jgit.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.ptp.rdt.sync.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.remote.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.tm.terminal.feature.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.zest.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.cdt.autotools.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.cdt.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.launchbar.feature.group" version="0.0.0"/>
-<repository location="http://download.eclipse.org/releases/2019-03/"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.reddeer.eclipse.feature.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.reddeer.tests.feature.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.reddeer.ui.feature.feature.group" version="0.0.0"/>
-<repository location="http://download.eclipse.org/reddeer/snapshots/"/>
-</location>
-</locations>
-<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
-<launcherArgs>
-<vmArgs>-Xms40m
--Xmx512M</vmArgs>
-<programArgs>-consolelog</programArgs>
-</launcherArgs>
-</target>
diff --git a/releng/org.eclipse.linuxtools.target/linuxtools-e4.13.target b/releng/org.eclipse.linuxtools.target/linuxtools-e4.13.target
deleted file mode 100644
index bd0305b7f9f203d2d9376daf8ca39cc1135c5372..0000000000000000000000000000000000000000
--- a/releng/org.eclipse.linuxtools.target/linuxtools-e4.13.target
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde version="3.8"?><target name="linuxtools-e4.13" sequenceNumber="1">
-<locations>
-<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="com.fasterxml.jackson.core.jackson-annotations" version="2.9.2.v20180207-1730"/>
-<unit id="com.fasterxml.jackson.core.jackson-core" version="2.9.2.v20180207-1730"/>
-<unit id="com.fasterxml.jackson.core.jackson-databind" version="2.9.2.v20180207-1730"/>
-<unit id="com.fasterxml.jackson.datatype.jackson-datatype-guava" version="2.9.2.v20180207-1730"/>
-<unit id="com.fasterxml.jackson.jaxrs.jackson-jaxrs-base" version="2.9.2.v20180207-1730"/>
-<unit id="com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider" version="2.9.2.v20180207-1730"/>
-<unit id="com.github.jnr.constants" version="0.9.8.v20180207-1730"/>
-<unit id="com.github.jnr.enxio" version="0.16.0.v20180207-1730"/>
-<unit id="com.github.jnr.ffi" version="2.1.4.v20180207-1730"/>
-<unit id="com.github.jnr.jffi" version="1.2.15.v20180207-1730"/>
-<unit id="com.github.jnr.jffi.native" version="1.2.15.v20180207-1730"/>
-<unit id="com.github.jnr.posix" version="3.0.35.v20180207-1730"/>
-<unit id="com.github.jnr.unixsocket" version="0.18.0.v20180207-1730"/>
-<unit id="com.google.gson" version="2.8.2.v20180104-1110"/>
-<unit id="com.google.guava" version="21.0.0.v20170206-1425"/>
-<unit id="com.spotify.docker.client" version="8.11.7.v20180731-1413"/>
-<unit id="com.spotify.docker.client.source" version="8.11.7.v20180731-1413"/>
-<unit id="javassist" version="3.13.0.GA_v201209210905"/>
-<unit id="javax.ws.rs" version="2.0.1.v201504171603"/>
-<unit id="javax.xml.bind" version="2.2.0.v201105210648"/>
-<unit id="javax.xml.stream" version="1.0.1.v201004272200"/>
-<unit id="jnr.x86asm" version="1.0.2.v201505052040"/>
-<unit id="org.aopalliance" version="1.0.0.v201105210816"/>
-<unit id="org.apache.commons.codec" version="1.10.0.v20180409-1845"/>
-<unit id="org.apache.commons.compress" version="1.18.0.v20181121-2221"/>
-<unit id="org.apache.commons.io" version="2.6.0.v20190123-2029"/>
-<unit id="org.apache.commons.lang3" version="3.1.0.v201403281430"/>
-<unit id="org.apache.httpcomponents.httpclient" version="4.5.6.v20190503-0009"/>
-<unit id="org.apache.httpcomponents.httpcore" version="4.4.10.v20190123-2214"/>
-<unit id="org.apache.xerces" version="2.9.0.v201101211617"/>
-<unit id="org.assertj" version="1.7.1.v20170413-2026"/>
-<unit id="org.bouncycastle.bcpkix" version="1.60.0.v20181210-2057"/>
-<unit id="org.bouncycastle.bcprov" version="1.60.0.v20181210-2057"/>
-<unit id="org.cyberneko.html" version="1.9.14.v201105210654"/>
-<unit id="org.glassfish.hk2.api" version="2.5.0.v20161103-0227"/>
-<unit id="org.glassfish.hk2.locator" version="2.5.0.v20161103-0227"/>
-<unit id="org.glassfish.hk2.osgi-resource-locator" version="2.5.0.v20161103-1916"/>
-<unit id="org.glassfish.hk2.utils" version="2.5.0.v20160210-1508"/>
-<unit id="org.glassfish.jersey.apache.connector" version="2.22.1.v20161103-1916"/>
-<unit id="org.glassfish.jersey.bundles.repackaged.jersey-guava" version="2.22.1.v20161103-1916"/>
-<unit id="org.glassfish.jersey.core.jersey-client" version="2.22.1.v20161103-1916"/>
-<unit id="org.glassfish.jersey.core.jersey-common" version="2.22.1.v20181004-1955"/>
-<unit id="org.glassfish.jersey.core.jersey-server" version="2.22.1.v20181004-1955"/>
-<unit id="org.glassfish.jersey.ext.entityfiltering" version="2.22.1.v20181004-1955"/>
-<unit id="org.glassfish.jersey.media.jersey-media-json-jackson" version="2.22.1.v20161117-2005"/>
-<unit id="org.mockito" version="2.23.0.v20190527-1420"/>
-<unit id="org.objectweb.asm" version="7.1.0.v20190412-2143"/>
-<unit id="org.objectweb.asm.analysis" version="7.1.0.v20190412-2143"/>
-<unit id="org.objectweb.asm.tree" version="7.1.0.v20190412-2143"/>
-<unit id="org.objectweb.asm.util" version="7.1.0.v20190412-2143"/>
-<unit id="org.slf4j.api" version="1.7.10.v20170428-1633"/>
-<unit id="org.swtchart" version="0.10.0.v201605200358"/>
-<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20190602212107/repository"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.jdt.annotation" version="0.0.0"/>
-<unit id="org.eclipse.jdt.core" version="0.0.0"/>
-<unit id="org.eclipse.jdt.debug.ui" version="0.0.0"/>
-<unit id="org.eclipse.jdt.ui" version="0.0.0"/>
-<unit id="org.eclipse.pde.runtime" version="0.0.0"/>
-<unit id="org.eclipse.platform.ide" version="0.0.0"/>
-<unit id="org.eclipse.equinox.core.feature.feature.group" version="0.0.0"/>
-<repository location="http://download.eclipse.org/eclipse/updates/4.13-I-builds/"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.license.feature.group" version="0.0.0"/>
-<repository location="http://download.eclipse.org/cbi/updates/license"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.swtbot.eclipse.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.swtbot.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.dstore.core" version="0.0.0"/>
-<unit id="org.eclipse.jgit.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.ptp.rdt.sync.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.remote.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.tm.terminal.feature.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.zest.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.cdt.autotools.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.cdt.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.launchbar.feature.group" version="0.0.0"/>
-<repository location="http://download.eclipse.org/releases/2019-09/"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.reddeer.eclipse.feature.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.reddeer.tests.feature.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.reddeer.ui.feature.feature.group" version="0.0.0"/>
-<repository location="http://download.eclipse.org/reddeer/snapshots/"/>
-</location>
-</locations>
-<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
-<launcherArgs>
-<vmArgs>-Xms40m
--Xmx512M</vmArgs>
-<programArgs>-consolelog</programArgs>
-</launcherArgs>
-</target>
diff --git a/releng/org.eclipse.linuxtools.target/linuxtools-e4.16.target b/releng/org.eclipse.linuxtools.target/linuxtools-e4.16.target
new file mode 100644
index 0000000000000000000000000000000000000000..47be0780ba1d252a268fc4092c0821e01eb8ee5a
--- /dev/null
+++ b/releng/org.eclipse.linuxtools.target/linuxtools-e4.16.target
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?pde version="3.8"?>
+<target name="linuxtools-e4.16" sequenceNumber="1">
+<locations>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="com.fasterxml.jackson.core.jackson-annotations" version="2.10.3.v20200512-1600"/>
+<unit id="com.fasterxml.jackson.core.jackson-core" version="2.10.3.v20200512-1600"/>
+<unit id="com.fasterxml.jackson.core.jackson-databind" version="2.10.3.v20200512-1600"/>
+<unit id="com.fasterxml.jackson.datatype.jackson-datatype-guava" version="2.10.3.v20200512-1600"/>
+<unit id="com.fasterxml.jackson.jaxrs.jackson-jaxrs-base" version="2.10.3.v20200512-1600"/>
+<unit id="com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider" version="2.10.3.v20200512-1600"/>
+<unit id="com.github.jnr.constants" version="0.9.15.v20200501-1917"/>
+<unit id="com.github.jnr.enxio" version="0.25.0.v20200501-1917"/>
+<unit id="com.github.jnr.ffi" version="2.1.12.v20200513-1859"/>
+<unit id="com.github.jnr.jffi" version="1.2.23.v20200501-1917"/>
+<unit id="com.github.jnr.jffi.native" version="1.2.23.v20200501-1917"/>
+<unit id="com.github.jnr.posix" version="3.0.54.v20200501-1917"/>
+<unit id="com.github.jnr.unixsocket" version="0.28.0.v20200501-1917"/>
+<unit id="com.google.gson" version="2.8.2.v20180104-1110"/>
+<unit id="com.google.guava" version="27.1.0.v20190517-1946"/>
+<unit id="org.mandas.docker-client" version="3.2.1.v20200519-1937"/>
+<unit id="org.mandas.docker-client.source" version="3.2.1.v20200519-1937"/>
+<unit id="javassist" version="3.13.0.GA_v201209210905"/>
+<unit id="javax.ws.rs" version="2.1.6.v20200505-2127"/>
+<unit id="jakarta.xml.bind" version="2.3.3.v20200525-2159"/>
+<unit id="javax.xml.stream" version="1.0.1.v201004272200"/>
+<unit id="com.github.jnr.x86asm" version="1.0.2.v20200501-1917"/>
+<unit id="org.aopalliance" version="1.0.0.v201105210816"/>
+<unit id="org.apache.commons.codec" version="1.13.0.v20200108-0001"/>
+<unit id="org.apache.commons.compress" version="1.19.0.v20200106-2343"/>
+<unit id="org.apache.commons.io" version="2.6.0.v20190123-2029"/>
+<unit id="org.apache.commons.lang3" version="3.1.0.v201403281430"/>
+<unit id="org.apache.httpcomponents.httpclient" version="4.5.10.v20200114-1512"/>
+<unit id="org.apache.httpcomponents.httpcore" version="4.4.12.v20200108-1212"/>
+<unit id="org.apache.xerces" version="2.9.0.v201101211617"/>
+<unit id="org.assertj" version="3.14.0.v20200120-1926"/>
+<unit id="org.bouncycastle.bcpkix" version="1.65.0.v20200502-2229"/>
+<unit id="org.bouncycastle.bcprov" version="1.65.0.v20200502-2229"/>
+<unit id="org.cyberneko.html" version="1.9.14.v201105210654"/>
+<unit id="org.glassfish.hk2.api" version="2.6.1.v20200513-1859"/>
+<unit id="org.glassfish.hk2.locator" version="2.6.1.v20200513-1859"/>
+<unit id="org.glassfish.hk2.osgi-resource-locator" version="1.0.3.v20200509-0149"/>
+<unit id="org.glassfish.hk2.utils" version="2.6.1.v20200513-1859"/>
+<unit id="org.glassfish.jersey.apache.connector" version="2.30.1.v20200513-1859"/>
+<unit id="org.glassfish.jersey.containers.servlet" version="2.30.1.v20200513-1859"/>
+<unit id="org.glassfish.jersey.containers.servlet.core" version="2.30.1.v20200513-1859"/>
+<unit id="org.glassfish.jersey.core.jersey-client" version="2.30.1.v20200513-1859"/>
+<unit id="org.glassfish.jersey.core.jersey-common" version="2.30.1.v20200513-1859"/>
+<unit id="org.glassfish.jersey.core.jersey-server" version="2.30.1.v20200513-1859"/>
+<unit id="org.glassfish.jersey.ext.entityfiltering" version="2.30.1.v20200513-1859"/>
+<unit id="org.glassfish.jersey.inject.jersey-hk2" version="2.30.1.v20200512-1802"/>
+<unit id="org.glassfish.jersey.media.jersey-media-json-jackson" version="2.30.1.v20200513-1859"/>
+<unit id="org.mockito" version="2.23.0.v20200310-1642"/>
+<unit id="org.objectweb.asm" version="8.0.1.v20200420-1007"/>
+<unit id="org.objectweb.asm.analysis" version="8.0.1.v20200420-1007"/>
+<unit id="org.objectweb.asm.tree" version="8.0.1.v20200420-1007"/>
+<unit id="org.objectweb.asm.util" version="8.0.1.v20200420-1007"/>
+<unit id="org.slf4j.api" version="1.7.30.v20200204-2150"/>
+<repository location="https://download.eclipse.org/tools/orbit/S-builds/S20200526004052/repository"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.jdt.annotation" version="0.0.0"/>
+<unit id="org.eclipse.jdt.core" version="0.0.0"/>
+<unit id="org.eclipse.jdt.debug.ui" version="0.0.0"/>
+<unit id="org.eclipse.jdt.ui" version="0.0.0"/>
+<unit id="org.eclipse.pde.runtime" version="0.0.0"/>
+<unit id="org.eclipse.platform.ide" version="0.0.0"/>
+<unit id="org.eclipse.equinox.core.feature.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.ui.tests.harness" version="0.0.0"/>
+<repository location="https://download.eclipse.org/eclipse/updates/4.16/"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.license.feature.group" version="0.0.0"/>
+<repository location="https://download.eclipse.org/cbi/updates/license"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.swtbot.eclipse.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.swtbot.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.dstore.core" version="0.0.0"/>
+<unit id="org.eclipse.jgit.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.ptp.rdt.sync.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.remote.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.tm.terminal.feature.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.zest.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.cdt.autotools.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.cdt.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.launchbar.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.lsp4e" version="0.0.0"/>
+<unit id="org.eclipse.tm4e.feature.feature.group" version="0.0.0"/>
+<repository location="https://download.eclipse.org/releases/2020-06/"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.reddeer.eclipse.feature.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.reddeer.tests.feature.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.reddeer.ui.feature.feature.group" version="0.0.0"/>
+<repository location="https://download.eclipse.org/reddeer/snapshots/"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.swtchart.feature.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.swtchart.feature.source.feature.group" version="0.0.0"/>
+<repository location="https://download.eclipse.org/swtchart/releases/0.12.0/repository"/>
+</location>
+</locations>
+<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
+<launcherArgs>
+<vmArgs>-Xms40m
+-Xmx512M</vmArgs>
+<programArgs>-consolelog</programArgs>
+</launcherArgs>
+</target>
\ No newline at end of file
diff --git a/releng/org.eclipse.linuxtools.target/linuxtools-e4.17.target b/releng/org.eclipse.linuxtools.target/linuxtools-e4.17.target
new file mode 100644
index 0000000000000000000000000000000000000000..5fe213c9c98e5e37e59990899f6b8c90175c24a5
--- /dev/null
+++ b/releng/org.eclipse.linuxtools.target/linuxtools-e4.17.target
@@ -0,0 +1,125 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?pde version="3.8"?>
+<target name="linuxtools-e4.17" sequenceNumber="3">
+<locations>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="com.fasterxml.jackson.core.jackson-annotations" version="2.10.3.v20200512-1600"/>
+<unit id="com.fasterxml.jackson.core.jackson-core" version="2.10.3.v20200512-1600"/>
+<unit id="com.fasterxml.jackson.core.jackson-databind" version="2.10.3.v20200512-1600"/>
+<unit id="com.fasterxml.jackson.datatype.jackson-datatype-guava" version="2.10.3.v20200512-1600"/>
+<unit id="com.fasterxml.jackson.jaxrs.jackson-jaxrs-base" version="2.10.3.v20200512-1600"/>
+<unit id="com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider" version="2.10.3.v20200512-1600"/>
+<unit id="com.github.jnr.constants" version="0.9.15.v20200501-1917"/>
+<unit id="com.github.jnr.enxio" version="0.25.0.v20200501-1917"/>
+<unit id="com.github.jnr.ffi" version="2.1.12.v20200513-1859"/>
+<unit id="com.github.jnr.jffi" version="1.2.23.v20200501-1917"/>
+<unit id="com.github.jnr.jffi.native" version="1.2.23.v20200501-1917"/>
+<unit id="com.github.jnr.posix" version="3.0.54.v20200501-1917"/>
+<unit id="com.github.jnr.unixsocket" version="0.28.0.v20200501-1917"/>
+<unit id="com.google.gson" version="2.8.2.v20180104-1110"/>
+<unit id="com.google.guava" version="27.1.0.v20190517-1946"/>
+<unit id="org.mandas.docker-client" version="3.2.1.v20200519-1937"/>
+<unit id="org.mandas.docker-client.source" version="3.2.1.v20200519-1937"/>
+<unit id="javassist" version="3.13.0.GA_v201209210905"/>
+<unit id="javax.ws.rs" version="2.1.6.v20200505-2127"/>
+<unit id="jakarta.xml.bind" version="2.3.3.v20200525-2159"/>
+<unit id="javax.xml.stream" version="1.0.1.v201004272200"/>
+<unit id="com.github.jnr.x86asm" version="1.0.2.v20200501-1917"/>
+<unit id="org.aopalliance" version="1.0.0.v201105210816"/>
+<unit id="org.apache.commons.codec" version="1.13.0.v20200108-0001"/>
+<unit id="org.apache.commons.compress" version="1.19.0.v20200106-2343"/>
+<unit id="org.apache.commons.io" version="2.6.0.v20190123-2029"/>
+<unit id="org.apache.commons.lang3" version="3.1.0.v201403281430"/>
+<unit id="org.apache.httpcomponents.httpclient" version="4.5.10.v20200114-1512"/>
+<unit id="org.apache.httpcomponents.httpcore" version="4.4.12.v20200108-1212"/>
+<unit id="org.apache.xerces" version="2.9.0.v201101211617"/>
+<unit id="org.assertj" version="3.14.0.v20200120-1926"/>
+<unit id="org.bouncycastle.bcpkix" version="1.65.0.v20200527-1955"/>
+<unit id="org.bouncycastle.bcprov" version="1.65.1.v20200529-1514"/>
+<unit id="org.cyberneko.html" version="1.9.14.v201105210654"/>
+<unit id="org.glassfish.hk2.api" version="2.6.1.v20200513-1859"/>
+<unit id="org.glassfish.hk2.locator" version="2.6.1.v20200513-1859"/>
+<unit id="org.glassfish.hk2.osgi-resource-locator" version="1.0.3.v20200509-0149"/>
+<unit id="org.glassfish.hk2.utils" version="2.6.1.v20200513-1859"/>
+<unit id="org.glassfish.jersey.apache.connector" version="2.30.1.v20200513-1859"/>
+<unit id="org.glassfish.jersey.containers.servlet" version="2.30.1.v20200513-1859"/>
+<unit id="org.glassfish.jersey.containers.servlet.core" version="2.30.1.v20200513-1859"/>
+<unit id="org.glassfish.jersey.core.jersey-client" version="2.30.1.v20200513-1859"/>
+<unit id="org.glassfish.jersey.core.jersey-common" version="2.30.1.v20200513-1859"/>
+<unit id="org.glassfish.jersey.core.jersey-server" version="2.30.1.v20200513-1859"/>
+<unit id="org.glassfish.jersey.ext.entityfiltering" version="2.30.1.v20200513-1859"/>
+<unit id="org.glassfish.jersey.inject.jersey-hk2" version="2.30.1.v20200512-1802"/>
+<unit id="org.glassfish.jersey.media.jersey-media-json-jackson" version="2.30.1.v20200513-1859"/>
+<unit id="org.mockito" version="2.23.0.v20200310-1642"/>
+<unit id="org.objectweb.asm" version="8.0.1.v20200420-1007"/>
+<unit id="org.objectweb.asm.analysis" version="8.0.1.v20200420-1007"/>
+<unit id="org.objectweb.asm.tree" version="8.0.1.v20200420-1007"/>
+<unit id="org.objectweb.asm.util" version="8.0.1.v20200420-1007"/>
+<unit id="org.slf4j.api" version="1.7.30.v20200204-2150"/>
+<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/S20200817205214/repository"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.jdt.annotation" version="0.0.0"/>
+<unit id="org.eclipse.jdt.core" version="0.0.0"/>
+<unit id="org.eclipse.jdt.debug.ui" version="0.0.0"/>
+<unit id="org.eclipse.jdt.ui" version="0.0.0"/>
+<unit id="org.eclipse.jdt.junit4.runtime" version="0.0.0"/>
+<unit id="org.eclipse.pde.runtime" version="0.0.0"/>
+<unit id="org.eclipse.platform.ide" version="0.0.0"/>
+<unit id="org.eclipse.equinox.core.feature.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.ui.tests.harness" version="0.0.0"/>
+<repository location="https://download.eclipse.org/eclipse/updates/4.17/"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.license.feature.group" version="0.0.0"/>
+<repository location="https://download.eclipse.org/cbi/updates/license"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.tm.terminal.feature.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.cdt.autotools.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.cdt.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.launchbar.feature.group" version="0.0.0"/>
+<repository location="https://ci.eclipse.org/cdt/job/cdt-master/lastSuccessfulBuild/artifact/releng/org.eclipse.cdt.repo/target/repository/"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.swtbot.eclipse.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.swtbot.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.dstore.core" version="0.0.0"/>
+<unit id="org.eclipse.jgit.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.ptp.rdt.sync.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.remote.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.zest.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.lsp4e" version="0.0.0"/>
+<unit id="org.eclipse.tm4e.feature.feature.group" version="0.0.0"/>
+<repository location="https://download.eclipse.org/staging/2020-09/"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.cdt.autotools.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.cdt.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.launchbar.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.tm.terminal.feature.feature.group" version="0.0.0"/>
+<repository location="https://ci.eclipse.org/cdt/job/cdt-master/lastSuccessfulBuild/artifact/releng/org.eclipse.cdt.repo/target/repository/"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.reddeer.eclipse.feature.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.reddeer.tests.feature.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.reddeer.ui.feature.feature.group" version="0.0.0"/>
+<repository location="https://download.eclipse.org/reddeer/releases/latest/"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.wildwebdeveloper.embedder.node.feature.feature.group" version="0.0.0"/>
+<repository location="https://download.eclipse.org/wildwebdeveloper/snapshots/"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.swtchart.feature.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.swtchart.feature.source.feature.group" version="0.0.0"/>
+<repository location="https://download.eclipse.org/swtchart/integration/develop/repository"/>
+</location>
+</locations>
+<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
+<launcherArgs>
+<vmArgs>-Xms40m
+-Xmx512M</vmArgs>
+<programArgs>-consolelog</programArgs>
+</launcherArgs>
+</target>
diff --git a/releng/org.eclipse.linuxtools.target/linuxtools-e4.18.target b/releng/org.eclipse.linuxtools.target/linuxtools-e4.18.target
new file mode 100644
index 0000000000000000000000000000000000000000..866880924fa4805fb18ae459763b0bc777234070
--- /dev/null
+++ b/releng/org.eclipse.linuxtools.target/linuxtools-e4.18.target
@@ -0,0 +1,125 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?pde version="3.8"?>
+<target name="linuxtools-e4.18" sequenceNumber="4">
+<locations>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="com.fasterxml.jackson.core.jackson-annotations" version="2.10.3.v20200512-1600"/>
+<unit id="com.fasterxml.jackson.core.jackson-core" version="2.10.3.v20200512-1600"/>
+<unit id="com.fasterxml.jackson.core.jackson-databind" version="2.10.3.v20200512-1600"/>
+<unit id="com.fasterxml.jackson.datatype.jackson-datatype-guava" version="2.10.3.v20200512-1600"/>
+<unit id="com.fasterxml.jackson.jaxrs.jackson-jaxrs-base" version="2.10.3.v20200512-1600"/>
+<unit id="com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider" version="2.10.3.v20200512-1600"/>
+<unit id="com.github.jnr.constants" version="0.9.15.v20200501-1917"/>
+<unit id="com.github.jnr.enxio" version="0.25.0.v20200501-1917"/>
+<unit id="com.github.jnr.ffi" version="2.1.12.v20200513-1859"/>
+<unit id="com.github.jnr.jffi" version="1.2.23.v20200501-1917"/>
+<unit id="com.github.jnr.jffi.native" version="1.2.23.v20200501-1917"/>
+<unit id="com.github.jnr.posix" version="3.0.54.v20200501-1917"/>
+<unit id="com.github.jnr.unixsocket" version="0.28.0.v20200501-1917"/>
+<unit id="com.google.gson" version="2.8.2.v20180104-1110"/>
+<unit id="com.google.guava" version="27.1.0.v20190517-1946"/>
+<unit id="org.mandas.docker-client" version="3.2.1.v20200519-1937"/>
+<unit id="org.mandas.docker-client.source" version="3.2.1.v20200519-1937"/>
+<unit id="javassist" version="3.13.0.GA_v201209210905"/>
+<unit id="javax.ws.rs" version="2.1.6.v20200505-2127"/>
+<unit id="jakarta.xml.bind" version="2.3.3.v20201118-1818"/>
+<unit id="javax.xml.stream" version="1.0.1.v201004272200"/>
+<unit id="com.github.jnr.x86asm" version="1.0.2.v20200501-1917"/>
+<unit id="org.aopalliance" version="1.0.0.v201105210816"/>
+<unit id="org.apache.commons.codec" version="1.14.0.v20200818-1422"/>
+<unit id="org.apache.commons.compress" version="1.19.0.v20200106-2343"/>
+<unit id="org.apache.commons.io" version="2.6.0.v20190123-2029"/>
+<unit id="org.apache.commons.lang3" version="3.1.0.v201403281430"/>
+<unit id="org.apache.httpcomponents.httpclient" version="4.5.10.v20200830-2311"/>
+<unit id="org.apache.httpcomponents.httpcore" version="4.4.12.v20200108-1212"/>
+<unit id="org.apache.xerces" version="2.9.0.v201101211617"/>
+<unit id="org.assertj" version="3.14.0.v20200120-1926"/>
+<unit id="org.bouncycastle.bcpkix" version="1.65.0.v20200527-1955"/>
+<unit id="org.bouncycastle.bcprov" version="1.65.1.v20200529-1514"/>
+<unit id="org.cyberneko.html" version="1.9.14.v201105210654"/>
+<unit id="org.glassfish.hk2.api" version="2.6.1.v20200513-1859"/>
+<unit id="org.glassfish.hk2.locator" version="2.6.1.v20200513-1859"/>
+<unit id="org.glassfish.hk2.osgi-resource-locator" version="1.0.3.v20200509-0149"/>
+<unit id="org.glassfish.hk2.utils" version="2.6.1.v20200513-1859"/>
+<unit id="org.glassfish.jersey.apache.connector" version="2.30.1.v20200513-1859"/>
+<unit id="org.glassfish.jersey.containers.servlet" version="2.30.1.v20200513-1859"/>
+<unit id="org.glassfish.jersey.containers.servlet.core" version="2.30.1.v20200513-1859"/>
+<unit id="org.glassfish.jersey.core.jersey-client" version="2.30.1.v20200513-1859"/>
+<unit id="org.glassfish.jersey.core.jersey-common" version="2.30.1.v20200513-1859"/>
+<unit id="org.glassfish.jersey.core.jersey-server" version="2.30.1.v20200513-1859"/>
+<unit id="org.glassfish.jersey.ext.entityfiltering" version="2.30.1.v20200513-1859"/>
+<unit id="org.glassfish.jersey.inject.jersey-hk2" version="2.30.1.v20200512-1802"/>
+<unit id="org.glassfish.jersey.media.jersey-media-json-jackson" version="2.30.1.v20200513-1859"/>
+<unit id="org.mockito" version="2.23.0.v20200310-1642"/>
+<unit id="org.objectweb.asm" version="9.0.0.v20201001-1419"/>
+<unit id="org.objectweb.asm.analysis" version="9.0.0.v20201001-1419"/>
+<unit id="org.objectweb.asm.tree" version="9.0.0.v20201001-1419"/>
+<unit id="org.objectweb.asm.util" version="9.0.0.v20201001-1419"/>
+<unit id="org.slf4j.api" version="1.7.30.v20200204-2150"/>
+<repository location="https://download.eclipse.org/tools/orbit/downloads/2020-12"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.jdt.annotation" version="0.0.0"/>
+<unit id="org.eclipse.jdt.core" version="0.0.0"/>
+<unit id="org.eclipse.jdt.debug.ui" version="0.0.0"/>
+<unit id="org.eclipse.jdt.ui" version="0.0.0"/>
+<unit id="org.eclipse.jdt.junit4.runtime" version="0.0.0"/>
+<unit id="org.eclipse.pde.runtime" version="0.0.0"/>
+<unit id="org.eclipse.platform.ide" version="0.0.0"/>
+<unit id="org.eclipse.equinox.core.feature.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.ui.tests.harness" version="0.0.0"/>
+<repository location="https://download.eclipse.org/eclipse/updates/4.18-I-builds/"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.license.feature.group" version="0.0.0"/>
+<repository location="https://download.eclipse.org/cbi/updates/license"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.tm.terminal.feature.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.cdt.autotools.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.cdt.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.launchbar.feature.group" version="0.0.0"/>
+<repository location="https://ci.eclipse.org/cdt/job/cdt-master/lastSuccessfulBuild/artifact/releng/org.eclipse.cdt.repo/target/repository/"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.swtbot.eclipse.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.swtbot.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.dstore.core" version="0.0.0"/>
+<unit id="org.eclipse.jgit.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.ptp.rdt.sync.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.remote.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.zest.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.lsp4e" version="0.0.0"/>
+<unit id="org.eclipse.tm4e.feature.feature.group" version="0.0.0"/>
+<repository location="https://download.eclipse.org/staging/2020-12/"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.cdt.autotools.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.cdt.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.launchbar.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.tm.terminal.feature.feature.group" version="0.0.0"/>
+<repository location="https://ci.eclipse.org/cdt/job/cdt-master/lastSuccessfulBuild/artifact/releng/org.eclipse.cdt.repo/target/repository/"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.reddeer.eclipse.feature.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.reddeer.tests.feature.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.reddeer.ui.feature.feature.group" version="0.0.0"/>
+<repository location="https://download.eclipse.org/reddeer/releases/latest/"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.wildwebdeveloper.embedder.node.feature.feature.group" version="0.0.0"/>
+<repository location="https://download.eclipse.org/wildwebdeveloper/snapshots/"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.swtchart.feature.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.swtchart.feature.source.feature.group" version="0.0.0"/>
+<repository location="https://download.eclipse.org/swtchart/integration/develop/repository"/>
+</location>
+</locations>
+<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
+<launcherArgs>
+<vmArgs>-Xms40m
+-Xmx512M</vmArgs>
+<programArgs>-consolelog</programArgs>
+</launcherArgs>
+</target>
diff --git a/releng/org.eclipse.linuxtools.target/pom.xml b/releng/org.eclipse.linuxtools.target/pom.xml
index 5e1b1594bae9df91c3eb57e20dc823946ebe6070..574dcc19843abf90267d1211566adfa68ee06645 100644
--- a/releng/org.eclipse.linuxtools.target/pom.xml
+++ b/releng/org.eclipse.linuxtools.target/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.eclipse.linuxtools.releng</groupId>
<artifactId>linuxtools-releng-parent</artifactId>
- <version>7.4.0</version>
+ <version>8.1.0</version>
</parent>
<groupId>org.eclipse.linuxtools</groupId>
@@ -31,9 +31,9 @@
<configuration>
<artifacts>
<artifact>
- <file>linuxtools-e4.13.target</file>
+ <file>linuxtools-e4.17.target</file>
<type>target</type>
- <classifier>linuxtools-e4.13</classifier>
+ <classifier>linuxtools-e4.17</classifier>
</artifact>
<!-- More targets could be added here -->
</artifacts>
@@ -43,4 +43,4 @@
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
diff --git a/releng/pom.xml b/releng/pom.xml
index 0d4b3b33d4b49e2d8d00e598cb0380273712a962..6532d7d2170158b6e60ae48f485f66e593cdae48 100644
--- a/releng/pom.xml
+++ b/releng/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.eclipse.linuxtools</groupId>
<artifactId>linuxtools-parent</artifactId>
- <version>7.4.0</version>
+ <version>8.1.0</version>
</parent>
<groupId>org.eclipse.linuxtools.releng</groupId>
diff --git a/rpm/org.eclipse.linuxtools.rpm-feature/feature.xml b/rpm/org.eclipse.linuxtools.rpm-feature/feature.xml
index de9407d9b9c5d5918108818da782f9bd5540028e..fc26bea372af949179eef8a678f2dfd97e289e36 100644
--- a/rpm/org.eclipse.linuxtools.rpm-feature/feature.xml
+++ b/rpm/org.eclipse.linuxtools.rpm-feature/feature.xml
@@ -14,7 +14,7 @@
<feature
id="org.eclipse.linuxtools.rpm"
label="%featureName"
- version="7.4.0.qualifier"
+ version="8.1.0.qualifier"
provider-name="%provider"
license-feature="org.eclipse.license"
license-feature-version="0.0.0">
diff --git a/rpm/org.eclipse.linuxtools.rpm-feature/pom.xml b/rpm/org.eclipse.linuxtools.rpm-feature/pom.xml
index d2419ecedef76e049182daa54e1ed1ad1cf1bafe..ada1e394d0dc556125007fcb0c284ba17cf0a85c 100644
--- a/rpm/org.eclipse.linuxtools.rpm-feature/pom.xml
+++ b/rpm/org.eclipse.linuxtools.rpm-feature/pom.xml
@@ -15,12 +15,12 @@
<parent>
<artifactId>linuxtools-rpm-parent</artifactId>
<groupId>org.eclipse.linuxtools.rpm</groupId>
- <version>7.4.0</version>
+ <version>8.1.0</version>
</parent>
<artifactId>org.eclipse.linuxtools.rpm</artifactId>
<packaging>eclipse-feature</packaging>
- <version>7.4.0-SNAPSHOT</version>
+ <version>8.1.0-SNAPSHOT</version>
<name>Linux Tools RPM Tools Feature</name>
diff --git a/rpm/org.eclipse.linuxtools.rpm.core.tests/.classpath b/rpm/org.eclipse.linuxtools.rpm.core.tests/.classpath
index 43b986286a9e5fd1828793fa4b2353d02ab8625f..a621c21ac550d71458aac26221ac3641277a488d 100644
--- a/rpm/org.eclipse.linuxtools.rpm.core.tests/.classpath
+++ b/rpm/org.eclipse.linuxtools.rpm.core.tests/.classpath
@@ -1,7 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="src" path="src"/>
+ <classpathentry kind="src" path="src">
+ <attributes>
+ <attribute name="test" value="true"/>
+ </attributes>
+ </classpathentry>
<classpathentry kind="output" path="target/classes"/>
</classpath>
diff --git a/rpm/org.eclipse.linuxtools.rpm.core.tests/.settings/org.eclipse.jdt.core.prefs b/rpm/org.eclipse.linuxtools.rpm.core.tests/.settings/org.eclipse.jdt.core.prefs
index 080126d4893a9ffe0626dca8dce149239d182e4b..906e9ae50840cac5a238ce8ea4d42b8e377a4c53 100644
--- a/rpm/org.eclipse.linuxtools.rpm.core.tests/.settings/org.eclipse.jdt.core.prefs
+++ b/rpm/org.eclipse.linuxtools.rpm.core.tests/.settings/org.eclipse.jdt.core.prefs
@@ -9,8 +9,8 @@ org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nul
org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
+org.eclipse.jdt.core.compiler.compliance=11
org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
@@ -21,6 +21,7 @@ org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=enabled
org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=warning
org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
@@ -64,6 +65,7 @@ org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=warn
org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=warning
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
@@ -96,4 +98,5 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11
diff --git a/rpm/org.eclipse.linuxtools.rpm.core.tests/META-INF/MANIFEST.MF b/rpm/org.eclipse.linuxtools.rpm.core.tests/META-INF/MANIFEST.MF
index 556a14ee9f3ba1dd8afa352b2d70971e28e29997..30de56c7d60105d37fc8b1dab31f4394adf5b135 100644
--- a/rpm/org.eclipse.linuxtools.rpm.core.tests/META-INF/MANIFEST.MF
+++ b/rpm/org.eclipse.linuxtools.rpm.core.tests/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-Name: %Bundle-Name.0
Bundle-SymbolicName: org.eclipse.linuxtools.rpm.core.tests;singleton:=true
Bundle-Version: 1.0.0.qualifier
Bundle-Vendor: %Bundle-Vendor.0
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
Fragment-Host: org.eclipse.linuxtools.rpm.core;bundle-version="0.4.3"
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.core.resources,
diff --git a/rpm/org.eclipse.linuxtools.rpm.core.tests/pom.xml b/rpm/org.eclipse.linuxtools.rpm.core.tests/pom.xml
index d97e52918a3a644fb7ecd023c407cfdf0b9bd5b4..e8c0b4f39ea3c8b37c38515af99ac648c8d329df 100644
--- a/rpm/org.eclipse.linuxtools.rpm.core.tests/pom.xml
+++ b/rpm/org.eclipse.linuxtools.rpm.core.tests/pom.xml
@@ -15,7 +15,7 @@
<parent>
<artifactId>linuxtools-rpm-parent</artifactId>
<groupId>org.eclipse.linuxtools.rpm</groupId>
- <version>7.4.0</version>
+ <version>8.1.0</version>
</parent>
<artifactId>org.eclipse.linuxtools.rpm.core.tests</artifactId>
diff --git a/rpm/org.eclipse.linuxtools.rpm.core/.classpath b/rpm/org.eclipse.linuxtools.rpm.core/.classpath
index 43b986286a9e5fd1828793fa4b2353d02ab8625f..1db08c6b4ce2fb50395b2f9c9a50c140a0bab199 100644
--- a/rpm/org.eclipse.linuxtools.rpm.core/.classpath
+++ b/rpm/org.eclipse.linuxtools.rpm.core/.classpath
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="target/classes"/>
diff --git a/rpm/org.eclipse.linuxtools.rpm.core/.settings/org.eclipse.jdt.core.prefs b/rpm/org.eclipse.linuxtools.rpm.core/.settings/org.eclipse.jdt.core.prefs
index 6149eb984b7006900c6895e27ae5b48e03a64dfa..7c23b2da016aa727300dc385714bef40224cd50b 100644
--- a/rpm/org.eclipse.linuxtools.rpm.core/.settings/org.eclipse.jdt.core.prefs
+++ b/rpm/org.eclipse.linuxtools.rpm.core/.settings/org.eclipse.jdt.core.prefs
@@ -9,9 +9,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nul
org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.compliance=11
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -26,6 +26,7 @@ org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=enabled
org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=warning
org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
@@ -81,6 +82,7 @@ org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=warn
org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
@@ -113,4 +115,5 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11
diff --git a/rpm/org.eclipse.linuxtools.rpm.core/META-INF/MANIFEST.MF b/rpm/org.eclipse.linuxtools.rpm.core/META-INF/MANIFEST.MF
index 0b16f0e83da12f5b8efe3677617e0321be606063..4467d5a9f5b1bbcb7e3c3293bddad4bc4da7cd20 100644
--- a/rpm/org.eclipse.linuxtools.rpm.core/META-INF/MANIFEST.MF
+++ b/rpm/org.eclipse.linuxtools.rpm.core/META-INF/MANIFEST.MF
@@ -6,7 +6,7 @@ Bundle-Version: 3.1.0.qualifier
Bundle-Localization: plugin
Bundle-Vendor: %Bundle-Vendor
Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
Require-Bundle: org.eclipse.core.resources,
org.eclipse.core.runtime,
org.eclipse.ui,
diff --git a/rpm/org.eclipse.linuxtools.rpm.core/pom.xml b/rpm/org.eclipse.linuxtools.rpm.core/pom.xml
index 7f5c4e6227783d72ac96537eb19cc296313a93a4..b4570349a10a4f13af477ee6698d2751de363fd4 100644
--- a/rpm/org.eclipse.linuxtools.rpm.core/pom.xml
+++ b/rpm/org.eclipse.linuxtools.rpm.core/pom.xml
@@ -15,7 +15,7 @@
<parent>
<artifactId>linuxtools-rpm-parent</artifactId>
<groupId>org.eclipse.linuxtools.rpm</groupId>
- <version>7.4.0</version>
+ <version>8.1.0</version>
</parent>
<artifactId>org.eclipse.linuxtools.rpm.core</artifactId>
diff --git a/rpm/org.eclipse.linuxtools.rpm.createrepo.tests/.classpath b/rpm/org.eclipse.linuxtools.rpm.createrepo.tests/.classpath
index 43b986286a9e5fd1828793fa4b2353d02ab8625f..a621c21ac550d71458aac26221ac3641277a488d 100644
--- a/rpm/org.eclipse.linuxtools.rpm.createrepo.tests/.classpath
+++ b/rpm/org.eclipse.linuxtools.rpm.createrepo.tests/.classpath
@@ -1,7 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="src" path="src"/>
+ <classpathentry kind="src" path="src">
+ <attributes>
+ <attribute name="test" value="true"/>
+ </attributes>
+ </classpathentry>
<classpathentry kind="output" path="target/classes"/>
</classpath>
diff --git a/rpm/org.eclipse.linuxtools.rpm.createrepo.tests/.settings/org.eclipse.jdt.core.prefs b/rpm/org.eclipse.linuxtools.rpm.createrepo.tests/.settings/org.eclipse.jdt.core.prefs
index 53b13434f54f2cb36d013d268adfa196f39407ff..2df0a321f2847047db40ca12ef66b51f71f3f3c4 100644
--- a/rpm/org.eclipse.linuxtools.rpm.createrepo.tests/.settings/org.eclipse.jdt.core.prefs
+++ b/rpm/org.eclipse.linuxtools.rpm.createrepo.tests/.settings/org.eclipse.jdt.core.prefs
@@ -9,9 +9,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nul
org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.compliance=11
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -25,6 +25,7 @@ org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=warning
org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
@@ -68,6 +69,7 @@ org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=warn
org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=warning
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
@@ -100,4 +102,5 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11
diff --git a/rpm/org.eclipse.linuxtools.rpm.createrepo.tests/META-INF/MANIFEST.MF b/rpm/org.eclipse.linuxtools.rpm.createrepo.tests/META-INF/MANIFEST.MF
index 358e28ba47b293abf890fc702e75904b41bdb96f..18f524b4e9cf4ec79d80304d46f477dce9b8fe82 100644
--- a/rpm/org.eclipse.linuxtools.rpm.createrepo.tests/META-INF/MANIFEST.MF
+++ b/rpm/org.eclipse.linuxtools.rpm.createrepo.tests/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.linuxtools.rpm.createrepo.tests
Bundle-Version: 1.0.0.qualifier
Fragment-Host: org.eclipse.linuxtools.rpm.createrepo;bundle-version="1.0.0"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
Bundle-Vendor: %Bundle-Vendor
Require-Bundle: org.junit;bundle-version="4.8.1",
org.eclipse.swtbot.eclipse.finder,
diff --git a/rpm/org.eclipse.linuxtools.rpm.createrepo.tests/pom.xml b/rpm/org.eclipse.linuxtools.rpm.createrepo.tests/pom.xml
index 1c5e176164e7627414d08740a07687ebb3bec4b9..8b27c6815b7149ed1a31f46e7d94d52c1da577db 100644
--- a/rpm/org.eclipse.linuxtools.rpm.createrepo.tests/pom.xml
+++ b/rpm/org.eclipse.linuxtools.rpm.createrepo.tests/pom.xml
@@ -15,7 +15,7 @@
<parent>
<artifactId>linuxtools-rpm-parent</artifactId>
<groupId>org.eclipse.linuxtools.rpm</groupId>
- <version>7.4.0</version>
+ <version>8.1.0</version>
</parent>
<artifactId>org.eclipse.linuxtools.rpm.createrepo.tests</artifactId>
diff --git a/rpm/org.eclipse.linuxtools.rpm.createrepo.tests/src/org/eclipse/linuxtools/internal/rpm/createrepo/form/tests/ICreaterepoTestConstants.java b/rpm/org.eclipse.linuxtools.rpm.createrepo.tests/src/org/eclipse/linuxtools/internal/rpm/createrepo/form/tests/ICreaterepoTestConstants.java
index deb95d6b877ce075d63d0b9b60a36f837b3f41b2..ec92a67e9ab7b8d039754754fafa3cdfd992fd23 100644
--- a/rpm/org.eclipse.linuxtools.rpm.createrepo.tests/src/org/eclipse/linuxtools/internal/rpm/createrepo/form/tests/ICreaterepoTestConstants.java
+++ b/rpm/org.eclipse.linuxtools.rpm.createrepo.tests/src/org/eclipse/linuxtools/internal/rpm/createrepo/form/tests/ICreaterepoTestConstants.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2013, 2018 Red Hat Inc. and others.
+ * Copyright (c) 2013, 2020 Red Hat Inc. and others.
*
* This program and the accompanying materials are made
* available under the terms of the Eclipse Public License 2.0
@@ -40,6 +40,7 @@ public interface ICreaterepoTestConstants {
String DEFAULTS = "Restore Defaults"; //$NON-NLS-1$
String PROPERTIES = "Properties"; //$NON-NLS-1$
String PROPERTIES_SHELL = "Properties for %s"; //$NON-NLS-1$
+ String SELECT_A_WIZARD = "Select a wizard"; //$NON-NLS-1$
/*
* Navigator controls
diff --git a/rpm/org.eclipse.linuxtools.rpm.createrepo.tests/src/org/eclipse/linuxtools/internal/rpm/createrepo/wizard/tests/CreaterepoWizardTest.java b/rpm/org.eclipse.linuxtools.rpm.createrepo.tests/src/org/eclipse/linuxtools/internal/rpm/createrepo/wizard/tests/CreaterepoWizardTest.java
index dbda4a3c39f51dff885926d2f657c39616de8b23..50839f0611090127a8af6e3d325e9b0842b045ca 100644
--- a/rpm/org.eclipse.linuxtools.rpm.createrepo.tests/src/org/eclipse/linuxtools/internal/rpm/createrepo/wizard/tests/CreaterepoWizardTest.java
+++ b/rpm/org.eclipse.linuxtools.rpm.createrepo.tests/src/org/eclipse/linuxtools/internal/rpm/createrepo/wizard/tests/CreaterepoWizardTest.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2013, 2018 Red Hat Inc. and others.
+ * Copyright (c) 2013, 2020 Red Hat Inc. and others.
*
* This program and the accompanying materials are made
* available under the terms of the Eclipse Public License 2.0
@@ -102,7 +102,7 @@ public class CreaterepoWizardTest {
public void testCreaterepoWizardProjectCreation() throws CoreException, IOException {
// go through the process of creating a new createrepo project
bot.menu(ICreaterepoTestConstants.FILE).menu(ICreaterepoTestConstants.NEW).menu(ICreaterepoTestConstants.OTHER).click();
- SWTBotShell shell = bot.shell(ICreaterepoTestConstants.NEW);
+ SWTBotShell shell = bot.shell(ICreaterepoTestConstants.SELECT_A_WIZARD);
shell.activate();
bot.text().setText(ICreaterepoTestConstants.CREATEREPO_PROJECT_WIZARD);
bot.waitUntil(new TestUtils.NodeAvailableAndSelect(bot.tree(), ICreaterepoTestConstants.CREATEREPO_PROJECT_CATEGORY, ICreaterepoTestConstants.CREATEREPO_PROJECT_WIZARD));
diff --git a/rpm/org.eclipse.linuxtools.rpm.createrepo/.classpath b/rpm/org.eclipse.linuxtools.rpm.createrepo/.classpath
index 43b986286a9e5fd1828793fa4b2353d02ab8625f..1db08c6b4ce2fb50395b2f9c9a50c140a0bab199 100644
--- a/rpm/org.eclipse.linuxtools.rpm.createrepo/.classpath
+++ b/rpm/org.eclipse.linuxtools.rpm.createrepo/.classpath
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="target/classes"/>
diff --git a/rpm/org.eclipse.linuxtools.rpm.createrepo/.settings/org.eclipse.jdt.core.prefs b/rpm/org.eclipse.linuxtools.rpm.createrepo/.settings/org.eclipse.jdt.core.prefs
index 9c6a776ab49f9ba6d5ad4401f6a740e05ee4bacf..e12c70b37582b829cb2228cdfea3d372a2e4e903 100644
--- a/rpm/org.eclipse.linuxtools.rpm.createrepo/.settings/org.eclipse.jdt.core.prefs
+++ b/rpm/org.eclipse.linuxtools.rpm.createrepo/.settings/org.eclipse.jdt.core.prefs
@@ -10,9 +10,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.compliance=11
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -27,6 +27,7 @@ org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=warning
org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
@@ -83,6 +84,7 @@ org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=warn
org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=warning
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
@@ -115,4 +117,5 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11
diff --git a/rpm/org.eclipse.linuxtools.rpm.createrepo/META-INF/MANIFEST.MF b/rpm/org.eclipse.linuxtools.rpm.createrepo/META-INF/MANIFEST.MF
index 4cea8186ac4abbc9c4ea99f59f2c36fd9fcc8f27..04d2d43e0393fc20fbfede13d5eed4c1826359fb 100644
--- a/rpm/org.eclipse.linuxtools.rpm.createrepo/META-INF/MANIFEST.MF
+++ b/rpm/org.eclipse.linuxtools.rpm.createrepo/META-INF/MANIFEST.MF
@@ -15,6 +15,6 @@ Require-Bundle: org.eclipse.ui,
org.eclipse.core.resources,
org.eclipse.linuxtools.rpm.core,
org.eclipse.linuxtools.rpm.ui.editor
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
Bundle-ActivationPolicy: lazy
Automatic-Module-Name: org.eclipse.linuxtools.rpm.createrepo
diff --git a/rpm/org.eclipse.linuxtools.rpm.createrepo/pom.xml b/rpm/org.eclipse.linuxtools.rpm.createrepo/pom.xml
index b25cfac232506585ea9bf59c3e4b0b5186e5ccfd..c973b7e019883d927a61f9c8b64962e0110b8084 100644
--- a/rpm/org.eclipse.linuxtools.rpm.createrepo/pom.xml
+++ b/rpm/org.eclipse.linuxtools.rpm.createrepo/pom.xml
@@ -15,7 +15,7 @@
<parent>
<artifactId>linuxtools-rpm-parent</artifactId>
<groupId>org.eclipse.linuxtools.rpm</groupId>
- <version>7.4.0</version>
+ <version>8.1.0</version>
</parent>
<artifactId>org.eclipse.linuxtools.rpm.createrepo</artifactId>
diff --git a/rpm/org.eclipse.linuxtools.rpm.createrepo/src/org/eclipse/linuxtools/internal/rpm/createrepo/Activator.java b/rpm/org.eclipse.linuxtools.rpm.createrepo/src/org/eclipse/linuxtools/internal/rpm/createrepo/Activator.java
index 6ba40f21518f6de5d142e306d5730b188d283e26..25f9e42a071994f999ad6e9368b0e6a7d716e719 100644
--- a/rpm/org.eclipse.linuxtools.rpm.createrepo/src/org/eclipse/linuxtools/internal/rpm/createrepo/Activator.java
+++ b/rpm/org.eclipse.linuxtools.rpm.createrepo/src/org/eclipse/linuxtools/internal/rpm/createrepo/Activator.java
@@ -15,6 +15,7 @@ package org.eclipse.linuxtools.internal.rpm.createrepo;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.jface.resource.ResourceLocator;
import org.eclipse.ui.plugin.AbstractUIPlugin;
import org.osgi.framework.BundleContext;
@@ -58,7 +59,7 @@ public class Activator extends AbstractUIPlugin {
* @return the image descriptor
*/
public static ImageDescriptor getImageDescriptor(String path) {
- return imageDescriptorFromPlugin(PLUGIN_ID, path);
+ return ResourceLocator.imageDescriptorFromBundle(PLUGIN_ID, path).get();
}
/**
diff --git a/rpm/org.eclipse.linuxtools.rpm.rpmlint/.classpath b/rpm/org.eclipse.linuxtools.rpm.rpmlint/.classpath
index 43b986286a9e5fd1828793fa4b2353d02ab8625f..1db08c6b4ce2fb50395b2f9c9a50c140a0bab199 100644
--- a/rpm/org.eclipse.linuxtools.rpm.rpmlint/.classpath
+++ b/rpm/org.eclipse.linuxtools.rpm.rpmlint/.classpath
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="target/classes"/>
diff --git a/rpm/org.eclipse.linuxtools.rpm.rpmlint/.settings/org.eclipse.jdt.core.prefs b/rpm/org.eclipse.linuxtools.rpm.rpmlint/.settings/org.eclipse.jdt.core.prefs
index f74677f59564d1f7b0c81339dfddb87ea4187319..c8da9bfd73dcd05ae964c0ab0b2cd1aa68ae6e4e 100644
--- a/rpm/org.eclipse.linuxtools.rpm.rpmlint/.settings/org.eclipse.jdt.core.prefs
+++ b/rpm/org.eclipse.linuxtools.rpm.rpmlint/.settings/org.eclipse.jdt.core.prefs
@@ -10,9 +10,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.compliance=11
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -27,6 +27,7 @@ org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=warning
org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
@@ -85,6 +86,7 @@ org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=warn
org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=warning
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
@@ -120,4 +122,5 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11
diff --git a/rpm/org.eclipse.linuxtools.rpm.rpmlint/META-INF/MANIFEST.MF b/rpm/org.eclipse.linuxtools.rpm.rpmlint/META-INF/MANIFEST.MF
index b57e810307e87fe45255f8d98e7aa2c09a318b26..64209db90f4647d19f63a91b8795a4cb6efd6d73 100644
--- a/rpm/org.eclipse.linuxtools.rpm.rpmlint/META-INF/MANIFEST.MF
+++ b/rpm/org.eclipse.linuxtools.rpm.rpmlint/META-INF/MANIFEST.MF
@@ -14,6 +14,6 @@ Require-Bundle: org.eclipse.core.runtime,
org.eclipse.ui.console;bundle-version="3.3.0",
org.eclipse.linuxtools.rpm.core
Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
Bundle-Vendor: %provider
Automatic-Module-Name: org.eclipse.linuxtools.rpm.rpmlint
diff --git a/rpm/org.eclipse.linuxtools.rpm.rpmlint/pom.xml b/rpm/org.eclipse.linuxtools.rpm.rpmlint/pom.xml
index 501f054e7790073688f00f4afc548a668eee5a1c..4dbfec6a617b5ff8004662042dd9a7c8893ae457 100644
--- a/rpm/org.eclipse.linuxtools.rpm.rpmlint/pom.xml
+++ b/rpm/org.eclipse.linuxtools.rpm.rpmlint/pom.xml
@@ -15,7 +15,7 @@
<parent>
<artifactId>linuxtools-rpm-parent</artifactId>
<groupId>org.eclipse.linuxtools.rpm</groupId>
- <version>7.4.0</version>
+ <version>8.1.0</version>
</parent>
<artifactId>org.eclipse.linuxtools.rpm.rpmlint</artifactId>
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor.doc/pom.xml b/rpm/org.eclipse.linuxtools.rpm.ui.editor.doc/pom.xml
index 463fd22b314981f12263de244227c79b5b87c3e8..aa82a46bf0be2e8cec9970074a6bba9c3ebf6214 100644
--- a/rpm/org.eclipse.linuxtools.rpm.ui.editor.doc/pom.xml
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor.doc/pom.xml
@@ -15,7 +15,7 @@
<parent>
<artifactId>linuxtools-rpm-parent</artifactId>
<groupId>org.eclipse.linuxtools.rpm</groupId>
- <version>7.4.0</version>
+ <version>8.1.0</version>
</parent>
<artifactId>org.eclipse.linuxtools.rpm.ui.editor.doc</artifactId>
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor.tests/.classpath b/rpm/org.eclipse.linuxtools.rpm.ui.editor.tests/.classpath
index 43b986286a9e5fd1828793fa4b2353d02ab8625f..a621c21ac550d71458aac26221ac3641277a488d 100644
--- a/rpm/org.eclipse.linuxtools.rpm.ui.editor.tests/.classpath
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor.tests/.classpath
@@ -1,7 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="src" path="src"/>
+ <classpathentry kind="src" path="src">
+ <attributes>
+ <attribute name="test" value="true"/>
+ </attributes>
+ </classpathentry>
<classpathentry kind="output" path="target/classes"/>
</classpath>
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor.tests/.settings/org.eclipse.jdt.core.prefs b/rpm/org.eclipse.linuxtools.rpm.ui.editor.tests/.settings/org.eclipse.jdt.core.prefs
index 093d05df8013e78ad518a68fe0065b09d9aaa805..dabca7cd10952f2813b858f9d2b1d9866ef48087 100644
--- a/rpm/org.eclipse.linuxtools.rpm.ui.editor.tests/.settings/org.eclipse.jdt.core.prefs
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor.tests/.settings/org.eclipse.jdt.core.prefs
@@ -9,9 +9,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nul
org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.compliance=11
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -25,6 +25,7 @@ org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=warning
org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
@@ -68,6 +69,7 @@ org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=warn
org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
@@ -100,4 +102,5 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor.tests/META-INF/MANIFEST.MF b/rpm/org.eclipse.linuxtools.rpm.ui.editor.tests/META-INF/MANIFEST.MF
index e783f993851bbaf1e8234a51bf706723c689e365..faadb7cee1ddd17a6049babb2f5772449c46cbd5 100644
--- a/rpm/org.eclipse.linuxtools.rpm.ui.editor.tests/META-INF/MANIFEST.MF
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor.tests/META-INF/MANIFEST.MF
@@ -9,6 +9,6 @@ Require-Bundle:
org.junit;bundle-version="4.8.1",
org.eclipse.core.resources
Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
Bundle-Vendor: %provider
Automatic-Module-Name: org.eclipse.linuxtools.rpm.ui.editor.tests
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor.tests/pom.xml b/rpm/org.eclipse.linuxtools.rpm.ui.editor.tests/pom.xml
index 85611b80590c8a4d22f7ec7d0d285decd3821c2b..e42cfa8a945c265b0c7e4aae0efdf36a09f2633d 100644
--- a/rpm/org.eclipse.linuxtools.rpm.ui.editor.tests/pom.xml
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor.tests/pom.xml
@@ -15,7 +15,7 @@
<parent>
<artifactId>linuxtools-rpm-parent</artifactId>
<groupId>org.eclipse.linuxtools.rpm</groupId>
- <version>7.4.0</version>
+ <version>8.1.0</version>
</parent>
<artifactId>org.eclipse.linuxtools.rpm.ui.editor.tests</artifactId>
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor/.classpath b/rpm/org.eclipse.linuxtools.rpm.ui.editor/.classpath
index 43b986286a9e5fd1828793fa4b2353d02ab8625f..1db08c6b4ce2fb50395b2f9c9a50c140a0bab199 100644
--- a/rpm/org.eclipse.linuxtools.rpm.ui.editor/.classpath
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor/.classpath
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="target/classes"/>
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor/.settings/org.eclipse.jdt.core.prefs b/rpm/org.eclipse.linuxtools.rpm.ui.editor/.settings/org.eclipse.jdt.core.prefs
index 2dbb62c3fed5e22b5aa4036045ed590baef673e1..a33a5175ef873c1f9243e95e11b9b9f994a2c182 100644
--- a/rpm/org.eclipse.linuxtools.rpm.ui.editor/.settings/org.eclipse.jdt.core.prefs
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor/.settings/org.eclipse.jdt.core.prefs
@@ -10,9 +10,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.compliance=11
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -27,6 +27,7 @@ org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=warning
org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
@@ -83,6 +84,7 @@ org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=warn
org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
@@ -115,4 +117,5 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor/META-INF/MANIFEST.MF b/rpm/org.eclipse.linuxtools.rpm.ui.editor/META-INF/MANIFEST.MF
index 397f5fdeb6efc1f7a1c5b01d06ec3011237ec285..3f32c405f27aa42494a290f1ddb2d52c8cb543bf 100644
--- a/rpm/org.eclipse.linuxtools.rpm.ui.editor/META-INF/MANIFEST.MF
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor/META-INF/MANIFEST.MF
@@ -15,7 +15,6 @@ Require-Bundle: org.eclipse.ui,
org.eclipse.ui.ide,
org.eclipse.ui.console,
org.eclipse.linuxtools.changelog.core,
- com.ibm.icu,
org.eclipse.compare;bundle-version="3.4.0",
org.eclipse.linuxtools.rpm.core,
org.eclipse.ui.console,
@@ -24,6 +23,6 @@ Bundle-ActivationPolicy: lazy
Export-Package: org.eclipse.linuxtools.rpm.ui.editor.markers,
org.eclipse.linuxtools.rpm.ui.editor.parser,
org.eclipse.linuxtools.rpm.ui.editor.wizards
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
Bundle-Vendor: %provider
Automatic-Module-Name: org.eclipse.linuxtools.rpm.ui.editor
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor/pom.xml b/rpm/org.eclipse.linuxtools.rpm.ui.editor/pom.xml
index 0223ed36470dfdb26364de8d4139b612eef92423..84c7607fbe3ba582fab1bd5aa6e81f0a94fa87d6 100644
--- a/rpm/org.eclipse.linuxtools.rpm.ui.editor/pom.xml
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor/pom.xml
@@ -15,7 +15,7 @@
<parent>
<artifactId>linuxtools-rpm-parent</artifactId>
<groupId>org.eclipse.linuxtools.rpm</groupId>
- <version>7.4.0</version>
+ <version>8.1.0</version>
</parent>
<artifactId>org.eclipse.linuxtools.rpm.ui.editor</artifactId>
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/internal/rpm/ui/editor/Activator.java b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/internal/rpm/ui/editor/Activator.java
index d4b5cd253b36abef0d56fa028a9ba379102e08d8..86df03d1ea67f7c8ada4197c26dd4d1bf2900d24 100644
--- a/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/internal/rpm/ui/editor/Activator.java
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/internal/rpm/ui/editor/Activator.java
@@ -24,6 +24,7 @@ import java.util.List;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.resource.ImageRegistry;
+import org.eclipse.jface.resource.ResourceLocator;
import org.eclipse.jface.text.templates.ContextTypeRegistry;
import org.eclipse.jface.text.templates.persistence.TemplateStore;
import org.eclipse.swt.graphics.Image;
@@ -170,7 +171,7 @@ public class Activator extends AbstractUIPlugin {
ImageRegistry registry = getImageRegistry();
Image image = registry.get(imageRelativePath);
if (image == null) {
- ImageDescriptor desc = AbstractUIPlugin.imageDescriptorFromPlugin(PLUGIN_ID, imageRelativePath);
+ ImageDescriptor desc = ResourceLocator.imageDescriptorFromBundle(PLUGIN_ID, imageRelativePath).get();
registry.put(imageRelativePath, desc);
image = registry.get(imageRelativePath);
}
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/internal/rpm/ui/editor/hyperlink/SpecfileElementHyperlinkDetector.java b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/internal/rpm/ui/editor/hyperlink/SpecfileElementHyperlinkDetector.java
index 11d5e48391841df264c77bbbc71ec739ab9aacea..1b2cd8f3ddd8e16f8680f352b668d4baa0404832 100644
--- a/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/internal/rpm/ui/editor/hyperlink/SpecfileElementHyperlinkDetector.java
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/internal/rpm/ui/editor/hyperlink/SpecfileElementHyperlinkDetector.java
@@ -13,6 +13,7 @@
package org.eclipse.linuxtools.internal.rpm.ui.editor.hyperlink;
+import java.util.StringTokenizer;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -38,8 +39,6 @@ import org.eclipse.ui.IWorkbenchWindow;
import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.part.FileEditorInput;
-import com.ibm.icu.util.StringTokenizer;
-
/**
* Hyperlink detector for source, patch and defines in the spec file.
*
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui/.classpath b/rpm/org.eclipse.linuxtools.rpm.ui/.classpath
index 43b986286a9e5fd1828793fa4b2353d02ab8625f..1db08c6b4ce2fb50395b2f9c9a50c140a0bab199 100644
--- a/rpm/org.eclipse.linuxtools.rpm.ui/.classpath
+++ b/rpm/org.eclipse.linuxtools.rpm.ui/.classpath
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="target/classes"/>
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui/.settings/org.eclipse.jdt.core.prefs b/rpm/org.eclipse.linuxtools.rpm.ui/.settings/org.eclipse.jdt.core.prefs
index 50680df2d68cfefd9d0bbde3035c23f0c1cb89df..899f0b9fd72735e1731af069cc39a212e69e6841 100644
--- a/rpm/org.eclipse.linuxtools.rpm.ui/.settings/org.eclipse.jdt.core.prefs
+++ b/rpm/org.eclipse.linuxtools.rpm.ui/.settings/org.eclipse.jdt.core.prefs
@@ -10,9 +10,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.compliance=11
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -27,6 +27,7 @@ org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=enabled
org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=warning
org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
@@ -82,6 +83,7 @@ org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=warn
org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
@@ -114,4 +116,5 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui/META-INF/MANIFEST.MF b/rpm/org.eclipse.linuxtools.rpm.ui/META-INF/MANIFEST.MF
index e117ae109d0ecbc2d7420fb13cc16a798ff8d04e..64cc7716c997cbfe6bffb7d8c68a10c00f6a8727 100644
--- a/rpm/org.eclipse.linuxtools.rpm.ui/META-INF/MANIFEST.MF
+++ b/rpm/org.eclipse.linuxtools.rpm.ui/META-INF/MANIFEST.MF
@@ -5,7 +5,7 @@ Bundle-SymbolicName: org.eclipse.linuxtools.rpm.ui;singleton:=true
Bundle-Version: 1.1.0.qualifier
Bundle-Vendor: %Bundle-Vendor.0
Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
Require-Bundle: org.eclipse.ui.ide,
org.eclipse.jface.text,
org.eclipse.core.runtime,
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui/pom.xml b/rpm/org.eclipse.linuxtools.rpm.ui/pom.xml
index 27aa0cd4fdb24fb5eb43da5103ab9a74a2156460..b79cb070533e28c4bbcd6a69cb858bb193cc0440 100644
--- a/rpm/org.eclipse.linuxtools.rpm.ui/pom.xml
+++ b/rpm/org.eclipse.linuxtools.rpm.ui/pom.xml
@@ -15,7 +15,7 @@
<parent>
<artifactId>linuxtools-rpm-parent</artifactId>
<groupId>org.eclipse.linuxtools.rpm</groupId>
- <version>7.4.0</version>
+ <version>8.1.0</version>
</parent>
<artifactId>org.eclipse.linuxtools.rpm.ui</artifactId>
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui/src/org/eclipse/linuxtools/internal/rpm/ui/NewProjectCreationPage.java b/rpm/org.eclipse.linuxtools.rpm.ui/src/org/eclipse/linuxtools/internal/rpm/ui/NewProjectCreationPage.java
index cb4f5f7020898362df1a2b815bf7312b489f677f..a4980f4446f7d867c42e071232b8697d2c0976de 100644
--- a/rpm/org.eclipse.linuxtools.rpm.ui/src/org/eclipse/linuxtools/internal/rpm/ui/NewProjectCreationPage.java
+++ b/rpm/org.eclipse.linuxtools.rpm.ui/src/org/eclipse/linuxtools/internal/rpm/ui/NewProjectCreationPage.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2011, 2018 Red Hat, Inc.
+ * Copyright (c) 2011, 2020 Red Hat, Inc.
*
* This program and the accompanying materials are made
* available under the terms of the Eclipse Public License 2.0
@@ -29,8 +29,10 @@ import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Group;
import org.eclipse.swt.widgets.Label;
import org.eclipse.ui.IWorkingSet;
+import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.dialogs.WizardNewProjectCreationPage;
import org.eclipse.ui.dialogs.WorkingSetConfigurationBlock;
+import org.osgi.framework.FrameworkUtil;
/**
* Standard page for project creation adding some rpm specific controls.
@@ -177,7 +179,8 @@ public class NewProjectCreationPage extends WizardNewProjectCreationPage {
public WorkingSetGroup() {
String[] workingSetIds = new String[] { "org.eclipse.ui.resourceWorkingSetPage" }; //$NON-NLS-1$
workingSetBlock = new WorkingSetConfigurationBlock(workingSetIds,
- Activator.getDefault().getDialogSettings());
+ PlatformUI.getDialogSettingsProvider(FrameworkUtil.getBundle(NewProjectCreationPage.class))
+ .getDialogSettings());
}
public Control createControl(Composite composite) {
diff --git a/rpm/org.eclipse.linuxtools.rpmstubby/.classpath b/rpm/org.eclipse.linuxtools.rpmstubby/.classpath
index 43b986286a9e5fd1828793fa4b2353d02ab8625f..1db08c6b4ce2fb50395b2f9c9a50c140a0bab199 100644
--- a/rpm/org.eclipse.linuxtools.rpmstubby/.classpath
+++ b/rpm/org.eclipse.linuxtools.rpmstubby/.classpath
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="target/classes"/>
diff --git a/rpm/org.eclipse.linuxtools.rpmstubby/.settings/org.eclipse.jdt.core.prefs b/rpm/org.eclipse.linuxtools.rpmstubby/.settings/org.eclipse.jdt.core.prefs
index d4b4965c3735ae25340edb4b253a04fe5b070018..f7a361ab938b46203e4a2f467b3aff3e318484fd 100644
--- a/rpm/org.eclipse.linuxtools.rpmstubby/.settings/org.eclipse.jdt.core.prefs
+++ b/rpm/org.eclipse.linuxtools.rpmstubby/.settings/org.eclipse.jdt.core.prefs
@@ -10,9 +10,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nul
org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.compliance=11
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -27,6 +27,7 @@ org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=enabled
org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=warning
org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
@@ -82,6 +83,7 @@ org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=warn
org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=warning
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
@@ -114,4 +116,5 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11
diff --git a/rpm/org.eclipse.linuxtools.rpmstubby/META-INF/MANIFEST.MF b/rpm/org.eclipse.linuxtools.rpmstubby/META-INF/MANIFEST.MF
index d6475d08432e6cdb6e48e313629438a41c4c4d43..9f313eb2f4bcb7c5c23ffce9ddd33e141ceae17b 100644
--- a/rpm/org.eclipse.linuxtools.rpmstubby/META-INF/MANIFEST.MF
+++ b/rpm/org.eclipse.linuxtools.rpmstubby/META-INF/MANIFEST.MF
@@ -9,7 +9,7 @@ Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
org.eclipse.core.resources,
org.eclipse.ui.ide
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
Bundle-ActivationPolicy: lazy
Export-Package: org.eclipse.linuxtools.rpmstubby
Automatic-Module-Name: org.eclipse.linuxtools.rpmstubby
diff --git a/rpm/org.eclipse.linuxtools.rpmstubby/pom.xml b/rpm/org.eclipse.linuxtools.rpmstubby/pom.xml
index 3d6f07da2c2bbbd173476e3b3c4a6fd3a63c3553..9e81d9905557955984db224bf6a446cdd2e91aa7 100644
--- a/rpm/org.eclipse.linuxtools.rpmstubby/pom.xml
+++ b/rpm/org.eclipse.linuxtools.rpmstubby/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.eclipse.linuxtools.rpm</groupId>
<artifactId>linuxtools-rpm-parent</artifactId>
- <version>7.4.0</version>
+ <version>8.1.0</version>
</parent>
<artifactId>org.eclipse.linuxtools.rpmstubby</artifactId>
diff --git a/rpm/org.eclipse.linuxtools.rpmstubby/src/org/eclipse/linuxtools/internal/rpmstubby/parser/PythonEggParser.java b/rpm/org.eclipse.linuxtools.rpmstubby/src/org/eclipse/linuxtools/internal/rpmstubby/parser/PythonEggParser.java
index 04ab3c647f64f76b822f18ca4b0549af2b382d7f..1122a88d450f18fa9b0acc5b757144372d747cb6 100644
--- a/rpm/org.eclipse.linuxtools.rpmstubby/src/org/eclipse/linuxtools/internal/rpmstubby/parser/PythonEggParser.java
+++ b/rpm/org.eclipse.linuxtools.rpmstubby/src/org/eclipse/linuxtools/internal/rpmstubby/parser/PythonEggParser.java
@@ -64,9 +64,7 @@ public class PythonEggParser {
String setupLine = "";
List<String> vars = new ArrayList<>();
int offset = 0;
- try {
- RandomAccessFile raf = new RandomAccessFile(file.getRawLocation().makeAbsolute().toFile(), "r");
-
+ try (RandomAccessFile raf = new RandomAccessFile(file.getRawLocation().makeAbsolute().toFile(), "r")){
// end if cannot find setup(
long bytesToSkip = findStartSetup(raf);
if (bytesToSkip == -1) {
@@ -116,8 +114,6 @@ public class PythonEggParser {
}
resolveVariables(variables, setupOptions);
-
- raf.close();
} catch (IOException e) {
StubbyLog.logError(e);
}
diff --git a/rpm/pom.xml b/rpm/pom.xml
index e058fba264873d84af53071c02d47d8b8463616e..4183b1e4b07ab3539667fb9fb17f865efdd1f52d 100644
--- a/rpm/pom.xml
+++ b/rpm/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.eclipse.linuxtools</groupId>
<artifactId>linuxtools-parent</artifactId>
- <version>7.4.0</version>
+ <version>8.1.0</version>
</parent>
<groupId>org.eclipse.linuxtools.rpm</groupId>
diff --git a/systemtap/org.eclipse.linuxtools.callgraph-feature/feature.xml b/systemtap/org.eclipse.linuxtools.callgraph-feature/feature.xml
index 4c8494b9fef8533df66ea2b5df5e71d0e57b0b6f..8754b11da9f361bd43a86199e9b84b487d0478fd 100644
--- a/systemtap/org.eclipse.linuxtools.callgraph-feature/feature.xml
+++ b/systemtap/org.eclipse.linuxtools.callgraph-feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.linuxtools.callgraph.feature"
label="%featureName"
- version="7.4.0.qualifier"
+ version="8.1.0.qualifier"
provider-name="%featureProvider"
os="linux"
license-feature="org.eclipse.license"
diff --git a/systemtap/org.eclipse.linuxtools.callgraph-feature/pom.xml b/systemtap/org.eclipse.linuxtools.callgraph-feature/pom.xml
index 8b22595651d4083b66288c3f56019315691518d4..4cd02805b53974ac84fff790adcd368b7e0bdf11 100644
--- a/systemtap/org.eclipse.linuxtools.callgraph-feature/pom.xml
+++ b/systemtap/org.eclipse.linuxtools.callgraph-feature/pom.xml
@@ -14,12 +14,12 @@
<parent>
<artifactId>linuxtools-systemtap-parent</artifactId>
<groupId>org.eclipse.linuxtools.systemtap</groupId>
- <version>7.4.0</version>
+ <version>8.1.0</version>
</parent>
<artifactId>org.eclipse.linuxtools.callgraph.feature</artifactId>
<packaging>eclipse-feature</packaging>
- <version>7.4.0-SNAPSHOT</version>
+ <version>8.1.0-SNAPSHOT</version>
<name>Linux Tools C/C++ Call Graph Visualization Feature</name>
diff --git a/systemtap/org.eclipse.linuxtools.callgraph.core/.classpath b/systemtap/org.eclipse.linuxtools.callgraph.core/.classpath
index 43b986286a9e5fd1828793fa4b2353d02ab8625f..1db08c6b4ce2fb50395b2f9c9a50c140a0bab199 100644
--- a/systemtap/org.eclipse.linuxtools.callgraph.core/.classpath
+++ b/systemtap/org.eclipse.linuxtools.callgraph.core/.classpath
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="target/classes"/>
diff --git a/systemtap/org.eclipse.linuxtools.callgraph.core/.settings/org.eclipse.jdt.core.prefs b/systemtap/org.eclipse.linuxtools.callgraph.core/.settings/org.eclipse.jdt.core.prefs
index 7c6374b7b685c14dd58e5624d7ed91d204d68ba7..1938bdc3008148ed9cd94fc3ae9cf82ef7d5a0a7 100644
--- a/systemtap/org.eclipse.linuxtools.callgraph.core/.settings/org.eclipse.jdt.core.prefs
+++ b/systemtap/org.eclipse.linuxtools.callgraph.core/.settings/org.eclipse.jdt.core.prefs
@@ -6,9 +6,9 @@ org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annota
org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.compliance=11
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -22,6 +22,7 @@ org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=warning
org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
@@ -65,6 +66,7 @@ org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=warn
org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
@@ -96,4 +98,5 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11
diff --git a/containers/org.eclipse.linuxtools.docker.editor/.settings/org.eclipse.jdt.ui.prefs b/systemtap/org.eclipse.linuxtools.callgraph.core/.settings/org.eclipse.jdt.ui.prefs
similarity index 85%
rename from containers/org.eclipse.linuxtools.docker.editor/.settings/org.eclipse.jdt.ui.prefs
rename to systemtap/org.eclipse.linuxtools.callgraph.core/.settings/org.eclipse.jdt.ui.prefs
index 1cbfac22d4aaa331cf5a547e27da3cdb7fb7363e..79881a2512180bb5e541aeb4e67561b9e8913f9d 100644
--- a/containers/org.eclipse.linuxtools.docker.editor/.settings/org.eclipse.jdt.ui.prefs
+++ b/systemtap/org.eclipse.linuxtools.callgraph.core/.settings/org.eclipse.jdt.ui.prefs
@@ -13,11 +13,11 @@ sp_cleanup.always_use_blocks=true
sp_cleanup.always_use_parentheses_in_expressions=false
sp_cleanup.always_use_this_for_non_static_field_access=false
sp_cleanup.always_use_this_for_non_static_method_access=false
-sp_cleanup.convert_functional_interfaces=false
-sp_cleanup.convert_to_enhanced_for_loop=false
+sp_cleanup.convert_functional_interfaces=true
+sp_cleanup.convert_to_enhanced_for_loop=true
sp_cleanup.correct_indentation=false
sp_cleanup.format_source_code=true
-sp_cleanup.format_source_code_changes_only=false
+sp_cleanup.format_source_code_changes_only=true
sp_cleanup.insert_inferred_type_arguments=false
sp_cleanup.make_local_variable_final=true
sp_cleanup.make_parameters_final=false
@@ -28,16 +28,20 @@ sp_cleanup.never_use_blocks=false
sp_cleanup.never_use_parentheses_in_expressions=true
sp_cleanup.on_save_use_additional_actions=true
sp_cleanup.organize_imports=true
+sp_cleanup.push_down_negation=false
sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
sp_cleanup.qualify_static_member_accesses_with_declaring_class=false
sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
sp_cleanup.remove_private_constructors=true
-sp_cleanup.remove_redundant_type_arguments=false
-sp_cleanup.remove_trailing_whitespaces=false
+sp_cleanup.remove_redundant_modifiers=true
+sp_cleanup.remove_redundant_semicolons=true
+sp_cleanup.remove_redundant_type_arguments=true
+sp_cleanup.remove_trailing_whitespaces=true
sp_cleanup.remove_trailing_whitespaces_all=true
sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
+sp_cleanup.remove_unnecessary_array_creation=true
sp_cleanup.remove_unnecessary_casts=true
sp_cleanup.remove_unnecessary_nls_tags=false
sp_cleanup.remove_unused_imports=false
@@ -49,6 +53,7 @@ sp_cleanup.remove_unused_private_types=true
sp_cleanup.sort_members=false
sp_cleanup.sort_members_all=false
sp_cleanup.use_anonymous_class_creation=false
+sp_cleanup.use_autoboxing=false
sp_cleanup.use_blocks=false
sp_cleanup.use_blocks_only_for_return_and_throw=false
sp_cleanup.use_lambda=true
@@ -57,3 +62,4 @@ sp_cleanup.use_this_for_non_static_field_access=false
sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
sp_cleanup.use_this_for_non_static_method_access=false
sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+sp_cleanup.use_unboxing=false
diff --git a/systemtap/org.eclipse.linuxtools.callgraph.core/META-INF/MANIFEST.MF b/systemtap/org.eclipse.linuxtools.callgraph.core/META-INF/MANIFEST.MF
index 926a7c87096db5c12200b226168cfdbc3373f4de..7ef3612c5362b51f81a616944af95c64f504bfb0 100644
--- a/systemtap/org.eclipse.linuxtools.callgraph.core/META-INF/MANIFEST.MF
+++ b/systemtap/org.eclipse.linuxtools.callgraph.core/META-INF/MANIFEST.MF
@@ -7,7 +7,7 @@ Bundle-Activator: org.eclipse.linuxtools.internal.callgraph.core.CallgraphCorePl
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime
Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
Export-Package: org.eclipse.linuxtools.internal.callgraph.core
Import-Package: org.eclipse.cdt.core.model,
org.eclipse.core.resources,
diff --git a/systemtap/org.eclipse.linuxtools.callgraph.core/pom.xml b/systemtap/org.eclipse.linuxtools.callgraph.core/pom.xml
index f2d7fc8f5da4c094156a0879b1d5bdc5dc526557..0135adad1dea3e57d5b01bdbd752e0acb8ead564 100644
--- a/systemtap/org.eclipse.linuxtools.callgraph.core/pom.xml
+++ b/systemtap/org.eclipse.linuxtools.callgraph.core/pom.xml
@@ -15,7 +15,7 @@
<parent>
<artifactId>linuxtools-systemtap-parent</artifactId>
<groupId>org.eclipse.linuxtools.systemtap</groupId>
- <version>7.4.0</version>
+ <version>8.1.0</version>
</parent>
<artifactId>org.eclipse.linuxtools.callgraph.core</artifactId>
diff --git a/systemtap/org.eclipse.linuxtools.callgraph.core/src/org/eclipse/linuxtools/internal/callgraph/core/SystemTapView.java b/systemtap/org.eclipse.linuxtools.callgraph.core/src/org/eclipse/linuxtools/internal/callgraph/core/SystemTapView.java
index 3e2315faff0270f3f2c9ed30d76de88c793f48ac..e3570a5b70900a315e58c40c7df0c0f55ddef437 100644
--- a/systemtap/org.eclipse.linuxtools.callgraph.core/src/org/eclipse/linuxtools/internal/callgraph/core/SystemTapView.java
+++ b/systemtap/org.eclipse.linuxtools.callgraph.core/src/org/eclipse/linuxtools/internal/callgraph/core/SystemTapView.java
@@ -1,6 +1,6 @@
/*******************************************************************************
- * Copyright (c) 2009, 2018 Red Hat, Inc. and others.
- *
+ * Copyright (c) 2009, 2019 Red Hat, Inc. and others.
+ *
* This program and the accompanying materials are made
* available under the terms of the Eclipse Public License 2.0
* which is available at https://www.eclipse.org/legal/epl-2.0/
@@ -34,6 +34,7 @@ import org.eclipse.jface.action.IMenuManager;
import org.eclipse.jface.action.IToolBarManager;
import org.eclipse.jface.action.MenuManager;
import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.jface.resource.ResourceLocator;
import org.eclipse.linuxtools.tools.launch.core.factory.RuntimeProcessFactory;
import org.eclipse.swt.SWT;
import org.eclipse.swt.widgets.Composite;
@@ -43,7 +44,6 @@ import org.eclipse.swt.widgets.Shell;
import org.eclipse.ui.IWorkbenchPage;
import org.eclipse.ui.handlers.IHandlerService;
import org.eclipse.ui.part.ViewPart;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
import org.eclipse.ui.progress.UIJob;
public abstract class SystemTapView extends ViewPart {
@@ -268,13 +268,14 @@ public abstract class SystemTapView extends ViewPart {
protected void addKillButton() {
IToolBarManager mgr = getViewSite().getActionBars().getToolBarManager();
- kill = new Action(Messages.getString("SystemTapView.StopScript"), //$NON-NLS-1$
- AbstractUIPlugin.imageDescriptorFromPlugin(CallgraphCorePlugin.PLUGIN_ID, "icons/progress_stop.gif")) { //$NON-NLS-1$
- @Override
- public void run() {
- getParser().cancelJob();
- }
- };
+ kill = new Action(Messages.getString("SystemTapView.StopScript"), //$NON-NLS-1$
+ ResourceLocator.imageDescriptorFromBundle(CallgraphCorePlugin.PLUGIN_ID, "icons/progress_stop.gif") //$NON-NLS-1$
+ .get()) {
+ @Override
+ public void run() {
+ getParser().cancelJob();
+ }
+ };
mgr.add(kill);
setKillButtonEnabled(false);
}
diff --git a/systemtap/org.eclipse.linuxtools.callgraph.docs/pom.xml b/systemtap/org.eclipse.linuxtools.callgraph.docs/pom.xml
index 4beb271e7e27e332f7ca3e8807ca4691fecabf9f..ce264ca1b0527ab15db65f4609c86e817738dbe3 100644
--- a/systemtap/org.eclipse.linuxtools.callgraph.docs/pom.xml
+++ b/systemtap/org.eclipse.linuxtools.callgraph.docs/pom.xml
@@ -14,7 +14,7 @@
<parent>
<artifactId>linuxtools-systemtap-parent</artifactId>
<groupId>org.eclipse.linuxtools.systemtap</groupId>
- <version>7.4.0</version>
+ <version>8.1.0</version>
</parent>
<artifactId>org.eclipse.linuxtools.callgraph.docs</artifactId>
diff --git a/systemtap/org.eclipse.linuxtools.callgraph.launch.tests/.classpath b/systemtap/org.eclipse.linuxtools.callgraph.launch.tests/.classpath
index 43b986286a9e5fd1828793fa4b2353d02ab8625f..a621c21ac550d71458aac26221ac3641277a488d 100644
--- a/systemtap/org.eclipse.linuxtools.callgraph.launch.tests/.classpath
+++ b/systemtap/org.eclipse.linuxtools.callgraph.launch.tests/.classpath
@@ -1,7 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="src" path="src"/>
+ <classpathentry kind="src" path="src">
+ <attributes>
+ <attribute name="test" value="true"/>
+ </attributes>
+ </classpathentry>
<classpathentry kind="output" path="target/classes"/>
</classpath>
diff --git a/systemtap/org.eclipse.linuxtools.callgraph.launch.tests/.settings/org.eclipse.jdt.core.prefs b/systemtap/org.eclipse.linuxtools.callgraph.launch.tests/.settings/org.eclipse.jdt.core.prefs
index c2c83d84bd1636731b5f1267945a81c4e0cacb9c..efb8f9cf1d4debc9e3c391f997e35209338a6d4f 100644
--- a/systemtap/org.eclipse.linuxtools.callgraph.launch.tests/.settings/org.eclipse.jdt.core.prefs
+++ b/systemtap/org.eclipse.linuxtools.callgraph.launch.tests/.settings/org.eclipse.jdt.core.prefs
@@ -6,9 +6,9 @@ org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annota
org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.compliance=11
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -22,6 +22,7 @@ org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=warning
org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
@@ -65,6 +66,7 @@ org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=warn
org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
@@ -96,4 +98,5 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11
diff --git a/systemtap/org.eclipse.linuxtools.callgraph.launch.tests/META-INF/MANIFEST.MF b/systemtap/org.eclipse.linuxtools.callgraph.launch.tests/META-INF/MANIFEST.MF
index 2b9654de3982bc842214de29e4823bbd96972134..30486e20b9a65905d7451ee5c5764a59dc0f3016 100644
--- a/systemtap/org.eclipse.linuxtools.callgraph.launch.tests/META-INF/MANIFEST.MF
+++ b/systemtap/org.eclipse.linuxtools.callgraph.launch.tests/META-INF/MANIFEST.MF
@@ -5,7 +5,7 @@ Bundle-SymbolicName: org.eclipse.linuxtools.callgraph.launch.tests
Bundle-Version: 1.0.0.qualifier
Require-Bundle: org.junit;bundle-version="4.7.0"
Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
Fragment-Host: org.eclipse.linuxtools.callgraph.launch
Import-Package: org.eclipse.linuxtools.profiling.tests,
org.eclipse.linuxtools.tools.launch.core.factory
diff --git a/systemtap/org.eclipse.linuxtools.callgraph.launch.tests/pom.xml b/systemtap/org.eclipse.linuxtools.callgraph.launch.tests/pom.xml
index aa4db02c6eee349916a9c77827e45bef4aaac542..d6f728dce1076ca523fe20dcee1f908b0952c4a1 100644
--- a/systemtap/org.eclipse.linuxtools.callgraph.launch.tests/pom.xml
+++ b/systemtap/org.eclipse.linuxtools.callgraph.launch.tests/pom.xml
@@ -14,7 +14,7 @@
<parent>
<artifactId>linuxtools-systemtap-parent</artifactId>
<groupId>org.eclipse.linuxtools.systemtap</groupId>
- <version>7.4.0</version>
+ <version>8.1.0</version>
</parent>
<artifactId>org.eclipse.linuxtools.callgraph.launch.tests</artifactId>
diff --git a/systemtap/org.eclipse.linuxtools.callgraph.launch/.classpath b/systemtap/org.eclipse.linuxtools.callgraph.launch/.classpath
index 43b986286a9e5fd1828793fa4b2353d02ab8625f..1db08c6b4ce2fb50395b2f9c9a50c140a0bab199 100644
--- a/systemtap/org.eclipse.linuxtools.callgraph.launch/.classpath
+++ b/systemtap/org.eclipse.linuxtools.callgraph.launch/.classpath
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="target/classes"/>
diff --git a/systemtap/org.eclipse.linuxtools.callgraph.launch/.settings/org.eclipse.jdt.core.prefs b/systemtap/org.eclipse.linuxtools.callgraph.launch/.settings/org.eclipse.jdt.core.prefs
index 181a73534391109585e7776d30d82d260887979a..59425b1305e8efb80347d76738fb0cd053e38bb7 100644
--- a/systemtap/org.eclipse.linuxtools.callgraph.launch/.settings/org.eclipse.jdt.core.prefs
+++ b/systemtap/org.eclipse.linuxtools.callgraph.launch/.settings/org.eclipse.jdt.core.prefs
@@ -6,8 +6,8 @@ org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annota
org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
+org.eclipse.jdt.core.compiler.compliance=11
org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
@@ -18,6 +18,7 @@ org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=warning
org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
@@ -61,6 +62,7 @@ org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=warn
org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
@@ -92,4 +94,5 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11
diff --git a/systemtap/org.eclipse.linuxtools.callgraph.launch/META-INF/MANIFEST.MF b/systemtap/org.eclipse.linuxtools.callgraph.launch/META-INF/MANIFEST.MF
index 34c0a3680ea83798bf1f3fd118bb17a080e6c514..a80f641dc9422c0616dedb85f71cd9bb9225c2c3 100644
--- a/systemtap/org.eclipse.linuxtools.callgraph.launch/META-INF/MANIFEST.MF
+++ b/systemtap/org.eclipse.linuxtools.callgraph.launch/META-INF/MANIFEST.MF
@@ -11,7 +11,7 @@ Require-Bundle: org.eclipse.ui,
org.eclipse.cdt.ui,
org.eclipse.linuxtools.tools.launch.core
Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
Import-Package: org.eclipse.cdt.core.model,
org.eclipse.cdt.debug.core,
org.eclipse.cdt.launch,
diff --git a/systemtap/org.eclipse.linuxtools.callgraph.launch/pom.xml b/systemtap/org.eclipse.linuxtools.callgraph.launch/pom.xml
index b20a4154d8a9a3c8dbb2a654c8ff8f563ffa198c..feebaa56c33c190771d28b0f1f613b4ae020138d 100644
--- a/systemtap/org.eclipse.linuxtools.callgraph.launch/pom.xml
+++ b/systemtap/org.eclipse.linuxtools.callgraph.launch/pom.xml
@@ -15,7 +15,7 @@
<parent>
<artifactId>linuxtools-systemtap-parent</artifactId>
<groupId>org.eclipse.linuxtools.systemtap</groupId>
- <version>7.4.0</version>
+ <version>8.1.0</version>
</parent>
<artifactId>org.eclipse.linuxtools.callgraph.launch</artifactId>
diff --git a/systemtap/org.eclipse.linuxtools.callgraph.tests/.classpath b/systemtap/org.eclipse.linuxtools.callgraph.tests/.classpath
index 43b986286a9e5fd1828793fa4b2353d02ab8625f..a621c21ac550d71458aac26221ac3641277a488d 100644
--- a/systemtap/org.eclipse.linuxtools.callgraph.tests/.classpath
+++ b/systemtap/org.eclipse.linuxtools.callgraph.tests/.classpath
@@ -1,7 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="src" path="src"/>
+ <classpathentry kind="src" path="src">
+ <attributes>
+ <attribute name="test" value="true"/>
+ </attributes>
+ </classpathentry>
<classpathentry kind="output" path="target/classes"/>
</classpath>
diff --git a/systemtap/org.eclipse.linuxtools.callgraph.tests/.settings/org.eclipse.jdt.core.prefs b/systemtap/org.eclipse.linuxtools.callgraph.tests/.settings/org.eclipse.jdt.core.prefs
index c2c83d84bd1636731b5f1267945a81c4e0cacb9c..efb8f9cf1d4debc9e3c391f997e35209338a6d4f 100644
--- a/systemtap/org.eclipse.linuxtools.callgraph.tests/.settings/org.eclipse.jdt.core.prefs
+++ b/systemtap/org.eclipse.linuxtools.callgraph.tests/.settings/org.eclipse.jdt.core.prefs
@@ -6,9 +6,9 @@ org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annota
org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.compliance=11
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -22,6 +22,7 @@ org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=warning
org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
@@ -65,6 +66,7 @@ org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=warn
org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
@@ -96,4 +98,5 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11
diff --git a/systemtap/org.eclipse.linuxtools.callgraph.tests/META-INF/MANIFEST.MF b/systemtap/org.eclipse.linuxtools.callgraph.tests/META-INF/MANIFEST.MF
index f53f78da3041f722472097240690ab3594ea1d37..d6129cf9c1fb854203074db1a4b62f0beb1f8a2b 100644
--- a/systemtap/org.eclipse.linuxtools.callgraph.tests/META-INF/MANIFEST.MF
+++ b/systemtap/org.eclipse.linuxtools.callgraph.tests/META-INF/MANIFEST.MF
@@ -11,7 +11,7 @@ Require-Bundle: org.eclipse.ui,
org.eclipse.zest.core;bundle-version="1.2.0",
org.eclipse.zest.layouts;bundle-version="1.1.0"
Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
Import-Package: org.eclipse.cdt.core.model,
org.eclipse.linuxtools.internal.callgraph.core
Bundle-Vendor: %Bundle-Vendor
diff --git a/systemtap/org.eclipse.linuxtools.callgraph.tests/pom.xml b/systemtap/org.eclipse.linuxtools.callgraph.tests/pom.xml
index aad61e9b52a9663d22735736be368539be7d1ba8..ed1dd40c79d20af1c357461153a490d75178373b 100644
--- a/systemtap/org.eclipse.linuxtools.callgraph.tests/pom.xml
+++ b/systemtap/org.eclipse.linuxtools.callgraph.tests/pom.xml
@@ -14,7 +14,7 @@
<parent>
<artifactId>linuxtools-systemtap-parent</artifactId>
<groupId>org.eclipse.linuxtools.systemtap</groupId>
- <version>7.4.0</version>
+ <version>8.1.0</version>
</parent>
<artifactId>org.eclipse.linuxtools.callgraph.tests</artifactId>
diff --git a/systemtap/org.eclipse.linuxtools.callgraph/.classpath b/systemtap/org.eclipse.linuxtools.callgraph/.classpath
index 43b986286a9e5fd1828793fa4b2353d02ab8625f..1db08c6b4ce2fb50395b2f9c9a50c140a0bab199 100644
--- a/systemtap/org.eclipse.linuxtools.callgraph/.classpath
+++ b/systemtap/org.eclipse.linuxtools.callgraph/.classpath
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="target/classes"/>
diff --git a/systemtap/org.eclipse.linuxtools.callgraph/.settings/org.eclipse.jdt.core.prefs b/systemtap/org.eclipse.linuxtools.callgraph/.settings/org.eclipse.jdt.core.prefs
index 7844a0e4bd587ae2d96c2f2addbcbd648ade1898..eac5dff1be0f871dccb18dece0b1ce03498195d9 100644
--- a/systemtap/org.eclipse.linuxtools.callgraph/.settings/org.eclipse.jdt.core.prefs
+++ b/systemtap/org.eclipse.linuxtools.callgraph/.settings/org.eclipse.jdt.core.prefs
@@ -7,9 +7,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nul
org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.compliance=11
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -23,6 +23,7 @@ org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=warning
org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
@@ -66,6 +67,7 @@ org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=warn
org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=warning
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
@@ -97,4 +99,5 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11
diff --git a/systemtap/org.eclipse.linuxtools.callgraph/META-INF/MANIFEST.MF b/systemtap/org.eclipse.linuxtools.callgraph/META-INF/MANIFEST.MF
index 49f35ab614f805657260dece6b318fb59eef7095..e447b7ae6c91e5a9ccc8e59da1ac8cbe1f83d981 100644
--- a/systemtap/org.eclipse.linuxtools.callgraph/META-INF/MANIFEST.MF
+++ b/systemtap/org.eclipse.linuxtools.callgraph/META-INF/MANIFEST.MF
@@ -8,7 +8,7 @@ Require-Bundle: org.eclipse.ui,
org.eclipse.zest.layouts;bundle-version="1.1.0",
org.eclipse.zest.core;bundle-version="1.2.0"
Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
Export-Package: org.eclipse.linuxtools.internal.callgraph,
org.eclipse.linuxtools.internal.callgraph.graphlisteners
Import-Package: org.eclipse.cdt.core.model,
diff --git a/systemtap/org.eclipse.linuxtools.callgraph/pom.xml b/systemtap/org.eclipse.linuxtools.callgraph/pom.xml
index 6abcf9ee044d014253c6c49070260e0f72dac689..bbd9b5e6ca6fc10afd50a6ef5dfa393de5613959 100644
--- a/systemtap/org.eclipse.linuxtools.callgraph/pom.xml
+++ b/systemtap/org.eclipse.linuxtools.callgraph/pom.xml
@@ -15,7 +15,7 @@
<parent>
<artifactId>linuxtools-systemtap-parent</artifactId>
<groupId>org.eclipse.linuxtools.systemtap</groupId>
- <version>7.4.0</version>
+ <version>8.1.0</version>
</parent>
<artifactId>org.eclipse.linuxtools.callgraph</artifactId>
diff --git a/systemtap/org.eclipse.linuxtools.callgraph/src/org/eclipse/linuxtools/internal/callgraph/CallgraphView.java b/systemtap/org.eclipse.linuxtools.callgraph/src/org/eclipse/linuxtools/internal/callgraph/CallgraphView.java
index 2a4fac7e491be14da336d94ebcaaae0ca6c7e8a0..d588c103fe5d59ad02a62a902f27c5a68e0453df 100644
--- a/systemtap/org.eclipse.linuxtools.callgraph/src/org/eclipse/linuxtools/internal/callgraph/CallgraphView.java
+++ b/systemtap/org.eclipse.linuxtools.callgraph/src/org/eclipse/linuxtools/internal/callgraph/CallgraphView.java
@@ -33,6 +33,7 @@ import org.eclipse.jface.action.IMenuManager;
import org.eclipse.jface.action.IToolBarManager;
import org.eclipse.jface.action.MenuManager;
import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.jface.resource.ResourceLocator;
import org.eclipse.linuxtools.internal.callgraph.core.PluginConstants;
import org.eclipse.linuxtools.internal.callgraph.core.SystemTapParser;
import org.eclipse.linuxtools.internal.callgraph.core.SystemTapUIErrorMessages;
@@ -52,7 +53,6 @@ import org.eclipse.swt.widgets.FileDialog;
import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.swt.widgets.Spinner;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
/**
* The SystemTap View for displaying output of the 'stap' command, and acts
@@ -1026,7 +1026,7 @@ public class CallgraphView extends SystemTapView {
}
private static ImageDescriptor getImageDescriptor(String path) {
- return AbstractUIPlugin.imageDescriptorFromPlugin(CallGraphConstants.PLUGIN_ID, path);
+ return ResourceLocator.imageDescriptorFromBundle(CallGraphConstants.PLUGIN_ID, path).get();
}
diff --git a/systemtap/org.eclipse.linuxtools.callgraph/src/org/eclipse/linuxtools/internal/callgraph/treeviewer/StapTreeLabelProvider.java b/systemtap/org.eclipse.linuxtools.callgraph/src/org/eclipse/linuxtools/internal/callgraph/treeviewer/StapTreeLabelProvider.java
index f8db2c6fc00a296208cf12085693956a91d96173..1ecb5e461146dcdd7e35eae69d3b0a9acbaad689 100644
--- a/systemtap/org.eclipse.linuxtools.callgraph/src/org/eclipse/linuxtools/internal/callgraph/treeviewer/StapTreeLabelProvider.java
+++ b/systemtap/org.eclipse.linuxtools.callgraph/src/org/eclipse/linuxtools/internal/callgraph/treeviewer/StapTreeLabelProvider.java
@@ -12,22 +12,24 @@
*******************************************************************************/
package org.eclipse.linuxtools.internal.callgraph.treeviewer;
+import org.eclipse.jface.resource.ResourceLocator;
import org.eclipse.jface.viewers.LabelProvider;
import org.eclipse.linuxtools.internal.callgraph.CallGraphConstants;
import org.eclipse.linuxtools.internal.callgraph.StapData;
import org.eclipse.swt.graphics.Image;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
public class StapTreeLabelProvider extends LabelProvider {
@Override
public Image getImage(Object element) {
Image im = null;
- if ( ((StapData) element).isMarked()) {
- im = AbstractUIPlugin.imageDescriptorFromPlugin(CallGraphConstants.PLUGIN_ID, "/icons/public_co.gif").createImage(); //$NON-NLS-1$
- } else {
- im = AbstractUIPlugin.imageDescriptorFromPlugin(CallGraphConstants.PLUGIN_ID, "/icons/compare_method.gif").createImage(); //$NON-NLS-1$
- }
+ if (((StapData) element).isMarked()) {
+ im = ResourceLocator.imageDescriptorFromBundle(CallGraphConstants.PLUGIN_ID, "/icons/public_co.gif").get() //$NON-NLS-1$
+ .createImage();
+ } else {
+ im = ResourceLocator.imageDescriptorFromBundle(CallGraphConstants.PLUGIN_ID, "/icons/compare_method.gif") //$NON-NLS-1$
+ .get().createImage();
+ }
return im;
}
diff --git a/systemtap/org.eclipse.linuxtools.systemtap-feature/feature.xml b/systemtap/org.eclipse.linuxtools.systemtap-feature/feature.xml
index 32d8004a18c3f9fa39049e52d3c12cb70cae3637..e6443f4ccae5042ef7dd043d7dd444d1ce26c40e 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap-feature/feature.xml
+++ b/systemtap/org.eclipse.linuxtools.systemtap-feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.linuxtools.systemtap"
label="%description"
- version="7.4.0.qualifier"
+ version="8.1.0.qualifier"
provider-name="%featureProvider"
os="linux"
license-feature="org.eclipse.license"
diff --git a/systemtap/org.eclipse.linuxtools.systemtap-feature/pom.xml b/systemtap/org.eclipse.linuxtools.systemtap-feature/pom.xml
index ff787391b3c39dd003e42477c278df849e4e4f56..0962e9c3a2dc77270ecb44da72352ecf2a1c0e32 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap-feature/pom.xml
+++ b/systemtap/org.eclipse.linuxtools.systemtap-feature/pom.xml
@@ -14,12 +14,12 @@
<parent>
<artifactId>linuxtools-systemtap-parent</artifactId>
<groupId>org.eclipse.linuxtools.systemtap</groupId>
- <version>7.4.0</version>
+ <version>8.1.0</version>
</parent>
<artifactId>org.eclipse.linuxtools.systemtap</artifactId>
<packaging>eclipse-feature</packaging>
- <version>7.4.0-SNAPSHOT</version>
+ <version>8.1.0-SNAPSHOT</version>
<name>Linux Tools SystemTap IDE and Visualization Tools Feature</name>
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.graphing.core.tests/.classpath b/systemtap/org.eclipse.linuxtools.systemtap.graphing.core.tests/.classpath
index 0f2de47284470f7780b6f497695ceab85589c6ac..174b7049317b9ec71174f3ef6070ef0fbe2a9c86 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap.graphing.core.tests/.classpath
+++ b/systemtap/org.eclipse.linuxtools.systemtap.graphing.core.tests/.classpath
@@ -1,7 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
<classpathentry exported="true" kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="src" path="src"/>
+ <classpathentry kind="src" path="src">
+ <attributes>
+ <attribute name="test" value="true"/>
+ </attributes>
+ </classpathentry>
<classpathentry kind="output" path="target/classes"/>
</classpath>
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.graphing.core.tests/.settings/org.eclipse.jdt.core.prefs b/systemtap/org.eclipse.linuxtools.systemtap.graphing.core.tests/.settings/org.eclipse.jdt.core.prefs
index c2c83d84bd1636731b5f1267945a81c4e0cacb9c..efb8f9cf1d4debc9e3c391f997e35209338a6d4f 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap.graphing.core.tests/.settings/org.eclipse.jdt.core.prefs
+++ b/systemtap/org.eclipse.linuxtools.systemtap.graphing.core.tests/.settings/org.eclipse.jdt.core.prefs
@@ -6,9 +6,9 @@ org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annota
org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.compliance=11
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -22,6 +22,7 @@ org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=warning
org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
@@ -65,6 +66,7 @@ org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=warn
org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
@@ -96,4 +98,5 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.graphing.core.tests/META-INF/MANIFEST.MF b/systemtap/org.eclipse.linuxtools.systemtap.graphing.core.tests/META-INF/MANIFEST.MF
index a5fd189b86e296fe13fece0952a9f7b4632472a7..782dc69ede2964b0919905559325966df564d4b9 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap.graphing.core.tests/META-INF/MANIFEST.MF
+++ b/systemtap/org.eclipse.linuxtools.systemtap.graphing.core.tests/META-INF/MANIFEST.MF
@@ -7,6 +7,6 @@ Bundle-Vendor: %bundleProvider
Bundle-Localization: plugin
Bundle-ActivationPolicy: lazy
Require-Bundle: org.junit;bundle-version="4.0.0"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
Fragment-Host: org.eclipse.linuxtools.systemtap.graphing.core
Automatic-Module-Name: org.eclipse.linuxtools.systemtap.graphing.core.tests
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.graphing.core.tests/pom.xml b/systemtap/org.eclipse.linuxtools.systemtap.graphing.core.tests/pom.xml
index f1928e0539c172f8aefd0a94e5260f39760729e8..86e43dd3a1ff97dfdc69ea023d1568b4d28aa291 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap.graphing.core.tests/pom.xml
+++ b/systemtap/org.eclipse.linuxtools.systemtap.graphing.core.tests/pom.xml
@@ -15,7 +15,7 @@
<parent>
<artifactId>linuxtools-systemtap-parent</artifactId>
<groupId>org.eclipse.linuxtools.systemtap</groupId>
- <version>7.4.0</version>
+ <version>8.1.0</version>
</parent>
<artifactId>org.eclipse.linuxtools.systemtap.graphing.core.tests</artifactId>
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.graphing.core/.classpath b/systemtap/org.eclipse.linuxtools.systemtap.graphing.core/.classpath
index 43b986286a9e5fd1828793fa4b2353d02ab8625f..1db08c6b4ce2fb50395b2f9c9a50c140a0bab199 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap.graphing.core/.classpath
+++ b/systemtap/org.eclipse.linuxtools.systemtap.graphing.core/.classpath
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="target/classes"/>
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.graphing.core/.settings/org.eclipse.jdt.core.prefs b/systemtap/org.eclipse.linuxtools.systemtap.graphing.core/.settings/org.eclipse.jdt.core.prefs
index 859c5720b326c027a9d7e1df7034d70ea83c9cda..8579a4826e96c45287d35f00f022619d0fd7516f 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap.graphing.core/.settings/org.eclipse.jdt.core.prefs
+++ b/systemtap/org.eclipse.linuxtools.systemtap.graphing.core/.settings/org.eclipse.jdt.core.prefs
@@ -6,8 +6,8 @@ org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annota
org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
+org.eclipse.jdt.core.compiler.compliance=11
org.eclipse.jdt.core.compiler.doc.comment.support=enabled
org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
@@ -19,6 +19,7 @@ org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=warning
org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
@@ -75,6 +76,7 @@ org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=warn
org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
@@ -106,4 +108,5 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.graphing.core/META-INF/MANIFEST.MF b/systemtap/org.eclipse.linuxtools.systemtap.graphing.core/META-INF/MANIFEST.MF
index 8eef5f4f92bc7c601817bacbd535de2d04f66288..92d4afe8946a7fe8453c300a5d61a844305974c1 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap.graphing.core/META-INF/MANIFEST.MF
+++ b/systemtap/org.eclipse.linuxtools.systemtap.graphing.core/META-INF/MANIFEST.MF
@@ -16,5 +16,5 @@ Export-Package: org.eclipse.linuxtools.systemtap.graphing.core,
Require-Bundle: org.eclipse.linuxtools.systemtap.structures,
org.eclipse.swt
Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
Automatic-Module-Name: org.eclipse.linuxtools.systemtap.graphing.core
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.graphing.core/pom.xml b/systemtap/org.eclipse.linuxtools.systemtap.graphing.core/pom.xml
index 6afd68002631582896d2205ed98afed4f5c0ebcb..5cafc58000815bab0a3b0db88fd419ba6c699af0 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap.graphing.core/pom.xml
+++ b/systemtap/org.eclipse.linuxtools.systemtap.graphing.core/pom.xml
@@ -15,7 +15,7 @@
<parent>
<artifactId>linuxtools-systemtap-parent</artifactId>
<groupId>org.eclipse.linuxtools.systemtap</groupId>
- <version>7.4.0</version>
+ <version>8.1.0</version>
</parent>
<artifactId>org.eclipse.linuxtools.systemtap.graphing.core</artifactId>
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.graphing.ui/.classpath b/systemtap/org.eclipse.linuxtools.systemtap.graphing.ui/.classpath
index 43b986286a9e5fd1828793fa4b2353d02ab8625f..1db08c6b4ce2fb50395b2f9c9a50c140a0bab199 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap.graphing.ui/.classpath
+++ b/systemtap/org.eclipse.linuxtools.systemtap.graphing.ui/.classpath
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="target/classes"/>
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.graphing.ui/.settings/org.eclipse.jdt.core.prefs b/systemtap/org.eclipse.linuxtools.systemtap.graphing.ui/.settings/org.eclipse.jdt.core.prefs
index 84614a54a304dddf9a9a992a68721d805bbfc40f..f0e85de7bf109e872ca6ba237d242b76c44b67e7 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap.graphing.ui/.settings/org.eclipse.jdt.core.prefs
+++ b/systemtap/org.eclipse.linuxtools.systemtap.graphing.ui/.settings/org.eclipse.jdt.core.prefs
@@ -6,9 +6,9 @@ org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annota
org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.compliance=11
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -23,6 +23,7 @@ org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=warning
org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
@@ -79,6 +80,7 @@ org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=warn
org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
@@ -110,4 +112,5 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.ui/.settings/org.eclipse.jdt.ui.prefs b/systemtap/org.eclipse.linuxtools.systemtap.graphing.ui/.settings/org.eclipse.jdt.ui.prefs
similarity index 81%
rename from oprofile/org.eclipse.linuxtools.oprofile.ui/.settings/org.eclipse.jdt.ui.prefs
rename to systemtap/org.eclipse.linuxtools.systemtap.graphing.ui/.settings/org.eclipse.jdt.ui.prefs
index 5fce079820fa874e99879dc32871d86d09d3de63..690dcacd30cc11dee03802b183eab9def580a34c 100644
--- a/oprofile/org.eclipse.linuxtools.oprofile.ui/.settings/org.eclipse.jdt.ui.prefs
+++ b/systemtap/org.eclipse.linuxtools.systemtap.graphing.ui/.settings/org.eclipse.jdt.ui.prefs
@@ -13,10 +13,12 @@ sp_cleanup.always_use_blocks=true
sp_cleanup.always_use_parentheses_in_expressions=false
sp_cleanup.always_use_this_for_non_static_field_access=false
sp_cleanup.always_use_this_for_non_static_method_access=false
-sp_cleanup.convert_to_enhanced_for_loop=false
+sp_cleanup.convert_functional_interfaces=true
+sp_cleanup.convert_to_enhanced_for_loop=true
sp_cleanup.correct_indentation=false
-sp_cleanup.format_source_code=false
-sp_cleanup.format_source_code_changes_only=false
+sp_cleanup.format_source_code=true
+sp_cleanup.format_source_code_changes_only=true
+sp_cleanup.insert_inferred_type_arguments=false
sp_cleanup.make_local_variable_final=true
sp_cleanup.make_parameters_final=false
sp_cleanup.make_private_fields_final=true
@@ -26,15 +28,20 @@ sp_cleanup.never_use_blocks=false
sp_cleanup.never_use_parentheses_in_expressions=true
sp_cleanup.on_save_use_additional_actions=true
sp_cleanup.organize_imports=true
+sp_cleanup.push_down_negation=false
sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
sp_cleanup.qualify_static_member_accesses_with_declaring_class=false
sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
sp_cleanup.remove_private_constructors=true
+sp_cleanup.remove_redundant_modifiers=true
+sp_cleanup.remove_redundant_semicolons=true
+sp_cleanup.remove_redundant_type_arguments=true
sp_cleanup.remove_trailing_whitespaces=true
sp_cleanup.remove_trailing_whitespaces_all=true
sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
+sp_cleanup.remove_unnecessary_array_creation=true
sp_cleanup.remove_unnecessary_casts=true
sp_cleanup.remove_unnecessary_nls_tags=false
sp_cleanup.remove_unused_imports=true
@@ -45,10 +52,14 @@ sp_cleanup.remove_unused_private_methods=true
sp_cleanup.remove_unused_private_types=true
sp_cleanup.sort_members=false
sp_cleanup.sort_members_all=false
+sp_cleanup.use_anonymous_class_creation=false
+sp_cleanup.use_autoboxing=false
sp_cleanup.use_blocks=false
sp_cleanup.use_blocks_only_for_return_and_throw=false
+sp_cleanup.use_lambda=true
sp_cleanup.use_parentheses_in_expressions=false
sp_cleanup.use_this_for_non_static_field_access=false
sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
sp_cleanup.use_this_for_non_static_method_access=false
sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+sp_cleanup.use_unboxing=false
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.graphing.ui/META-INF/MANIFEST.MF b/systemtap/org.eclipse.linuxtools.systemtap.graphing.ui/META-INF/MANIFEST.MF
index 815fcf6f5dbcbba351cc8f142520949ca11358c4..c2b2d6d3c61047e02a3c31b50ddd31c7874ef10d 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap.graphing.ui/META-INF/MANIFEST.MF
+++ b/systemtap/org.eclipse.linuxtools.systemtap.graphing.ui/META-INF/MANIFEST.MF
@@ -18,9 +18,10 @@ Require-Bundle: org.eclipse.linuxtools.systemtap.graphing.core,
org.eclipse.ui,
org.eclipse.core.runtime,
org.eclipse.ui.forms,
- org.swtchart,
+ org.eclipse.swtchart,
org.eclipse.linuxtools.dataviewers.piechart,
org.eclipse.linuxtools.dataviewers.charts
Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
Automatic-Module-Name: org.eclipse.linuxtools.systemtap.graphing.ui
+Import-Package: org.eclipse.swtchart.extensions.charts
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.graphing.ui/plugin.xml b/systemtap/org.eclipse.linuxtools.systemtap.graphing.ui/plugin.xml
index dbffe79b6efc8b39e81ba3f679f0ac1439e8c364..4a62c221ab23b2c0b181bb87f2fe78d89f8c0ae7 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap.graphing.ui/plugin.xml
+++ b/systemtap/org.eclipse.linuxtools.systemtap.graphing.ui/plugin.xml
@@ -25,43 +25,6 @@
<initializer class="org.eclipse.linuxtools.internal.systemtap.graphing.ui.preferences.PreferenceInitializer"/>
</extension>
- <extension
- point="org.eclipse.ui.commands">
- <category
- name="%category.file.name"
- description="%category.file.desc"
- id="org.eclipse.linuxtools.systemtap.graphing.ui.category.file"/>
- <command
- name="%command.save.name"
- description="%command.save.desc"
- categoryId="org.eclipse.linuxtools.systemtap.graphing.ui.category.file"
- id="org.eclipse.linuxtools.systemtap.graphing.ui.commands.SaveGraphImage"/>
- </extension>
-
- <extension
- point="org.eclipse.ui.menus">
- <menuContribution
- locationURI="toolbar:org.eclipse.linuxtools.systemtap.ui.ide.toolbar?after=chartGroup">
- <command
- commandId="org.eclipse.linuxtools.systemtap.graphing.ui.commands.SaveGraphImage"
- label="%command.save.name"
- icon="icons/actions/chart-save.png">
- <visibleWhen checkEnabled="true"/>
- </command>
- </menuContribution>
- </extension>
-
- <extension
- point="org.eclipse.ui.handlers">
- <handler
- class="org.eclipse.linuxtools.internal.systemtap.graphing.ui.handlers.SaveGraphImageHandler"
- commandId="org.eclipse.linuxtools.systemtap.graphing.ui.commands.SaveGraphImage">
- <activeWhen>
- <reference definitionId="org.eclipse.linuxtools.systemtap.graphing.ui.graphEditorEnablement"/>
- </activeWhen>
- </handler>
- </extension>
-
<extension
point="org.eclipse.ui.editors">
<editor
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.graphing.ui/pom.xml b/systemtap/org.eclipse.linuxtools.systemtap.graphing.ui/pom.xml
index 26eba857face45dffb1459d41c529f74b3c39727..3cfc30e87b86e7ea35350fbcb7592c97392dcb16 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap.graphing.ui/pom.xml
+++ b/systemtap/org.eclipse.linuxtools.systemtap.graphing.ui/pom.xml
@@ -15,7 +15,7 @@
<parent>
<artifactId>linuxtools-systemtap-parent</artifactId>
<groupId>org.eclipse.linuxtools.systemtap</groupId>
- <version>7.4.0</version>
+ <version>8.1.0</version>
</parent>
<artifactId>org.eclipse.linuxtools.systemtap.graphing.ui</artifactId>
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.graphing.ui/src/org/eclipse/linuxtools/internal/systemtap/graphing/ui/GraphingUIPlugin.java b/systemtap/org.eclipse.linuxtools.systemtap.graphing.ui/src/org/eclipse/linuxtools/internal/systemtap/graphing/ui/GraphingUIPlugin.java
index 5a694a11f8377286a166b657c92cc51947582d08..b946c7cd57d9bf3af9a2837f806e09bd4b23f6cb 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap.graphing.ui/src/org/eclipse/linuxtools/internal/systemtap/graphing/ui/GraphingUIPlugin.java
+++ b/systemtap/org.eclipse.linuxtools.systemtap.graphing.ui/src/org/eclipse/linuxtools/internal/systemtap/graphing/ui/GraphingUIPlugin.java
@@ -1,6 +1,6 @@
/*******************************************************************************
- * Copyright (c) 2006, 2018 IBM Corporation and others.
- *
+ * Copyright (c) 2006, 2019 IBM Corporation and others.
+ *
* This program and the accompanying materials are made
* available under the terms of the Eclipse Public License 2.0
* which is available at https://www.eclipse.org/legal/epl-2.0/
@@ -14,6 +14,7 @@
package org.eclipse.linuxtools.internal.systemtap.graphing.ui;
import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.jface.resource.ResourceLocator;
import org.eclipse.ui.plugin.AbstractUIPlugin;
import org.osgi.framework.BundleContext;
@@ -57,6 +58,6 @@ public class GraphingUIPlugin extends AbstractUIPlugin {
* @return the image descriptor
*/
public static ImageDescriptor getImageDescriptor(String path) {
- return AbstractUIPlugin.imageDescriptorFromPlugin(PLUGIN_ID, path);
+ return ResourceLocator.imageDescriptorFromBundle(PLUGIN_ID, path).get();
}
}
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.graphing.ui/src/org/eclipse/linuxtools/internal/systemtap/graphing/ui/charts/AbstractChartWithAxisBuilder.java b/systemtap/org.eclipse.linuxtools.systemtap.graphing.ui/src/org/eclipse/linuxtools/internal/systemtap/graphing/ui/charts/AbstractChartWithAxisBuilder.java
index 0d316cd3412da7b77c25770f0cb1632edc5c608f..d87b6a9d46e1d6943b07f2fc8db88403a7d79eb2 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap.graphing.ui/src/org/eclipse/linuxtools/internal/systemtap/graphing/ui/charts/AbstractChartWithAxisBuilder.java
+++ b/systemtap/org.eclipse.linuxtools.systemtap.graphing.ui/src/org/eclipse/linuxtools/internal/systemtap/graphing/ui/charts/AbstractChartWithAxisBuilder.java
@@ -1,6 +1,6 @@
/*******************************************************************************
* Copyright (c) 2010, 2018 IBM Corporation and others.
- *
+ *
* This program and the accompanying materials are made
* available under the terms of the Eclipse Public License 2.0
* which is available at https://www.eclipse.org/legal/epl-2.0/
@@ -25,11 +25,11 @@ import org.eclipse.swt.graphics.Point;
import org.eclipse.swt.graphics.Rectangle;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
-import org.swtchart.IAxis;
-import org.swtchart.ISeries;
-import org.swtchart.ITitle;
-import org.swtchart.LineStyle;
-import org.swtchart.Range;
+import org.eclipse.swtchart.IAxis;
+import org.eclipse.swtchart.ISeries;
+import org.eclipse.swtchart.ITitle;
+import org.eclipse.swtchart.LineStyle;
+import org.eclipse.swtchart.Range;
/**
* A {@link AbstractChartBuilder} for building a chart with axes.
@@ -119,7 +119,7 @@ public abstract class AbstractChartWithAxisBuilder extends AbstractChartBuilder
protected void createChart() {
super.createChart();
applyTitleBoundsListener();
- chartMouseMoveListener = new ChartWithAxisMouseMoveListener(chart, chart.getPlotArea());
+ chartMouseMoveListener = new ChartWithAxisMouseMoveListener(chart, chart.getPlotArea().getControl());
}
/**
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.graphing.ui/src/org/eclipse/linuxtools/internal/systemtap/graphing/ui/charts/AreaChartBuilder.java b/systemtap/org.eclipse.linuxtools.systemtap.graphing.ui/src/org/eclipse/linuxtools/internal/systemtap/graphing/ui/charts/AreaChartBuilder.java
index f2d5788c5d724746bfbd6a10c05ecd478239f540..8c9c449c020ab558138501dd4a74117c3a5c3c10 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap.graphing.ui/src/org/eclipse/linuxtools/internal/systemtap/graphing/ui/charts/AreaChartBuilder.java
+++ b/systemtap/org.eclipse.linuxtools.systemtap.graphing.ui/src/org/eclipse/linuxtools/internal/systemtap/graphing/ui/charts/AreaChartBuilder.java
@@ -1,6 +1,6 @@
/****************************************************************
* Copyright (c) 2006, 2018 IBM Corp. and others.
- *
+ *
* This program and the accompanying materials are made
* available under the terms of the Eclipse Public License 2.0
* which is available at https://www.eclipse.org/legal/epl-2.0/
@@ -16,8 +16,8 @@ package org.eclipse.linuxtools.internal.systemtap.graphing.ui.charts;
import org.eclipse.linuxtools.systemtap.graphing.core.adapters.IAdapter;
import org.eclipse.swt.widgets.Composite;
-import org.swtchart.ILineSeries;
-import org.swtchart.ISeries;
+import org.eclipse.swtchart.ILineSeries;
+import org.eclipse.swtchart.ISeries;
/**
* Builds bar chart.
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.graphing.ui/src/org/eclipse/linuxtools/internal/systemtap/graphing/ui/charts/BarChart.java b/systemtap/org.eclipse.linuxtools.systemtap.graphing.ui/src/org/eclipse/linuxtools/internal/systemtap/graphing/ui/charts/BarChart.java
index a10d9a7191a1fe9a98b7d1067b8a0c6b2e2f28c3..f4cf23db2a937ea6d9839336a73c447c11d1d350 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap.graphing.ui/src/org/eclipse/linuxtools/internal/systemtap/graphing/ui/charts/BarChart.java
+++ b/systemtap/org.eclipse.linuxtools.systemtap.graphing.ui/src/org/eclipse/linuxtools/internal/systemtap/graphing/ui/charts/BarChart.java
@@ -1,6 +1,6 @@
/*******************************************************************************
* Copyright (c) 2013, 2018 Red Hat Inc. and others.
- *
+ *
* This program and the accompanying materials are made
* available under the terms of the Eclipse Public License 2.0
* which is available at https://www.eclipse.org/legal/epl-2.0/
@@ -13,15 +13,15 @@
package org.eclipse.linuxtools.internal.systemtap.graphing.ui.charts;
import org.eclipse.swt.widgets.Composite;
-import org.swtchart.Chart;
-import org.swtchart.IAxis;
-import org.swtchart.ISeries;
-import org.swtchart.Range;
+import org.eclipse.swtchart.IAxis;
+import org.eclipse.swtchart.ISeries;
+import org.eclipse.swtchart.Range;
+import org.eclipse.swtchart.extensions.charts.InteractiveChart;
/**
* @since 3.0
*/
-public class BarChart extends Chart {
+public class BarChart extends InteractiveChart {
private final static int MIN_LABEL_SIZE = Messages.BarChartBuilder_LabelTrimTag.length();
private final int fontSize;
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.graphing.ui/src/org/eclipse/linuxtools/internal/systemtap/graphing/ui/charts/BarChartBuilder.java b/systemtap/org.eclipse.linuxtools.systemtap.graphing.ui/src/org/eclipse/linuxtools/internal/systemtap/graphing/ui/charts/BarChartBuilder.java
index fffdae3fcfc88b9249b3a7ebb4152fda161ad38a..af789f1d424f7b12e54ea22efe8adc5aaf6eb947 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap.graphing.ui/src/org/eclipse/linuxtools/internal/systemtap/graphing/ui/charts/BarChartBuilder.java
+++ b/systemtap/org.eclipse.linuxtools.systemtap.graphing.ui/src/org/eclipse/linuxtools/internal/systemtap/graphing/ui/charts/BarChartBuilder.java
@@ -1,6 +1,6 @@
/****************************************************************
* Copyright (c) 2006, 2018 IBM Corporation and others.
- *
+ *
* This program and the accompanying materials are made
* available under the terms of the Eclipse Public License 2.0
* which is available at https://www.eclipse.org/legal/epl-2.0/
@@ -17,10 +17,10 @@ package org.eclipse.linuxtools.internal.systemtap.graphing.ui.charts;
import org.eclipse.linuxtools.internal.systemtap.graphing.ui.charts.listeners.BarChartMouseMoveListener;
import org.eclipse.linuxtools.systemtap.graphing.core.adapters.IAdapter;
import org.eclipse.swt.widgets.Composite;
-import org.swtchart.IBarSeries;
-import org.swtchart.ISeries;
-import org.swtchart.ISeries.SeriesType;
-import org.swtchart.Range;
+import org.eclipse.swtchart.IBarSeries;
+import org.eclipse.swtchart.ISeries;
+import org.eclipse.swtchart.ISeries.SeriesType;
+import org.eclipse.swtchart.Range;
/**
* A {@link Composite} for building a bar chart.
@@ -42,7 +42,7 @@ public class BarChartBuilder extends AbstractChartWithAxisBuilder {
protected void createChart() {
this.chart = new BarChart(this, getStyle());
applyTitleBoundsListener();
- chartMouseMoveListener = new BarChartMouseMoveListener((BarChart) chart, chart.getPlotArea());
+ chartMouseMoveListener = new BarChartMouseMoveListener((BarChart) chart, chart.getPlotArea().getControl());
}
@Override
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.graphing.ui/src/org/eclipse/linuxtools/internal/systemtap/graphing/ui/charts/LineChartBuilder.java b/systemtap/org.eclipse.linuxtools.systemtap.graphing.ui/src/org/eclipse/linuxtools/internal/systemtap/graphing/ui/charts/LineChartBuilder.java
index fcd3f486881656e1faecabaef83a5739cecb7bf4..2c88e0e3220812a1a4e9b5d6830265df503e0f14 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap.graphing.ui/src/org/eclipse/linuxtools/internal/systemtap/graphing/ui/charts/LineChartBuilder.java
+++ b/systemtap/org.eclipse.linuxtools.systemtap.graphing.ui/src/org/eclipse/linuxtools/internal/systemtap/graphing/ui/charts/LineChartBuilder.java
@@ -1,6 +1,6 @@
/****************************************************************
* Copyright (c) 2006, 2018 IBM Corp. and others.
- *
+ *
* This program and the accompanying materials are made
* available under the terms of the Eclipse Public License 2.0
* which is available at https://www.eclipse.org/legal/epl-2.0/
@@ -14,10 +14,10 @@ package org.eclipse.linuxtools.internal.systemtap.graphing.ui.charts;
import org.eclipse.linuxtools.systemtap.graphing.core.adapters.IAdapter;
import org.eclipse.swt.widgets.Composite;
-import org.swtchart.ILineSeries;
-import org.swtchart.ISeries;
-import org.swtchart.ISeries.SeriesType;
-import org.swtchart.LineStyle;
+import org.eclipse.swtchart.ILineSeries;
+import org.eclipse.swtchart.ISeries;
+import org.eclipse.swtchart.ISeries.SeriesType;
+import org.eclipse.swtchart.LineStyle;
/**
* Builds line chart.
@@ -25,19 +25,19 @@ import org.swtchart.LineStyle;
public class LineChartBuilder extends AbstractChartWithAxisBuilder {
- public static final String ID = "org.eclipse.linuxtools.systemtap.graphing.ui.charts.linechartbuilder"; //$NON-NLS-1$
+ public static final String ID = "org.eclipse.linuxtools.systemtap.graphing.ui.charts.linechartbuilder"; //$NON-NLS-1$
- public LineChartBuilder(Composite parent, int style, String title,IAdapter adapter) {
- super(adapter, parent, style, title);
- }
+ public LineChartBuilder(Composite parent, int style, String title, IAdapter adapter) {
+ super(adapter, parent, style, title);
+ }
- @Override
- protected ISeries createChartISeries(int i) {
- ILineSeries series = (ILineSeries) chart.getSeriesSet().
- createSeries(SeriesType.LINE, adapter.getLabels()[i+1]);
- series.setSymbolColor(COLORS[i % COLORS.length]);
- series.setLineColor(COLORS[i % COLORS.length]);
- series.setLineStyle(LineStyle.SOLID);
- return series;
- }
+ @Override
+ protected ISeries createChartISeries(int i) {
+ ILineSeries series = (ILineSeries) chart.getSeriesSet().createSeries(SeriesType.LINE,
+ adapter.getLabels()[i + 1]);
+ series.setSymbolColor(COLORS[i % COLORS.length]);
+ series.setLineColor(COLORS[i % COLORS.length]);
+ series.setLineStyle(LineStyle.SOLID);
+ return series;
+ }
}
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.graphing.ui/src/org/eclipse/linuxtools/internal/systemtap/graphing/ui/charts/PieChartBuilder.java b/systemtap/org.eclipse.linuxtools.systemtap.graphing.ui/src/org/eclipse/linuxtools/internal/systemtap/graphing/ui/charts/PieChartBuilder.java
index 89b4e1a12c380242dd25c68b4aa90c478b89e59b..a016fc0f44986932112141897d5e7beb21de5b2e 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap.graphing.ui/src/org/eclipse/linuxtools/internal/systemtap/graphing/ui/charts/PieChartBuilder.java
+++ b/systemtap/org.eclipse.linuxtools.systemtap.graphing.ui/src/org/eclipse/linuxtools/internal/systemtap/graphing/ui/charts/PieChartBuilder.java
@@ -1,6 +1,6 @@
/****************************************************************
* Copyright (c) 2006, 2018 IBM Corp. and others.
- *
+ *
* This program and the accompanying materials are made
* available under the terms of the Eclipse Public License 2.0
* which is available at https://www.eclipse.org/legal/epl-2.0/
@@ -14,12 +14,12 @@
*/
package org.eclipse.linuxtools.internal.systemtap.graphing.ui.charts;
-import org.eclipse.linuxtools.dataviewers.piechart.PieChart;
+import org.eclipse.linuxtools.internal.dataviewers.piechart.PieChart;
import org.eclipse.linuxtools.internal.systemtap.graphing.ui.charts.listeners.PieChartMouseMoveListener;
import org.eclipse.linuxtools.systemtap.graphing.core.adapters.IAdapter;
import org.eclipse.swt.widgets.Composite;
-import org.swtchart.IAxis;
-import org.swtchart.Range;
+import org.eclipse.swtchart.IAxis;
+import org.eclipse.swtchart.Range;
/**
* Builds Pie chart.
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.graphing.ui/src/org/eclipse/linuxtools/internal/systemtap/graphing/ui/charts/ScatterChartBuilder.java b/systemtap/org.eclipse.linuxtools.systemtap.graphing.ui/src/org/eclipse/linuxtools/internal/systemtap/graphing/ui/charts/ScatterChartBuilder.java
index d5c580599913c5aab646695ab7edab65e38eda70..a8ded38bb2f24f644a41a877ab74ed52f03c44d0 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap.graphing.ui/src/org/eclipse/linuxtools/internal/systemtap/graphing/ui/charts/ScatterChartBuilder.java
+++ b/systemtap/org.eclipse.linuxtools.systemtap.graphing.ui/src/org/eclipse/linuxtools/internal/systemtap/graphing/ui/charts/ScatterChartBuilder.java
@@ -1,6 +1,6 @@
/****************************************************************
* Copyright (c) 2006, 2018 IBM Corp. and others.
- *
+ *
* This program and the accompanying materials are made
* available under the terms of the Eclipse Public License 2.0
* which is available at https://www.eclipse.org/legal/epl-2.0/
@@ -15,9 +15,9 @@ package org.eclipse.linuxtools.internal.systemtap.graphing.ui.charts;
import org.eclipse.linuxtools.systemtap.graphing.core.adapters.IAdapter;
import org.eclipse.swt.widgets.Composite;
-import org.swtchart.ILineSeries;
-import org.swtchart.ISeries;
-import org.swtchart.LineStyle;
+import org.eclipse.swtchart.ILineSeries;
+import org.eclipse.swtchart.ISeries;
+import org.eclipse.swtchart.LineStyle;
/**
* Builds bar chart.
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.graphing.ui/src/org/eclipse/linuxtools/internal/systemtap/graphing/ui/charts/listeners/BarChartMouseMoveListener.java b/systemtap/org.eclipse.linuxtools.systemtap.graphing.ui/src/org/eclipse/linuxtools/internal/systemtap/graphing/ui/charts/listeners/BarChartMouseMoveListener.java
index ddaa18d679ebeb68b00f267beeba46ac80eb4d67..9105c47c38071fcfa61351b10b8ebc2dda4aad31 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap.graphing.ui/src/org/eclipse/linuxtools/internal/systemtap/graphing/ui/charts/listeners/BarChartMouseMoveListener.java
+++ b/systemtap/org.eclipse.linuxtools.systemtap.graphing.ui/src/org/eclipse/linuxtools/internal/systemtap/graphing/ui/charts/listeners/BarChartMouseMoveListener.java
@@ -1,6 +1,6 @@
/*******************************************************************************
* Copyright (c) 2014, 2018 Red Hat, Inc. and others.
- *
+ *
* This program and the accompanying materials are made
* available under the terms of the Eclipse Public License 2.0
* which is available at https://www.eclipse.org/legal/epl-2.0/
@@ -17,9 +17,9 @@ import java.text.MessageFormat;
import org.eclipse.linuxtools.internal.systemtap.graphing.ui.charts.BarChart;
import org.eclipse.linuxtools.internal.systemtap.graphing.ui.charts.Messages;
import org.eclipse.swt.events.MouseEvent;
-import org.eclipse.swt.widgets.Composite;
-import org.swtchart.IAxis;
-import org.swtchart.ISeries;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swtchart.IAxis;
+import org.eclipse.swtchart.ISeries;
/**
* This is a specialized mouse listener for displaying the value of a category (bar)
@@ -29,7 +29,7 @@ import org.swtchart.ISeries;
* @since 3.0
*/
public class BarChartMouseMoveListener extends ToolTipChartMouseMoveListener {
- public BarChartMouseMoveListener(BarChart chart, Composite parent) {
+ public BarChartMouseMoveListener(BarChart chart, Control parent) {
super(chart, parent);
}
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.graphing.ui/src/org/eclipse/linuxtools/internal/systemtap/graphing/ui/charts/listeners/ChartWithAxisMouseMoveListener.java b/systemtap/org.eclipse.linuxtools.systemtap.graphing.ui/src/org/eclipse/linuxtools/internal/systemtap/graphing/ui/charts/listeners/ChartWithAxisMouseMoveListener.java
index 320dcd1dd5bb55f543fab075640098ed763b6bb7..2aa4f1cf51ac3e7e75618584e23cf82bbdf57dd6 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap.graphing.ui/src/org/eclipse/linuxtools/internal/systemtap/graphing/ui/charts/listeners/ChartWithAxisMouseMoveListener.java
+++ b/systemtap/org.eclipse.linuxtools.systemtap.graphing.ui/src/org/eclipse/linuxtools/internal/systemtap/graphing/ui/charts/listeners/ChartWithAxisMouseMoveListener.java
@@ -1,6 +1,6 @@
/*******************************************************************************
* Copyright (c) 2014, 2018 Red Hat, Inc. and others.
- *
+ *
* This program and the accompanying materials are made
* available under the terms of the Eclipse Public License 2.0
* which is available at https://www.eclipse.org/legal/epl-2.0/
@@ -17,9 +17,9 @@ import java.text.MessageFormat;
import org.eclipse.linuxtools.internal.systemtap.graphing.ui.charts.Messages;
import org.eclipse.swt.events.MouseEvent;
import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.widgets.Composite;
-import org.swtchart.Chart;
-import org.swtchart.ISeries;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swtchart.Chart;
+import org.eclipse.swtchart.ISeries;
/**
* This is a specialized mouse listener for displaying the coordinates of a data point on
@@ -30,7 +30,7 @@ import org.swtchart.ISeries;
public class ChartWithAxisMouseMoveListener extends ToolTipChartMouseMoveListener {
private static final double DIST_TOLERANCE = 20.0;
- public ChartWithAxisMouseMoveListener(Chart chart, Composite hoverArea) {
+ public ChartWithAxisMouseMoveListener(Chart chart, Control hoverArea) {
super(chart, hoverArea);
}
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.graphing.ui/src/org/eclipse/linuxtools/internal/systemtap/graphing/ui/charts/listeners/PieChartMouseMoveListener.java b/systemtap/org.eclipse.linuxtools.systemtap.graphing.ui/src/org/eclipse/linuxtools/internal/systemtap/graphing/ui/charts/listeners/PieChartMouseMoveListener.java
index f371f6b8289b2f8125d36fbbd5203d288ce4c4d5..8c9067ce25c626640b697399cf9783cfde54fdab 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap.graphing.ui/src/org/eclipse/linuxtools/internal/systemtap/graphing/ui/charts/listeners/PieChartMouseMoveListener.java
+++ b/systemtap/org.eclipse.linuxtools.systemtap.graphing.ui/src/org/eclipse/linuxtools/internal/systemtap/graphing/ui/charts/listeners/PieChartMouseMoveListener.java
@@ -1,6 +1,6 @@
/*******************************************************************************
* Copyright (c) 2014, 2018 Red Hat, Inc. and others.
- *
+ *
* This program and the accompanying materials are made
* available under the terms of the Eclipse Public License 2.0
* which is available at https://www.eclipse.org/legal/epl-2.0/
@@ -14,11 +14,11 @@ package org.eclipse.linuxtools.internal.systemtap.graphing.ui.charts.listeners;
import java.text.MessageFormat;
-import org.eclipse.linuxtools.dataviewers.piechart.PieChart;
+import org.eclipse.linuxtools.internal.dataviewers.piechart.PieChart;
import org.eclipse.linuxtools.internal.systemtap.graphing.ui.charts.Messages;
import org.eclipse.swt.events.MouseEvent;
import org.eclipse.swt.widgets.Composite;
-import org.swtchart.ISeries;
+import org.eclipse.swtchart.ISeries;
/**
* @since 3.0
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.graphing.ui/src/org/eclipse/linuxtools/internal/systemtap/graphing/ui/charts/listeners/ToolTipChartMouseMoveListener.java b/systemtap/org.eclipse.linuxtools.systemtap.graphing.ui/src/org/eclipse/linuxtools/internal/systemtap/graphing/ui/charts/listeners/ToolTipChartMouseMoveListener.java
index d8bf63a9dd5ab950bd756a9a9b118cee57e9a42c..1b7a7f42ed706963c2d10a8fc4190276c0b3f5db 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap.graphing.ui/src/org/eclipse/linuxtools/internal/systemtap/graphing/ui/charts/listeners/ToolTipChartMouseMoveListener.java
+++ b/systemtap/org.eclipse.linuxtools.systemtap.graphing.ui/src/org/eclipse/linuxtools/internal/systemtap/graphing/ui/charts/listeners/ToolTipChartMouseMoveListener.java
@@ -1,6 +1,6 @@
/*******************************************************************************
* Copyright (c) 2014, 2018 Red Hat, Inc.
- *
+ *
* This program and the accompanying materials are made
* available under the terms of the Eclipse Public License 2.0
* which is available at https://www.eclipse.org/legal/epl-2.0/
@@ -19,11 +19,11 @@ import java.util.concurrent.RunnableFuture;
import org.eclipse.linuxtools.systemtap.graphing.ui.charts.listeners.AbstractChartMouseMoveListener;
import org.eclipse.swt.SWT;
import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.swt.widgets.Text;
-import org.swtchart.Chart;
+import org.eclipse.swtchart.Chart;
/**
* @since 3.0
@@ -33,7 +33,7 @@ public class ToolTipChartMouseMoveListener extends AbstractChartMouseMoveListene
protected final Shell tipShell;
protected final Text tipText;
- public ToolTipChartMouseMoveListener(Chart chart, Composite parent) {
+ public ToolTipChartMouseMoveListener(Chart chart, Control parent) {
super(chart, parent);
tipShell = new Shell(Display.getCurrent().getActiveShell(), SWT.TOOL | SWT.ON_TOP);
tipText = new Text(tipShell, SWT.MULTI | SWT.BOLD);
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.graphing.ui/src/org/eclipse/linuxtools/internal/systemtap/graphing/ui/handlers/SaveGraphImageHandler.java b/systemtap/org.eclipse.linuxtools.systemtap.graphing.ui/src/org/eclipse/linuxtools/internal/systemtap/graphing/ui/handlers/SaveGraphImageHandler.java
deleted file mode 100644
index 4cdf98bc882ca67f16b15d70edb4e873037ce5c0..0000000000000000000000000000000000000000
--- a/systemtap/org.eclipse.linuxtools.systemtap.graphing.ui/src/org/eclipse/linuxtools/internal/systemtap/graphing/ui/handlers/SaveGraphImageHandler.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2014, 2019 Red Hat, Inc.
- *
- * This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License 2.0
- * which is available at https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- * IBM Corporation - initial API and Action implementation
- * Red Hat - conversion to Handler implementation
- *******************************************************************************/
-
-package org.eclipse.linuxtools.internal.systemtap.graphing.ui.handlers;
-
-import org.eclipse.core.commands.AbstractHandler;
-import org.eclipse.core.commands.ExecutionEvent;
-import org.eclipse.linuxtools.dataviewers.charts.actions.SaveChartAction;
-import org.eclipse.linuxtools.systemtap.graphing.ui.GraphDisplaySet;
-import org.eclipse.linuxtools.systemtap.graphing.ui.charts.AbstractChartBuilder;
-import org.eclipse.linuxtools.systemtap.graphing.ui.views.GraphSelectorEditor;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.PlatformUI;
-import org.swtchart.Chart;
-
-/**
- * This action is designed to allow for saving of the graph in the active window.
- * It will let the user select the location to save the image, and then save it as
- * a jpg image.
- * @author Ryan Morse
- * @since 3.0 Migrated from .ui.graphing package.
- */
-public class SaveGraphImageHandler extends AbstractHandler {
-
- private SaveChartAction saveChartAction = new SaveChartAction();
-
- /**
- * This is the main method of the action. It handles getting the active graph,
- * prompting the user for a location to save the image to, and then actually doing
- * the save.
- */
- @Override
- public Object execute(ExecutionEvent event) {
- saveChartAction.setChart(getActiveChart());
- saveChartAction.run();
- return null;
- }
-
- private GraphSelectorEditor getActiveGraphEditor() {
- IEditorPart editor = PlatformUI.getWorkbench().getActiveWorkbenchWindow().
- getActivePage().getActiveEditor();
- return editor instanceof GraphSelectorEditor ? (GraphSelectorEditor) editor : null;
- }
-
- private AbstractChartBuilder getActiveGraph() {
- GraphSelectorEditor graphEditor = getActiveGraphEditor();
- if (graphEditor == null) {
- return null;
- }
- GraphDisplaySet gds = graphEditor.getActiveDisplaySet();
- return gds == null ? null : gds.getActiveGraph();
- }
-
- private Chart getActiveChart() {
- AbstractChartBuilder abs = getActiveGraph();
- return abs == null ? null : abs.getChart();
- }
-
-}
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.graphing.ui/src/org/eclipse/linuxtools/systemtap/graphing/ui/GraphDisplaySet.java b/systemtap/org.eclipse.linuxtools.systemtap.graphing.ui/src/org/eclipse/linuxtools/systemtap/graphing/ui/GraphDisplaySet.java
index b9b42bd6ae1587d17bcc76a04c24e515a00a05f9..0f1c5803710851ee43dc86acfee2a7b6578c3254 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap.graphing.ui/src/org/eclipse/linuxtools/systemtap/graphing/ui/GraphDisplaySet.java
+++ b/systemtap/org.eclipse.linuxtools.systemtap.graphing.ui/src/org/eclipse/linuxtools/systemtap/graphing/ui/GraphDisplaySet.java
@@ -1,6 +1,6 @@
/*******************************************************************************
- * Copyright (c) 2006, 2018 IBM Corporation and others.
- *
+ * Copyright (c) 2006, 2019 IBM Corporation and others.
+ *
* This program and the accompanying materials are made
* available under the terms of the Eclipse Public License 2.0
* which is available at https://www.eclipse.org/legal/epl-2.0/
@@ -19,6 +19,7 @@ import java.util.ArrayList;
import java.util.List;
import org.eclipse.jface.preference.IPreferenceStore;
+import org.eclipse.jface.resource.ResourceLocator;
import org.eclipse.jface.util.IPropertyChangeListener;
import org.eclipse.jface.wizard.WizardDialog;
import org.eclipse.linuxtools.internal.systemtap.graphing.ui.GraphingUIPlugin;
@@ -52,9 +53,6 @@ import org.eclipse.swt.widgets.Button;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.ui.IWorkbench;
import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-
-
/**
* This class is used to contain all of the graphing components that can
@@ -139,10 +137,10 @@ public class GraphDisplaySet {
//This is a tab/button for opening new graphs
CTabItem newGraph = new CTabItem(folder, SWT.NONE);
- newGraph.setImage(AbstractUIPlugin.imageDescriptorFromPlugin(GraphingUIPlugin.PLUGIN_ID, "icons/actions/new_wiz.gif").createImage()); //$NON-NLS-1$
+ newGraph.setImage(ResourceLocator.imageDescriptorFromBundle(GraphingUIPlugin.PLUGIN_ID, "icons/actions/new_wiz.gif").get().createImage()); //$NON-NLS-1$
newGraph.setToolTipText(Localization.getString("GraphDisplaySet.CreateGraph")); //$NON-NLS-1$
- //Tab containing the data table
+ // Tab containing the data table
CTabItem item = new CTabItem(folder, SWT.NONE);
item.setText(Localization.getString("GraphDisplaySet.DataView")); //$NON-NLS-1$
Composite c = new Composite(folder, SWT.NONE);
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.graphing.ui/src/org/eclipse/linuxtools/systemtap/graphing/ui/charts/AbstractChartBuilder.java b/systemtap/org.eclipse.linuxtools.systemtap.graphing.ui/src/org/eclipse/linuxtools/systemtap/graphing/ui/charts/AbstractChartBuilder.java
index 358b75cc928d2af0ba9783f080b8ce38650fda43..4aa398e91849a7462808d92bdc9f75dba9a92585 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap.graphing.ui/src/org/eclipse/linuxtools/systemtap/graphing/ui/charts/AbstractChartBuilder.java
+++ b/systemtap/org.eclipse.linuxtools.systemtap.graphing.ui/src/org/eclipse/linuxtools/systemtap/graphing/ui/charts/AbstractChartBuilder.java
@@ -1,6 +1,6 @@
/****************************************************************
* Copyright (c) 2006, 2018 IBM Corporation and others.
- *
+ *
* This program and the accompanying materials are made
* available under the terms of the Eclipse Public License 2.0
* which is available at https://www.eclipse.org/legal/epl-2.0/
@@ -32,8 +32,9 @@ import org.eclipse.swt.graphics.Color;
import org.eclipse.swt.layout.FillLayout;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Display;
-import org.swtchart.Chart;
-import org.swtchart.ITitle;
+import org.eclipse.swtchart.Chart;
+import org.eclipse.swtchart.ITitle;
+import org.eclipse.swtchart.extensions.charts.InteractiveChart;
/**
* A {@link Composite} that provides the common members and the framework to build one chart.
@@ -84,7 +85,7 @@ public abstract class AbstractChartBuilder extends Composite implements IUpdateL
/**
* Chart instance.
*/
- protected Chart chart = null;
+ protected InteractiveChart chart = null;
/**
* Chart title.
@@ -179,7 +180,7 @@ public abstract class AbstractChartBuilder extends Composite implements IUpdateL
* Creates chart instance.
*/
protected void createChart() {
- this.chart = new Chart(this, getStyle());
+ this.chart = new InteractiveChart(this, getStyle());
}
/**
@@ -187,7 +188,7 @@ public abstract class AbstractChartBuilder extends Composite implements IUpdateL
*/
private void buildPlot() {
this.chart.setBackground(WHITE);
- this.chart.setBackgroundInPlotArea(WHITE);
+ this.chart.getPlotArea().setBackground(WHITE);
}
/**
@@ -227,6 +228,7 @@ public abstract class AbstractChartBuilder extends Composite implements IUpdateL
ITitle ctitle = chart.getTitle();
ctitle.setForeground(BLACK);
ctitle.setText(this.title);
+ chart.setProposedSaveAsFilename(this.title);
}
/**
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.graphing.ui/src/org/eclipse/linuxtools/systemtap/graphing/ui/charts/listeners/AbstractChartMouseMoveListener.java b/systemtap/org.eclipse.linuxtools.systemtap.graphing.ui/src/org/eclipse/linuxtools/systemtap/graphing/ui/charts/listeners/AbstractChartMouseMoveListener.java
index 67891ae79a058448c5101f1f43268b4e6772e79b..a8436f9c9e13e5b18043bc7deb58d973be07560c 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap.graphing.ui/src/org/eclipse/linuxtools/systemtap/graphing/ui/charts/listeners/AbstractChartMouseMoveListener.java
+++ b/systemtap/org.eclipse.linuxtools.systemtap.graphing.ui/src/org/eclipse/linuxtools/systemtap/graphing/ui/charts/listeners/AbstractChartMouseMoveListener.java
@@ -1,6 +1,6 @@
/*******************************************************************************
* Copyright (c) 2014, 2018 Red Hat, Inc.
- *
+ *
* This program and the accompanying materials are made
* available under the terms of the Eclipse Public License 2.0
* which is available at https://www.eclipse.org/legal/epl-2.0/
@@ -15,8 +15,8 @@ package org.eclipse.linuxtools.systemtap.graphing.ui.charts.listeners;
import org.eclipse.swt.events.MouseEvent;
import org.eclipse.swt.events.MouseMoveListener;
import org.eclipse.swt.events.MouseTrackAdapter;
-import org.eclipse.swt.widgets.Composite;
-import org.swtchart.Chart;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swtchart.Chart;
/**
* An abstract listener class for displaying data values of a chart as it
@@ -36,7 +36,7 @@ public abstract class AbstractChartMouseMoveListener implements MouseMoveListene
* @param hoverArea The plot area of the chart in which this listener will react
* to mouse movement.
*/
- public AbstractChartMouseMoveListener(Chart chart, final Composite hoverArea) {
+ public AbstractChartMouseMoveListener(Chart chart, final Control hoverArea) {
this.chart = chart;
final MouseMoveListener thisListener = this;
hoverArea.addMouseTrackListener(new MouseTrackAdapter() {
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.graphing.ui/src/org/eclipse/linuxtools/systemtap/graphing/ui/widgets/GraphComposite.java b/systemtap/org.eclipse.linuxtools.systemtap.graphing.ui/src/org/eclipse/linuxtools/systemtap/graphing/ui/widgets/GraphComposite.java
index a052ee1250413d146f03854e40020d46f0defdbb..2a1a31a2f9d3229c103cf9c1d8f36fc06e1aa362 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap.graphing.ui/src/org/eclipse/linuxtools/systemtap/graphing/ui/widgets/GraphComposite.java
+++ b/systemtap/org.eclipse.linuxtools.systemtap.graphing.ui/src/org/eclipse/linuxtools/systemtap/graphing/ui/widgets/GraphComposite.java
@@ -1,6 +1,6 @@
/*******************************************************************************
* Copyright (c) 2006, 2018 IBM Corporation.
- *
+ *
* This program and the accompanying materials are made
* available under the terms of the Eclipse Public License 2.0
* which is available at https://www.eclipse.org/legal/epl-2.0/
@@ -112,7 +112,7 @@ public class GraphComposite extends Composite {
public void addCheckOption(final String title, final SelectionListener listener) {
Display.getDefault().syncExec(() -> {
- Button b = new Button(checkOptionComp, SWT.CHECK);
+ Button b = new Button(checkOptionComp, SWT.CHECK);
b.setText(title);
b.addSelectionListener(listener);
checkOptions.add(b);
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.graphing.ui/src/org/eclipse/linuxtools/systemtap/graphing/ui/widgets/GraphDiscreteXControl.java b/systemtap/org.eclipse.linuxtools.systemtap.graphing.ui/src/org/eclipse/linuxtools/systemtap/graphing/ui/widgets/GraphDiscreteXControl.java
index 1fd4c4231c6a2e6a6f4c14476397d49d414d37bb..11fa7dec69ab490c5be48749284c2f18aa6260f5 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap.graphing.ui/src/org/eclipse/linuxtools/systemtap/graphing/ui/widgets/GraphDiscreteXControl.java
+++ b/systemtap/org.eclipse.linuxtools.systemtap.graphing.ui/src/org/eclipse/linuxtools/systemtap/graphing/ui/widgets/GraphDiscreteXControl.java
@@ -1,6 +1,6 @@
/*******************************************************************************
* Copyright (c) 2013, 2018 Red Hat, Inc.
- *
+ *
* This program and the accompanying materials are made
* available under the terms of the Eclipse Public License 2.0
* which is available at https://www.eclipse.org/legal/epl-2.0/
@@ -23,9 +23,9 @@ import org.eclipse.swt.layout.FormData;
import org.eclipse.swt.layout.RowLayout;
import org.eclipse.swt.widgets.Button;
import org.eclipse.swt.widgets.Composite;
-import org.swtchart.IAxis;
-import org.swtchart.ISeries;
-import org.swtchart.Range;
+import org.eclipse.swtchart.IAxis;
+import org.eclipse.swtchart.ISeries;
+import org.eclipse.swtchart.Range;
/**
* @since 3.0
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.structures.tests/.classpath b/systemtap/org.eclipse.linuxtools.systemtap.structures.tests/.classpath
index 0f2de47284470f7780b6f497695ceab85589c6ac..174b7049317b9ec71174f3ef6070ef0fbe2a9c86 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap.structures.tests/.classpath
+++ b/systemtap/org.eclipse.linuxtools.systemtap.structures.tests/.classpath
@@ -1,7 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
<classpathentry exported="true" kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="src" path="src"/>
+ <classpathentry kind="src" path="src">
+ <attributes>
+ <attribute name="test" value="true"/>
+ </attributes>
+ </classpathentry>
<classpathentry kind="output" path="target/classes"/>
</classpath>
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.structures.tests/.settings/org.eclipse.jdt.core.prefs b/systemtap/org.eclipse.linuxtools.systemtap.structures.tests/.settings/org.eclipse.jdt.core.prefs
index 89403a77994b785316070de748ba8557617d10d2..649554d9b3307e8870e94c442906bcfe4a4e8e83 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap.structures.tests/.settings/org.eclipse.jdt.core.prefs
+++ b/systemtap/org.eclipse.linuxtools.systemtap.structures.tests/.settings/org.eclipse.jdt.core.prefs
@@ -6,8 +6,8 @@ org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annota
org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
+org.eclipse.jdt.core.compiler.compliance=11
org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
@@ -18,6 +18,7 @@ org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=warning
org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
@@ -61,6 +62,7 @@ org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=warn
org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
@@ -92,4 +94,5 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.structures.tests/META-INF/MANIFEST.MF b/systemtap/org.eclipse.linuxtools.systemtap.structures.tests/META-INF/MANIFEST.MF
index 7b52e59b0ebb02c0a29a5c768ddcbc18f2d3fcc9..7161ac1ed8ebbeade25829219f07f8edb5a7beb1 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap.structures.tests/META-INF/MANIFEST.MF
+++ b/systemtap/org.eclipse.linuxtools.systemtap.structures.tests/META-INF/MANIFEST.MF
@@ -9,7 +9,7 @@ Bundle-ActivationPolicy: lazy
Import-Package: org.junit,
org.junit.runner;version="4.10.0",
org.junit.runners;version="4.10.0"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
Fragment-Host: org.eclipse.linuxtools.systemtap.structures
Automatic-Module-Name: org.eclipse.linuxtools.systemtap.structures.tests
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.structures.tests/pom.xml b/systemtap/org.eclipse.linuxtools.systemtap.structures.tests/pom.xml
index 047bad356c2689ec2a5af6c123d6024fa43ef04f..dc2f5e1fc2efe687e14d1cef6209700eb52fc53d 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap.structures.tests/pom.xml
+++ b/systemtap/org.eclipse.linuxtools.systemtap.structures.tests/pom.xml
@@ -15,7 +15,7 @@
<parent>
<artifactId>linuxtools-systemtap-parent</artifactId>
<groupId>org.eclipse.linuxtools.systemtap</groupId>
- <version>7.4.0</version>
+ <version>8.1.0</version>
</parent>
<artifactId>org.eclipse.linuxtools.systemtap.structures.tests</artifactId>
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.structures/.classpath b/systemtap/org.eclipse.linuxtools.systemtap.structures/.classpath
index 43b986286a9e5fd1828793fa4b2353d02ab8625f..1db08c6b4ce2fb50395b2f9c9a50c140a0bab199 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap.structures/.classpath
+++ b/systemtap/org.eclipse.linuxtools.systemtap.structures/.classpath
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="target/classes"/>
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.structures/.settings/org.eclipse.jdt.core.prefs b/systemtap/org.eclipse.linuxtools.systemtap.structures/.settings/org.eclipse.jdt.core.prefs
index f1808c18e90dbdad3111a58bb1631d2a00f9b669..bda0105d73d90b890a2bb7f007fb0fd46ae33daf 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap.structures/.settings/org.eclipse.jdt.core.prefs
+++ b/systemtap/org.eclipse.linuxtools.systemtap.structures/.settings/org.eclipse.jdt.core.prefs
@@ -6,8 +6,8 @@ org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annota
org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
+org.eclipse.jdt.core.compiler.compliance=11
org.eclipse.jdt.core.compiler.doc.comment.support=enabled
org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
@@ -19,6 +19,7 @@ org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=warning
org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
@@ -75,6 +76,7 @@ org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=warn
org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
@@ -106,4 +108,5 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.structures/META-INF/MANIFEST.MF b/systemtap/org.eclipse.linuxtools.systemtap.structures/META-INF/MANIFEST.MF
index 067a4f0fe66e28c3924cf1208579c0a0c188491d..2bb7dec85bf99da0a1222be811b950426b1ce4c5 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap.structures/META-INF/MANIFEST.MF
+++ b/systemtap/org.eclipse.linuxtools.systemtap.structures/META-INF/MANIFEST.MF
@@ -13,7 +13,7 @@ Require-Bundle: org.eclipse.core.runtime,
org.eclipse.linuxtools.profiling.launch;bundle-version="0.11.0",
org.eclipse.core.filesystem;bundle-version="1.3.200",
org.eclipse.core.resources;bundle-version="3.8.0"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
Bundle-Localization: plugin
Import-Package: org.eclipse.debug.core,
org.eclipse.debug.core.model,
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.structures/pom.xml b/systemtap/org.eclipse.linuxtools.systemtap.structures/pom.xml
index 3e5e53113137fe88906b7e6aa7284d28a8c4ce48..8106ffdc9d91ee41a37490e71b39cac2dbd58213 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap.structures/pom.xml
+++ b/systemtap/org.eclipse.linuxtools.systemtap.structures/pom.xml
@@ -15,7 +15,7 @@
<parent>
<artifactId>linuxtools-systemtap-parent</artifactId>
<groupId>org.eclipse.linuxtools.systemtap</groupId>
- <version>7.4.0</version>
+ <version>8.1.0</version>
</parent>
<artifactId>org.eclipse.linuxtools.systemtap.structures</artifactId>
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog.tests/.classpath b/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog.tests/.classpath
index 43b986286a9e5fd1828793fa4b2353d02ab8625f..a621c21ac550d71458aac26221ac3641277a488d 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog.tests/.classpath
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog.tests/.classpath
@@ -1,7 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="src" path="src"/>
+ <classpathentry kind="src" path="src">
+ <attributes>
+ <attribute name="test" value="true"/>
+ </attributes>
+ </classpathentry>
<classpathentry kind="output" path="target/classes"/>
</classpath>
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog.tests/.settings/org.eclipse.jdt.core.prefs b/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog.tests/.settings/org.eclipse.jdt.core.prefs
index c2c83d84bd1636731b5f1267945a81c4e0cacb9c..efb8f9cf1d4debc9e3c391f997e35209338a6d4f 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog.tests/.settings/org.eclipse.jdt.core.prefs
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog.tests/.settings/org.eclipse.jdt.core.prefs
@@ -6,9 +6,9 @@ org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annota
org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.compliance=11
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -22,6 +22,7 @@ org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=warning
org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
@@ -65,6 +66,7 @@ org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=warn
org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
@@ -96,4 +98,5 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog.tests/META-INF/MANIFEST.MF b/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog.tests/META-INF/MANIFEST.MF
index 28138cac230a9ca725f181117b0ae9a83ed9c2d0..d1db4a7f8d5f30f6ca5b84001692e52fb911f5fb 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog.tests/META-INF/MANIFEST.MF
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog.tests/META-INF/MANIFEST.MF
@@ -7,6 +7,6 @@ Bundle-Vendor: %bundleProvider
Bundle-Localization: plugin
Bundle-ActivationPolicy: lazy
Require-Bundle: org.junit;bundle-version="4.0.0"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
Fragment-Host: org.eclipse.linuxtools.systemtap.ui.consolelog
Automatic-Module-Name: org.eclipse.linuxtools.systemtap.ui.consolelog.tests
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog.tests/pom.xml b/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog.tests/pom.xml
index ecd8f97edcb969553ab1b778c491dfb73152d931..cf48801eca45c2279723013772a9dd8d086f64ea 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog.tests/pom.xml
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog.tests/pom.xml
@@ -14,7 +14,7 @@
<parent>
<artifactId>linuxtools-systemtap-parent</artifactId>
<groupId>org.eclipse.linuxtools.systemtap</groupId>
- <version>7.4.0</version>
+ <version>8.1.0</version>
</parent>
<artifactId>org.eclipse.linuxtools.systemtap.ui.consolelog.tests</artifactId>
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog/.classpath b/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog/.classpath
index 43b986286a9e5fd1828793fa4b2353d02ab8625f..1db08c6b4ce2fb50395b2f9c9a50c140a0bab199 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog/.classpath
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog/.classpath
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="target/classes"/>
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog/.settings/org.eclipse.jdt.core.prefs b/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog/.settings/org.eclipse.jdt.core.prefs
index 4c38f90962f96dd9e7d2a501a768b129baaa8bb6..98da29425843d073fb01758bab1a137483286532 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog/.settings/org.eclipse.jdt.core.prefs
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog/.settings/org.eclipse.jdt.core.prefs
@@ -7,9 +7,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nul
org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.compliance=11
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -24,6 +24,7 @@ org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=warning
org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
@@ -80,6 +81,7 @@ org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=warn
org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
@@ -112,4 +114,5 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog/META-INF/MANIFEST.MF b/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog/META-INF/MANIFEST.MF
index f154efd9421ea6cf1c5b4d8c1c2c4aabfab41163..dafe438e29bd7118b93f4b47ab3ef9ce867e6a04 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog/META-INF/MANIFEST.MF
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog/META-INF/MANIFEST.MF
@@ -17,7 +17,7 @@ Require-Bundle: org.eclipse.ui,
com.jcraft.jsch;bundle-version="0.1.37",
org.eclipse.debug.ui
Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
Import-Package: org.eclipse.core.filesystem,
org.eclipse.core.resources,
org.eclipse.debug.ui,
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog/pom.xml b/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog/pom.xml
index 68832a9550a2d5683b8d8e76af9af7d1edefde9f..d30936a28c60f8e745c820799a2c406a63c5c1b9 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog/pom.xml
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog/pom.xml
@@ -14,7 +14,7 @@
<parent>
<artifactId>linuxtools-systemtap-parent</artifactId>
<groupId>org.eclipse.linuxtools.systemtap</groupId>
- <version>7.4.0</version>
+ <version>8.1.0</version>
</parent>
<artifactId>org.eclipse.linuxtools.systemtap.ui.consolelog</artifactId>
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.doc/pom.xml b/systemtap/org.eclipse.linuxtools.systemtap.ui.doc/pom.xml
index 4cf49bdcd0b314d49fc5df0fcfbebc68ad8fa4fd..ab6e02224c8e6025f23e00062d15013d5653221d 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap.ui.doc/pom.xml
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.doc/pom.xml
@@ -15,7 +15,7 @@
<parent>
<artifactId>linuxtools-systemtap-parent</artifactId>
<groupId>org.eclipse.linuxtools.systemtap</groupId>
- <version>7.4.0</version>
+ <version>8.1.0</version>
</parent>
<artifactId>org.eclipse.linuxtools.systemtap.ui.doc</artifactId>
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide.tests/.classpath b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide.tests/.classpath
index 0f2de47284470f7780b6f497695ceab85589c6ac..174b7049317b9ec71174f3ef6070ef0fbe2a9c86 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide.tests/.classpath
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide.tests/.classpath
@@ -1,7 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
<classpathentry exported="true" kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="src" path="src"/>
+ <classpathentry kind="src" path="src">
+ <attributes>
+ <attribute name="test" value="true"/>
+ </attributes>
+ </classpathentry>
<classpathentry kind="output" path="target/classes"/>
</classpath>
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide.tests/.settings/org.eclipse.jdt.core.prefs b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide.tests/.settings/org.eclipse.jdt.core.prefs
index d172f587194961046c05effe2055b0fa2142c95f..00df47c42530d09b1dddec47d31f29688bfdc37b 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide.tests/.settings/org.eclipse.jdt.core.prefs
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide.tests/.settings/org.eclipse.jdt.core.prefs
@@ -7,9 +7,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nul
org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.compliance=11
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -23,6 +23,7 @@ org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=warning
org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
@@ -66,6 +67,7 @@ org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=warn
org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=warning
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
@@ -97,4 +99,5 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide.tests/META-INF/MANIFEST.MF b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide.tests/META-INF/MANIFEST.MF
index af2a59da07d210bf75916aa03a097f06b07688e3..9986e61a0bb0d7a07152496b882d5b72d4eb24d7 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide.tests/META-INF/MANIFEST.MF
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide.tests/META-INF/MANIFEST.MF
@@ -8,7 +8,7 @@ Bundle-Localization: plugin
Bundle-ActivationPolicy: lazy
Require-Bundle: org.eclipse.swtbot.go,
org.eclipse.linuxtools.systemtap.graphing.core
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
Fragment-Host: org.eclipse.linuxtools.systemtap.ui.ide
-Import-Package: org.swtchart
+Import-Package: org.eclipse.swtchart
Automatic-Module-Name: org.eclipse.linuxtools.systemtap.ui.ide.tests
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide.tests/pom.xml b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide.tests/pom.xml
index d7d463fdfee07eeb6d6a88914d63962a95190407..84a5b5313547f0db5420fe18043f04404d4000ea 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide.tests/pom.xml
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide.tests/pom.xml
@@ -15,7 +15,7 @@
<parent>
<artifactId>linuxtools-systemtap-parent</artifactId>
<groupId>org.eclipse.linuxtools.systemtap</groupId>
- <version>7.4.0</version>
+ <version>8.1.0</version>
</parent>
<artifactId>org.eclipse.linuxtools.systemtap.ui.ide.tests</artifactId>
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide.tests/src/org/eclipse/linuxtools/systemtap/ui/ide/test/swtbot/TestCreateSystemtapScript.java b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide.tests/src/org/eclipse/linuxtools/systemtap/ui/ide/test/swtbot/TestCreateSystemtapScript.java
index dcd1e001ab56b039daeac3c2cb2d4e4a906ccab4..31bb8ef4889dc710cd33ca0aae70350287a7617d 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide.tests/src/org/eclipse/linuxtools/systemtap/ui/ide/test/swtbot/TestCreateSystemtapScript.java
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide.tests/src/org/eclipse/linuxtools/systemtap/ui/ide/test/swtbot/TestCreateSystemtapScript.java
@@ -75,6 +75,10 @@ import org.eclipse.swtbot.swt.finder.widgets.SWTBotToolbarButton;
import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree;
import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem;
import org.eclipse.swtbot.swt.finder.widgets.TimeoutException;
+import org.eclipse.swtchart.Chart;
+import org.eclipse.swtchart.IAxis;
+import org.eclipse.swtchart.ISeries;
+import org.eclipse.swtchart.Range;
import org.hamcrest.Matcher;
import org.junit.After;
import org.junit.AfterClass;
@@ -82,10 +86,6 @@ import org.junit.BeforeClass;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.swtchart.Chart;
-import org.swtchart.IAxis;
-import org.swtchart.ISeries;
-import org.swtchart.Range;
@RunWith(SWTBotJunit4ClassRunner.class)
@Ignore("fails with Oxygen")
@@ -1305,7 +1305,7 @@ public class TestCreateSystemtapScript {
});
bot.sleep(100);
UIThreadRunnable.syncExec(() -> {
- Point mousePoint = cb.getChart().getPlotArea()
+ Point mousePoint = cb.getChart().getPlotArea().getControl()
.toDisplay(cb.getChart().getSeriesSet().getSeries()[0].getPixelCoordinates(dataPoint));
event.x = mousePoint.x;
event.y = mousePoint.y;
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/.classpath b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/.classpath
index 43b986286a9e5fd1828793fa4b2353d02ab8625f..1db08c6b4ce2fb50395b2f9c9a50c140a0bab199 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/.classpath
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/.classpath
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="target/classes"/>
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/.settings/org.eclipse.jdt.core.prefs b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/.settings/org.eclipse.jdt.core.prefs
index e1bdb9132f3f1a4a62a57e71301791ed83a5f669..78dac72dcb68133abc9217c7f481e0050e0d9516 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/.settings/org.eclipse.jdt.core.prefs
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/.settings/org.eclipse.jdt.core.prefs
@@ -10,9 +10,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.compliance=11
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -26,6 +26,7 @@ org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=warning
org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
@@ -71,6 +72,7 @@ org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=warn
org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
@@ -106,4 +108,5 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/META-INF/MANIFEST.MF b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/META-INF/MANIFEST.MF
index 2d5e6088a745d63f56f0cf4275992146a1d8de55..ce04aa4f9b01bc9b32605dbf219fc0b66d626c99 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/META-INF/MANIFEST.MF
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/META-INF/MANIFEST.MF
@@ -26,5 +26,5 @@ Bundle-ActivationPolicy: lazy
Import-Package: com.jcraft.jsch;version="0.1.37",
org.eclipse.cdt.core.model,
org.eclipse.linuxtools.tools.launch.core.factory
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
Automatic-Module-Name: org.eclipse.linuxtools.systemtap.ui.ide
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/pom.xml b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/pom.xml
index 0091f31fef5168498d1105d4ffd604b970e4f8db..a93560951441f3661a8932f1c0be03bcd29afc67 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/pom.xml
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/pom.xml
@@ -15,7 +15,7 @@
<parent>
<artifactId>linuxtools-systemtap-parent</artifactId>
<groupId>org.eclipse.linuxtools.systemtap</groupId>
- <version>7.4.0</version>
+ <version>8.1.0</version>
</parent>
<artifactId>org.eclipse.linuxtools.systemtap.ui.ide</artifactId>
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/internal/systemtap/ui/ide/IDEPlugin.java b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/internal/systemtap/ui/ide/IDEPlugin.java
index f0ec83d322f10cedfc656519b3f5cff6c7c91ac6..d11ca5a0e566073c150963e05eb7ac838adfe5ab 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/internal/systemtap/ui/ide/IDEPlugin.java
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/internal/systemtap/ui/ide/IDEPlugin.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2006, 2018 IBM Corporation and others.
+ * Copyright (c) 2006, 2019 IBM Corporation and others.
*
* This program and the accompanying materials are made
* available under the terms of the Eclipse Public License 2.0
@@ -23,11 +23,13 @@ import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.jface.resource.ResourceLocator;
import org.eclipse.linuxtools.internal.systemtap.ui.ide.structures.TapsetLibrary;
import org.eclipse.linuxtools.systemtap.ui.consolelog.internal.ConsoleLogPlugin;
import org.eclipse.linuxtools.systemtap.ui.consolelog.preferences.ConsoleLogPreferenceConstants;
import org.eclipse.linuxtools.systemtap.ui.consolelog.structures.ScriptConsole;
import org.eclipse.ui.IWorkbenchListener;
+import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.plugin.AbstractUIPlugin;
import org.osgi.framework.BundleContext;
@@ -56,7 +58,7 @@ public class IDEPlugin extends AbstractUIPlugin {
super.start(context);
workbenchListener = new IDECloseMonitor();
- plugin.getWorkbench().addWorkbenchListener(workbenchListener);
+ PlatformUI.getWorkbench().addWorkbenchListener(workbenchListener);
TapsetLibrary.init();
}
@@ -68,7 +70,7 @@ public class IDEPlugin extends AbstractUIPlugin {
super.stop(context);
TapsetLibrary.stop();
ScriptConsole.stopAll();
- plugin.getWorkbench().removeWorkbenchListener(workbenchListener);
+ PlatformUI.getWorkbench().removeWorkbenchListener(workbenchListener);
plugin = null;
}
@@ -87,7 +89,7 @@ public class IDEPlugin extends AbstractUIPlugin {
* @return the image descriptor
*/
public static ImageDescriptor getImageDescriptor(String path) {
- return AbstractUIPlugin.imageDescriptorFromPlugin(PLUGIN_ID, path);
+ return ResourceLocator.imageDescriptorFromBundle(PLUGIN_ID, path).get();
}
/**
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/internal/systemtap/ui/ide/launcher/SystemTapScriptGraphOptionsTab.java b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/internal/systemtap/ui/ide/launcher/SystemTapScriptGraphOptionsTab.java
index a14e1e0940951fca0bd940d7b9da4493692a0862..c326d7b26b626462a0d8d17a971b5061459ed79b 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/internal/systemtap/ui/ide/launcher/SystemTapScriptGraphOptionsTab.java
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/internal/systemtap/ui/ide/launcher/SystemTapScriptGraphOptionsTab.java
@@ -31,6 +31,7 @@ import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
import org.eclipse.debug.ui.AbstractLaunchConfigurationTab;
import org.eclipse.debug.ui.ILaunchConfigurationTab;
import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.jface.resource.ResourceLocator;
import org.eclipse.jface.wizard.WizardDialog;
import org.eclipse.linuxtools.internal.systemtap.ui.ide.IDEPlugin;
import org.eclipse.linuxtools.systemtap.graphing.core.datasets.IDataSet;
@@ -62,7 +63,6 @@ import org.eclipse.swt.widgets.TableItem;
import org.eclipse.swt.widgets.Text;
import org.eclipse.ui.IWorkbench;
import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
public class SystemTapScriptGraphOptionsTab extends
AbstractLaunchConfigurationTab {
@@ -1384,8 +1384,8 @@ public class SystemTapScriptGraphOptionsTab extends
@Override
public Image getImage() {
- return AbstractUIPlugin.imageDescriptorFromPlugin(IDEPlugin.PLUGIN_ID,
- "icons/graphing_tab.gif").createImage(); //$NON-NLS-1$
+ return ResourceLocator.imageDescriptorFromBundle(IDEPlugin.PLUGIN_ID, "icons/graphing_tab.gif").get() //$NON-NLS-1$
+ .createImage();
}
private void setGraphingEnabled(boolean enabled) {
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/internal/systemtap/ui/ide/launcher/SystemTapScriptLaunchConfigurationTab.java b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/internal/systemtap/ui/ide/launcher/SystemTapScriptLaunchConfigurationTab.java
index fdf72beff35c7185c384802d390d15d64340d997..924bdd6b1a73efa6e953cc6f629637368d000f23 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/internal/systemtap/ui/ide/launcher/SystemTapScriptLaunchConfigurationTab.java
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/internal/systemtap/ui/ide/launcher/SystemTapScriptLaunchConfigurationTab.java
@@ -23,6 +23,7 @@ import org.eclipse.core.runtime.Platform;
import org.eclipse.debug.core.ILaunchConfiguration;
import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
import org.eclipse.debug.ui.AbstractLaunchConfigurationTab;
+import org.eclipse.jface.resource.ResourceLocator;
import org.eclipse.jface.text.TextSelection;
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.TreeSelection;
@@ -45,7 +46,6 @@ import org.eclipse.ui.IEditorPart;
import org.eclipse.ui.IWorkbenchWindow;
import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.ide.ResourceUtil;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
public class SystemTapScriptLaunchConfigurationTab extends
AbstractLaunchConfigurationTab {
@@ -347,7 +347,6 @@ public class SystemTapScriptLaunchConfigurationTab extends
@Override
public Image getImage() {
- return AbstractUIPlugin.imageDescriptorFromPlugin(IDEPlugin.PLUGIN_ID,
- "icons/main_tab.gif").createImage(); //$NON-NLS-1$
+ return ResourceLocator.imageDescriptorFromBundle(IDEPlugin.PLUGIN_ID, "icons/main_tab.gif").get().createImage(); //$NON-NLS-1$
}
}
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/internal/systemtap/ui/ide/launcher/SystemTapScriptOptionsTab.java b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/internal/systemtap/ui/ide/launcher/SystemTapScriptOptionsTab.java
index 55df8262970bfe0165da140163d70c2d01a760b9..8a77e7fd0b092b4421ec691d9dffb8c1211cc372 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/internal/systemtap/ui/ide/launcher/SystemTapScriptOptionsTab.java
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/internal/systemtap/ui/ide/launcher/SystemTapScriptOptionsTab.java
@@ -22,6 +22,7 @@ import org.eclipse.debug.core.ILaunchConfiguration;
import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
import org.eclipse.debug.ui.AbstractLaunchConfigurationTab;
import org.eclipse.jface.preference.IPreferenceStore;
+import org.eclipse.jface.resource.ResourceLocator;
import org.eclipse.linuxtools.internal.systemtap.ui.ide.IDEPlugin;
import org.eclipse.linuxtools.internal.systemtap.ui.ide.preferences.IDEPreferenceConstants;
import org.eclipse.linuxtools.systemtap.graphing.ui.widgets.ExceptionErrorDialog;
@@ -39,7 +40,6 @@ import org.eclipse.swt.widgets.Group;
import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Text;
import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
public class SystemTapScriptOptionsTab extends AbstractLaunchConfigurationTab {
@@ -266,8 +266,8 @@ public class SystemTapScriptOptionsTab extends AbstractLaunchConfigurationTab {
@Override
public Image getImage() {
- return AbstractUIPlugin.imageDescriptorFromPlugin(IDEPlugin.PLUGIN_ID,
- "icons/smileytap_small.gif").createImage(); //$NON-NLS-1$
+ return ResourceLocator.imageDescriptorFromBundle(IDEPlugin.PLUGIN_ID, "icons/smileytap_small.gif").get() //$NON-NLS-1$
+ .createImage();
}
}
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/internal/systemtap/ui/ide/views/BrowserView.java b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/internal/systemtap/ui/ide/views/BrowserView.java
index 9141ee1cb54ed92b4ff8c76302f8ab2fd430fec0..cd6d781d9b46fb3cb87e09626530a2612fb0848c 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/internal/systemtap/ui/ide/views/BrowserView.java
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/internal/systemtap/ui/ide/views/BrowserView.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2006, 2018 IBM Corporation and others.
+ * Copyright (c) 2006, 2019 IBM Corporation and others.
*
* This program and the accompanying materials are made
* available under the terms of the Eclipse Public License 2.0
@@ -119,7 +119,8 @@ public abstract class BrowserView extends ViewPart {
@Override
public void createPartControl(Composite parent) {
PatternFilter filter = new PatternFilter();
- FilteredTree filteredTree = new FilteredTree(parent, SWT.MULTI | SWT.H_SCROLL | SWT.V_SCROLL, filter, true);
+ FilteredTree filteredTree = new FilteredTree(parent, SWT.MULTI | SWT.H_SCROLL | SWT.V_SCROLL, filter, true,
+ true);
viewer = filteredTree.getViewer();
viewer.setContentProvider(new ViewContentProvider());
viewer.setLabelProvider(new ViewLabelProvider());
diff --git a/systemtap/pom.xml b/systemtap/pom.xml
index 88ce86aa23fe012c1ab2d7b784b0841d761ab1aa..b546e8d360e727d76e9053ac4525547de9705c06 100644
--- a/systemtap/pom.xml
+++ b/systemtap/pom.xml
@@ -16,7 +16,7 @@
<parent>
<groupId>org.eclipse.linuxtools</groupId>
<artifactId>linuxtools-parent</artifactId>
- <version>7.4.0</version>
+ <version>8.1.0</version>
</parent>
<groupId>org.eclipse.linuxtools.systemtap</groupId>
diff --git a/vagrant/org.eclipse.linuxtools.vagrant-feature/feature.xml b/vagrant/org.eclipse.linuxtools.vagrant-feature/feature.xml
index 7e1b90aa18330a60d8c88c65ab8b6cdfaaf66fd4..2f7815b6d3dc06f2785670f2fc18d0d04c19f0fd 100644
--- a/vagrant/org.eclipse.linuxtools.vagrant-feature/feature.xml
+++ b/vagrant/org.eclipse.linuxtools.vagrant-feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.linuxtools.vagrant.feature"
label="%featureName"
- version="4.4.0.qualifier"
+ version="5.1.0.qualifier"
provider-name="%featureProvider"
license-feature="org.eclipse.license"
license-feature-version="0.0.0">
diff --git a/vagrant/org.eclipse.linuxtools.vagrant-feature/pom.xml b/vagrant/org.eclipse.linuxtools.vagrant-feature/pom.xml
index 9f58acb71ef67ef285cc09fcac5471cac2968c37..3ea5dc51f5a97c3dbdb415a70e2949092d73b2f7 100644
--- a/vagrant/org.eclipse.linuxtools.vagrant-feature/pom.xml
+++ b/vagrant/org.eclipse.linuxtools.vagrant-feature/pom.xml
@@ -14,12 +14,12 @@
<parent>
<groupId>org.eclipse.linuxtools</groupId>
<artifactId>org.eclipse.linuxtools.vagrant</artifactId>
- <version>4.4.0</version>
+ <version>5.1.0</version>
</parent>
<artifactId>org.eclipse.linuxtools.vagrant.feature</artifactId>
<packaging>eclipse-feature</packaging>
- <version>4.4.0-SNAPSHOT</version>
+ <version>5.1.0-SNAPSHOT</version>
<name>Linux Tools Vagrant Tooling Feature</name>
diff --git a/vagrant/org.eclipse.linuxtools.vagrant.core/.classpath b/vagrant/org.eclipse.linuxtools.vagrant.core/.classpath
index cf36b561195a3e4e3849ff022040558ccc6c3074..bc57d2383d545884b89334a8dd1293afd4316f5d 100644
--- a/vagrant/org.eclipse.linuxtools.vagrant.core/.classpath
+++ b/vagrant/org.eclipse.linuxtools.vagrant.core/.classpath
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src/"/>
<classpathentry kind="output" path="target/classes"/>
diff --git a/vagrant/org.eclipse.linuxtools.vagrant.core/.settings/org.eclipse.jdt.core.prefs b/vagrant/org.eclipse.linuxtools.vagrant.core/.settings/org.eclipse.jdt.core.prefs
index e6aabf54ea677641b2367317800f367eda6a5e44..fb282c74ede02769de9c1d72a5217c210b04fa75 100644
--- a/vagrant/org.eclipse.linuxtools.vagrant.core/.settings/org.eclipse.jdt.core.prefs
+++ b/vagrant/org.eclipse.linuxtools.vagrant.core/.settings/org.eclipse.jdt.core.prefs
@@ -7,9 +7,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nul
org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.compliance=11
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -24,6 +24,7 @@ org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore
org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
@@ -80,6 +81,7 @@ org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=warn
org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
@@ -112,7 +114,8 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11
org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
diff --git a/vagrant/org.eclipse.linuxtools.vagrant.core/META-INF/MANIFEST.MF b/vagrant/org.eclipse.linuxtools.vagrant.core/META-INF/MANIFEST.MF
index fa7b23e23f080a4c0aa996768cf46fa985e3da2b..c2a3352ed921f034c5ad6f0082e1de586b3396f4 100644
--- a/vagrant/org.eclipse.linuxtools.vagrant.core/META-INF/MANIFEST.MF
+++ b/vagrant/org.eclipse.linuxtools.vagrant.core/META-INF/MANIFEST.MF
@@ -10,7 +10,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="3.10.0",
org.eclipse.equinox.registry,
org.eclipse.equinox.security,
org.eclipse.osgi
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
Bundle-ActivationPolicy: lazy
Import-Package: org.eclipse.debug.core,
org.eclipse.jface.preference
diff --git a/vagrant/org.eclipse.linuxtools.vagrant.core/pom.xml b/vagrant/org.eclipse.linuxtools.vagrant.core/pom.xml
index 7ff8bb3bd15fbd9bd3d79e3ced9f2af7d7aba0b6..b18b4aae05d9f44735b1e556fb75d8996590853f 100644
--- a/vagrant/org.eclipse.linuxtools.vagrant.core/pom.xml
+++ b/vagrant/org.eclipse.linuxtools.vagrant.core/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.linuxtools</groupId>
<artifactId>org.eclipse.linuxtools.vagrant</artifactId>
- <version>4.4.0</version>
+ <version>5.1.0</version>
</parent>
<artifactId>org.eclipse.linuxtools.vagrant.core</artifactId>
<version>2.0.0-SNAPSHOT</version>
diff --git a/vagrant/org.eclipse.linuxtools.vagrant.docs/pom.xml b/vagrant/org.eclipse.linuxtools.vagrant.docs/pom.xml
index d16ea39afff4b49a84ce64fbf422a285d9e93bef..b179fa3cc2c354b7a12e9689a059a9da27fc3c8b 100644
--- a/vagrant/org.eclipse.linuxtools.vagrant.docs/pom.xml
+++ b/vagrant/org.eclipse.linuxtools.vagrant.docs/pom.xml
@@ -15,7 +15,7 @@
<parent>
<artifactId>org.eclipse.linuxtools.vagrant</artifactId>
<groupId>org.eclipse.linuxtools</groupId>
- <version>4.4.0</version>
+ <version>5.1.0</version>
</parent>
<artifactId>org.eclipse.linuxtools.vagrant.docs</artifactId>
diff --git a/vagrant/org.eclipse.linuxtools.vagrant.ui/.classpath b/vagrant/org.eclipse.linuxtools.vagrant.ui/.classpath
index cf36b561195a3e4e3849ff022040558ccc6c3074..bc57d2383d545884b89334a8dd1293afd4316f5d 100644
--- a/vagrant/org.eclipse.linuxtools.vagrant.ui/.classpath
+++ b/vagrant/org.eclipse.linuxtools.vagrant.ui/.classpath
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src/"/>
<classpathentry kind="output" path="target/classes"/>
diff --git a/vagrant/org.eclipse.linuxtools.vagrant.ui/.settings/org.eclipse.jdt.core.prefs b/vagrant/org.eclipse.linuxtools.vagrant.ui/.settings/org.eclipse.jdt.core.prefs
index 9676ecc8bef389cb95b751b63dc6cdac0e166aa8..fe8d4a255b7bef6b97c48a312a9179f02af55d56 100644
--- a/vagrant/org.eclipse.linuxtools.vagrant.ui/.settings/org.eclipse.jdt.core.prefs
+++ b/vagrant/org.eclipse.linuxtools.vagrant.ui/.settings/org.eclipse.jdt.core.prefs
@@ -7,9 +7,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nul
org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.compliance=11
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -23,6 +23,7 @@ org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore
org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
@@ -66,6 +67,7 @@ org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=warn
org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
@@ -98,8 +100,13 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11
+org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns=false
+org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647
org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
+org.eclipse.jdt.core.formatter.align_variable_declarations_on_columns=false
+org.eclipse.jdt.core.formatter.align_with_spaces=false
org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
@@ -110,26 +117,37 @@ org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_e
org.eclipse.jdt.core.formatter.alignment_for_assignment=0
org.eclipse.jdt.core.formatter.alignment_for_bitwise_operator=16
org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
+org.eclipse.jdt.core.formatter.alignment_for_compact_loops=16
org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
-org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
+org.eclipse.jdt.core.formatter.alignment_for_conditional_expression_chain=0
+org.eclipse.jdt.core.formatter.alignment_for_enum_constants=16
org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_for_loop_header=0
org.eclipse.jdt.core.formatter.alignment_for_logical_operator=16
org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_module_statements=16
org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
org.eclipse.jdt.core.formatter.alignment_for_multiplicative_operator=16
+org.eclipse.jdt.core.formatter.alignment_for_parameterized_type_references=0
org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_relational_operator=0
org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_shift_operator=0
org.eclipse.jdt.core.formatter.alignment_for_string_concatenation=16
org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_type_arguments=0
+org.eclipse.jdt.core.formatter.alignment_for_type_parameters=0
org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16
org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_after_last_class_body_declaration=0
org.eclipse.jdt.core.formatter.blank_lines_after_package=1
+org.eclipse.jdt.core.formatter.blank_lines_before_abstract_method=1
org.eclipse.jdt.core.formatter.blank_lines_before_field=0
org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
@@ -138,6 +156,7 @@ org.eclipse.jdt.core.formatter.blank_lines_before_method=1
org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
org.eclipse.jdt.core.formatter.blank_lines_before_package=0
org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
+org.eclipse.jdt.core.formatter.blank_lines_between_statement_group_in_switch=0
org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
@@ -151,18 +170,22 @@ org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line
org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.comment.align_tags_descriptions_grouped=true
+org.eclipse.jdt.core.formatter.comment.align_tags_names_descriptions=false
org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
+org.eclipse.jdt.core.formatter.comment.count_line_length_from_starting_position=true
org.eclipse.jdt.core.formatter.comment.format_block_comments=true
org.eclipse.jdt.core.formatter.comment.format_header=false
org.eclipse.jdt.core.formatter.comment.format_html=true
org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
org.eclipse.jdt.core.formatter.comment.format_line_comments=true
org.eclipse.jdt.core.formatter.comment.format_source_code=true
-org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
-org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
+org.eclipse.jdt.core.formatter.comment.indent_parameter_description=false
+org.eclipse.jdt.core.formatter.comment.indent_root_tags=false
+org.eclipse.jdt.core.formatter.comment.indent_tag_description=false
org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
+org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=do not insert
org.eclipse.jdt.core.formatter.comment.line_length=80
org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
@@ -173,7 +196,7 @@ org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
-org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
+org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=false
org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
@@ -185,6 +208,7 @@ org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
org.eclipse.jdt.core.formatter.indentation.size=4
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_enum_constant=insert
org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
@@ -209,11 +233,13 @@ org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
org.eclipse.jdt.core.formatter.insert_space_after_additive_operator=insert
org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_after_arrow_in_switch_case=insert
+org.eclipse.jdt.core.formatter.insert_space_after_arrow_in_switch_default=insert
org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
org.eclipse.jdt.core.formatter.insert_space_after_bitwise_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=do not insert
org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
@@ -239,6 +265,7 @@ org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declar
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_switch_case_expressions=insert
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
@@ -277,6 +304,8 @@ org.eclipse.jdt.core.formatter.insert_space_after_string_concatenation=insert
org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_additive_operator=insert
org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_before_arrow_in_switch_case=insert
+org.eclipse.jdt.core.formatter.insert_space_before_arrow_in_switch_default=insert
org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
org.eclipse.jdt.core.formatter.insert_space_before_bitwise_operator=insert
@@ -323,6 +352,7 @@ org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_decla
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_switch_case_expressions=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
@@ -382,24 +412,58 @@ org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_decla
org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
org.eclipse.jdt.core.formatter.join_lines_in_comments=true
org.eclipse.jdt.core.formatter.join_wrapped_lines=true
+org.eclipse.jdt.core.formatter.keep_annotation_declaration_on_one_line=one_line_never
+org.eclipse.jdt.core.formatter.keep_anonymous_type_declaration_on_one_line=one_line_never
+org.eclipse.jdt.core.formatter.keep_code_block_on_one_line=one_line_never
org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_enum_constant_declaration_on_one_line=one_line_never
+org.eclipse.jdt.core.formatter.keep_enum_declaration_on_one_line=one_line_never
+org.eclipse.jdt.core.formatter.keep_if_then_body_block_on_one_line=one_line_never
org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_lambda_body_block_on_one_line=one_line_never
+org.eclipse.jdt.core.formatter.keep_loop_body_block_on_one_line=one_line_never
+org.eclipse.jdt.core.formatter.keep_method_body_on_one_line=one_line_never
+org.eclipse.jdt.core.formatter.keep_simple_do_while_body_on_same_line=false
+org.eclipse.jdt.core.formatter.keep_simple_for_body_on_same_line=false
+org.eclipse.jdt.core.formatter.keep_simple_getter_setter_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_simple_while_body_on_same_line=false
org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.lineSplit=80
+org.eclipse.jdt.core.formatter.keep_type_declaration_on_one_line=one_line_never
+org.eclipse.jdt.core.formatter.lineSplit=120
org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.number_of_blank_lines_after_code_block=0
+org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_code_block=0
org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
+org.eclipse.jdt.core.formatter.number_of_blank_lines_at_end_of_code_block=0
+org.eclipse.jdt.core.formatter.number_of_blank_lines_at_end_of_method_body=0
+org.eclipse.jdt.core.formatter.number_of_blank_lines_before_code_block=0
org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
+org.eclipse.jdt.core.formatter.parentheses_positions_in_annotation=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_catch_clause=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_enum_constant_declaration=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_for_statment=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_if_while_statement=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_lambda_declaration=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_method_delcaration=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_method_invocation=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_switch_statement=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_try_clause=common_lines
org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
org.eclipse.jdt.core.formatter.tabulation.char=tab
org.eclipse.jdt.core.formatter.tabulation.size=4
org.eclipse.jdt.core.formatter.use_on_off_tags=false
org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
org.eclipse.jdt.core.formatter.wrap_before_additive_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_assignment_operator=false
org.eclipse.jdt.core.formatter.wrap_before_bitwise_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_conditional_operator=true
org.eclipse.jdt.core.formatter.wrap_before_logical_operator=true
org.eclipse.jdt.core.formatter.wrap_before_multiplicative_operator=true
org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
+org.eclipse.jdt.core.formatter.wrap_before_relational_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_shift_operator=true
org.eclipse.jdt.core.formatter.wrap_before_string_concatenation=true
org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
+org.eclipse.jdt.core.javaFormatter=org.eclipse.jdt.core.defaultJavaFormatter
diff --git a/vagrant/org.eclipse.linuxtools.vagrant.ui/.settings/org.eclipse.jdt.ui.prefs b/vagrant/org.eclipse.linuxtools.vagrant.ui/.settings/org.eclipse.jdt.ui.prefs
index 446b847248fe18b33c39bc69cb039342f8d63727..a8c7697e676efd53762f2cc31871cbd99c280e8e 100644
--- a/vagrant/org.eclipse.linuxtools.vagrant.ui/.settings/org.eclipse.jdt.ui.prefs
+++ b/vagrant/org.eclipse.linuxtools.vagrant.ui/.settings/org.eclipse.jdt.ui.prefs
@@ -1,7 +1,7 @@
eclipse.preferences.version=1
editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
formatter_profile=org.eclipse.jdt.ui.default.eclipse_profile
-formatter_settings_version=12
+formatter_settings_version=17
sp_cleanup.add_default_serial_version_id=true
sp_cleanup.add_generated_serial_version_id=false
sp_cleanup.add_missing_annotations=true
@@ -30,16 +30,20 @@ sp_cleanup.never_use_blocks=false
sp_cleanup.never_use_parentheses_in_expressions=true
sp_cleanup.on_save_use_additional_actions=true
sp_cleanup.organize_imports=true
+sp_cleanup.push_down_negation=false
sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
sp_cleanup.qualify_static_member_accesses_with_declaring_class=false
sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
sp_cleanup.remove_private_constructors=true
+sp_cleanup.remove_redundant_modifiers=false
+sp_cleanup.remove_redundant_semicolons=false
sp_cleanup.remove_redundant_type_arguments=true
sp_cleanup.remove_trailing_whitespaces=false
sp_cleanup.remove_trailing_whitespaces_all=true
sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
+sp_cleanup.remove_unnecessary_array_creation=false
sp_cleanup.remove_unnecessary_casts=true
sp_cleanup.remove_unnecessary_nls_tags=false
sp_cleanup.remove_unused_imports=false
@@ -51,6 +55,7 @@ sp_cleanup.remove_unused_private_types=true
sp_cleanup.sort_members=false
sp_cleanup.sort_members_all=false
sp_cleanup.use_anonymous_class_creation=false
+sp_cleanup.use_autoboxing=false
sp_cleanup.use_blocks=false
sp_cleanup.use_blocks_only_for_return_and_throw=false
sp_cleanup.use_lambda=true
@@ -60,3 +65,4 @@ sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
sp_cleanup.use_this_for_non_static_method_access=false
sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
sp_cleanup.use_type_arguments=false
+sp_cleanup.use_unboxing=false
diff --git a/vagrant/org.eclipse.linuxtools.vagrant.ui/META-INF/MANIFEST.MF b/vagrant/org.eclipse.linuxtools.vagrant.ui/META-INF/MANIFEST.MF
index f0bcc3d1d7ed18f5dbe8c4a4b3d68d2e8cead275..d668e804da95bb0de7dbb27575857f2ec0c16d7a 100644
--- a/vagrant/org.eclipse.linuxtools.vagrant.ui/META-INF/MANIFEST.MF
+++ b/vagrant/org.eclipse.linuxtools.vagrant.ui/META-INF/MANIFEST.MF
@@ -26,7 +26,7 @@ Require-Bundle: org.eclipse.ui,
org.eclipse.tm.terminal.connector.ssh;bundle-version="4.0.0",
org.eclipse.tm.terminal.view.core;bundle-version="4.0.0",
org.eclipse.tm.terminal.view.ui;bundle-version="4.0.0"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
Bundle-ActivationPolicy: lazy
Bundle-Localization: plugin
Export-Package: org.eclipse.linuxtools.internal.vagrant.ui;x-internal:=true,
diff --git a/vagrant/org.eclipse.linuxtools.vagrant.ui/pom.xml b/vagrant/org.eclipse.linuxtools.vagrant.ui/pom.xml
index 1d249090bf0c6b80ba1bc06c4e21471f2d7e8503..0c0e9a5caa793c2f2feddef4f051255fe3296602 100644
--- a/vagrant/org.eclipse.linuxtools.vagrant.ui/pom.xml
+++ b/vagrant/org.eclipse.linuxtools.vagrant.ui/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.linuxtools</groupId>
<artifactId>org.eclipse.linuxtools.vagrant</artifactId>
- <version>4.4.0</version>
+ <version>5.1.0</version>
</parent>
<artifactId>org.eclipse.linuxtools.vagrant.ui</artifactId>
<version>2.0.0-SNAPSHOT</version>
diff --git a/vagrant/org.eclipse.linuxtools.vagrant.ui/src/org/eclipse/linuxtools/internal/vagrant/ui/commands/OpenVagrantfileCommandHandler.java b/vagrant/org.eclipse.linuxtools.vagrant.ui/src/org/eclipse/linuxtools/internal/vagrant/ui/commands/OpenVagrantfileCommandHandler.java
index feb0226b8d7a7b43be66dd24793edb4849267efb..5bdb751bba7c85c6f106d4e30916674eabe649fa 100644
--- a/vagrant/org.eclipse.linuxtools.vagrant.ui/src/org/eclipse/linuxtools/internal/vagrant/ui/commands/OpenVagrantfileCommandHandler.java
+++ b/vagrant/org.eclipse.linuxtools.vagrant.ui/src/org/eclipse/linuxtools/internal/vagrant/ui/commands/OpenVagrantfileCommandHandler.java
@@ -25,6 +25,7 @@ import org.eclipse.linuxtools.vagrant.core.IVagrantVM;
import org.eclipse.swt.widgets.Display;
import org.eclipse.ui.IWorkbenchPage;
import org.eclipse.ui.PartInitException;
+import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.ide.IDE;
public class OpenVagrantfileCommandHandler extends BaseVMCommandHandler {
@@ -46,10 +47,8 @@ public class OpenVagrantfileCommandHandler extends BaseVMCommandHandler {
@Override
void executeInJob(IVagrantVM vm, IProgressMonitor monitor) {
Display.getDefault().asyncExec(() -> {
- IWorkbenchPage activePage = Activator.getDefault().getWorkbench()
- .getActiveWorkbenchWindow().getActivePage();
- IPath vgFilePath = new Path(vm.directory().getAbsolutePath())
- .append("Vagrantfile"); //$NON-NLS-1$
+ IWorkbenchPage activePage = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
+ IPath vgFilePath = new Path(vm.directory().getAbsolutePath()).append("Vagrantfile"); //$NON-NLS-1$
IFileStore file = EFS.getLocalFileSystem().getStore(vgFilePath);
try {
IDE.openEditorOnFileStore(activePage, file);
diff --git a/vagrant/pom.xml b/vagrant/pom.xml
index 001177d0fe351ad0a5babba237af83ad9c20ef63..5db462b69e863802e1449e5f9d3b852426ddeeae 100644
--- a/vagrant/pom.xml
+++ b/vagrant/pom.xml
@@ -3,13 +3,13 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.eclipse.linuxtools</groupId>
<artifactId>org.eclipse.linuxtools.vagrant</artifactId>
- <version>4.4.0</version>
+ <version>5.1.0</version>
<packaging>pom</packaging>
<parent>
<groupId>org.eclipse.linuxtools</groupId>
<artifactId>linuxtools-parent</artifactId>
- <version>7.4.0</version>
+ <version>8.1.0</version>
</parent>
<properties>
@@ -72,7 +72,7 @@
<dependency>
<groupId>org.eclipse.tycho.extras</groupId>
<artifactId>tycho-sourceref-jgit</artifactId>
- <version>${tycho-extras-version}</version>
+ <version>${tycho-version}</version>
</dependency>
</dependencies>
</plugin>
diff --git a/valgrind/org.eclipse.linuxtools.valgrind-feature/feature.xml b/valgrind/org.eclipse.linuxtools.valgrind-feature/feature.xml
index e938896d5caca6c3ed06a368addbdc97caea9359..a19fe18f696c2557c8984d5ce6f98959157539e4 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind-feature/feature.xml
+++ b/valgrind/org.eclipse.linuxtools.valgrind-feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.linuxtools.valgrind"
label="%featureName"
- version="7.4.0.qualifier"
+ version="8.1.0.qualifier"
provider-name="%featureProvider"
license-feature="org.eclipse.license"
license-feature-version="0.0.0">
diff --git a/valgrind/org.eclipse.linuxtools.valgrind-feature/pom.xml b/valgrind/org.eclipse.linuxtools.valgrind-feature/pom.xml
index be1ee57a72c25df908e2552edca2cfdb282b425a..44ac4934ad49d32ffec55d266098bdbb66154435 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind-feature/pom.xml
+++ b/valgrind/org.eclipse.linuxtools.valgrind-feature/pom.xml
@@ -15,12 +15,12 @@
<parent>
<artifactId>linuxtools-valgrind-parent</artifactId>
<groupId>org.eclipse.linuxtools.valgrind</groupId>
- <version>7.4.0</version>
+ <version>8.1.0</version>
</parent>
<artifactId>org.eclipse.linuxtools.valgrind</artifactId>
<packaging>eclipse-feature</packaging>
- <version>7.4.0-SNAPSHOT</version>
+ <version>8.1.0-SNAPSHOT</version>
<name>Linux Tools Valgrind Tools Integration Feature</name>
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/.classpath b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/.classpath
index 43b986286a9e5fd1828793fa4b2353d02ab8625f..a621c21ac550d71458aac26221ac3641277a488d 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/.classpath
+++ b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/.classpath
@@ -1,7 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="src" path="src"/>
+ <classpathentry kind="src" path="src">
+ <attributes>
+ <attribute name="test" value="true"/>
+ </attributes>
+ </classpathentry>
<classpathentry kind="output" path="target/classes"/>
</classpath>
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/.settings/org.eclipse.jdt.core.prefs b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/.settings/org.eclipse.jdt.core.prefs
index 53f22b92c139d6994e0b268c60098d227f3f5d52..7b4eecc744e13e0763dd16841c552853d67d729c 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/.settings/org.eclipse.jdt.core.prefs
+++ b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/.settings/org.eclipse.jdt.core.prefs
@@ -6,8 +6,8 @@ org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annota
org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
+org.eclipse.jdt.core.compiler.compliance=11
org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
@@ -18,6 +18,7 @@ org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=warning
org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
@@ -61,6 +62,7 @@ org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=warn
org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=warning
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
@@ -92,4 +94,5 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/META-INF/MANIFEST.MF b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/META-INF/MANIFEST.MF
index 24a3bef0f916a4d5986b31def73fed62d966397d..b29f1b4fe4b7644ac5719a87e2c6736d7634d859 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/META-INF/MANIFEST.MF
+++ b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/META-INF/MANIFEST.MF
@@ -5,7 +5,7 @@ Bundle-SymbolicName: org.eclipse.linuxtools.valgrind.cachegrind.tests
Bundle-Version: 1.0.0.qualifier
Bundle-Vendor: %Bundle-Vendor.0
Require-Bundle: org.junit;bundle-version="4.7.0"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
Bundle-ActivationPolicy: lazy
Bundle-Localization: plugin
Fragment-Host: org.eclipse.linuxtools.valgrind.cachegrind
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/pom.xml b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/pom.xml
index 687e8260e87ea7e7a376e326938cb15bf78e21a8..4327f1e62a1a59069e6f5d2ef827360fe5b74109 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/pom.xml
+++ b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/pom.xml
@@ -15,7 +15,7 @@
<parent>
<artifactId>linuxtools-valgrind-parent</artifactId>
<groupId>org.eclipse.linuxtools.valgrind</groupId>
- <version>7.4.0</version>
+ <version>8.1.0</version>
</parent>
<artifactId>org.eclipse.linuxtools.valgrind.cachegrind.tests</artifactId>
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.cachegrind/.classpath b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind/.classpath
index 43b986286a9e5fd1828793fa4b2353d02ab8625f..1db08c6b4ce2fb50395b2f9c9a50c140a0bab199 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.cachegrind/.classpath
+++ b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind/.classpath
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="target/classes"/>
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.cachegrind/.settings/org.eclipse.jdt.core.prefs b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind/.settings/org.eclipse.jdt.core.prefs
index df2ab3a48b18af44b4b2811f8f06bca3e1a09a91..1cf590090233f30bd5077691a2f5bdcb0eac65f6 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.cachegrind/.settings/org.eclipse.jdt.core.prefs
+++ b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind/.settings/org.eclipse.jdt.core.prefs
@@ -9,8 +9,8 @@ org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nul
org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
+org.eclipse.jdt.core.compiler.compliance=11
org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
@@ -21,6 +21,7 @@ org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=warning
org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
@@ -64,6 +65,7 @@ org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=warn
org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
@@ -96,4 +98,5 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.cachegrind/.settings/org.eclipse.jdt.ui.prefs b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind/.settings/org.eclipse.jdt.ui.prefs
index 48e17e1a61b7eb437ec76c8c3c8132934ae7e518..6c8cdab5c5266304f55a3df70739c458e11c09d7 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.cachegrind/.settings/org.eclipse.jdt.ui.prefs
+++ b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind/.settings/org.eclipse.jdt.ui.prefs
@@ -13,10 +13,12 @@ sp_cleanup.always_use_blocks=true
sp_cleanup.always_use_parentheses_in_expressions=false
sp_cleanup.always_use_this_for_non_static_field_access=false
sp_cleanup.always_use_this_for_non_static_method_access=false
-sp_cleanup.convert_to_enhanced_for_loop=false
+sp_cleanup.convert_functional_interfaces=true
+sp_cleanup.convert_to_enhanced_for_loop=true
sp_cleanup.correct_indentation=false
-sp_cleanup.format_source_code=false
-sp_cleanup.format_source_code_changes_only=false
+sp_cleanup.format_source_code=true
+sp_cleanup.format_source_code_changes_only=true
+sp_cleanup.insert_inferred_type_arguments=false
sp_cleanup.make_local_variable_final=false
sp_cleanup.make_parameters_final=false
sp_cleanup.make_private_fields_final=true
@@ -26,18 +28,23 @@ sp_cleanup.never_use_blocks=false
sp_cleanup.never_use_parentheses_in_expressions=true
sp_cleanup.on_save_use_additional_actions=true
sp_cleanup.organize_imports=true
+sp_cleanup.push_down_negation=false
sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
sp_cleanup.qualify_static_member_accesses_with_declaring_class=false
sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
sp_cleanup.remove_private_constructors=true
-sp_cleanup.remove_trailing_whitespaces=false
+sp_cleanup.remove_redundant_modifiers=true
+sp_cleanup.remove_redundant_semicolons=true
+sp_cleanup.remove_redundant_type_arguments=true
+sp_cleanup.remove_trailing_whitespaces=true
sp_cleanup.remove_trailing_whitespaces_all=true
sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
+sp_cleanup.remove_unnecessary_array_creation=true
sp_cleanup.remove_unnecessary_casts=true
sp_cleanup.remove_unnecessary_nls_tags=false
-sp_cleanup.remove_unused_imports=false
+sp_cleanup.remove_unused_imports=true
sp_cleanup.remove_unused_local_variables=false
sp_cleanup.remove_unused_private_fields=true
sp_cleanup.remove_unused_private_members=false
@@ -45,10 +52,14 @@ sp_cleanup.remove_unused_private_methods=true
sp_cleanup.remove_unused_private_types=true
sp_cleanup.sort_members=false
sp_cleanup.sort_members_all=false
+sp_cleanup.use_anonymous_class_creation=false
+sp_cleanup.use_autoboxing=false
sp_cleanup.use_blocks=false
sp_cleanup.use_blocks_only_for_return_and_throw=false
+sp_cleanup.use_lambda=true
sp_cleanup.use_parentheses_in_expressions=false
sp_cleanup.use_this_for_non_static_field_access=false
sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
sp_cleanup.use_this_for_non_static_method_access=false
sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+sp_cleanup.use_unboxing=false
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.cachegrind/META-INF/MANIFEST.MF b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind/META-INF/MANIFEST.MF
index 3683cca4f26c5ee72d5a85c4bbef4312ef900300..0a3087efd379bc099b0cf7529bce8c4eb9951d72 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.cachegrind/META-INF/MANIFEST.MF
+++ b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind/META-INF/MANIFEST.MF
@@ -6,7 +6,7 @@ Bundle-Version: 1.1.0.qualifier
Bundle-Vendor: %Bundle-Vendor.0
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
Bundle-ActivationPolicy: lazy
Bundle-Localization: plugin
Import-Package: org.eclipse.cdt.core.model,
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.cachegrind/pom.xml b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind/pom.xml
index 89efff486ccdb970ebc5a73be3ac755b2b08e068..80695306ded932b4a6fe0788eea291a170147385 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.cachegrind/pom.xml
+++ b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind/pom.xml
@@ -15,7 +15,7 @@
<parent>
<artifactId>linuxtools-valgrind-parent</artifactId>
<groupId>org.eclipse.linuxtools.valgrind</groupId>
- <version>7.4.0</version>
+ <version>8.1.0</version>
</parent>
<artifactId>org.eclipse.linuxtools.valgrind.cachegrind</artifactId>
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.cachegrind/src/org/eclipse/linuxtools/internal/valgrind/cachegrind/CachegrindLabelProvider.java b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind/src/org/eclipse/linuxtools/internal/valgrind/cachegrind/CachegrindLabelProvider.java
index c9e6cd353728ff296928c3c9bacb32f9cd03cde0..f695900940d8f21c504c551e4f59f03702c5d6e1 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.cachegrind/src/org/eclipse/linuxtools/internal/valgrind/cachegrind/CachegrindLabelProvider.java
+++ b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind/src/org/eclipse/linuxtools/internal/valgrind/cachegrind/CachegrindLabelProvider.java
@@ -1,6 +1,6 @@
/*******************************************************************************
- * Copyright (c) 2009, 2018 Red Hat, Inc.
- *
+ * Copyright (c) 2009, 2019 Red Hat, Inc.
+ *
* This program and the accompanying materials are made
* available under the terms of the Eclipse Public License 2.0
* which is available at https://www.eclipse.org/legal/epl-2.0/
@@ -18,6 +18,7 @@ import org.eclipse.cdt.ui.CElementLabelProvider;
import org.eclipse.core.runtime.IAdaptable;
import org.eclipse.debug.ui.DebugUITools;
import org.eclipse.debug.ui.IDebugUIConstants;
+import org.eclipse.jface.resource.ResourceLocator;
import org.eclipse.jface.viewers.CellLabelProvider;
import org.eclipse.jface.viewers.ViewerCell;
import org.eclipse.linuxtools.internal.valgrind.cachegrind.model.CachegrindFile;
@@ -29,7 +30,6 @@ import org.eclipse.osgi.util.NLS;
import org.eclipse.swt.graphics.Image;
import org.eclipse.ui.ISharedImages;
import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
public class CachegrindLabelProvider extends CellLabelProvider {
@@ -39,14 +39,14 @@ public class CachegrindLabelProvider extends CellLabelProvider {
protected DecimalFormat df = new DecimalFormat("#,##0"); //$NON-NLS-1$
- private static final Image FUNC_IMG = AbstractUIPlugin.imageDescriptorFromPlugin(CachegrindPlugin.PLUGIN_ID, "icons/function_obj.gif").createImage(); //$NON-NLS-1$
+ private static final Image FUNC_IMG = ResourceLocator.imageDescriptorFromBundle(CachegrindPlugin.PLUGIN_ID, "icons/function_obj.gif").get().createImage(); //$NON-NLS-1$
@Override
public void update(ViewerCell cell) {
ICachegrindElement element = ((ICachegrindElement) cell.getElement());
int index = cell.getColumnIndex();
- if (index == 0) {
+ if (index == 0) {
if (element instanceof CachegrindFile) {
// Try to use the CElementLabelProvider
IAdaptable model = ((CachegrindFile) element).getModel();
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.core.tests/.classpath b/valgrind/org.eclipse.linuxtools.valgrind.core.tests/.classpath
index f193818786f61c1c84ac29c76272f500fcc97986..a621c21ac550d71458aac26221ac3641277a488d 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.core.tests/.classpath
+++ b/valgrind/org.eclipse.linuxtools.valgrind.core.tests/.classpath
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src">
<attributes>
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.core.tests/.settings/org.eclipse.jdt.core.prefs b/valgrind/org.eclipse.linuxtools.valgrind.core.tests/.settings/org.eclipse.jdt.core.prefs
index 5ed59cda7fff83e073bb4b5ca951dd9613416083..90b087049c63bcc20a3ccc8e66d77742a010f54c 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.core.tests/.settings/org.eclipse.jdt.core.prefs
+++ b/valgrind/org.eclipse.linuxtools.valgrind.core.tests/.settings/org.eclipse.jdt.core.prefs
@@ -7,9 +7,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nul
org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.compliance=11
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -24,6 +24,7 @@ org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=warning
org.eclipse.jdt.core.compiler.problem.fallthroughCase=warning
@@ -80,6 +81,7 @@ org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=warn
org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
@@ -112,4 +114,5 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.core.tests/META-INF/MANIFEST.MF b/valgrind/org.eclipse.linuxtools.valgrind.core.tests/META-INF/MANIFEST.MF
index a76919b69f1f623e7811428f969c8e4581c6bedf..6842bf968d1e372082a4a11faed397cfe54cafc4 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.core.tests/META-INF/MANIFEST.MF
+++ b/valgrind/org.eclipse.linuxtools.valgrind.core.tests/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-Name: Valgrdind Core Test Fragment
Bundle-SymbolicName: org.eclipse.linuxtools.valgrind.core.tests;singleton:=true
Bundle-Version: 1.0.0.qualifier
Fragment-Host: org.eclipse.linuxtools.valgrind.core;bundle-version="1.0.0"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
Require-Bundle: org.eclipse.linuxtools.docker.tests.hamcrest-wrap;bundle-version="1.2.0",
org.junit;bundle-version="4.12.0",
org.mockito
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.core.tests/pom.xml b/valgrind/org.eclipse.linuxtools.valgrind.core.tests/pom.xml
index 897a70d914d05525451813f06d470147b4a11750..3ef88ba59980471054e928ee7dcf1b8223269ce8 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.core.tests/pom.xml
+++ b/valgrind/org.eclipse.linuxtools.valgrind.core.tests/pom.xml
@@ -18,7 +18,7 @@
<parent>
<artifactId>linuxtools-valgrind-parent</artifactId>
<groupId>org.eclipse.linuxtools.valgrind</groupId>
- <version>7.4.0</version>
+ <version>8.1.0</version>
</parent>
<artifactId>org.eclipse.linuxtools.valgrind.core.tests</artifactId>
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.core/.classpath b/valgrind/org.eclipse.linuxtools.valgrind.core/.classpath
index 43b986286a9e5fd1828793fa4b2353d02ab8625f..1db08c6b4ce2fb50395b2f9c9a50c140a0bab199 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.core/.classpath
+++ b/valgrind/org.eclipse.linuxtools.valgrind.core/.classpath
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="target/classes"/>
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.core/.settings/org.eclipse.jdt.core.prefs b/valgrind/org.eclipse.linuxtools.valgrind.core/.settings/org.eclipse.jdt.core.prefs
index d1e990c2b150843287dcfffc6d81bc7e30c11b79..25c7c9eeeab1650e561ad6d66c4b721dc5ffc5af 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.core/.settings/org.eclipse.jdt.core.prefs
+++ b/valgrind/org.eclipse.linuxtools.valgrind.core/.settings/org.eclipse.jdt.core.prefs
@@ -9,9 +9,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nul
org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.compliance=11
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -26,6 +26,7 @@ org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=warning
org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
@@ -82,6 +83,7 @@ org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=warn
org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=enabled
@@ -114,4 +116,5 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.core/META-INF/MANIFEST.MF b/valgrind/org.eclipse.linuxtools.valgrind.core/META-INF/MANIFEST.MF
index 1715777cc4dd8b09c5308e348b592a55f6122d80..affab3c7fd7c83f193fe767995c426641ccdd9c3 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.core/META-INF/MANIFEST.MF
+++ b/valgrind/org.eclipse.linuxtools.valgrind.core/META-INF/MANIFEST.MF
@@ -7,7 +7,7 @@ Bundle-Vendor: %Bundle-Vendor.0
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.linuxtools.tools.launch.core,
org.eclipse.debug.core
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
Bundle-ActivationPolicy: lazy
Export-Package: org.eclipse.linuxtools.internal.valgrind.core;
x-friends:="org.eclipse.linuxtools.valgrind.launch,
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.core/pom.xml b/valgrind/org.eclipse.linuxtools.valgrind.core/pom.xml
index 8c7ee3aa38ee890693abd747ea0d388029f95bde..6419c43adeabd3323a1ea2f44b22bbb26fc17e4a 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.core/pom.xml
+++ b/valgrind/org.eclipse.linuxtools.valgrind.core/pom.xml
@@ -15,7 +15,7 @@
<parent>
<artifactId>linuxtools-valgrind-parent</artifactId>
<groupId>org.eclipse.linuxtools.valgrind</groupId>
- <version>7.4.0</version>
+ <version>8.1.0</version>
</parent>
<artifactId>org.eclipse.linuxtools.valgrind.core</artifactId>
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.doc/pom.xml b/valgrind/org.eclipse.linuxtools.valgrind.doc/pom.xml
index f45c6b7c25d5029bfd2f0e6870aae874b1257bf9..7e0177452f64aee66da65e3bd32d2897fd67b4d8 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.doc/pom.xml
+++ b/valgrind/org.eclipse.linuxtools.valgrind.doc/pom.xml
@@ -15,7 +15,7 @@
<parent>
<artifactId>linuxtools-valgrind-parent</artifactId>
<groupId>org.eclipse.linuxtools.valgrind</groupId>
- <version>7.4.0</version>
+ <version>8.1.0</version>
</parent>
<artifactId>org.eclipse.linuxtools.valgrind.doc</artifactId>
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.helgrind.tests/.classpath b/valgrind/org.eclipse.linuxtools.valgrind.helgrind.tests/.classpath
index 43b986286a9e5fd1828793fa4b2353d02ab8625f..a621c21ac550d71458aac26221ac3641277a488d 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.helgrind.tests/.classpath
+++ b/valgrind/org.eclipse.linuxtools.valgrind.helgrind.tests/.classpath
@@ -1,7 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="src" path="src"/>
+ <classpathentry kind="src" path="src">
+ <attributes>
+ <attribute name="test" value="true"/>
+ </attributes>
+ </classpathentry>
<classpathentry kind="output" path="target/classes"/>
</classpath>
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.helgrind.tests/.settings/org.eclipse.jdt.core.prefs b/valgrind/org.eclipse.linuxtools.valgrind.helgrind.tests/.settings/org.eclipse.jdt.core.prefs
index 373593c6da958672f64843b4361b066133093015..ca17ceef41b4ae37e1ff6f785e8197c38328c27a 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.helgrind.tests/.settings/org.eclipse.jdt.core.prefs
+++ b/valgrind/org.eclipse.linuxtools.valgrind.helgrind.tests/.settings/org.eclipse.jdt.core.prefs
@@ -6,8 +6,8 @@ org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annota
org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
+org.eclipse.jdt.core.compiler.compliance=11
org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
@@ -18,6 +18,7 @@ org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=warning
org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
@@ -61,6 +62,7 @@ org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=warn
org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
@@ -92,4 +94,5 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.helgrind.tests/META-INF/MANIFEST.MF b/valgrind/org.eclipse.linuxtools.valgrind.helgrind.tests/META-INF/MANIFEST.MF
index 6901d8608cd48dad526736c49b4ebd0931c35ba3..5e4f29cc03b931ff05a478cc219d40729cebefcb 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.helgrind.tests/META-INF/MANIFEST.MF
+++ b/valgrind/org.eclipse.linuxtools.valgrind.helgrind.tests/META-INF/MANIFEST.MF
@@ -6,7 +6,7 @@ Bundle-Version: 1.0.0.qualifier
Bundle-Vendor: %Bundle-Vendor.0
Require-Bundle: org.junit;bundle-version="4.7.0",
org.eclipse.ui.ide;bundle-version="3.8.0"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
Bundle-ActivationPolicy: lazy
Bundle-Localization: plugin
Fragment-Host: org.eclipse.linuxtools.valgrind.helgrind
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.helgrind.tests/pom.xml b/valgrind/org.eclipse.linuxtools.valgrind.helgrind.tests/pom.xml
index 9f3706d65a9166d3769dac705bae69f1720d9ea1..d50adaa90801215fd22ce1ef429890d4610af6c2 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.helgrind.tests/pom.xml
+++ b/valgrind/org.eclipse.linuxtools.valgrind.helgrind.tests/pom.xml
@@ -15,7 +15,7 @@
<parent>
<artifactId>linuxtools-valgrind-parent</artifactId>
<groupId>org.eclipse.linuxtools.valgrind</groupId>
- <version>7.4.0</version>
+ <version>8.1.0</version>
</parent>
<artifactId>org.eclipse.linuxtools.valgrind.helgrind.tests</artifactId>
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.helgrind/.classpath b/valgrind/org.eclipse.linuxtools.valgrind.helgrind/.classpath
index 43b986286a9e5fd1828793fa4b2353d02ab8625f..1db08c6b4ce2fb50395b2f9c9a50c140a0bab199 100755
--- a/valgrind/org.eclipse.linuxtools.valgrind.helgrind/.classpath
+++ b/valgrind/org.eclipse.linuxtools.valgrind.helgrind/.classpath
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="target/classes"/>
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.helgrind/.settings/org.eclipse.jdt.core.prefs b/valgrind/org.eclipse.linuxtools.valgrind.helgrind/.settings/org.eclipse.jdt.core.prefs
index df2ab3a48b18af44b4b2811f8f06bca3e1a09a91..1cf590090233f30bd5077691a2f5bdcb0eac65f6 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.helgrind/.settings/org.eclipse.jdt.core.prefs
+++ b/valgrind/org.eclipse.linuxtools.valgrind.helgrind/.settings/org.eclipse.jdt.core.prefs
@@ -9,8 +9,8 @@ org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nul
org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
+org.eclipse.jdt.core.compiler.compliance=11
org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
@@ -21,6 +21,7 @@ org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=warning
org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
@@ -64,6 +65,7 @@ org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=warn
org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
@@ -96,4 +98,5 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.helgrind/META-INF/MANIFEST.MF b/valgrind/org.eclipse.linuxtools.valgrind.helgrind/META-INF/MANIFEST.MF
index a1e6ab513246441cb1d769eb53e5df9b8e168ca0..3939bbcc74d2e9580140900b12424ae0b8b7b33a 100755
--- a/valgrind/org.eclipse.linuxtools.valgrind.helgrind/META-INF/MANIFEST.MF
+++ b/valgrind/org.eclipse.linuxtools.valgrind.helgrind/META-INF/MANIFEST.MF
@@ -5,7 +5,7 @@ Bundle-SymbolicName: org.eclipse.linuxtools.valgrind.helgrind;singleton:=true
Bundle-Version: 1.1.0.qualifier
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
Bundle-ActivationPolicy: lazy
Bundle-Localization: plugin
Import-Package: org.eclipse.cdt.core.model,
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.helgrind/pom.xml b/valgrind/org.eclipse.linuxtools.valgrind.helgrind/pom.xml
index c7a2998df464833d7bc0e301505cf4bf99333ac7..bf1878b1484642645d3327720057f8459f1b08b3 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.helgrind/pom.xml
+++ b/valgrind/org.eclipse.linuxtools.valgrind.helgrind/pom.xml
@@ -15,7 +15,7 @@
<parent>
<artifactId>linuxtools-valgrind-parent</artifactId>
<groupId>org.eclipse.linuxtools.valgrind</groupId>
- <version>7.4.0</version>
+ <version>8.1.0</version>
</parent>
<artifactId>org.eclipse.linuxtools.valgrind.helgrind</artifactId>
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.launch/.classpath b/valgrind/org.eclipse.linuxtools.valgrind.launch/.classpath
index 43b986286a9e5fd1828793fa4b2353d02ab8625f..1db08c6b4ce2fb50395b2f9c9a50c140a0bab199 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.launch/.classpath
+++ b/valgrind/org.eclipse.linuxtools.valgrind.launch/.classpath
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="target/classes"/>
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.launch/.settings/org.eclipse.jdt.core.prefs b/valgrind/org.eclipse.linuxtools.valgrind.launch/.settings/org.eclipse.jdt.core.prefs
index 6efcacbf83a25912872060367e2f3ca9fd0d0298..7fc73ecee291c0a6ce4adea965be4f5291396dd8 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.launch/.settings/org.eclipse.jdt.core.prefs
+++ b/valgrind/org.eclipse.linuxtools.valgrind.launch/.settings/org.eclipse.jdt.core.prefs
@@ -9,8 +9,8 @@ org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nul
org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
+org.eclipse.jdt.core.compiler.compliance=11
org.eclipse.jdt.core.compiler.doc.comment.support=enabled
org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
@@ -22,6 +22,7 @@ org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=warning
org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
@@ -78,6 +79,7 @@ org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=warn
org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
@@ -110,4 +112,5 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.launch/META-INF/MANIFEST.MF b/valgrind/org.eclipse.linuxtools.valgrind.launch/META-INF/MANIFEST.MF
index 7ec8adff01566914e657fd394ec6f83d30a5d8ed..2f19062d9dfdfbcb7655a909e19028e50e587336 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.launch/META-INF/MANIFEST.MF
+++ b/valgrind/org.eclipse.linuxtools.valgrind.launch/META-INF/MANIFEST.MF
@@ -7,7 +7,7 @@ Bundle-Activator: org.eclipse.linuxtools.internal.valgrind.launch.ValgrindLaunch
Bundle-Vendor: %Bundle-Vendor.0
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
Bundle-ActivationPolicy: lazy
Import-Package: org.eclipse.cdt.core.model,
org.eclipse.cdt.debug.core,
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.launch/pom.xml b/valgrind/org.eclipse.linuxtools.valgrind.launch/pom.xml
index 969de9f7e9fd74fc37d9a794968954be435e05c5..26cd0ce7cc7597463dd7cfe67ffd55ed20d8da8e 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.launch/pom.xml
+++ b/valgrind/org.eclipse.linuxtools.valgrind.launch/pom.xml
@@ -15,7 +15,7 @@
<parent>
<artifactId>linuxtools-valgrind-parent</artifactId>
<groupId>org.eclipse.linuxtools.valgrind</groupId>
- <version>7.4.0</version>
+ <version>8.1.0</version>
</parent>
<artifactId>org.eclipse.linuxtools.valgrind.launch</artifactId>
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.launch/src/org/eclipse/linuxtools/internal/valgrind/launch/ValgrindLaunchPlugin.java b/valgrind/org.eclipse.linuxtools.valgrind.launch/src/org/eclipse/linuxtools/internal/valgrind/launch/ValgrindLaunchPlugin.java
index ec060d6ed7386049bed7ed0d6c683a9a224de463..dcf9e15ba2662ccd050fd5609963ddbbf099aa05 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.launch/src/org/eclipse/linuxtools/internal/valgrind/launch/ValgrindLaunchPlugin.java
+++ b/valgrind/org.eclipse.linuxtools.valgrind.launch/src/org/eclipse/linuxtools/internal/valgrind/launch/ValgrindLaunchPlugin.java
@@ -38,6 +38,7 @@ import org.eclipse.linuxtools.valgrind.launch.IValgrindToolPage;
import org.eclipse.osgi.util.NLS;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.ui.IWorkbenchWindow;
+import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.plugin.AbstractUIPlugin;
import org.osgi.framework.BundleContext;
import org.osgi.framework.Version;
@@ -229,7 +230,7 @@ public class ValgrindLaunchPlugin extends AbstractUIPlugin {
}
public static Shell getActiveWorkbenchShell() {
- IWorkbenchWindow window = getDefault().getWorkbench().getActiveWorkbenchWindow();
+ IWorkbenchWindow window = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
if (window != null) {
return window.getShell();
}
@@ -240,7 +241,7 @@ public class ValgrindLaunchPlugin extends AbstractUIPlugin {
if (getActiveWorkbenchShell() != null) {
return getActiveWorkbenchShell();
}
- IWorkbenchWindow[] windows = getDefault().getWorkbench().getWorkbenchWindows();
+ IWorkbenchWindow[] windows = PlatformUI.getWorkbench().getWorkbenchWindows();
return windows[0].getShell();
}
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.launch/src/org/eclipse/linuxtools/internal/valgrind/launch/ValgrindOptionsTab.java b/valgrind/org.eclipse.linuxtools.valgrind.launch/src/org/eclipse/linuxtools/internal/valgrind/launch/ValgrindOptionsTab.java
index c431d5bf9ba11b94785a4cb37777622e29084af6..95ec583832ed1831de02c2f1f3a37374b842c9fc 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.launch/src/org/eclipse/linuxtools/internal/valgrind/launch/ValgrindOptionsTab.java
+++ b/valgrind/org.eclipse.linuxtools.valgrind.launch/src/org/eclipse/linuxtools/internal/valgrind/launch/ValgrindOptionsTab.java
@@ -28,6 +28,7 @@ import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
import org.eclipse.debug.ui.AbstractLaunchConfigurationTab;
import org.eclipse.jface.dialogs.IDialogConstants;
import org.eclipse.jface.layout.GridDataFactory;
+import org.eclipse.jface.resource.ResourceLocator;
import org.eclipse.linuxtools.profiling.launch.ConfigUtils;
import org.eclipse.linuxtools.valgrind.launch.IValgrindToolPage;
import org.eclipse.osgi.util.NLS;
@@ -54,7 +55,6 @@ import org.eclipse.swt.widgets.Text;
import org.eclipse.ui.dialogs.ElementTreeSelectionDialog;
import org.eclipse.ui.model.WorkbenchContentProvider;
import org.eclipse.ui.model.WorkbenchLabelProvider;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
import org.eclipse.ui.views.navigator.ResourceComparator;
import org.osgi.framework.Version;
@@ -487,9 +487,10 @@ public class ValgrindOptionsTab extends AbstractLaunchConfigurationTab {
}
@Override
- public Image getImage() {
- return AbstractUIPlugin.imageDescriptorFromPlugin(ValgrindLaunchPlugin.PLUGIN_ID, "icons/valgrind-icon.png").createImage(); //$NON-NLS-1$
- }
+ public Image getImage() {
+ return ResourceLocator.imageDescriptorFromBundle(ValgrindLaunchPlugin.PLUGIN_ID, "icons/valgrind-icon.png") //$NON-NLS-1$
+ .get().createImage();
+ }
@Override
public void initializeFrom(ILaunchConfiguration configuration) {
@@ -585,20 +586,22 @@ public class ValgrindOptionsTab extends AbstractLaunchConfigurationTab {
}
private boolean isGeneralValid() {
- String[] suppFiles = suppFileList.getItems();
- boolean result = true;
- for (int i = 0; i < suppFiles.length && result; i++) {
- try {
- IPath suppfile = getPlugin().parseWSPath(suppFiles[i]);
- if (!suppfile.toFile().exists()) {
- setErrorMessage(NLS.bind(Messages.getString("ValgrindOptionsTab.suppressions_file_doesnt_exist"), suppFiles[i])); //$NON-NLS-1$
- result = false;
- }
- } catch (CoreException e) {
- // should only occur if there's a cycle in variable substitution
- e.printStackTrace();
- }
- }
+ boolean result = true;
+ if (suppFileList != null) {
+ String[] suppFiles = suppFileList.getItems();
+ for (int i = 0; i < suppFiles.length && result; i++) {
+ try {
+ IPath suppfile = getPlugin().parseWSPath(suppFiles[i]);
+ if (!suppfile.toFile().exists()) {
+ setErrorMessage(NLS.bind(Messages.getString("ValgrindOptionsTab.suppressions_file_doesnt_exist"), suppFiles[i])); //$NON-NLS-1$
+ result = false;
+ }
+ } catch (CoreException e) {
+ // should only occur if there's a cycle in variable substitution
+ e.printStackTrace();
+ }
+ }
+ }
return result;
}
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/.classpath b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/.classpath
index 43b986286a9e5fd1828793fa4b2353d02ab8625f..a621c21ac550d71458aac26221ac3641277a488d 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/.classpath
+++ b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/.classpath
@@ -1,7 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="src" path="src"/>
+ <classpathentry kind="src" path="src">
+ <attributes>
+ <attribute name="test" value="true"/>
+ </attributes>
+ </classpathentry>
<classpathentry kind="output" path="target/classes"/>
</classpath>
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/.settings/org.eclipse.jdt.core.prefs b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/.settings/org.eclipse.jdt.core.prefs
index f08a6e7a05eec34664f92a5736a542080c8d8914..d885a09e58b340584d56aadd56a0cd2f0bd863ed 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/.settings/org.eclipse.jdt.core.prefs
+++ b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/.settings/org.eclipse.jdt.core.prefs
@@ -6,9 +6,9 @@ org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annota
org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.compliance=11
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -22,6 +22,7 @@ org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=warning
org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
@@ -65,6 +66,7 @@ org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=warn
org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
@@ -96,4 +98,5 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/META-INF/MANIFEST.MF b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/META-INF/MANIFEST.MF
index 58fdab9e845befbb18589f0fdf9b280d005f4cce..1960728bbe09b0d51bd8ea4140d87189f15f73a1 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/META-INF/MANIFEST.MF
+++ b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/META-INF/MANIFEST.MF
@@ -4,9 +4,8 @@ Bundle-Name: %Bundle-Name.0
Bundle-SymbolicName: org.eclipse.linuxtools.valgrind.massif.tests
Bundle-Version: 1.0.0.qualifier
Bundle-Vendor: %Bundle-Vendor.0
-Require-Bundle: org.junit;bundle-version="4.7.0",
- org.eclipse.linuxtools.dataviewers.charts
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Require-Bundle: org.junit;bundle-version="4.7.0"
+Bundle-RequiredExecutionEnvironment: JavaSE-11
Bundle-ActivationPolicy: lazy
Bundle-Localization: plugin
Fragment-Host: org.eclipse.linuxtools.valgrind.massif
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/pom.xml b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/pom.xml
index beed447013e03332ae7d4e020453c00bbb892867..1884d6ceebfc15985b6ac45f99267d968d2314d4 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/pom.xml
+++ b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/pom.xml
@@ -15,7 +15,7 @@
<parent>
<artifactId>linuxtools-valgrind-parent</artifactId>
<groupId>org.eclipse.linuxtools.valgrind</groupId>
- <version>7.4.0</version>
+ <version>8.1.0</version>
</parent>
<artifactId>org.eclipse.linuxtools.valgrind.massif.tests</artifactId>
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/src/org/eclipse/linuxtools/internal/valgrind/massif/tests/ChartExportTest.java b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/src/org/eclipse/linuxtools/internal/valgrind/massif/tests/ChartExportTest.java
index 518bc1ce81f46dfd0a5f41c3bbc8cb4cd7f2bee7..8d5a6139b2a9b3f747d2f922542a6a4e356c138b 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/src/org/eclipse/linuxtools/internal/valgrind/massif/tests/ChartExportTest.java
+++ b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/src/org/eclipse/linuxtools/internal/valgrind/massif/tests/ChartExportTest.java
@@ -22,10 +22,10 @@ import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IPath;
import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.linuxtools.dataviewers.charts.actions.SaveChartAction;
-import org.eclipse.linuxtools.internal.valgrind.massif.MassifViewPart;
import org.eclipse.linuxtools.internal.valgrind.massif.charting.ChartEditorInput;
+import org.eclipse.swt.SWT;
import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swtchart.extensions.charts.InteractiveChart;
import org.eclipse.ui.IEditorInput;
import org.eclipse.ui.PlatformUI;
import org.junit.After;
@@ -79,16 +79,15 @@ public class ChartExportTest extends AbstractMassifTest {
control.setSize(10, 10);
}
- SaveChartAction saveChartAction = (SaveChartAction) getToolbarAction(MassifViewPart.SAVE_CHART_ACTION);
- assertNotNull(saveChartAction);
+ InteractiveChart intChart = (InteractiveChart)control;
for (IPath path : paths) {
- saveAsPath(saveChartAction, path);
+ saveAsPath(intChart, path);
}
}
- private void saveAsPath(SaveChartAction saveChartAction, IPath path) {
- saveChartAction.run(path.toString());
+ private void saveAsPath(InteractiveChart saveChartAction, IPath path) {
+ saveChartAction.save(path.toString(), SWT.IMAGE_PNG);
File chartFile = path.toFile();
assertTrue(chartFile.exists());
assertTrue(chartFile.length() > 0);
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/src/org/eclipse/linuxtools/internal/valgrind/massif/tests/ChartTests.java b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/src/org/eclipse/linuxtools/internal/valgrind/massif/tests/ChartTests.java
index fd781929a7ca91faaffa6a05fe9a5a9f52694ded..62ecaa923e780cb2fba9cb290c32a339229affb0 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/src/org/eclipse/linuxtools/internal/valgrind/massif/tests/ChartTests.java
+++ b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/src/org/eclipse/linuxtools/internal/valgrind/massif/tests/ChartTests.java
@@ -35,13 +35,13 @@ import org.eclipse.linuxtools.internal.valgrind.ui.ValgrindUIPlugin;
import org.eclipse.swt.SWT;
import org.eclipse.swt.graphics.Point;
import org.eclipse.swt.widgets.Shell;
+import org.eclipse.swtchart.Chart;
+import org.eclipse.swtchart.ILineSeries;
import org.eclipse.ui.IEditorPart;
import org.eclipse.ui.PlatformUI;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import org.swtchart.Chart;
-import org.swtchart.ILineSeries;
public class ChartTests extends AbstractMassifTest {
@Before
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.massif/.classpath b/valgrind/org.eclipse.linuxtools.valgrind.massif/.classpath
index 43b986286a9e5fd1828793fa4b2353d02ab8625f..1db08c6b4ce2fb50395b2f9c9a50c140a0bab199 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.massif/.classpath
+++ b/valgrind/org.eclipse.linuxtools.valgrind.massif/.classpath
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="target/classes"/>
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.massif/.settings/org.eclipse.jdt.core.prefs b/valgrind/org.eclipse.linuxtools.valgrind.massif/.settings/org.eclipse.jdt.core.prefs
index df2ab3a48b18af44b4b2811f8f06bca3e1a09a91..1cf590090233f30bd5077691a2f5bdcb0eac65f6 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.massif/.settings/org.eclipse.jdt.core.prefs
+++ b/valgrind/org.eclipse.linuxtools.valgrind.massif/.settings/org.eclipse.jdt.core.prefs
@@ -9,8 +9,8 @@ org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nul
org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
+org.eclipse.jdt.core.compiler.compliance=11
org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
@@ -21,6 +21,7 @@ org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=warning
org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
@@ -64,6 +65,7 @@ org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=warn
org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
@@ -96,4 +98,5 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.launch/.settings/org.eclipse.jdt.ui.prefs b/valgrind/org.eclipse.linuxtools.valgrind.massif/.settings/org.eclipse.jdt.ui.prefs
similarity index 83%
rename from oprofile/org.eclipse.linuxtools.oprofile.launch/.settings/org.eclipse.jdt.ui.prefs
rename to valgrind/org.eclipse.linuxtools.valgrind.massif/.settings/org.eclipse.jdt.ui.prefs
index 90de15f40bd897727106a7bf6cb6439a4ef03d9c..79881a2512180bb5e541aeb4e67561b9e8913f9d 100644
--- a/oprofile/org.eclipse.linuxtools.oprofile.launch/.settings/org.eclipse.jdt.ui.prefs
+++ b/valgrind/org.eclipse.linuxtools.valgrind.massif/.settings/org.eclipse.jdt.ui.prefs
@@ -13,11 +13,11 @@ sp_cleanup.always_use_blocks=true
sp_cleanup.always_use_parentheses_in_expressions=false
sp_cleanup.always_use_this_for_non_static_field_access=false
sp_cleanup.always_use_this_for_non_static_method_access=false
-sp_cleanup.convert_functional_interfaces=false
-sp_cleanup.convert_to_enhanced_for_loop=false
+sp_cleanup.convert_functional_interfaces=true
+sp_cleanup.convert_to_enhanced_for_loop=true
sp_cleanup.correct_indentation=false
-sp_cleanup.format_source_code=false
-sp_cleanup.format_source_code_changes_only=false
+sp_cleanup.format_source_code=true
+sp_cleanup.format_source_code_changes_only=true
sp_cleanup.insert_inferred_type_arguments=false
sp_cleanup.make_local_variable_final=true
sp_cleanup.make_parameters_final=false
@@ -28,16 +28,20 @@ sp_cleanup.never_use_blocks=false
sp_cleanup.never_use_parentheses_in_expressions=true
sp_cleanup.on_save_use_additional_actions=true
sp_cleanup.organize_imports=true
+sp_cleanup.push_down_negation=false
sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
sp_cleanup.qualify_static_member_accesses_with_declaring_class=false
sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
sp_cleanup.remove_private_constructors=true
-sp_cleanup.remove_redundant_type_arguments=false
-sp_cleanup.remove_trailing_whitespaces=false
+sp_cleanup.remove_redundant_modifiers=true
+sp_cleanup.remove_redundant_semicolons=true
+sp_cleanup.remove_redundant_type_arguments=true
+sp_cleanup.remove_trailing_whitespaces=true
sp_cleanup.remove_trailing_whitespaces_all=true
sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
+sp_cleanup.remove_unnecessary_array_creation=true
sp_cleanup.remove_unnecessary_casts=true
sp_cleanup.remove_unnecessary_nls_tags=false
sp_cleanup.remove_unused_imports=false
@@ -49,6 +53,7 @@ sp_cleanup.remove_unused_private_types=true
sp_cleanup.sort_members=false
sp_cleanup.sort_members_all=false
sp_cleanup.use_anonymous_class_creation=false
+sp_cleanup.use_autoboxing=false
sp_cleanup.use_blocks=false
sp_cleanup.use_blocks_only_for_return_and_throw=false
sp_cleanup.use_lambda=true
@@ -57,4 +62,4 @@ sp_cleanup.use_this_for_non_static_field_access=false
sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
sp_cleanup.use_this_for_non_static_method_access=false
sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
-sp_cleanup.use_type_arguments=false
+sp_cleanup.use_unboxing=false
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.massif/META-INF/MANIFEST.MF b/valgrind/org.eclipse.linuxtools.valgrind.massif/META-INF/MANIFEST.MF
index 11c2d746117dfa3afa14a263dc65d787d027c502..2754401d100f3809023345452d52c66aadd6376f 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.massif/META-INF/MANIFEST.MF
+++ b/valgrind/org.eclipse.linuxtools.valgrind.massif/META-INF/MANIFEST.MF
@@ -7,8 +7,8 @@ Bundle-Activator: org.eclipse.linuxtools.internal.valgrind.massif.MassifPlugin
Bundle-Vendor: %Bundle-Vendor.0
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
- org.eclipse.linuxtools.dataviewers.charts
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+ org.eclipse.swtchart.extensions
+Bundle-RequiredExecutionEnvironment: JavaSE-11
Bundle-ActivationPolicy: lazy
Bundle-Localization: plugin
Import-Package: org.eclipse.cdt.core.model,
@@ -28,5 +28,5 @@ Import-Package: org.eclipse.cdt.core.model,
org.eclipse.linuxtools.valgrind.launch,
org.eclipse.linuxtools.valgrind.ui,
org.eclipse.ui,
- org.swtchart
+ org.eclipse.swtchart
Automatic-Module-Name: org.eclipse.linuxtools.valgrind.massif
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.massif/pom.xml b/valgrind/org.eclipse.linuxtools.valgrind.massif/pom.xml
index 23bd24008459ebeee93dabc9263de7dc44a9a6aa..2ec0d64d14526ad4c8e1fc936b5798f33df8d925 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.massif/pom.xml
+++ b/valgrind/org.eclipse.linuxtools.valgrind.massif/pom.xml
@@ -15,7 +15,7 @@
<parent>
<artifactId>linuxtools-valgrind-parent</artifactId>
<groupId>org.eclipse.linuxtools.valgrind</groupId>
- <version>7.4.0</version>
+ <version>8.1.0</version>
</parent>
<artifactId>org.eclipse.linuxtools.valgrind.massif</artifactId>
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.massif/src/org/eclipse/linuxtools/internal/valgrind/massif/MassifTreeLabelProvider.java b/valgrind/org.eclipse.linuxtools.valgrind.massif/src/org/eclipse/linuxtools/internal/valgrind/massif/MassifTreeLabelProvider.java
index aaa43356ee25b1d316e44e423645839b97393c0a..feb7e7e20ce63892201a137a581b8ee6d838132d 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.massif/src/org/eclipse/linuxtools/internal/valgrind/massif/MassifTreeLabelProvider.java
+++ b/valgrind/org.eclipse.linuxtools.valgrind.massif/src/org/eclipse/linuxtools/internal/valgrind/massif/MassifTreeLabelProvider.java
@@ -1,6 +1,6 @@
/*******************************************************************************
* Copyright (c) 2009, 2018 Red Hat, Inc.
- *
+ *
* This program and the accompanying materials are made
* available under the terms of the Eclipse Public License 2.0
* which is available at https://www.eclipse.org/legal/epl-2.0/
@@ -14,9 +14,9 @@ package org.eclipse.linuxtools.internal.valgrind.massif;
import org.eclipse.debug.ui.DebugUITools;
import org.eclipse.debug.ui.IDebugUIConstants;
+import org.eclipse.jface.resource.ResourceLocator;
import org.eclipse.jface.viewers.LabelProvider;
import org.eclipse.swt.graphics.Image;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
public class MassifTreeLabelProvider extends LabelProvider {
@@ -29,7 +29,8 @@ public class MassifTreeLabelProvider extends LabelProvider {
public Image getImage(Object element) {
Image img = null;
if (((MassifHeapTreeNode) element).getParent() == null) { // only show for root elements
- img = AbstractUIPlugin.imageDescriptorFromPlugin(MassifPlugin.PLUGIN_ID, "icons/memory_view.gif").createImage(); //$NON-NLS-1$
+ img = ResourceLocator.imageDescriptorFromBundle(MassifPlugin.PLUGIN_ID, "icons/memory_view.gif").get() //$NON-NLS-1$
+ .createImage();
} else { // stack frame
img = DebugUITools.getImage(IDebugUIConstants.IMG_OBJS_STACKFRAME);
}
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.massif/src/org/eclipse/linuxtools/internal/valgrind/massif/MassifViewPart.java b/valgrind/org.eclipse.linuxtools.valgrind.massif/src/org/eclipse/linuxtools/internal/valgrind/massif/MassifViewPart.java
index 59b04125f5c146ac359d5da0d56d6aea25d7cf75..4484c0d239bfcf546281011da02f3db167bef411 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.massif/src/org/eclipse/linuxtools/internal/valgrind/massif/MassifViewPart.java
+++ b/valgrind/org.eclipse.linuxtools.valgrind.massif/src/org/eclipse/linuxtools/internal/valgrind/massif/MassifViewPart.java
@@ -1,6 +1,6 @@
/*******************************************************************************
* Copyright (c) 2008, 2018 Red Hat, Inc.
- *
+ *
* This program and the accompanying materials are made
* available under the terms of the Eclipse Public License 2.0
* which is available at https://www.eclipse.org/legal/epl-2.0/
@@ -19,6 +19,7 @@ import java.util.List;
import org.eclipse.jface.action.Action;
import org.eclipse.jface.action.IAction;
import org.eclipse.jface.resource.JFaceResources;
+import org.eclipse.jface.resource.ResourceLocator;
import org.eclipse.jface.viewers.AbstractTreeViewer;
import org.eclipse.jface.viewers.ArrayContentProvider;
import org.eclipse.jface.viewers.IFontProvider;
@@ -30,7 +31,6 @@ import org.eclipse.jface.viewers.TableViewer;
import org.eclipse.jface.viewers.TableViewerColumn;
import org.eclipse.jface.viewers.Viewer;
import org.eclipse.jface.viewers.ViewerComparator;
-import org.eclipse.linuxtools.dataviewers.charts.actions.SaveChartAction;
import org.eclipse.linuxtools.internal.valgrind.massif.MassifSnapshot.SnapshotType;
import org.eclipse.linuxtools.internal.valgrind.massif.charting.ChartEditorInput;
import org.eclipse.linuxtools.internal.valgrind.massif.charting.HeapChart;
@@ -52,7 +52,6 @@ import org.eclipse.ui.IWorkbenchPage;
import org.eclipse.ui.PartInitException;
import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.part.ViewPart;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
public class MassifViewPart extends ViewPart implements IValgrindToolView {
@@ -74,8 +73,6 @@ public class MassifViewPart extends ViewPart implements IValgrindToolView {
+ ".chartAction"; //$NON-NLS-1$
public static final String PID_ACTION = MassifPlugin.PLUGIN_ID
+ ".pidAction"; //$NON-NLS-1$
- public static final String SAVE_CHART_ACTION = MassifPlugin.PLUGIN_ID
- + ".saveChartAction"; //$NON-NLS-1$
private MassifOutput output;
private Integer pid;
@@ -91,7 +88,6 @@ public class MassifViewPart extends ViewPart implements IValgrindToolView {
private Action treeAction;
private MassifPidMenuAction pidAction;
- private SaveChartAction saveChartAction;
private List<ChartEditorInput> chartInputs;
@@ -114,9 +110,9 @@ public class MassifViewPart extends ViewPart implements IValgrindToolView {
String[] columnTitles = { TITLE_NUMBER, TITLE_TIME, TITLE_TOTAL,
TITLE_USEFUL, TITLE_EXTRA, TITLE_STACKS };
- for (int i = 0; i < columnTitles.length; i++) {
+ for (String columnTitle : columnTitles) {
TableViewerColumn column = new TableViewerColumn(viewer, SWT.NONE);
- column.getColumn().setText(columnTitles[i]);
+ column.getColumn().setText(columnTitle);
column.getColumn().setWidth(COLUMN_SIZE);
column.getColumn().setResizable(true);
column.getColumn().addSelectionListener(getHeaderListener());
@@ -229,14 +225,11 @@ public class MassifViewPart extends ViewPart implements IValgrindToolView {
}
};
chartAction.setId(CHART_ACTION);
- chartAction.setImageDescriptor(AbstractUIPlugin.imageDescriptorFromPlugin(
- MassifPlugin.PLUGIN_ID, "icons/linecharticon.gif")); //$NON-NLS-1$
+ chartAction.setImageDescriptor(
+ ResourceLocator.imageDescriptorFromBundle(MassifPlugin.PLUGIN_ID, "icons/linecharticon.gif").get()); //$NON-NLS-1$
chartAction.setToolTipText(Messages
.getString("MassifViewPart.Display_Heap_Allocation")); //$NON-NLS-1$
- saveChartAction = new SaveChartAction();
- saveChartAction.setId(SAVE_CHART_ACTION);
-
treeAction = new Action(
Messages.getString("MassifViewPart.Show_Heap_Tree"), IAction.AS_CHECK_BOX) { //$NON-NLS-1$
@Override
@@ -251,12 +244,12 @@ public class MassifViewPart extends ViewPart implements IValgrindToolView {
}
};
treeAction.setId(TREE_ACTION);
- treeAction.setImageDescriptor(AbstractUIPlugin.imageDescriptorFromPlugin(
- MassifPlugin.PLUGIN_ID, "icons/call_hierarchy.gif")); //$NON-NLS-1$
+ treeAction.setImageDescriptor(
+ ResourceLocator.imageDescriptorFromBundle(MassifPlugin.PLUGIN_ID, "icons/call_hierarchy.gif").get()); //$NON-NLS-1$
treeAction.setToolTipText(Messages
.getString("MassifViewPart.Show_Heap_Tree")); //$NON-NLS-1$
- return new IAction[] { pidAction, chartAction, saveChartAction, treeAction };
+ return new IAction[] { pidAction, chartAction, treeAction };
}
private void createChart(MassifSnapshot[] snapshots) {
@@ -281,7 +274,6 @@ public class MassifViewPart extends ViewPart implements IValgrindToolView {
e.printStackTrace();
}
});
- saveChartAction.setChart(chartInput.getChart().getChartControl(), chartInput.getName());
}
private String getInputName(String description) {
@@ -304,7 +296,6 @@ public class MassifViewPart extends ViewPart implements IValgrindToolView {
@Override
public void refreshView() {
if (output != null && pid != null) {
- saveChartAction.setChart(null);
MassifSnapshot[] snapshots = output.getSnapshots(pid);
pidAction.setPids(output.getPids());
if (snapshots != null) {
@@ -399,9 +390,9 @@ public class MassifViewPart extends ViewPart implements IValgrindToolView {
break;
case PEAK:
case DETAILED:
- image = AbstractUIPlugin
- .imageDescriptorFromPlugin(MassifPlugin.PLUGIN_ID,
- "icons/call_hierarchy.gif").createImage(); //$NON-NLS-1$
+ image = ResourceLocator
+ .imageDescriptorFromBundle(MassifPlugin.PLUGIN_ID, "icons/call_hierarchy.gif").get() //$NON-NLS-1$
+ .createImage();
}
}
return image;
@@ -459,8 +450,7 @@ public class MassifViewPart extends ViewPart implements IValgrindToolView {
private ChartEditorInput getChartInput(Integer pid) {
ChartEditorInput result = null;
- for (int i = 0; i < chartInputs.size(); i++) {
- ChartEditorInput input = chartInputs.get(i);
+ for (ChartEditorInput input : chartInputs) {
if (input.getPid().equals(pid)) {
result = input;
}
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.massif/src/org/eclipse/linuxtools/internal/valgrind/massif/charting/ChartEditor.java b/valgrind/org.eclipse.linuxtools.valgrind.massif/src/org/eclipse/linuxtools/internal/valgrind/massif/charting/ChartEditor.java
index 61e4eb1129b0a33c6b3ca6bbfd47d22459b68088..2e01d1ba0f767e641e5c7ec38e918a7335138bf3 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.massif/src/org/eclipse/linuxtools/internal/valgrind/massif/charting/ChartEditor.java
+++ b/valgrind/org.eclipse.linuxtools.valgrind.massif/src/org/eclipse/linuxtools/internal/valgrind/massif/charting/ChartEditor.java
@@ -1,6 +1,6 @@
/*******************************************************************************
* Copyright (c) 2008, 2018 Red Hat, Inc.
- *
+ *
* This program and the accompanying materials are made
* available under the terms of the Eclipse Public License 2.0
* which is available at https://www.eclipse.org/legal/epl-2.0/
@@ -29,24 +29,25 @@ import org.eclipse.swt.graphics.FontData;
import org.eclipse.swt.graphics.Point;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Display;
+import org.eclipse.swtchart.Chart;
+import org.eclipse.swtchart.IAxis;
+import org.eclipse.swtchart.IAxisSet;
+import org.eclipse.swtchart.ILineSeries;
+import org.eclipse.swtchart.ILineSeries.PlotSymbolType;
+import org.eclipse.swtchart.ISeries.SeriesType;
+import org.eclipse.swtchart.ITitle;
+import org.eclipse.swtchart.LineStyle;
+import org.eclipse.swtchart.Range;
+import org.eclipse.swtchart.extensions.charts.InteractiveChart;
import org.eclipse.ui.IEditorInput;
import org.eclipse.ui.IEditorSite;
import org.eclipse.ui.IWorkbenchPage;
import org.eclipse.ui.PartInitException;
import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.part.EditorPart;
-import org.swtchart.Chart;
-import org.swtchart.IAxis;
-import org.swtchart.IAxisSet;
-import org.swtchart.ILineSeries;
-import org.swtchart.ILineSeries.PlotSymbolType;
-import org.swtchart.ISeries.SeriesType;
-import org.swtchart.ITitle;
-import org.swtchart.LineStyle;
-import org.swtchart.Range;
public class ChartEditor extends EditorPart {
- private Chart control;
+ private InteractiveChart control;
@Override
public void doSave(IProgressMonitor monitor) {
@@ -83,7 +84,7 @@ public class ChartEditor extends EditorPart {
public void createPartControl(Composite parent) {
final ChartEditorInput input = (ChartEditorInput) getEditorInput();
final HeapChart heapChart = input.getChart();
- control = new Chart(parent, SWT.FILL);
+ control = new InteractiveChart(parent, SWT.FILL);
heapChart.setChartControl(control);
final Color LIGHTYELLOW = new Color(Display.getDefault(), 255, 255, 225);
@@ -96,7 +97,8 @@ public class ChartEditor extends EditorPart {
final int TICK_GAP = 40;
control.setBackground(WHITE);
- control.setBackgroundInPlotArea(LIGHTYELLOW);
+ control.getPlotArea().setBackground(LIGHTYELLOW);
+ control.setProposedSaveAsFilename(heapChart.title.substring(0, heapChart.title.indexOf(' ')));
FontData fd = JFaceResources.getDialogFont().getFontData()[0];
fd.setStyle(SWT.BOLD);
@@ -178,7 +180,7 @@ public class ChartEditor extends EditorPart {
axisSet.getYAxis(0).setRange(new Range(yRange.lower, yRange.upper + yExtra));
// listeners
- control.getPlotArea().addMouseListener(new MouseAdapter() {
+ control.getPlotArea().getControl().addMouseListener(new MouseAdapter() {
@Override
public void mouseDown(MouseEvent e) {
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.massif/src/org/eclipse/linuxtools/internal/valgrind/massif/charting/ChartEditorInput.java b/valgrind/org.eclipse.linuxtools.valgrind.massif/src/org/eclipse/linuxtools/internal/valgrind/massif/charting/ChartEditorInput.java
index 5493ef1f329d200b8160961bc093f0118aafeb31..f4a1aa6e0c43be995db6a4a6a1508159ceb00880 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.massif/src/org/eclipse/linuxtools/internal/valgrind/massif/charting/ChartEditorInput.java
+++ b/valgrind/org.eclipse.linuxtools.valgrind.massif/src/org/eclipse/linuxtools/internal/valgrind/massif/charting/ChartEditorInput.java
@@ -1,6 +1,6 @@
/*******************************************************************************
- * Copyright (c) 2008, 2018 Red Hat, Inc.
- *
+ * Copyright (c) 2008, 2019 Red Hat, Inc.
+ *
* This program and the accompanying materials are made
* available under the terms of the Eclipse Public License 2.0
* which is available at https://www.eclipse.org/legal/epl-2.0/
@@ -13,12 +13,12 @@
package org.eclipse.linuxtools.internal.valgrind.massif.charting;
import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.jface.resource.ResourceLocator;
import org.eclipse.linuxtools.internal.valgrind.massif.MassifPlugin;
import org.eclipse.linuxtools.internal.valgrind.massif.MassifViewPart;
import org.eclipse.osgi.util.NLS;
import org.eclipse.ui.IEditorInput;
import org.eclipse.ui.IPersistableElement;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
public class ChartEditorInput implements IEditorInput {
@@ -41,7 +41,7 @@ public class ChartEditorInput implements IEditorInput {
@Override
public ImageDescriptor getImageDescriptor() {
- return AbstractUIPlugin.imageDescriptorFromPlugin(MassifPlugin.PLUGIN_ID, "icons/linecharticon.gif"); //$NON-NLS-1$
+ return ResourceLocator.imageDescriptorFromBundle(MassifPlugin.PLUGIN_ID, "icons/linecharticon.gif").get(); //$NON-NLS-1$
}
@Override
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.memcheck.tests/.classpath b/valgrind/org.eclipse.linuxtools.valgrind.memcheck.tests/.classpath
index 43b986286a9e5fd1828793fa4b2353d02ab8625f..a621c21ac550d71458aac26221ac3641277a488d 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.memcheck.tests/.classpath
+++ b/valgrind/org.eclipse.linuxtools.valgrind.memcheck.tests/.classpath
@@ -1,7 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="src" path="src"/>
+ <classpathentry kind="src" path="src">
+ <attributes>
+ <attribute name="test" value="true"/>
+ </attributes>
+ </classpathentry>
<classpathentry kind="output" path="target/classes"/>
</classpath>
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.memcheck.tests/.settings/org.eclipse.jdt.core.prefs b/valgrind/org.eclipse.linuxtools.valgrind.memcheck.tests/.settings/org.eclipse.jdt.core.prefs
index c2c83d84bd1636731b5f1267945a81c4e0cacb9c..efb8f9cf1d4debc9e3c391f997e35209338a6d4f 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.memcheck.tests/.settings/org.eclipse.jdt.core.prefs
+++ b/valgrind/org.eclipse.linuxtools.valgrind.memcheck.tests/.settings/org.eclipse.jdt.core.prefs
@@ -6,9 +6,9 @@ org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annota
org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.compliance=11
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -22,6 +22,7 @@ org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=warning
org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
@@ -65,6 +66,7 @@ org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=warn
org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
@@ -96,4 +98,5 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.memcheck.tests/META-INF/MANIFEST.MF b/valgrind/org.eclipse.linuxtools.valgrind.memcheck.tests/META-INF/MANIFEST.MF
index d508f94bf73719b235a16d8a83581bd320efb830..69de4b3a7037bdc3547fc942faf0ab412160205e 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.memcheck.tests/META-INF/MANIFEST.MF
+++ b/valgrind/org.eclipse.linuxtools.valgrind.memcheck.tests/META-INF/MANIFEST.MF
@@ -6,7 +6,7 @@ Bundle-Version: 1.0.0.qualifier
Bundle-Vendor: %Bundle-Vendor.0
Require-Bundle: org.junit;bundle-version="4.7.0",
org.eclipse.debug.ui
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
Bundle-ActivationPolicy: lazy
Bundle-Localization: plugin
Fragment-Host: org.eclipse.linuxtools.valgrind.memcheck
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.memcheck/.classpath b/valgrind/org.eclipse.linuxtools.valgrind.memcheck/.classpath
index 43b986286a9e5fd1828793fa4b2353d02ab8625f..1db08c6b4ce2fb50395b2f9c9a50c140a0bab199 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.memcheck/.classpath
+++ b/valgrind/org.eclipse.linuxtools.valgrind.memcheck/.classpath
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="target/classes"/>
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.memcheck/.settings/org.eclipse.jdt.core.prefs b/valgrind/org.eclipse.linuxtools.valgrind.memcheck/.settings/org.eclipse.jdt.core.prefs
index df2ab3a48b18af44b4b2811f8f06bca3e1a09a91..1cf590090233f30bd5077691a2f5bdcb0eac65f6 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.memcheck/.settings/org.eclipse.jdt.core.prefs
+++ b/valgrind/org.eclipse.linuxtools.valgrind.memcheck/.settings/org.eclipse.jdt.core.prefs
@@ -9,8 +9,8 @@ org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nul
org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
+org.eclipse.jdt.core.compiler.compliance=11
org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
@@ -21,6 +21,7 @@ org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=warning
org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
@@ -64,6 +65,7 @@ org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=warn
org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
@@ -96,4 +98,5 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.memcheck/META-INF/MANIFEST.MF b/valgrind/org.eclipse.linuxtools.valgrind.memcheck/META-INF/MANIFEST.MF
index 44e9ed79e3d38781a33e84709b7720448d5a7c4a..c778d4beb2239020e23ad32628b0df8b55ca191c 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.memcheck/META-INF/MANIFEST.MF
+++ b/valgrind/org.eclipse.linuxtools.valgrind.memcheck/META-INF/MANIFEST.MF
@@ -6,7 +6,7 @@ Bundle-Version: 1.1.0.qualifier
Bundle-Vendor: %Bundle-Vendor.0
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
Bundle-ActivationPolicy: lazy
Import-Package: org.eclipse.debug.core,
org.eclipse.debug.ui,
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.memcheck/pom.xml b/valgrind/org.eclipse.linuxtools.valgrind.memcheck/pom.xml
index f0d5f992adf259d99dd1e3fe50423a559616ac6a..644c20c27f0de67a4913736bb3abf1fb6a680647 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.memcheck/pom.xml
+++ b/valgrind/org.eclipse.linuxtools.valgrind.memcheck/pom.xml
@@ -15,7 +15,7 @@
<parent>
<artifactId>linuxtools-valgrind-parent</artifactId>
<groupId>org.eclipse.linuxtools.valgrind</groupId>
- <version>7.4.0</version>
+ <version>8.1.0</version>
</parent>
<artifactId>org.eclipse.linuxtools.valgrind.memcheck</artifactId>
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.remote-feature/feature.xml b/valgrind/org.eclipse.linuxtools.valgrind.remote-feature/feature.xml
index de624e3690f158e4a1130feb62b0d6d56975fc2c..3eb9a68faee9ff79af769f3334b648386e186da4 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.remote-feature/feature.xml
+++ b/valgrind/org.eclipse.linuxtools.valgrind.remote-feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.linuxtools.valgrind.remote"
label="%featureName"
- version="7.4.0.qualifier"
+ version="8.1.0.qualifier"
provider-name="%featureProvider"
license-feature="org.eclipse.license"
license-feature-version="0.0.0">
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.remote-feature/pom.xml b/valgrind/org.eclipse.linuxtools.valgrind.remote-feature/pom.xml
index 72783d81a833548342261815d0e0703f138f62dd..6a96b8bd44c5140d722bb944f6f0d2f182748d55 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.remote-feature/pom.xml
+++ b/valgrind/org.eclipse.linuxtools.valgrind.remote-feature/pom.xml
@@ -15,12 +15,12 @@
<parent>
<artifactId>linuxtools-valgrind-parent</artifactId>
<groupId>org.eclipse.linuxtools.valgrind</groupId>
- <version>7.4.0</version>
+ <version>8.1.0</version>
</parent>
<artifactId>org.eclipse.linuxtools.valgrind.remote</artifactId>
<packaging>eclipse-feature</packaging>
- <version>7.4.0-SNAPSHOT</version>
+ <version>8.1.0-SNAPSHOT</version>
<name>Linux Tools Valgrind Tools Remote Integration Feature</name>
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.tests/.classpath b/valgrind/org.eclipse.linuxtools.valgrind.tests/.classpath
index 43b986286a9e5fd1828793fa4b2353d02ab8625f..a621c21ac550d71458aac26221ac3641277a488d 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.tests/.classpath
+++ b/valgrind/org.eclipse.linuxtools.valgrind.tests/.classpath
@@ -1,7 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="src" path="src"/>
+ <classpathentry kind="src" path="src">
+ <attributes>
+ <attribute name="test" value="true"/>
+ </attributes>
+ </classpathentry>
<classpathentry kind="output" path="target/classes"/>
</classpath>
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.tests/.settings/org.eclipse.jdt.core.prefs b/valgrind/org.eclipse.linuxtools.valgrind.tests/.settings/org.eclipse.jdt.core.prefs
index 3931296f6b38aa69b9722b022235c5f04d85561f..f69a5623ab2eb86c1946fad21c6aa3b257a4956d 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.tests/.settings/org.eclipse.jdt.core.prefs
+++ b/valgrind/org.eclipse.linuxtools.valgrind.tests/.settings/org.eclipse.jdt.core.prefs
@@ -10,9 +10,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.compliance=11
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -26,6 +26,7 @@ org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=warning
org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
@@ -69,6 +70,7 @@ org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=warn
org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
@@ -101,4 +103,5 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.tests/META-INF/MANIFEST.MF b/valgrind/org.eclipse.linuxtools.valgrind.tests/META-INF/MANIFEST.MF
index 4e2f0f8755669bf62ea5e49caef498c624bce676..a5479397be1f274a73d83250bd3617be733d8a93 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.tests/META-INF/MANIFEST.MF
+++ b/valgrind/org.eclipse.linuxtools.valgrind.tests/META-INF/MANIFEST.MF
@@ -9,7 +9,7 @@ Bundle-ActivationPolicy: lazy
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
org.junit;bundle-version="4.7.0"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
Import-Package: org.eclipse.cdt.core.model,
org.eclipse.cdt.launch,
org.eclipse.core.resources,
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.tests/pom.xml b/valgrind/org.eclipse.linuxtools.valgrind.tests/pom.xml
index b2326beba37bde3f4486db0df13d0b5ab1350f6e..5039233c95a2de40cb55d4551333bc5d95d754bd 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.tests/pom.xml
+++ b/valgrind/org.eclipse.linuxtools.valgrind.tests/pom.xml
@@ -15,7 +15,7 @@
<parent>
<artifactId>linuxtools-valgrind-parent</artifactId>
<groupId>org.eclipse.linuxtools.valgrind</groupId>
- <version>7.4.0</version>
+ <version>8.1.0</version>
</parent>
<artifactId>org.eclipse.linuxtools.valgrind.tests</artifactId>
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.ui.editor/.classpath b/valgrind/org.eclipse.linuxtools.valgrind.ui.editor/.classpath
index 43b986286a9e5fd1828793fa4b2353d02ab8625f..1db08c6b4ce2fb50395b2f9c9a50c140a0bab199 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.ui.editor/.classpath
+++ b/valgrind/org.eclipse.linuxtools.valgrind.ui.editor/.classpath
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="target/classes"/>
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.ui.editor/.settings/org.eclipse.jdt.core.prefs b/valgrind/org.eclipse.linuxtools.valgrind.ui.editor/.settings/org.eclipse.jdt.core.prefs
index 451a97f8a09a7aeb3fa9199c8ee58c7ed88e99ef..5b647c53cde1e501e2e03d8ccec839be418892e8 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.ui.editor/.settings/org.eclipse.jdt.core.prefs
+++ b/valgrind/org.eclipse.linuxtools.valgrind.ui.editor/.settings/org.eclipse.jdt.core.prefs
@@ -9,8 +9,8 @@ org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nul
org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
+org.eclipse.jdt.core.compiler.compliance=11
org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
@@ -21,6 +21,7 @@ org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=warning
org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
@@ -64,6 +65,7 @@ org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=warn
org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
@@ -96,4 +98,5 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.ui.editor/META-INF/MANIFEST.MF b/valgrind/org.eclipse.linuxtools.valgrind.ui.editor/META-INF/MANIFEST.MF
index f4dff1dd68b6625bf90b287e4b8ad8bdda9c83e4..09ae6e49524f6d2d3e37e2c63cdc048718611949 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.ui.editor/META-INF/MANIFEST.MF
+++ b/valgrind/org.eclipse.linuxtools.valgrind.ui.editor/META-INF/MANIFEST.MF
@@ -9,7 +9,7 @@ Require-Bundle: org.eclipse.ui,
org.eclipse.core.resources,
org.eclipse.ui.ide,
org.eclipse.ui.genericeditor
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
Bundle-ActivationPolicy: lazy
Import-Package: org.eclipse.jface.text,
org.eclipse.jface.text.contentassist,
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.ui.editor/pom.xml b/valgrind/org.eclipse.linuxtools.valgrind.ui.editor/pom.xml
index 338962cfe98b17454240e0b970cb95c7cfbc9ea2..8724d68d011a94dba7aed3deba4765a04992176d 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.ui.editor/pom.xml
+++ b/valgrind/org.eclipse.linuxtools.valgrind.ui.editor/pom.xml
@@ -15,7 +15,7 @@
<parent>
<artifactId>linuxtools-valgrind-parent</artifactId>
<groupId>org.eclipse.linuxtools.valgrind</groupId>
- <version>7.4.0</version>
+ <version>8.1.0</version>
</parent>
<artifactId>org.eclipse.linuxtools.valgrind.ui.editor</artifactId>
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.ui.editor/src/org/eclipse/linuxtools/internal/valgrind/ui/editor/wizards/NewSuppressionWizard.java b/valgrind/org.eclipse.linuxtools.valgrind.ui.editor/src/org/eclipse/linuxtools/internal/valgrind/ui/editor/wizards/NewSuppressionWizard.java
index 9ab96c5ac973561a3419c267f57f280099f0f424..45129e62be7fb3d5d51bcfac84c0dc2e96a0a598 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.ui.editor/src/org/eclipse/linuxtools/internal/valgrind/ui/editor/wizards/NewSuppressionWizard.java
+++ b/valgrind/org.eclipse.linuxtools.valgrind.ui.editor/src/org/eclipse/linuxtools/internal/valgrind/ui/editor/wizards/NewSuppressionWizard.java
@@ -29,6 +29,7 @@ import org.eclipse.core.runtime.Path;
import org.eclipse.core.runtime.Status;
import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.jface.operation.IRunnableWithProgress;
+import org.eclipse.jface.resource.ResourceLocator;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.wizard.Wizard;
import org.eclipse.linuxtools.internal.valgrind.ui.editor.ValgrindEditorPlugin;
@@ -40,7 +41,6 @@ import org.eclipse.ui.PartInitException;
import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.dialogs.WizardNewFileCreationPage;
import org.eclipse.ui.ide.IDE;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
/**
* This is a sample new wizard. Its role is to create a new file
@@ -75,7 +75,7 @@ public class NewSuppressionWizard extends Wizard implements INewWizard {
page = new WizardNewFileCreationPage("newSuppressionPage", selection); //$NON-NLS-1$
page.setTitle(Messages.getString("NewSuppressionWizard.NewWizard_title")); //$NON-NLS-1$
page.setDescription(Messages.getString("NewSuppressionWizard.NewWizard_description")); //$NON-NLS-1$
- page.setImageDescriptor(AbstractUIPlugin.imageDescriptorFromPlugin(ValgrindEditorPlugin.PLUGIN_ID, "icons/newsupp_wiz.png")); //$NON-NLS-1$
+ page.setImageDescriptor(ResourceLocator.imageDescriptorFromBundle(ValgrindEditorPlugin.PLUGIN_ID, "icons/newsupp_wiz.png").get()); //$NON-NLS-1$
page.setFileExtension(EXT_SUPP);
addPage(page);
}
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.ui.tests/.classpath b/valgrind/org.eclipse.linuxtools.valgrind.ui.tests/.classpath
index 43b986286a9e5fd1828793fa4b2353d02ab8625f..a621c21ac550d71458aac26221ac3641277a488d 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.ui.tests/.classpath
+++ b/valgrind/org.eclipse.linuxtools.valgrind.ui.tests/.classpath
@@ -1,7 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="src" path="src"/>
+ <classpathentry kind="src" path="src">
+ <attributes>
+ <attribute name="test" value="true"/>
+ </attributes>
+ </classpathentry>
<classpathentry kind="output" path="target/classes"/>
</classpath>
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.ui.tests/.settings/org.eclipse.jdt.core.prefs b/valgrind/org.eclipse.linuxtools.valgrind.ui.tests/.settings/org.eclipse.jdt.core.prefs
index 6f38400385773818693187f371387a8a222ec772..c4b1d51d942090effcd938f9aed3b8983c20fae8 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.ui.tests/.settings/org.eclipse.jdt.core.prefs
+++ b/valgrind/org.eclipse.linuxtools.valgrind.ui.tests/.settings/org.eclipse.jdt.core.prefs
@@ -6,8 +6,8 @@ org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annota
org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
+org.eclipse.jdt.core.compiler.compliance=11
org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
@@ -18,6 +18,7 @@ org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore
org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
@@ -61,6 +62,7 @@ org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=igno
org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
@@ -92,4 +94,5 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.ui.tests/META-INF/MANIFEST.MF b/valgrind/org.eclipse.linuxtools.valgrind.ui.tests/META-INF/MANIFEST.MF
index ba3b2f2fd6f1552c6339587c5c8fae1a210b0591..efc2385d21fbc1f1fe97b9017f0194105cb5470e 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.ui.tests/META-INF/MANIFEST.MF
+++ b/valgrind/org.eclipse.linuxtools.valgrind.ui.tests/META-INF/MANIFEST.MF
@@ -8,7 +8,7 @@ Fragment-Host: org.eclipse.linuxtools.valgrind.ui
Require-Bundle: org.junit;bundle-version="4.7.0",
org.eclipse.linuxtools.valgrind.memcheck,
org.eclipse.cdt.codan.ui.cxx
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
Bundle-ActivationPolicy: lazy
Bundle-Localization: plugin
Import-Package: org.eclipse.linuxtools.internal.valgrind.tests,
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.ui.tests/pom.xml b/valgrind/org.eclipse.linuxtools.valgrind.ui.tests/pom.xml
index 1acfd1427102a75de0090c16fe3f9a4f87849757..ac1d2348950a91e078523fce4115f35370ff4e29 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.ui.tests/pom.xml
+++ b/valgrind/org.eclipse.linuxtools.valgrind.ui.tests/pom.xml
@@ -15,7 +15,7 @@
<parent>
<artifactId>linuxtools-valgrind-parent</artifactId>
<groupId>org.eclipse.linuxtools.valgrind</groupId>
- <version>7.4.0</version>
+ <version>8.1.0</version>
</parent>
<artifactId>org.eclipse.linuxtools.valgrind.ui.tests</artifactId>
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.ui/.classpath b/valgrind/org.eclipse.linuxtools.valgrind.ui/.classpath
index 43b986286a9e5fd1828793fa4b2353d02ab8625f..1db08c6b4ce2fb50395b2f9c9a50c140a0bab199 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.ui/.classpath
+++ b/valgrind/org.eclipse.linuxtools.valgrind.ui/.classpath
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="target/classes"/>
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.ui/.settings/org.eclipse.jdt.core.prefs b/valgrind/org.eclipse.linuxtools.valgrind.ui/.settings/org.eclipse.jdt.core.prefs
index 8eb2979cc3e8919c4c6d204555de475dd6f59731..b5ecf6ffa6693521e410937eb26de4bcac6a687b 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.ui/.settings/org.eclipse.jdt.core.prefs
+++ b/valgrind/org.eclipse.linuxtools.valgrind.ui/.settings/org.eclipse.jdt.core.prefs
@@ -10,9 +10,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.compliance=11
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -27,6 +27,7 @@ org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=warning
org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
@@ -83,6 +84,7 @@ org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=warn
org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=enabled
@@ -115,4 +117,5 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.ui/META-INF/MANIFEST.MF b/valgrind/org.eclipse.linuxtools.valgrind.ui/META-INF/MANIFEST.MF
index 425d8b20819391c814ca13ec01b8073442cbbcfc..a7ff0e50dda11dbfa17e85b9009f20f97d534b2c 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.ui/META-INF/MANIFEST.MF
+++ b/valgrind/org.eclipse.linuxtools.valgrind.ui/META-INF/MANIFEST.MF
@@ -15,7 +15,7 @@ Require-Bundle: org.eclipse.core.runtime,
org.eclipse.cdt.core,
org.eclipse.swt;bundle-version="3.106.0",
org.eclipse.cdt.codan.ui.cxx
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
Bundle-ActivationPolicy: lazy
Export-Package: org.eclipse.linuxtools.internal.valgrind.ui;
x-friends:="org.eclipse.linuxtools.valgrind.cachegrind,
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.ui/pom.xml b/valgrind/org.eclipse.linuxtools.valgrind.ui/pom.xml
index f798b458dce2cf56fdb4d34291c8b288a29bef45..43462a3708ff924bb18a5137bb1aab2669d45905 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.ui/pom.xml
+++ b/valgrind/org.eclipse.linuxtools.valgrind.ui/pom.xml
@@ -15,7 +15,7 @@
<parent>
<artifactId>linuxtools-valgrind-parent</artifactId>
<groupId>org.eclipse.linuxtools.valgrind</groupId>
- <version>7.4.0</version>
+ <version>8.1.0</version>
</parent>
<artifactId>org.eclipse.linuxtools.valgrind.ui</artifactId>
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.ui/src/org/eclipse/linuxtools/internal/valgrind/ui/CoreMessagesViewer.java b/valgrind/org.eclipse.linuxtools.valgrind.ui/src/org/eclipse/linuxtools/internal/valgrind/ui/CoreMessagesViewer.java
index cbc3950328b3ce1a224589ff41da24c3457d5cde..c52983fcb2444ed7ca659ebf4985b6427693980d 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.ui/src/org/eclipse/linuxtools/internal/valgrind/ui/CoreMessagesViewer.java
+++ b/valgrind/org.eclipse.linuxtools.valgrind.ui/src/org/eclipse/linuxtools/internal/valgrind/ui/CoreMessagesViewer.java
@@ -20,6 +20,7 @@ import org.eclipse.debug.ui.sourcelookup.ISourceLookupResult;
import org.eclipse.jface.action.MenuManager;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.resource.ImageRegistry;
+import org.eclipse.jface.resource.ResourceLocator;
import org.eclipse.jface.text.BadLocationException;
import org.eclipse.jface.viewers.AbstractTreeViewer;
import org.eclipse.jface.viewers.IDoubleClickListener;
@@ -40,7 +41,6 @@ import org.eclipse.swt.graphics.Image;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Menu;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
/**
* The inner tree view that holds the output messages to be displayed. Also hold
@@ -73,13 +73,13 @@ public class CoreMessagesViewer {
viewer = new TreeViewer(parent, SWT.SINGLE | SWT.H_SCROLL | SWT.V_SCROLL | style);
viewer.getControl().setLayoutData(new GridData(GridData.FILL_BOTH));
if (imageRegistry.getDescriptor(VALGRIND_ERROR) == null) {
- ImageDescriptor d = AbstractUIPlugin.imageDescriptorFromPlugin(ValgrindUIPlugin.PLUGIN_ID, VALGRIND_ERROR_IMAGE);
+ ImageDescriptor d = ResourceLocator.imageDescriptorFromBundle(ValgrindUIPlugin.PLUGIN_ID, VALGRIND_ERROR_IMAGE).get();
if (d != null) {
imageRegistry.put(VALGRIND_ERROR, d);
}
}
if (imageRegistry.getDescriptor(VALGRIND_INFO) == null) {
- ImageDescriptor d = AbstractUIPlugin.imageDescriptorFromPlugin(ValgrindUIPlugin.PLUGIN_ID, VALGRIND_INFO_IMAGE);
+ ImageDescriptor d = ResourceLocator.imageDescriptorFromBundle(ValgrindUIPlugin.PLUGIN_ID, VALGRIND_INFO_IMAGE).get();
if (d != null) {
imageRegistry.put(VALGRIND_INFO, d);
}
diff --git a/valgrind/pom.xml b/valgrind/pom.xml
index f238ed7a9bf40e83d55c29651f3cbf4eb5ba82c6..770612b1ee5cd52f41e748c22f40852bc698dde1 100644
--- a/valgrind/pom.xml
+++ b/valgrind/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.eclipse.linuxtools</groupId>
<artifactId>linuxtools-parent</artifactId>
- <version>7.4.0</version>
+ <version>8.1.0</version>
</parent>
<groupId>org.eclipse.linuxtools.valgrind</groupId>