Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion examples/org.eclipse.nebula.examples.feature/feature.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<feature
id="org.eclipse.nebula.examples.feature"
label="Nebula Examples View"
version="1.0.4.qualifier"
version="1.1.0.qualifier"
provider-name="Eclipse Nebula">

<description url="%featureDescriptionURL">
Expand Down
2 changes: 1 addition & 1 deletion examples/org.eclipse.nebula.examples.feature/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ Contributors:

<artifactId>org.eclipse.nebula.examples.feature</artifactId>
<packaging>eclipse-feature</packaging>
<version>1.0.4-SNAPSHOT</version>
<version>1.1.0-SNAPSHOT</version>

<name>Nebula Examples View Feature</name>

Expand Down
5 changes: 3 additions & 2 deletions examples/org.eclipse.nebula.examples/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,11 @@ Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.nebula.examples;singleton:=true
Automatic-Module-Name: org.eclipse.nebula.examples
Bundle-Version: 1.0.4.qualifier
Bundle-Version: 1.1.0.qualifier
Bundle-Localization: plugin
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime
org.eclipse.core.runtime,
org.eclipse.swt;bundle-version="[3.115.0,4.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-11
Export-Package: org.eclipse.nebula.examples
Bundle-Activator: org.eclipse.nebula.examples.internal.Activator
Expand Down
2 changes: 1 addition & 1 deletion examples/org.eclipse.nebula.examples/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ Contributors:
</parent>

<artifactId>org.eclipse.nebula.examples</artifactId>
<version>1.0.4-SNAPSHOT</version>
<version>1.1.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>

