From cfd634ee748f23cc3e012ee9a311e9bb17876580 Mon Sep 17 00:00:00 2001 From: Phillipus Date: Thu, 15 Feb 2024 21:25:50 +0000 Subject: [PATCH] Remove instances of UIUtils.fixMacSiliconItemHeight() - Not needed since Eclipse 4.31 --- ...mArchimateConnectionWithDialogCommand.java | 4 --- .../dialog/NewNestedRelationDialog.java | 4 --- .../dialog/NewNestedRelationsDialog.java | 4 --- .../editor/p2/DropinsPluginDialog.java | 4 --- .../editor/p2/P2PluginDialog.java | 4 --- .../preferences/ColoursPreferencePage.java | 4 --- .../ConnectionsARMPreferencePage.java | 4 --- .../preferences/FontsPreferencePage.java | 4 --- .../propertysections/ImageManagerDialog.java | 4 --- .../UsedInRelationshipsSection.java | 3 --- .../propertysections/UsedInViewsSection.java | 3 --- .../UserPropertiesManagerDialog.java | 4 --- .../UserPropertiesSection.java | 6 ----- .../editor/tools/ProfilesManagerDialog.java | 4 --- .../com/archimatetool/editor/ui/UIUtils.java | 26 +++---------------- .../views/navigator/NavigatorViewer.java | 3 --- .../editor/views/tree/TreeModelViewer.java | 3 --- .../hammer/view/ValidatorViewer.java | 4 --- .../dialog/TemplatesTableViewer.java | 4 --- .../templates/dialog/TemplatesTreeViewer.java | 4 --- .../wizard/ModelViewsTreeViewer.java | 4 --- .../wizard/TemplateGroupsTableViewer.java | 4 --- 22 files changed, 4 insertions(+), 104 deletions(-) diff --git a/com.archimatetool.editor/src/com/archimatetool/editor/diagram/commands/CreateDiagramArchimateConnectionWithDialogCommand.java b/com.archimatetool.editor/src/com/archimatetool/editor/diagram/commands/CreateDiagramArchimateConnectionWithDialogCommand.java index 03ccbb855..c38ff16db 100644 --- a/com.archimatetool.editor/src/com/archimatetool/editor/diagram/commands/CreateDiagramArchimateConnectionWithDialogCommand.java +++ b/com.archimatetool.editor/src/com/archimatetool/editor/diagram/commands/CreateDiagramArchimateConnectionWithDialogCommand.java @@ -36,7 +36,6 @@ import com.archimatetool.editor.ui.ArchiLabelProvider; import com.archimatetool.editor.ui.IArchiImages; -import com.archimatetool.editor.ui.UIUtils; import com.archimatetool.editor.ui.components.ExtendedTitleAreaDialog; import com.archimatetool.model.IArchimateConcept; import com.archimatetool.model.IArchimateRelationship; @@ -228,9 +227,6 @@ private class RelationsTableViewer extends TableViewer { RelationsTableViewer(Composite parent, int style) { super(parent, SWT.FULL_SELECTION | style); - // Mac Silicon Item height - UIUtils.fixMacSiliconItemHeight(getTable()); - setColumns(); setContentProvider(new RelationsTableViewerContentProvider()); diff --git a/com.archimatetool.editor/src/com/archimatetool/editor/diagram/dialog/NewNestedRelationDialog.java b/com.archimatetool.editor/src/com/archimatetool/editor/diagram/dialog/NewNestedRelationDialog.java index 2c4a250d0..1c9c0dbc4 100644 --- a/com.archimatetool.editor/src/com/archimatetool/editor/diagram/dialog/NewNestedRelationDialog.java +++ b/com.archimatetool.editor/src/com/archimatetool/editor/diagram/dialog/NewNestedRelationDialog.java @@ -41,7 +41,6 @@ import com.archimatetool.editor.preferences.IPreferenceConstants; import com.archimatetool.editor.ui.ArchiLabelProvider; import com.archimatetool.editor.ui.IArchiImages; -import com.archimatetool.editor.ui.UIUtils; import com.archimatetool.editor.ui.components.ExtendedTitleAreaDialog; import com.archimatetool.model.IArchimateDiagramModel; import com.archimatetool.model.IDiagramModelArchimateComponent; @@ -151,9 +150,6 @@ private class RelationsTableViewer extends TableViewer { RelationsTableViewer(Composite parent, int style) { super(parent, SWT.FULL_SELECTION | style); - // Mac Silicon Item height - UIUtils.fixMacSiliconItemHeight(getTable()); - setColumns(); setContentProvider(new RelationsTableViewerContentProvider()); diff --git a/com.archimatetool.editor/src/com/archimatetool/editor/diagram/dialog/NewNestedRelationsDialog.java b/com.archimatetool.editor/src/com/archimatetool/editor/diagram/dialog/NewNestedRelationsDialog.java index dfe2b1e91..653564466 100644 --- a/com.archimatetool.editor/src/com/archimatetool/editor/diagram/dialog/NewNestedRelationsDialog.java +++ b/com.archimatetool.editor/src/com/archimatetool/editor/diagram/dialog/NewNestedRelationsDialog.java @@ -43,7 +43,6 @@ import com.archimatetool.editor.preferences.IPreferenceConstants; import com.archimatetool.editor.ui.ArchiLabelProvider; import com.archimatetool.editor.ui.IArchiImages; -import com.archimatetool.editor.ui.UIUtils; import com.archimatetool.editor.ui.components.ExtendedTitleAreaDialog; import com.archimatetool.model.IArchimateDiagramModel; import com.archimatetool.model.IDiagramModelArchimateComponent; @@ -267,9 +266,6 @@ private class RelationsTableViewer extends TableViewer { RelationsTableViewer(Composite parent, int style) { super(parent, SWT.FULL_SELECTION | style); - // Mac Silicon Item height - UIUtils.fixMacSiliconItemHeight(getTable()); - setColumns(getTable()); setContentProvider(new RelationsTableViewerContentProvider()); setLabelProvider(new RelationsTableViewerLabelCellProvider()); diff --git a/com.archimatetool.editor/src/com/archimatetool/editor/p2/DropinsPluginDialog.java b/com.archimatetool.editor/src/com/archimatetool/editor/p2/DropinsPluginDialog.java index d200a08e0..3009ae53a 100644 --- a/com.archimatetool.editor/src/com/archimatetool/editor/p2/DropinsPluginDialog.java +++ b/com.archimatetool.editor/src/com/archimatetool/editor/p2/DropinsPluginDialog.java @@ -36,7 +36,6 @@ import com.archimatetool.editor.Logger; import com.archimatetool.editor.ui.IArchiImages; -import com.archimatetool.editor.ui.UIUtils; import com.archimatetool.editor.ui.components.ExtendedTitleAreaDialog; /** @@ -88,9 +87,6 @@ protected Control createDialogArea(Composite parent) { viewer = new TableViewer(tableComp, SWT.MULTI | SWT.V_SCROLL | SWT.BORDER | SWT.FULL_SELECTION); viewer.getControl().setLayoutData(new GridData(GridData.FILL_BOTH)); - // Mac Silicon Item height - UIUtils.fixMacSiliconItemHeight(viewer.getTable()); - viewer.getTable().setHeaderVisible(true); TableViewerColumn column = new TableViewerColumn(viewer, SWT.NONE); diff --git a/com.archimatetool.editor/src/com/archimatetool/editor/p2/P2PluginDialog.java b/com.archimatetool.editor/src/com/archimatetool/editor/p2/P2PluginDialog.java index 475ca60f8..a91b81c73 100644 --- a/com.archimatetool.editor/src/com/archimatetool/editor/p2/P2PluginDialog.java +++ b/com.archimatetool.editor/src/com/archimatetool/editor/p2/P2PluginDialog.java @@ -35,7 +35,6 @@ import org.eclipse.ui.PlatformUI; import com.archimatetool.editor.ui.IArchiImages; -import com.archimatetool.editor.ui.UIUtils; import com.archimatetool.editor.ui.components.ExtendedTitleAreaDialog; /** @@ -89,9 +88,6 @@ protected Control createDialogArea(Composite parent) { viewer = new TableViewer(tableComp, SWT.MULTI | SWT.V_SCROLL | SWT.BORDER | SWT.FULL_SELECTION); viewer.getControl().setLayoutData(new GridData(GridData.FILL_BOTH)); - // Mac Silicon Item height - UIUtils.fixMacSiliconItemHeight(viewer.getTable()); - viewer.getTable().setHeaderVisible(true); TableViewerColumn column = new TableViewerColumn(viewer, SWT.NONE); diff --git a/com.archimatetool.editor/src/com/archimatetool/editor/preferences/ColoursPreferencePage.java b/com.archimatetool.editor/src/com/archimatetool/editor/preferences/ColoursPreferencePage.java index 9dc862ae4..5b4c09454 100644 --- a/com.archimatetool.editor/src/com/archimatetool/editor/preferences/ColoursPreferencePage.java +++ b/com.archimatetool.editor/src/com/archimatetool/editor/preferences/ColoursPreferencePage.java @@ -51,7 +51,6 @@ import com.archimatetool.editor.ui.IArchiImages; import com.archimatetool.editor.ui.ImageFactory; import com.archimatetool.editor.ui.ThemeUtils; -import com.archimatetool.editor.ui.UIUtils; import com.archimatetool.editor.ui.components.CustomColorDialog; import com.archimatetool.editor.ui.factory.model.FolderUIProvider; import com.archimatetool.editor.utils.PlatformUtils; @@ -132,9 +131,6 @@ protected Control createContents(Composite parent) { fTreeViewer = new TreeViewer(client); GridDataFactory.create(GridData.FILL_BOTH).hint(SWT.DEFAULT, 200).applyTo(fTreeViewer.getTree()); - // Mac Silicon Item height - UIUtils.fixMacSiliconItemHeight(fTreeViewer.getTree()); - // Tree Double-click listener fTreeViewer.addDoubleClickListener(new IDoubleClickListener() { @Override diff --git a/com.archimatetool.editor/src/com/archimatetool/editor/preferences/ConnectionsARMPreferencePage.java b/com.archimatetool.editor/src/com/archimatetool/editor/preferences/ConnectionsARMPreferencePage.java index 0c455ade0..7d90d7d06 100644 --- a/com.archimatetool.editor/src/com/archimatetool/editor/preferences/ConnectionsARMPreferencePage.java +++ b/com.archimatetool.editor/src/com/archimatetool/editor/preferences/ConnectionsARMPreferencePage.java @@ -30,7 +30,6 @@ import com.archimatetool.editor.ArchiPlugin; import com.archimatetool.editor.ui.ArchiLabelProvider; -import com.archimatetool.editor.ui.UIUtils; @@ -140,9 +139,6 @@ public void widgetSelected(SelectionEvent e) { private CheckboxTableViewer createRelationsTable(Composite parent) { final CheckboxTableViewer viewer = CheckboxTableViewer.newCheckList(parent, SWT.BORDER); - // Mac Silicon Item height - UIUtils.fixMacSiliconItemHeight(viewer.getTable()); - GridDataFactory.create(GridData.FILL_HORIZONTAL).hint(SWT.DEFAULT, 100).applyTo(viewer.getTable()); viewer.setLabelProvider(new LabelProvider() { diff --git a/com.archimatetool.editor/src/com/archimatetool/editor/preferences/FontsPreferencePage.java b/com.archimatetool.editor/src/com/archimatetool/editor/preferences/FontsPreferencePage.java index ea6ef7994..327b7a8ee 100644 --- a/com.archimatetool.editor/src/com/archimatetool/editor/preferences/FontsPreferencePage.java +++ b/com.archimatetool.editor/src/com/archimatetool/editor/preferences/FontsPreferencePage.java @@ -43,7 +43,6 @@ import com.archimatetool.editor.ArchiPlugin; import com.archimatetool.editor.ui.FontFactory; import com.archimatetool.editor.ui.IArchiImages; -import com.archimatetool.editor.ui.UIUtils; import com.archimatetool.editor.utils.StringUtils; /** @@ -174,9 +173,6 @@ public Composite createContents(Composite parent) { private void createTable(Composite parent) { fTableViewer = new TableViewer(parent); - // Mac Silicon Item height - UIUtils.fixMacSiliconItemHeight(fTableViewer.getTable()); - GridDataFactory.create(GridData.FILL_BOTH).hint(SWT.DEFAULT, 200).applyTo(fTableViewer.getTable()); // Table Double-click listener diff --git a/com.archimatetool.editor/src/com/archimatetool/editor/propertysections/ImageManagerDialog.java b/com.archimatetool.editor/src/com/archimatetool/editor/propertysections/ImageManagerDialog.java index ab3601076..686366888 100644 --- a/com.archimatetool.editor/src/com/archimatetool/editor/propertysections/ImageManagerDialog.java +++ b/com.archimatetool.editor/src/com/archimatetool/editor/propertysections/ImageManagerDialog.java @@ -56,7 +56,6 @@ import com.archimatetool.editor.model.IEditorModelManager; import com.archimatetool.editor.ui.ArchiLabelProvider; import com.archimatetool.editor.ui.IArchiImages; -import com.archimatetool.editor.ui.UIUtils; import com.archimatetool.editor.ui.components.ExtendedTitleAreaDialog; import com.archimatetool.model.IArchimateModel; import com.archimatetool.model.INameable; @@ -385,9 +384,6 @@ private class ModelsViewer extends TableViewer { public ModelsViewer(Composite parent) { super(parent, SWT.FULL_SELECTION); - // Mac Silicon Item height - UIUtils.fixMacSiliconItemHeight(getTable()); - setColumns(); setContentProvider(new ModelsViewerContentProvider()); setLabelProvider(new ModelsViewerLabelProvider()); diff --git a/com.archimatetool.editor/src/com/archimatetool/editor/propertysections/UsedInRelationshipsSection.java b/com.archimatetool.editor/src/com/archimatetool/editor/propertysections/UsedInRelationshipsSection.java index 76f5930a3..c9fd3ad3f 100644 --- a/com.archimatetool.editor/src/com/archimatetool/editor/propertysections/UsedInRelationshipsSection.java +++ b/com.archimatetool.editor/src/com/archimatetool/editor/propertysections/UsedInRelationshipsSection.java @@ -90,9 +90,6 @@ private void createTableControl(Composite parent) { // Font UIUtils.setFontFromPreferences(fTableViewer.getTable(), IPreferenceConstants.ANALYSIS_TABLE_FONT, true); - // Mac Silicon Item height - UIUtils.fixMacSiliconItemHeight(fTableViewer.getTable()); - // Column TableViewerColumn column = new TableViewerColumn(fTableViewer, SWT.NONE, 0); tableLayout.setColumnData(column.getColumn(), new ColumnWeightData(100, false)); diff --git a/com.archimatetool.editor/src/com/archimatetool/editor/propertysections/UsedInViewsSection.java b/com.archimatetool.editor/src/com/archimatetool/editor/propertysections/UsedInViewsSection.java index 0cf41d976..9c4dacdf8 100644 --- a/com.archimatetool.editor/src/com/archimatetool/editor/propertysections/UsedInViewsSection.java +++ b/com.archimatetool.editor/src/com/archimatetool/editor/propertysections/UsedInViewsSection.java @@ -82,9 +82,6 @@ private void createTableControl(Composite parent) { // Font UIUtils.setFontFromPreferences(fTableViewer.getTable(), IPreferenceConstants.ANALYSIS_TABLE_FONT, true); - // Mac Silicon Item height - UIUtils.fixMacSiliconItemHeight(fTableViewer.getTable()); - // Column TableViewerColumn column = new TableViewerColumn(fTableViewer, SWT.NONE, 0); tableLayout.setColumnData(column.getColumn(), new ColumnWeightData(100, false)); diff --git a/com.archimatetool.editor/src/com/archimatetool/editor/propertysections/UserPropertiesManagerDialog.java b/com.archimatetool.editor/src/com/archimatetool/editor/propertysections/UserPropertiesManagerDialog.java index 11fac367c..c18a8ddd5 100644 --- a/com.archimatetool.editor/src/com/archimatetool/editor/propertysections/UserPropertiesManagerDialog.java +++ b/com.archimatetool.editor/src/com/archimatetool/editor/propertysections/UserPropertiesManagerDialog.java @@ -64,7 +64,6 @@ import org.eclipse.ui.PlatformUI; import com.archimatetool.editor.ui.IArchiImages; -import com.archimatetool.editor.ui.UIUtils; import com.archimatetool.editor.ui.components.ExtendedTitleAreaDialog; import com.archimatetool.model.IArchimateModel; import com.archimatetool.model.IProperties; @@ -210,9 +209,6 @@ private void createTableControl(Composite parent) { fTableViewer = new TableViewer(tableComp, SWT.MULTI | SWT.FULL_SELECTION | SWT.VIRTUAL); fTableViewer.getControl().setLayoutData(new GridData(GridData.FILL_BOTH)); - // Mac Silicon Item height - UIUtils.fixMacSiliconItemHeight(fTableViewer.getTable()); - // Edit cell on double-click and add Tab key traversal TableViewerEditor.create(fTableViewer, new ColumnViewerEditorActivationStrategy(fTableViewer) { @Override diff --git a/com.archimatetool.editor/src/com/archimatetool/editor/propertysections/UserPropertiesSection.java b/com.archimatetool.editor/src/com/archimatetool/editor/propertysections/UserPropertiesSection.java index 0d4a89a4d..7faf38260 100644 --- a/com.archimatetool.editor/src/com/archimatetool/editor/propertysections/UserPropertiesSection.java +++ b/com.archimatetool.editor/src/com/archimatetool/editor/propertysections/UserPropertiesSection.java @@ -266,9 +266,6 @@ private void createTableControl(Composite parent) { // Font UIUtils.setFontFromPreferences(fTableViewer.getTable(), IPreferenceConstants.PROPERTIES_TABLE_FONT, true); - // Mac Silicon Item height - UIUtils.fixMacSiliconItemHeight(fTableViewer.getTable()); - // Edit cell on double-click and add Tab key traversal TableViewerEditor.create(fTableViewer, new ColumnViewerEditorActivationStrategy(fTableViewer) { @Override @@ -1413,9 +1410,6 @@ private void createTableControl(Composite parent) { tableViewer = CheckboxTableViewer.newCheckList(tableComp, SWT.MULTI | SWT.FULL_SELECTION); tableViewer.getControl().setLayoutData(new GridData(GridData.FILL_BOTH)); - // Mac Silicon Item height - UIUtils.fixMacSiliconItemHeight(tableViewer.getControl()); - tableViewer.getTable().setLinesVisible(true); // Column diff --git a/com.archimatetool.editor/src/com/archimatetool/editor/tools/ProfilesManagerDialog.java b/com.archimatetool.editor/src/com/archimatetool/editor/tools/ProfilesManagerDialog.java index 97518043b..8e0b7deaf 100644 --- a/com.archimatetool.editor/src/com/archimatetool/editor/tools/ProfilesManagerDialog.java +++ b/com.archimatetool.editor/src/com/archimatetool/editor/tools/ProfilesManagerDialog.java @@ -80,7 +80,6 @@ import com.archimatetool.editor.ui.ArchiLabelProvider; import com.archimatetool.editor.ui.IArchiImages; import com.archimatetool.editor.ui.ImageFactory; -import com.archimatetool.editor.ui.UIUtils; import com.archimatetool.editor.ui.components.ExtendedTitleAreaDialog; import com.archimatetool.model.IArchimateFactory; import com.archimatetool.model.IArchimateModel; @@ -241,9 +240,6 @@ private void createTableControl(Composite parent) { fTableViewer = new TableViewer(tableComp, SWT.MULTI | SWT.FULL_SELECTION); GridDataFactory.create(GridData.FILL_BOTH).applyTo(fTableViewer.getControl()); - // Mac Silicon Item height - UIUtils.fixMacSiliconItemHeight(fTableViewer.getTable()); - // Edit cell on single-click and add Tab key traversal TableViewerEditor.create(fTableViewer, new ColumnViewerEditorActivationStrategy(fTableViewer), ColumnViewerEditor.TABBING_HORIZONTAL | diff --git a/com.archimatetool.editor/src/com/archimatetool/editor/ui/UIUtils.java b/com.archimatetool.editor/src/com/archimatetool/editor/ui/UIUtils.java index a1a4a6667..894e8d496 100644 --- a/com.archimatetool.editor/src/com/archimatetool/editor/ui/UIUtils.java +++ b/com.archimatetool.editor/src/com/archimatetool/editor/ui/UIUtils.java @@ -17,7 +17,6 @@ import org.eclipse.swt.widgets.Text; import com.archimatetool.editor.ArchiPlugin; -import com.archimatetool.editor.utils.PlatformUtils; import com.archimatetool.editor.utils.StringUtils; @@ -246,28 +245,11 @@ public static String shortenText(String text, Control control, int margin) { } /** - * Table/Tree/List Item heights on binaries built with Mac SDK 11.1 and later are taller than when using an earlier Mac SDK. - * However, if we change the font of a Table/Tree/List it will revert to the smaller item height. - * See https://github.com/eclipse-platform/eclipse.platform.swt/issues/677 - * - * It depends on what binary is being run and what version Mac SDK that binary was compiled against: - * - * Archi executable binary on Intel SDK 10.14 - smaller height - * Archi executable binary on Silicon SDK 11.1 - bigger height - * Java on Intel/Silicon (launch from Eclipse) SDK 11.1 - bigger height - * - * To determine which Mac SDK is used to create the binary run: - * otool -l /path/to/java - * and inspect the LC_VERSION_MIN_MACOSX or LC_BUILD_VERSION entry (look for "sdk") - * - * So call this method in all cases when running on Mac - * For some reason this will ensure that Table/Tree/List Item height is normal on Mac - * - * Note this should really be called "fixMacItemHeight" + * This is no longer needed with Eclipse 4.31 and later + * TODO: Remove this + * @deprecated */ public static void fixMacSiliconItemHeight(Control control) { - if(PlatformUtils.isMac()) { - control.setFont(control.getFont()); - } + // Do nothing } } diff --git a/com.archimatetool.editor/src/com/archimatetool/editor/views/navigator/NavigatorViewer.java b/com.archimatetool.editor/src/com/archimatetool/editor/views/navigator/NavigatorViewer.java index 598237a81..3a9727d7e 100644 --- a/com.archimatetool.editor/src/com/archimatetool/editor/views/navigator/NavigatorViewer.java +++ b/com.archimatetool.editor/src/com/archimatetool/editor/views/navigator/NavigatorViewer.java @@ -43,9 +43,6 @@ public NavigatorViewer(Composite parent, int style) { UIUtils.setFontFromPreferences(getTree(), IPreferenceConstants.NAVIGATOR_TREE_FONT, true); - // Mac Silicon Item height - UIUtils.fixMacSiliconItemHeight(getTree()); - setContentProvider(new NavigatorViewerContentProvider()); setLabelProvider(new NavigatorViewerLabelProvider()); setAutoExpandLevel(3); diff --git a/com.archimatetool.editor/src/com/archimatetool/editor/views/tree/TreeModelViewer.java b/com.archimatetool.editor/src/com/archimatetool/editor/views/tree/TreeModelViewer.java index e36c4be9c..3a871a213 100644 --- a/com.archimatetool.editor/src/com/archimatetool/editor/views/tree/TreeModelViewer.java +++ b/com.archimatetool.editor/src/com/archimatetool/editor/views/tree/TreeModelViewer.java @@ -98,9 +98,6 @@ public TreeModelViewer(Composite parent, int style) { // Font UIUtils.setFontFromPreferences(getTree(), IPreferenceConstants.MODEL_TREE_FONT, true); - // Mac Silicon Item height - UIUtils.fixMacSiliconItemHeight(getTree()); - setContentProvider(new ModelTreeViewerContentProvider()); setLabelProvider(new ModelTreeViewerLabelProvider()); diff --git a/com.archimatetool.hammer/src/com/archimatetool/hammer/view/ValidatorViewer.java b/com.archimatetool.hammer/src/com/archimatetool/hammer/view/ValidatorViewer.java index ea2601fff..473e896d0 100644 --- a/com.archimatetool.hammer/src/com/archimatetool/hammer/view/ValidatorViewer.java +++ b/com.archimatetool.hammer/src/com/archimatetool/hammer/view/ValidatorViewer.java @@ -24,7 +24,6 @@ import org.eclipse.swt.widgets.TreeColumn; import com.archimatetool.editor.ui.ArchiLabelProvider; -import com.archimatetool.editor.ui.UIUtils; import com.archimatetool.hammer.validation.issues.IIssue; import com.archimatetool.hammer.validation.issues.IIssueCategory; @@ -62,9 +61,6 @@ public class ValidatorViewer extends TreeViewer { public ValidatorViewer(Composite parent, int style) { super(parent, style | SWT.MULTI | SWT.FULL_SELECTION); - // Mac Silicon Item height - UIUtils.fixMacSiliconItemHeight(getTree()); - setContentProvider(new ValidatorViewerContentProvider()); setLabelProvider(new ValidatorViewerLabelProvider()); diff --git a/com.archimatetool.templates/src/com/archimatetool/templates/dialog/TemplatesTableViewer.java b/com.archimatetool.templates/src/com/archimatetool/templates/dialog/TemplatesTableViewer.java index 531100c92..c54a47173 100644 --- a/com.archimatetool.templates/src/com/archimatetool/templates/dialog/TemplatesTableViewer.java +++ b/com.archimatetool.templates/src/com/archimatetool/templates/dialog/TemplatesTableViewer.java @@ -21,7 +21,6 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Table; -import com.archimatetool.editor.ui.UIUtils; import com.archimatetool.templates.model.ITemplate; @@ -35,9 +34,6 @@ public class TemplatesTableViewer extends TableViewer { public TemplatesTableViewer(Composite parent, int style) { super(parent, SWT.FULL_SELECTION | style); - // Mac Silicon Item height - UIUtils.fixMacSiliconItemHeight(getTable()); - setColumns(); setContentProvider(new TemplatesTableViewerContentProvider()); setLabelProvider(new TemplatesTableViewerLabelCellProvider()); diff --git a/com.archimatetool.templates/src/com/archimatetool/templates/dialog/TemplatesTreeViewer.java b/com.archimatetool.templates/src/com/archimatetool/templates/dialog/TemplatesTreeViewer.java index fdb367aed..a40becb6c 100644 --- a/com.archimatetool.templates/src/com/archimatetool/templates/dialog/TemplatesTreeViewer.java +++ b/com.archimatetool.templates/src/com/archimatetool/templates/dialog/TemplatesTreeViewer.java @@ -17,7 +17,6 @@ import org.eclipse.swt.widgets.Composite; import com.archimatetool.editor.ui.IArchiImages; -import com.archimatetool.editor.ui.UIUtils; import com.archimatetool.templates.model.ITemplate; import com.archimatetool.templates.model.ITemplateGroup; @@ -37,9 +36,6 @@ public class TemplatesTreeViewer extends TreeViewer { public TemplatesTreeViewer(Composite parent, int style) { super(parent, style); - // Mac Silicon Item height - UIUtils.fixMacSiliconItemHeight(getTree()); - setContentProvider(new TemplatesTreeViewerContentProvider()); setLabelProvider(new TemplatesTreeViewerLabelProvider()); setComparator(new ViewerComparator(Collator.getInstance())); diff --git a/com.archimatetool.templates/src/com/archimatetool/templates/wizard/ModelViewsTreeViewer.java b/com.archimatetool.templates/src/com/archimatetool/templates/wizard/ModelViewsTreeViewer.java index 7685fbf40..c1bb3d220 100644 --- a/com.archimatetool.templates/src/com/archimatetool/templates/wizard/ModelViewsTreeViewer.java +++ b/com.archimatetool.templates/src/com/archimatetool/templates/wizard/ModelViewsTreeViewer.java @@ -20,7 +20,6 @@ import org.eclipse.swt.widgets.Composite; import com.archimatetool.editor.ui.ArchiLabelProvider; -import com.archimatetool.editor.ui.UIUtils; import com.archimatetool.model.IFolder; import com.archimatetool.model.INameable; @@ -35,9 +34,6 @@ public class ModelViewsTreeViewer extends TreeViewer { public ModelViewsTreeViewer(Composite parent, int style) { super(parent, style | SWT.BORDER); - // Mac Silicon Item height - UIUtils.fixMacSiliconItemHeight(getTree()); - setContentProvider(new ModelViewsTreeViewerContentProvider()); setLabelProvider(new ModelViewsTreeViewerLabelProvider()); diff --git a/com.archimatetool.templates/src/com/archimatetool/templates/wizard/TemplateGroupsTableViewer.java b/com.archimatetool.templates/src/com/archimatetool/templates/wizard/TemplateGroupsTableViewer.java index b450dc73e..5c614c04b 100644 --- a/com.archimatetool.templates/src/com/archimatetool/templates/wizard/TemplateGroupsTableViewer.java +++ b/com.archimatetool.templates/src/com/archimatetool/templates/wizard/TemplateGroupsTableViewer.java @@ -21,7 +21,6 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Table; -import com.archimatetool.editor.ui.UIUtils; import com.archimatetool.templates.model.ITemplateGroup; import com.archimatetool.templates.model.TemplateManager; @@ -36,9 +35,6 @@ public class TemplateGroupsTableViewer extends TableViewer { public TemplateGroupsTableViewer(Composite parent, int style) { super(parent, SWT.FULL_SELECTION | style); - // Mac Silicon Item height - UIUtils.fixMacSiliconItemHeight(getTable()); - setColumns(); setContentProvider(new CategoriesTableViewerContentProvider()); setLabelProvider(new CategoriesTableViewerLabelCellProvider());