Skip to content

Replace deprecated Color(Device, ...) constructors with display-free variants #127

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
vogella wants to merge 1 commit into from
Closed

Replace deprecated Color(Device, ...) constructors with display-free variants #127

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 org.eclipse.gef.cloudio.tests.ui/src/org/eclipse/gef/cloudio/tests/ui/TestLabelProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ public class TestLabelProvider extends BaseLabelProvider implements ICloudLabelP

public static final double WEIGHT = 0.987D;
public static final float ANGLE = 12.34F;
public static Color COLOR = new Color(Display.getDefault(), new RGB(100, 100, 100));
public static Color COLOR = new Color(new RGB(100, 100, 100));
public static FontData[] FONT_DATA = Display.getDefault().getShells()[0].getFont().getFontData();

public String getLabel(Object element) {
Expand Down
4 changes: 2 additions & 2 deletions org.eclipse.gef.cloudio.ui/src/org/eclipse/gef/cloudio/internal/ui/TagCloud.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,10 +237,10 @@ public TagCloud(Composite parent, int style, int accuracy, int maxSize) {
this.accuracy = accuracy;
this.maxSize = maxSize;
cloudArea = new Rectangle(0, 0, maxSize, maxSize);
highlightColor = new Color(getDisplay(), Display.getDefault().getSystemColor(SWT.COLOR_RED).getRGB());
highlightColor = new Color(Display.getDefault().getSystemColor(SWT.COLOR_RED).getRGB());
gc = new GC(this);
layouter = new DefaultLayouter(accuracy, accuracy);
setBackground(new Color(getDisplay(), Display.getDefault().getSystemColor(SWT.COLOR_WHITE).getRGB()));
setBackground(new Color(Display.getDefault().getSystemColor(SWT.COLOR_WHITE).getRGB()));
initListeners();
textLayerImage = new Image(getDisplay(), 100, 100);
zoomFit();
Expand Down
6 changes: 3 additions & 3 deletions ...se.gef.cloudio.ui/src/org/eclipse/gef/cloudio/internal/ui/view/CloudOptionsComposite.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,7 @@ public void widgetDefaultSelected(SelectionEvent e) {

protected Image createImageFromColor(RGB rgb, int size) {
Image image;
Color color = new Color(Display.getDefault(), rgb);
Color color = new Color(rgb);
image = new Image(Display.getDefault(), size, size);
GC gc = new GC(image);
gc.setBackground(color);
Expand Down Expand Up @@ -355,7 +355,7 @@ public void widgetSelected(SelectionEvent e) {
if (color == null)
return;
Color old = viewer.getCloud().getBackground();
Color c = new Color(Display.getDefault(), color);
Color c = new Color(color);
viewer.getCloud().setBackground(c);
old.dispose();
viewer.getCloud().redrawTextLayerImage();
Expand All @@ -382,7 +382,7 @@ public void widgetSelected(SelectionEvent e) {
if (color == null)
return;
Color old = viewer.getCloud().getSelectionColor();
Color c = new Color(Display.getDefault(), color);
Color c = new Color(color);
viewer.getCloud().setSelectionColor(c);
old.dispose();
viewer.getCloud().redrawTextLayerImage();
Expand Down
2 changes: 1 addition & 1 deletion ...clipse.gef.cloudio.ui/src/org/eclipse/gef/cloudio/internal/ui/view/TypeLabelProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ public void setColors(List<RGB> newColors) {
colorList.clear();
colors.clear();
for (RGB color : newColors) {
Color c = new Color(Display.getDefault(), color);
Color c = new Color(color);
colorList.add(c);
}
}
Expand Down
4 changes: 2 additions & 2 deletions ...gef.dot.tests/src/org/eclipse/gef/dot/tests/DotHtmlLabelIndentationHighlightingTest.xtend
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,8 +120,8 @@ class DotHtmlLabelIndentationHighlightingTest extends AbstractHighlightingTest {
int foregroundR, int foregroundG, int foregroundB,
int backgroundR, int backgroundG, int backgroundB) {

val expectedForegroundColor = new Color(null, foregroundR, foregroundG, foregroundB)
val expectedBackgroundColor = new Color(null, backgroundR, backgroundG, backgroundB)
val expectedForegroundColor = new Color(foregroundR, foregroundG, foregroundB)
val expectedBackgroundColor = new Color(backgroundR, backgroundG, backgroundB)

for(highlightingRegion : highlightingRegions) {
val offset = highlightingRegion.offset
Expand Down