Merge branch 'eclipse-platform:master' into DaveCarpeneto-issue2538-1

Author: DaveCarpeneto

.mvn/extensions.xml

@@ -3,6 +3,6 @@
 	<extension>
 		<groupId>org.eclipse.tycho</groupId>
 		<artifactId>tycho-build</artifactId>
-		<version>4.0.6</version>
+		<version>4.0.10</version>
 	</extension>
 </extensions>

bundles/org.eclipse.e4.ui.css.swt/META-INF/MANIFEST.MF

@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.e4.ui.css.swt;singleton:=true
-Bundle-Version: 0.15.400.qualifier
+Bundle-Version: 0.15.500.qualifier
 Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin

bundles/org.eclipse.e4.ui.css.swt/forceQualifierUpdate.txt

@@ -4,4 +4,5 @@ Bug 416898 - Some Platform UI bundles need to be touched to get API descriptions
 Bug 514690 - Build failure on I20170403-2000 and I20170404-0245
 https://github.com/eclipse-platform/eclipse.platform.releng.aggregator/issues/1184
 https://github.com/eclipse-platform/eclipse.platform.releng.aggregator/issues/1659
-https://github.com/eclipse-platform/eclipse.platform.releng.aggregator/issues/1781
+https://github.com/eclipse-platform/eclipse.platform.releng.aggregator/issues/1781
+https://github.com/eclipse-platform/eclipse.platform.releng.aggregator/issues/2595

bundles/org.eclipse.e4.ui.css.swt/plugin.xml

@@ -494,6 +494,7 @@
        	 <property-name name="category"/>
          <property-name name="label"/>       
          <property-name name="description"/>
+         <property-name name="editable"/>
       </handler>
       <handler
             adapter="org.eclipse.e4.ui.css.swt.dom.definition.FontDefinitionElement"

bundles/org.eclipse.e4.ui.css.swt/src/org/eclipse/e4/ui/css/swt/properties/definition/CSSPropertyThemeElementDefinitionHandler.java

@@ -42,6 +42,8 @@ public class CSSPropertyThemeElementDefinitionHandler implements ICSSPropertyHan
 
 	private static final String MESSAGE_QUERY_PARAM = "message";
 
+	private static final String EDITABLE_PROP = "editable";
+
 	private Map<Long, ResourceBundle> bundleToResourceBundles = new WeakHashMap<>();
 
 	@Override
@@ -65,6 +67,10 @@ public boolean applyCSSProperty(Object element, String property,
 		case DESCRIPTION_PROP:
 			definition.setDescription(getLabel(value));
 			break;
+		case EDITABLE_PROP:
+			Boolean editable = (Boolean) engine.convert(value, Boolean.class, null);
+			definition.setEditable(editable);
+			break;
 		default:
 			return false;
 		}

bundles/org.eclipse.e4.ui.css.swt/src/org/eclipse/e4/ui/internal/css/swt/definition/IThemeElementDefinitionOverridable.java

@@ -27,4 +27,6 @@ public interface IThemeElementDefinitionOverridable<T> {
 	void setName(String name);
 
 	void setDescription(String description);
+
+	void setEditable(Boolean editable);
 }

bundles/org.eclipse.jface.text/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.jface.text
-Bundle-Version: 3.26.0.qualifier
+Bundle-Version: 3.26.100.qualifier
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Export-Package: 

bundles/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/html/BrowserInformationControl.java

@@ -332,8 +332,6 @@ else if (!resizable)
 	@Override
 	public void setVisible(boolean visible) {
 		Shell shell= getShell();
-		if (shell.isVisible() == visible)
-			return;
 
 		if (!visible) {
 			super.setVisible(false);
@@ -342,6 +340,8 @@ public void setVisible(boolean visible) {
 			return;
 		}
 
+		if (shell.isVisible() == visible)
+			return;
 		/*
 		 * The Browser widget flickers when made visible while it is not completely loaded.
 		 * The fix is to delay the call to setVisible until either loading is completed

bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/AbstractInformationControl.java

@@ -505,7 +505,7 @@ public boolean isResizable() {
 
 	@Override
 	public void setVisible(boolean visible) {
-		if (fShell.isVisible() == visible)
+		if (visible && fShell.isVisible() == visible)
 			return;
 
 		fShell.setVisible(visible);

bundles/org.eclipse.text/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.text
-Bundle-Version: 3.14.200.qualifier
+Bundle-Version: 3.14.300.qualifier
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Export-Package: