Bug 547910 - CoreException due to property tester in systemtap.ui.ide

- add instanceof clause to DefinitionHandler in systemtap.ui.ide
  plugin so that property test won't be performed unless selected
  item is of appropriate class to match property tester
- bump up system.ui.ide version
- update linuxtools-4.12.target file now that 4.12 is released

Change-Id: Ie56e502c94800971be3aa2383659f351b707b445
Reviewed-on: https://git.eclipse.org/r/144538
Tested-by: Linux Tools Bot <linuxtools-bot@eclipse.org>
Reviewed-by: Jeff Johnston <jjohnstn@redhat.com>

4 files changed, 12 insertions, 7 deletions

diff --git a/releng/org.eclipse.linuxtools.target/linuxtools-e4.12.target b/releng/org.eclipse.linuxtools.target/linuxtools-e4.12.target
index 30e6cf9856..a870f263c6 100644
--- a/releng/org.eclipse.linuxtools.target/linuxtools-e4.12.target
+++ b/releng/org.eclipse.linuxtools.target/linuxtools-e4.12.target
@@ -64,7 +64,7 @@
 <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-I-builds/"/>
+<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"/>
@@ -97,4 +97,4 @@
 -Xmx512M</vmArgs>
 <programArgs>-consolelog</programArgs>
 </launcherArgs>
-</target>
\ No newline at end of file
+</target>
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 84f04d0003..2d5e6088a7 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
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %bundleName
 Bundle-SymbolicName: org.eclipse.linuxtools.systemtap.ui.ide;singleton:=true
-Bundle-Version: 2.3.0.qualifier
+Bundle-Version: 2.3.1.qualifier
 Bundle-Activator: org.eclipse.linuxtools.internal.systemtap.ui.ide.IDEPlugin
 Bundle-Vendor: %bundleProvider
 Bundle-Localization: plugin
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/plugin.xml b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/plugin.xml
index a7aa854107..ccc32151f2 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/plugin.xml
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/plugin.xml
@@ -500,9 +500,14 @@
                      value="1">
                </count>
                <iterate>
-                  <test
-                     property="org.eclipse.linuxtools.systemtap.ui.ide.handlers.hasDefinition">
-               </test>
+                  <and>
+                     <instanceof
+                           value="org.eclipse.linuxtools.systemtap.structures.TreeDefinitionNode">
+                     </instanceof>
+                     <test
+                           property="org.eclipse.linuxtools.systemtap.ui.ide.handlers.hasDefinition">
+                     </test>
+                  </and>
                </iterate>
             </with>
          </enabledWhen>
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/pom.xml b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/pom.xml
index 3a29e550c1..4799a7578e 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/pom.xml
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/pom.xml
@@ -19,7 +19,7 @@
   </parent>
 
   <artifactId>org.eclipse.linuxtools.systemtap.ui.ide</artifactId>
-  <version>2.3.0-SNAPSHOT</version>
+  <version>2.3.1-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
   <name>Linux Tools SystemTap IDE Plug-in</name>