Gets rid of the blind usage of WorkbenchHelper.getSheet();

gama-platform · Sep 17, 2021 · 7741c68 · 7741c68
1 parent 1eb390f
commit 7741c68
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 10 deletions.
diff --git a/ummisco.gama.ui.shared/src/ummisco/gama/ui/views/toolbar/GamaToolbar2.java b/ummisco.gama.ui.shared/src/ummisco/gama/ui/views/toolbar/GamaToolbar2.java
@@ -35,7 +35,6 @@
 import ummisco.gama.ui.resources.GamaIcons;
 import ummisco.gama.ui.resources.IGamaColors;
 import ummisco.gama.ui.utils.PlatformHelper;
-import ummisco.gama.ui.utils.WorkbenchHelper;
 import ummisco.gama.ui.views.toolbar.GamaToolbarFactory.ToggleAction;
 
 /**
@@ -138,7 +137,7 @@ public void createToolbars() {
 		data.horizontalAlignment = SWT.RIGHT;
 		data.minimumWidth = height * 2;
 		right.setLayoutData(data);
-		setBackgroundColor(isDark() ? WorkbenchHelper.getShell().getBackground() : IGamaColors.WHITE.color());
+		setBackgroundColor(isDark() ? getShell().getBackground() : IGamaColors.WHITE.color());
 	}
 
 	@Override
@@ -154,13 +153,9 @@ protected void checkSubclass() {}
 	 * @return the tool item
 	 */
 	public ToolItem sep(final int width, final int side /* SWT.LEFT or SWT.RIGHT */) {
-		// final var icon = GamaIcons.createSizer(getBackground(), width, height);
-		// final var item = create(icon.getCode(), null, null, null, SWT.NONE, false, null, side);
-		// item.setDisabledImage(icon.image());
-		// if (!PlatformHelper.isLinux()) { item.setEnabled(false); }
-		ToolItem item = new ToolItem(side == SWT.LEFT ? left : right, SWT.SEPARATOR );
+
 		// item.setWidth(width);
-		return item;
+		return new ToolItem(side == SWT.LEFT ? left : right, SWT.SEPARATOR);
 	}
 
 	/**

diff --git a/ummisco.gama.ui.shared/src/ummisco/gama/ui/views/toolbar/GamaToolbarFactory.java b/ummisco.gama.ui.shared/src/ummisco/gama/ui/views/toolbar/GamaToolbarFactory.java
@@ -30,7 +30,6 @@
 import ummisco.gama.ui.resources.GamaColors;
 import ummisco.gama.ui.resources.GamaIcons;
 import ummisco.gama.ui.resources.IGamaColors;
-import ummisco.gama.ui.utils.WorkbenchHelper;
 
 /**
  * The class GamaToolbarFactory.
@@ -288,7 +287,7 @@ public static Composite createToolbarComposite(final Composite composite) {
 		toolbarComposite.setLayout(layout);
 		// toolbarComposite.setBackground(IGamaColors.WHITE.color());
 		GamaColors.setBackground(toolbarComposite,
-				isDark() ? WorkbenchHelper.getShell().getBackground() : IGamaColors.WHITE.color());
+				isDark() ? composite.getShell().getBackground() : IGamaColors.WHITE.color());
 		return toolbarComposite;
 
 	}