Update #32 Using only one instance of image for the preferences tables

Old use of ImageFactory for enabled and disabled buttons was causing optimisation problem because exceeding SWT's threads handlers numbers.
cnescatlab · Jul 5, 2017 · 190298c · 190298c
1 parent 0043a1d
commit 190298c
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 7 deletions.
diff --git a/...ui/src/fr/cnes/analysis/tools/ui/preferences/checkerstables/CheckerMetricTableViewer.java b/...ui/src/fr/cnes/analysis/tools/ui/preferences/checkerstables/CheckerMetricTableViewer.java
@@ -31,9 +31,19 @@ public class CheckerMetricTableViewer {
 
     private LanguagePreferencesContainer language;
     private List<CheckerPreferencesContainer> inputs;
+    private Image infoImage;
+    private Image warningImage;
+    private Image enabledImage;
+    private Image errorImage;
+    private Image disabledImage;
 
     public CheckerMetricTableViewer(Composite parent, List<CheckerPreferencesContainer> checkers) {
         this.inputs = checkers;
+        infoImage = ImageFactory.getImage(ImageFactory.INFO_SMALL);
+        warningImage = ImageFactory.getImage(ImageFactory.WARNING_SMALL);
+        errorImage = ImageFactory.getImage(ImageFactory.ERROR_SMALL);
+        enabledImage = ImageFactory.getImage(ImageFactory.ENABLED);
+        disabledImage = ImageFactory.getImage(ImageFactory.DISABLED);
         GridLayout layout = new GridLayout(2, false);
         parent.setLayout(layout);
         Label searchLabel = new Label(parent, SWT.NONE);
@@ -96,9 +106,9 @@ public Image getImage(Object element) {
                 Image image;
                 CheckerPreferencesContainer checker = (CheckerPreferencesContainer) element;
                 if (checker.isChecked()) {
-                    image = ImageFactory.getImage(ImageFactory.ENABLED);
+                    image = enabledImage;
                 } else {
-                    image = ImageFactory.getImage(ImageFactory.DISABLED);
+                    image = disabledImage;
                 }
                 return image;
             }
@@ -181,14 +191,14 @@ public Image getImage(Object element) {
                 Image severityImage;
                 switch (checker.getSeverity()) {
                     case UserPreferencesService.PREF_SEVERITY_ERROR_VALUE:
-                        severityImage = ImageFactory.getImage(ImageFactory.ERROR_SMALL);
+                        severityImage = errorImage;
                         break;
                     case UserPreferencesService.PREF_SEVERITY_WARNING_VALUE:
-                        severityImage = ImageFactory.getImage(ImageFactory.WARNING_SMALL);
+                        severityImage = warningImage;
                         break;
                     case UserPreferencesService.PREF_SEVERITY_INFO_VALUE:
                     default:
-                        severityImage = ImageFactory.getImage(ImageFactory.INFO_SMALL);
+                        severityImage = infoImage;
                         break;
                 }
 

diff --git a/...tools.ui/src/fr/cnes/analysis/tools/ui/preferences/checkerstables/CheckerTableViewer.java b/...tools.ui/src/fr/cnes/analysis/tools/ui/preferences/checkerstables/CheckerTableViewer.java
@@ -33,6 +33,9 @@ public class CheckerTableViewer {
     private Image infoImage;
     private Image warningImage;
     private Image errorImage;
+    private Image enabledImage;
+    private Image disabledImage;
+
     private LanguagePreferencesContainer language;
     private List<CheckerPreferencesContainer> inputs;
 
@@ -43,6 +46,8 @@ public CheckerTableViewer(Composite parent, List<CheckerPreferencesContainer> ch
         infoImage = ImageFactory.getImage(ImageFactory.INFO_SMALL);
         warningImage = ImageFactory.getImage(ImageFactory.WARNING_SMALL);
         errorImage = ImageFactory.getImage(ImageFactory.ERROR_SMALL);
+        enabledImage = ImageFactory.getImage(ImageFactory.ENABLED);
+        disabledImage = ImageFactory.getImage(ImageFactory.DISABLED);
         GridLayout layout = new GridLayout(2, false);
         parent.setLayout(layout);
         Label searchLabel = new Label(parent, SWT.NONE);
@@ -95,6 +100,7 @@ private void createColumns(Composite parent, TableViewer pCheckersTableViewer) {
         TableViewerColumn col = createEnabledViewerColumn(bounds[0], 0);
         col.setEditingSupport(new EnabledEditingSupport(pCheckersTableViewer));
         col.setLabelProvider(new ColumnLabelProvider() {
+
             @Override
             public String getText(Object element) {
                 return null;
@@ -105,9 +111,9 @@ public Image getImage(Object element) {
                 Image image;
                 CheckerPreferencesContainer checker = (CheckerPreferencesContainer) element;
                 if (checker.isChecked()) {
-                    image = ImageFactory.getImage(ImageFactory.ENABLED);
+                    image = enabledImage;
                 } else {
-                    image = ImageFactory.getImage(ImageFactory.DISABLED);
+                    image = disabledImage;
                 }
                 return image;
             }