</project>
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,7 @@ private void createColors(Composite parent) {
ColorDialog cd = new ColorDialog(Display.getCurrent().getActiveShell());
RGB newRGB = cd.open();
if (newRGB != null) {
Color newColor = new Color(Display.getCurrent(), newRGB);
Color newColor = new Color(newRGB);
controlExample.setBackground(newColor);
if (modifiedBack != null) {
modifiedBack.dispose();
Expand All @@ -266,7 +266,7 @@ private void createColors(Composite parent) {
ColorDialog cd = new ColorDialog(Display.getCurrent().getActiveShell());
RGB newRGB = cd.open();
if (newRGB != null) {
Color newColor = new Color(Display.getCurrent(), newRGB);
Color newColor = new Color(newRGB);
controlExample.setForeground(newColor);
if (modifiedFore != null) {
modifiedFore.dispose();
Expand Down
5 changes: 3 additions & 2 deletions org.eclipse.nebula.presentations.shelf/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,11 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Nebula PShelf-based Presentation
Bundle-SymbolicName: org.eclipse.swt.nebula.presentations.shelf;singleton:=true
Bundle-Version: 3.3.0.alpha
Bundle-Version: 3.4.0.alpha
Bundle-Vendor: Eclipse Nebula
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime
org.eclipse.core.runtime,
org.eclipse.swt;bundle-version="[3.115.0,4.0.0)"
Bundle-ClassPath: .,
nebula_pshelf_ALPHA.jar,
nebula_pgroup_ALPHA.jar
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ public ExpandBarStandaloneStackPresentation(IStackPresentationSite stackSite, Co
RGB blendwith = new RGB(255,255,255);
RGB blended = blend(sel,blendwith,20);

toolbarBackground = new Color(parent.getDisplay(),blended);
toolbarBackground = new Color(blended);

eBar.addExpandListener(new ExpandListener()
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ public PGroupStackPresentation(IStackPresentationSite stackSite, Composite paren
RGB blendwith = new RGB(255,255,255);
RGB blended = blend(sel,blendwith,20);

toolbarBackground = new Color(parent.getDisplay(),blended);
toolbarBackground = new Color(blended);

group.addExpandListener(new ExpandListener()
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -90,11 +90,11 @@ public void handleEvent(Event event)
RGB blendwith = new RGB(255,255,255);
RGB blended = blend(sel,blendwith,20);

toolbarBackground = new Color(parent.getDisplay(),blended);
toolbarBackground = new Color(blended);

blended = blend(sel,blendwith,60);

border = new Color(parent.getDisplay(),blended);
border = new Color(blended);

URL imageURL = Platform.getBundle("org.eclipse.swt.nebula.presentations.shelf").getResource("icons/view_menu.gif");
menuTBImage = ImageDescriptor.createFromURL(imageURL).createImage();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@ public static RGB blend(RGB c1, RGB c2, int ratio)
public static Color createNewBlendedColor(RGB rgb1, RGB rgb2, int ratio)
{

Color newColor = new Color(Display.getCurrent(), blend(rgb1, rgb2, ratio));
Color newColor = new Color(blend(rgb1, rgb2, ratio));

return newColor;

Expand All @@ -224,14 +224,14 @@ public static Color createNewBlendedColor(RGB rgb1, RGB rgb2, int ratio)
public static Color createNewBlendedColor(Color c1, Color c2, int ratio)
{

Color newColor = new Color(Display.getCurrent(), blend(c1.getRGB(), c2.getRGB(), ratio));
Color newColor = new Color(blend(c1.getRGB(), c2.getRGB(), ratio));

return newColor;
}

public static Color createNewReverseColor(Color c)
{
Color newColor = new Color(Display.getCurrent(), 255 - c.getRed(), 255 - c.getGreen(),
Color newColor = new Color(255 - c.getRed(), 255 - c.getGreen(),
255 - c.getBlue());
return newColor;
}
Expand Down Expand Up @@ -267,6 +267,6 @@ public static RGB saturate(RGB rgb, float saturation)
public static Color createNewSaturatedColor(Color c, float saturation)
{
RGB newRGB = saturate(c.getRGB(), saturation);
return new Color(Display.getCurrent(), newRGB);
return new Color(newRGB);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<feature
id="org.eclipse.nebula.widgets.badgedlabel.feature"
label="Nebula Badged Label Widget"
version="1.0.0.qualifier"
version="1.1.0.qualifier"
provider-name="Eclipse Nebula">

<description url="http://eclipse.org/nebula">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ Contributors:

<artifactId>org.eclipse.nebula.widgets.badgedlabel.feature</artifactId>
<packaging>eclipse-feature</packaging>
<version>1.0.0-SNAPSHOT</version>
<version>1.1.0-SNAPSHOT</version>

<name>Nebula Badged Label Feature</name>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Nebula Badged Label Widget
Bundle-SymbolicName: org.eclipse.nebula.widgets.badgedlabel
Bundle-Version: 1.0.0.qualifier
Bundle-Version: 1.1.0.qualifier
Bundle-Vendor: Eclipse Nebula
Bundle-RequiredExecutionEnvironment: JavaSE-11
Export-Package: org.eclipse.nebula.widgets.badgedlabel
Require-Bundle: org.eclipse.nebula.widgets.opal.commons,
org.eclipse.swt
org.eclipse.swt;bundle-version="[3.115.0,4.0.0)"
Automatic-Module-Name: org.eclipse.nebula.widgets.badgedlabel
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ http://www.eclipse.org/legal/epl-v10.html
</parent>

<artifactId>org.eclipse.nebula.widgets.badgedlabel</artifactId>
<version>1.1.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>

</project>
Original file line number Diff line number Diff line change
Expand Up @@ -113,14 +113,14 @@ private void initDefaultColors() {
textColor = getDisplay().getSystemColor(SWT.COLOR_BLACK);
SWTGraphicUtil.addDisposer(this, textColor);

backgroundColor = new Color(getDisplay(), 247, 247, 247);
backgroundColor = new Color(247, 247, 247);
SWTGraphicUtil.addDisposer(this, backgroundColor);

borderColor = new Color(getDisplay(), 204, 204, 204);
borderColor = new Color(204, 204, 204);
SWTGraphicUtil.addDisposer(this, borderColor);

badgeForeground = getDisplay().getSystemColor(SWT.COLOR_WHITE);
badgeBackground = new Color(getDisplay(), 0, 123, 255);
badgeBackground = new Color(0, 123, 255);
SWTGraphicUtil.addDisposer(this, badgeBackground);
}

Expand Down Expand Up @@ -306,26 +306,26 @@ public void setPredefinedColor(int color) {
badgeForeground = getDisplay().getSystemColor(SWT.COLOR_WHITE);
switch (color) {
case SWT.COLOR_BLUE:
badgeBackground = new Color(getDisplay(), 0, 123, 255);
badgeBackground = new Color(0, 123, 255);
break;
case SWT.COLOR_GRAY:
badgeBackground = new Color(getDisplay(), 108, 117, 125);
badgeBackground = new Color(108, 117, 125);
break;
case SWT.COLOR_GREEN:
badgeBackground = new Color(getDisplay(), 40, 167, 69);
badgeBackground = new Color(40, 167, 69);
break;
case SWT.COLOR_RED:
badgeBackground = new Color(getDisplay(), 220, 53, 69);
badgeBackground = new Color(220, 53, 69);
break;
case SWT.COLOR_YELLOW:
badgeForeground = getDisplay().getSystemColor(SWT.COLOR_BLACK);
badgeBackground = new Color(getDisplay(), 255, 193, 7);
badgeBackground = new Color(255, 193, 7);
break;
case SWT.COLOR_CYAN:
badgeBackground = new Color(getDisplay(), 23, 162, 184);
badgeBackground = new Color(23, 162, 184);
break;
default: // BLACK
badgeBackground = new Color(getDisplay(), 52, 58, 64);
badgeBackground = new Color(52, 58, 64);
}

SWTGraphicUtil.addDisposer(this, badgeBackground);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<feature
id="org.eclipse.nebula.widgets.calendarcombo.feature"
label="Nebula Calendar Combo Widget - Incubating"
version="1.0.0.qualifier"
version="1.1.0.qualifier"
provider-name="Eclipse Nebula">

<description url="http://www.eclipse.org/nebula/widgets/calendarcombo/calendarcombo.php">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ Contributors:
</parent>

<artifactId>org.eclipse.nebula.widgets.calendarcombo.feature</artifactId>
<version>1.1.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>

<name>Nebula Calendar Combo Feature</name>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Nebula Calendar Combo Widget - Incubating
Bundle-SymbolicName: org.eclipse.nebula.widgets.calendarcombo
Bundle-Version: 1.0.0.qualifier
Bundle-Version: 1.1.0.qualifier
Require-Bundle: org.eclipse.swt;bundle-version="[3.126.0,4.0.0)"
Export-Package: org.eclipse.nebula.widgets.calendarcombo
Bundle-RequiredExecutionEnvironment: JavaSE-11
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ Contributors:
</parent>

<artifactId>org.eclipse.nebula.widgets.calendarcombo</artifactId>
<version>1.1.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>

</project>
Original file line number Diff line number Diff line change
Expand Up @@ -304,7 +304,7 @@ public static Color getColor(RGB rgb) {
Color color = (Color) mColorTable.get(rgb);

if (color == null) {
color = new Color(Display.getCurrent(), rgb);
color = new Color(rgb);
mColorTable.put(rgb, color);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<feature
id="org.eclipse.nebula.widgets.cdatetime.feature"
label="Nebula CDateTime Widget"
version="1.5.1.qualifier"
version="1.6.0.qualifier"
provider-name="Eclipse Nebula">

<description url="http://www.eclipse.org/nebula/widgets/cdatetime">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ Contributors:
</parent>

<artifactId>org.eclipse.nebula.widgets.cdatetime.feature</artifactId>
<version>1.6.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>

</project>
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.nebula.widgets.cdatetime
Bundle-Version: 1.5.1.qualifier
Bundle-Version: 1.6.0.qualifier
Bundle-Name: %pluginName
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ Contributors:
</parent>

<artifactId>org.eclipse.nebula.widgets.cdatetime</artifactId>
<version>1.6.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>

</project>
Original file line number Diff line number Diff line change
Expand Up @@ -192,8 +192,8 @@ protected void paintFace(VPanel panel, Event e) {
int x = picker.dialCenter.x - picker.dialRadius;
int y = picker.dialCenter.y - picker.dialRadius;

Color c1 = new Color(e.display, 220, 220, 225);
Color c2 = new Color(e.display, 200, 200, 200);
Color c1 = new Color(220, 220, 225);
Color c2 = new Color(200, 200, 200);

Pattern p = new Pattern(e.display, 0, y, 0, y + dia,
e.display.getSystemColor(SWT.COLOR_WHITE), c1);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<feature
id="org.eclipse.nebula.widgets.collapsiblebuttons.feature"
label="Nebula Collapsible Buttons Widget - Incubating"
version="1.0.0.qualifier"
version="1.1.0.qualifier"
provider-name="Eclipse Nebula">

<description url="http://www.eclipse.org/nebula/widgets/collapsible/collapsible.php">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
</parent>

<artifactId>org.eclipse.nebula.widgets.collapsiblebuttons.feature</artifactId>
<version>1.1.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>

<name>Eclipse Collabsible Buttons Feature</name>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Nebula Collapsible Buttons - Incubating
Bundle-SymbolicName: org.eclipse.nebula.widgets.collapsiblebuttons
Bundle-Version: 1.0.0.qualifier
Require-Bundle: org.eclipse.swt
Bundle-Version: 1.1.0.qualifier
Require-Bundle: org.eclipse.swt;bundle-version="[3.115.0,4.0.0)"
Export-Package: org.eclipse.nebula.widgets.collapsiblebuttons
Bundle-RequiredExecutionEnvironment: JavaSE-11
Bundle-Vendor: Eclipse Nebula
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
</parent>

<artifactId>org.eclipse.nebula.widgets.collapsiblebuttons</artifactId>
<version>1.1.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
<name>Collapsible Buttons Widget</name>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -304,7 +304,7 @@ public static Color getColor(RGB rgb) {
Color color = mColorTable.get(rgb);

if (color == null) {
color = new Color(Display.getCurrent(), rgb);
color = new Color(rgb);
mColorTable.put(rgb, color);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<feature
id="org.eclipse.nebula.widgets.compositetable.feature"
label="Nebula Composite Table Widget"
version="1.0.0.qualifier"
version="1.1.0.qualifier"
provider-name="Eclipse Nebula">

<description url="http://www.eclipse.org/nebula/widgets/compositetable/compositetable.php">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
</parent>

<artifactId>org.eclipse.nebula.widgets.compositetable.feature</artifactId>
<version>1.1.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>

<name>Nebula Composite Table Feature</name>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Nebula Compositetable
Bundle-SymbolicName: org.eclipse.nebula.widgets.compositetable
Bundle-Version: 1.0.0.qualifier
Bundle-Version: 1.1.0.qualifier
Export-Package: org.eclipse.nebula.widgets.compositetable,
org.eclipse.nebula.widgets.compositetable.day,
org.eclipse.nebula.widgets.compositetable.month,
org.eclipse.nebula.widgets.compositetable.timeeditor
Require-Bundle: org.eclipse.swt,
Require-Bundle: org.eclipse.swt;bundle-version="[3.115.0,4.0.0)",
org.eclipse.jface
Bundle-RequiredExecutionEnvironment: JavaSE-11
Bundle-Vendor: Eclipse Nebula
Expand Down
Loading
Loading