Skip to content

Commit

Permalink
Merge branch 'jbosstools-4.3.1.x' into jbosstools-4.3.x
Browse files Browse the repository at this point in the history
  • Loading branch information
fbricon committed Oct 15, 2015
2 parents 61a9b84 + 4206c33 commit 213f368
Show file tree
Hide file tree
Showing 58 changed files with 251 additions and 183 deletions.
Expand Up @@ -2,7 +2,7 @@
<feature
id="org.jboss.tools.openshift.egit.integration.feature"
label="%featureName"
version="3.0.0.qualifier"
version="3.1.0.qualifier"
provider-name="%providerName"
plugin="org.jboss.tools.openshift.egit.ui"
license-feature="org.jboss.tools.foundation.license.feature"
Expand Down
Expand Up @@ -4,10 +4,10 @@
<parent>
<groupId>org.jboss.tools.openshift</groupId>
<artifactId>features</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>3.1.0-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.openshift.features</groupId>
<artifactId>org.jboss.tools.openshift.egit.integration.feature</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>3.1.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
Expand Up @@ -2,7 +2,7 @@
<feature
id="org.jboss.tools.openshift.egit.integration.test.feature"
label="%featureName"
version="3.0.0.qualifier"
version="3.1.0.qualifier"
provider-name="%providerName"
license-feature="org.jboss.tools.foundation.license.feature"
license-feature-version="0.0.0">
Expand Down
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.jboss.tools.openshift</groupId>
<artifactId>features</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>3.1.0-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.openshift.features</groupId>
<artifactId>org.jboss.tools.openshift.egit.integration.test.feature</artifactId>
Expand Down
Expand Up @@ -2,7 +2,7 @@
<feature
id="org.jboss.tools.openshift.express.feature"
label="%featureName"
version="3.0.0.qualifier"
version="3.1.0.qualifier"
provider-name="%providerName"
plugin="org.jboss.tools.openshift.express.client"
license-feature="org.jboss.tools.foundation.license.feature"
Expand Down
2 changes: 1 addition & 1 deletion features/org.jboss.tools.openshift.express.feature/pom.xml
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.jboss.tools.openshift</groupId>
<artifactId>features</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>3.1.0-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.openshift.features</groupId>
<artifactId>org.jboss.tools.openshift.express.feature</artifactId>
Expand Down
Expand Up @@ -2,7 +2,7 @@
<feature
id="org.jboss.tools.openshift.express.test.feature"
label="%featureName"
version="3.0.0.qualifier"
version="3.1.0.qualifier"
provider-name="%providerName"
license-feature="org.jboss.tools.foundation.license.feature"
license-feature-version="0.0.0">
Expand Down
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.jboss.tools.openshift</groupId>
<artifactId>features</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>3.1.0-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.openshift.features</groupId>
<artifactId>org.jboss.tools.openshift.express.test.feature</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion features/org.jboss.tools.openshift.feature/feature.xml
Expand Up @@ -2,7 +2,7 @@
<feature
id="org.jboss.tools.openshift.feature"
label="%featureName"
version="3.0.0.qualifier"
version="3.1.0.qualifier"
provider-name="%providerName"
plugin="org.jboss.tools.openshift.ui"
license-feature="org.jboss.tools.foundation.license.feature"
Expand Down
2 changes: 1 addition & 1 deletion features/org.jboss.tools.openshift.feature/pom.xml
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.jboss.tools.openshift</groupId>
<artifactId>features</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>3.1.0-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.openshift.features</groupId>
<artifactId>org.jboss.tools.openshift.feature</artifactId>
Expand Down
Expand Up @@ -2,7 +2,7 @@
<feature
id="org.jboss.tools.openshift.test.feature"
label="%featureName"
version="3.0.0.qualifier"
version="3.1.0.qualifier"
provider-name="%providerName"
license-feature="org.jboss.tools.foundation.license.feature"
license-feature-version="0.0.0">
Expand Down
2 changes: 1 addition & 1 deletion features/org.jboss.tools.openshift.test.feature/pom.xml
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.jboss.tools.openshift</groupId>
<artifactId>features</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>3.1.0-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.openshift.features</groupId>
<artifactId>org.jboss.tools.openshift.test.feature</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion features/pom.xml
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.jboss.tools</groupId>
<artifactId>openshift</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>3.1.0-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.openshift</groupId>
<artifactId>features</artifactId>
Expand Down
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.jboss.tools.openshift.client;singleton:=true
Bundle-Version: 3.0.0.qualifier
Bundle-Version: 3.1.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-Vendor: %Bundle-Vendor
Bundle-Localization: plugin
Expand Down
2 changes: 1 addition & 1 deletion plugins/org.jboss.tools.openshift.client/pom.xml
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.jboss.tools.openshift</groupId>
<artifactId>plugins</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>3.1.0-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.openshift.plugins</groupId>
<artifactId>org.jboss.tools.openshift.client</artifactId>
Expand Down
Expand Up @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.jboss.tools.openshift.common.core
Bundle-Vendor: %Bundle-Vendor
Bundle-Version: 3.0.0.qualifier
Bundle-Version: 3.1.0.qualifier
Bundle-Activator: org.jboss.tools.openshift.internal.common.core.OpenShiftCommonCoreActivator
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Expand Down
2 changes: 1 addition & 1 deletion plugins/org.jboss.tools.openshift.common.core/pom.xml
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.jboss.tools.openshift</groupId>
<artifactId>plugins</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>3.1.0-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.openshift.plugins</groupId>
<artifactId>org.jboss.tools.openshift.common.core</artifactId>
Expand Down
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.jboss.tools.openshift.common.ui;singleton:=true
Bundle-Version: 3.0.0.qualifier
Bundle-Version: 3.1.0.qualifier
Bundle-Localization: plugin
Bundle-Activator: org.jboss.tools.openshift.internal.common.ui.OpenShiftCommonUIActivator
Require-Bundle: org.jboss.tools.openshift.common.core;bundle-version="[3.0.0,4.0.0)",
Expand Down
2 changes: 1 addition & 1 deletion plugins/org.jboss.tools.openshift.common.ui/pom.xml
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.jboss.tools.openshift</groupId>
<artifactId>plugins</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>3.1.0-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.openshift.plugins</groupId>
<artifactId>org.jboss.tools.openshift.common.ui</artifactId>
Expand Down
Expand Up @@ -104,11 +104,8 @@ protected void doCreateControls(Composite parent, DataBindingContext dbc) {
//JBIDE-20361 signup link doesn't work on OSX in some situations.
//Link signupLink = new Link(parent, SWT.WRAP);
//signupLink.setText("If you do not have an account on OpenShift, please <a>sign up here</a>.");

StyledText signupLink = new StyledText(parent, SWT.WRAP);
StyledTextUtils.setTransparent(signupLink);
StyledTextUtils.setLinkText("If you do not have an account on OpenShift, please <a>sign up here</a>.", signupLink);
signupLink.setEditable(false);
StyledText signupLink = StyledTextUtils.emulateLinkWidget(
"If you do not have an account on OpenShift, please <a>sign up here</a>.", new StyledText(parent, SWT.WRAP));

GridDataFactory.fillDefaults()
.align(SWT.LEFT, SWT.CENTER).span(3, 1).applyTo(signupLink);
Expand Down
Expand Up @@ -19,6 +19,7 @@
import org.eclipse.swt.custom.StyleRange;
import org.eclipse.swt.custom.StyledText;
import org.eclipse.swt.graphics.Color;
import org.eclipse.swt.graphics.Cursor;
import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Shell;
import org.jboss.tools.openshift.common.core.utils.StringUtils;
Expand All @@ -35,6 +36,23 @@ public class StyledTextUtils {
private StyledTextUtils() {
}

/**
* Configures the given styled text so that it looks and behaves as if it was a link widget.
*
* @param text
* @param styledText
*
* @see <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=471717">Some link objects don't work on Mac</a>
* @see <a href="https://issues.jboss.org/browse/JBIDE-20092">Connection wizard: hitting retrivial link with mouse does not do anything on OSX (hitting enter works)</a>
*/
public static StyledText emulateLinkWidget(String text, StyledText styledText) {
setLinkText(text, styledText);
setTransparent(styledText);
styledText.setEditable(false);
styledText.setCursor(new Cursor(styledText.getShell().getDisplay(), SWT.CURSOR_HAND));
return styledText;
}

/**
* Sets a given text (with link markers <a></a>) to a given styled text.
* Applies a link-styled alike style range to the text within the markers
Expand All @@ -46,7 +64,8 @@ private StyledTextUtils() {
* @param text
* @param styledText
*
* @see <a href="https://issues.jboss.org/browse/JBIDE-20092">swt link widget is not clickable in certain situations on MacOS</a>
* @see <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=471717">Some link objects don't work on Mac</a>
* @see <a href="https://issues.jboss.org/browse/JBIDE-20092">Connection wizard: hitting retrivial link with mouse does not do anything on OSX (hitting enter works)</a>
*/
public static void setLinkText(String text, StyledText styledText) {
Matcher matcher = LINK_REGEX.matcher(text);
Expand Down Expand Up @@ -109,7 +128,7 @@ public static void setTransparent(StyledText styledText) {
}
}

public static StyleRange createBoldStyleRange(String string, Color background) {
public static StyleRange createBoldStyle(String string, Color background) {
StyleRange styleRange = new StyleRange();
styleRange.fontStyle = SWT.BOLD;
if (background != null) {
Expand Down
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.jboss.tools.openshift.core
Bundle-Version: 3.0.0.qualifier
Bundle-Version: 3.1.0.qualifier
Bundle-Activator: org.jboss.tools.openshift.internal.core.OpenShiftCoreActivator
Bundle-Vendor: %Bundle-Vendor
Bundle-Localization: plugin
Expand Down
2 changes: 1 addition & 1 deletion plugins/org.jboss.tools.openshift.core/pom.xml
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.jboss.tools.openshift</groupId>
<artifactId>plugins</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>3.1.0-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.openshift.plugins</groupId>
<artifactId>org.jboss.tools.openshift.core</artifactId>
Expand Down
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.jboss.tools.openshift.egit.core;singleton:=true
Bundle-Version: 3.0.0.qualifier
Bundle-Version: 3.1.0.qualifier
Bundle-Activator: org.jboss.tools.openshift.egit.core.internal.EGitCoreActivator
Bundle-Localization: plugin
Require-Bundle: org.eclipse.jgit;bundle-version="3.0.0";visibility:=reexport,
Expand Down
2 changes: 1 addition & 1 deletion plugins/org.jboss.tools.openshift.egit.core/pom.xml
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.jboss.tools.openshift</groupId>
<artifactId>plugins</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>3.1.0-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.openshift.plugins</groupId>
<artifactId>org.jboss.tools.openshift.egit.core</artifactId>
Expand Down
Expand Up @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-Vendor: %Bundle-Vendor
Bundle-SymbolicName: org.jboss.tools.openshift.egit.ui;singleton:=true
Bundle-Version: 3.0.0.qualifier
Bundle-Version: 3.1.0.qualifier
Bundle-Activator: org.jboss.tools.openshift.egit.ui.EGitUIActivator
Bundle-Localization: plugin
Require-Bundle: org.jboss.tools.openshift.egit.core;bundle-version="[3.0.0,4.0.0)",
Expand Down
2 changes: 1 addition & 1 deletion plugins/org.jboss.tools.openshift.egit.ui/pom.xml
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.jboss.tools.openshift</groupId>
<artifactId>plugins</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>3.1.0-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.openshift.plugins</groupId>
<artifactId>org.jboss.tools.openshift.egit.ui</artifactId>
Expand Down
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.jboss.tools.openshift.express.client;singleton:=true
Bundle-Version: 3.0.0.qualifier
Bundle-Version: 3.1.0.qualifier
Bundle-Vendor: %Bundle-Vendor
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Expand Down
2 changes: 1 addition & 1 deletion plugins/org.jboss.tools.openshift.express.client/pom.xml
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.jboss.tools.openshift</groupId>
<artifactId>plugins</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>3.1.0-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.openshift.plugins</groupId>
<artifactId>org.jboss.tools.openshift.express.client</artifactId>
Expand Down
Expand Up @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.jboss.tools.openshift.express.core;singleton:=true
Bundle-Vendor: %Bundle-Vendor
Bundle-Version: 3.0.0.qualifier
Bundle-Version: 3.1.0.qualifier
Bundle-Localization: plugin
Bundle-Activator: org.jboss.tools.openshift.express.internal.core.ExpressCoreActivator
Require-Bundle: org.jboss.tools.openshift.express.client;bundle-version="[3.0.0,4.0.0)",
Expand Down
2 changes: 1 addition & 1 deletion plugins/org.jboss.tools.openshift.express.core/pom.xml
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.jboss.tools.openshift</groupId>
<artifactId>plugins</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>3.1.0-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.openshift.plugins</groupId>
<artifactId>org.jboss.tools.openshift.express.core</artifactId>
Expand Down
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.jboss.tools.openshift.express.ui;singleton:=true
Bundle-Version: 3.0.0.qualifier
Bundle-Version: 3.1.0.qualifier
Bundle-Localization: plugin
Bundle-Activator: org.jboss.tools.openshift.express.internal.ui.ExpressUIActivator
Require-Bundle: org.jboss.tools.openshift.express.client;bundle-version="[3.0.0,4.0.0)",
Expand Down
2 changes: 1 addition & 1 deletion plugins/org.jboss.tools.openshift.express.ui/pom.xml
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.jboss.tools.openshift</groupId>
<artifactId>plugins</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>3.1.0-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.openshift.plugins</groupId>
<artifactId>org.jboss.tools.openshift.express.ui</artifactId>
Expand Down
Expand Up @@ -121,7 +121,7 @@ public void onVisible(IObservableValue applicationTemplateObservable, DataBindin
IApplicationTemplate applicationTemplate = (IApplicationTemplate) value;
String templateName = applicationTemplate.getName();
this.nameText.setText(templateName);
this.nameText.setStyleRange(StyledTextUtils.createBoldStyleRange(templateName, null));
this.nameText.setStyleRange(StyledTextUtils.createBoldStyle(templateName, null));
this.descriptionText.setText(applicationTemplate.getDescription());
}

Expand Down Expand Up @@ -197,7 +197,7 @@ public void onVisible(IObservableValue applicationTemplateObservable, DataBindin
IApplicationTemplate applicationTemplate = (IApplicationTemplate) value;
String name = applicationTemplate.getName();
this.nameText.setText(name);
this.nameText.setStyleRange(StyledTextUtils.createBoldStyleRange(name, null));
this.nameText.setStyleRange(StyledTextUtils.createBoldStyle(name, null));
this.descriptionText.setText(applicationTemplate.getDescription());

IObservableValue urlTextObservable = WidgetProperties.text(SWT.Modify).observe(urlText);
Expand Down
Expand Up @@ -99,7 +99,7 @@ public void onVisible(IObservableValue selectedCartridgeObservable, DataBindingC
ICartridge embeddableCartridge = (ICartridge) value;
String name = ExpressResourceLabelUtils.toString(embeddableCartridge);
this.nameLabel.setText(name);
this.nameLabel.setStyleRange(StyledTextUtils.createBoldStyleRange(name, null));
this.nameLabel.setStyleRange(StyledTextUtils.createBoldStyle(name, null));

this.description.setText(embeddableCartridge.getDescription());
}
Expand Down Expand Up @@ -148,7 +148,7 @@ public void onVisible(IObservableValue selectedCartridgeObservable, DataBindingC
ICartridge cartridge = (ICartridge) value;
String cartridgeLabel = ExpressResourceLabelUtils.toString(cartridge);
this.name.setText(cartridgeLabel);
this.name.setStyleRange(StyledTextUtils.createBoldStyleRange(cartridgeLabel, null));
this.name.setStyleRange(StyledTextUtils.createBoldStyle(cartridgeLabel, null));
if (cartridge.getUrl() != null) {
this.url.setText(cartridge.getUrl().toString());
}
Expand Down Expand Up @@ -214,7 +214,7 @@ public void onVisible(IObservableValue selectedCartridgeObservable, DataBindingC
CodeAnythingCartridge cartridge = (CodeAnythingCartridge) value;
String name = cartridge.getDisplayName();
this.name.setText(name);
this.name.setStyleRange(StyledTextUtils.createBoldStyleRange(name, null));
this.name.setStyleRange(StyledTextUtils.createBoldStyle(name, null));
this.description.setText(cartridge.getDescription());

IObservableValue urlTextObservable = WidgetProperties.text(SWT.Modify).observeDelayed(100, urlText);
Expand Down

0 comments on commit 213f368

Please sign in to comment.