Skip to content

Commit

Permalink
SVY-15100 Eclipse bug for showing the context help (null pointer)
Browse files Browse the repository at this point in the history
patch on top of the plain copy from eclipse
  • Loading branch information
jcompagner committed Jun 16, 2020
1 parent d2f8a60 commit d04404b
Show file tree
Hide file tree
Showing 5 changed files with 72 additions and 2 deletions.
1 change: 1 addition & 0 deletions org.eclipse.e4.ui.workbench.swt/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/target/
2 changes: 1 addition & 1 deletion org.eclipse.e4.ui.workbench.swt/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.eclipse.e4.ui.workbench.swt;singleton:=true
Bundle-Version: 0.14.900.qualifier
Bundle-Version: 0.14.900.v20200213-1442
Bundle-Name: %pluginName
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Expand Down
67 changes: 67 additions & 0 deletions org.eclipse.e4.ui.workbench.swt/pom.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2012, 2019 Eclipse Foundation and others.
All rights reserved. This program and the accompanying materials
are made available under the terms of the Eclipse Distribution License v1.0
which accompanies this distribution, and is available at
http://www.eclipse.org/org/documents/edl-v10.php
Contributors:
Igor Fedorenko - initial implementation
Lars Vogel <Lars.Vogel@vogella.com> - Bug 475688
-->
<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>com.servoy</groupId>
<artifactId>servoy-eclipse</artifactId>
<version>2020.6.0.3581_rc2</version>
</parent>
<groupId>com.servoy</groupId>
<artifactId>org.eclipse.e4.ui.workbench.swt</artifactId>
<version>0.14.900.v20200213-1442</version>
<packaging>eclipse-plugin</packaging>

<properties>
<code.ignoredWarnings>-warn:-deprecation,raw,unchecked</code.ignoredWarnings>
</properties>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>3.1.1</version>
<executions>
<execution>
<id>adjust the p2 osgi area to overwrite the eclipse plugin</id>
<phase>install</phase>
<goals>
<goal>copy</goal>
</goals>
<configuration>
<artifactItems>
<artifactItem>
<groupId>com.servoy</groupId>
<artifactId>org.eclipse.e4.ui.workbench.swt</artifactId>
<version>${project.version}</version>
<type>jar</type>
<overWrite>true</overWrite>
<outputDirectory>${settings.localRepository}/p2/osgi/bundle/org.eclipse.e4.ui.workbench.swt/${project.version}/</outputDirectory>
</artifactItem>
<artifactItem>
<groupId>com.servoy</groupId>
<artifactId>org.eclipse.e4.ui.workbench.swt</artifactId>
<version>${project.version}</version>
<type>xml</type>
<classifier>p2artifacts</classifier>
<overWrite>true</overWrite>
<outputDirectory>${settings.localRepository}/p2/osgi/bundle/org.eclipse.e4.ui.workbench.swt/${project.version}/</outputDirectory>
</artifactItem>
</artifactItems>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
Original file line number Diff line number Diff line change
Expand Up @@ -328,7 +328,8 @@ private void subscribeChildrenHandler(@EventTopic(UIEvents.ElementContainer.TOPI
// it's 'globally visible' and, if so, remove all other
// 'local' placeholders referencing the same element.
int newLocation = modelService.getElementLocation(added);
if (newLocation == EModelService.IN_SHARED_AREA || newLocation == EModelService.OUTSIDE_PERSPECTIVE) {
if (added instanceof MPlaceholder && (newLocation == EModelService.IN_SHARED_AREA
|| newLocation == EModelService.OUTSIDE_PERSPECTIVE)) {
MWindow topWin = modelService.getTopLevelWindowFor(added);
modelService.hideLocalPlaceholders(topWin, null);
}
Expand Down
1 change: 1 addition & 0 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -269,6 +269,7 @@
<module>com.servoy.eclipse.notification</module>
<module>com.servoy.eclipse.ui.tweaks</module>
<module>org.eclipse.jface</module>
<module>org.eclipse.e4.ui.workbench.swt</module>
<module>j2db_documentation</module>
</modules>
</profile>
Expand Down

0 comments on commit d04404b

Please sign in to comment.