diff --git a/fr.cnes.analysis.tools.ui/src/fr/cnes/analysis/tools/ui/images/ImageFactory.java b/fr.cnes.analysis.tools.ui/src/fr/cnes/analysis/tools/ui/images/ImageFactory.java new file mode 100644 index 00000000..6089afa0 --- /dev/null +++ b/fr.cnes.analysis.tools.ui/src/fr/cnes/analysis/tools/ui/images/ImageFactory.java @@ -0,0 +1,33 @@ +package fr.cnes.analysis.tools.ui.images; + +import fr.cnes.analysis.tools.ui.Activator; +import org.eclipse.jface.resource.ImageDescriptor; +import org.eclipse.swt.graphics.Image; +import org.eclipse.ui.plugin.AbstractUIPlugin; + +public class ImageFactory { + + public static final String ENABLED = "./icons/enabled.png"; + public static final String DISABLED = "./icons/disabled.png"; + public static final String ERROR_VERY_SMALL = "./icons/logo-i-code-rouge-8x8.png"; + public static final String ERROR_SMALL = "./icons/logo-i-code-rouge-16x16.png"; + public static final String ERROR_MEDIUM = "./icons/logo-i-code-rouge-32x32.png"; + public static final String ERROR_BIG = "./icons/logo-i-code-rouge-45x45.png"; + public static final String INFO_VERY_SMALL = "./icons/logo-i-code-bleue-8x8.png"; + public static final String INFO_SMALL = "./icons/logo-i-code-bleue-16x16.png"; + public static final String INFO_MEDIUM = "./icons/logo-i-code-bleue-32x32.png"; + public static final String INFO_BIG = "./icons/logo-i-code-bleue-45x45.png"; + public static final String WARNING_VERY_SMALL = "./icons/logo-i-code-orange-8x8.png"; + public static final String WARNING_SMALL = "./icons/logo-i-code-orange-16x16.png"; + public static final String WARNING_MEDIUM = "./icons/logo-i-code-orange-32x32.png"; + public static final String WARNING_BIG = "./icons/logo-i-code-orange-45x45.png"; + + public static ImageDescriptor getDescriptor(String pImageLocation) { + return AbstractUIPlugin.imageDescriptorFromPlugin(Activator.PLUGIN_ID, pImageLocation); + } + + public static Image getImage(String pImageLocation) { + return AbstractUIPlugin.imageDescriptorFromPlugin(Activator.PLUGIN_ID, pImageLocation) + .createImage(); + } +} diff --git a/fr.cnes.analysis.tools.ui/src/fr/cnes/analysis/tools/ui/images/ImageService.java b/fr.cnes.analysis.tools.ui/src/fr/cnes/analysis/tools/ui/images/ImageService.java deleted file mode 100644 index 219f03ac..00000000 --- a/fr.cnes.analysis.tools.ui/src/fr/cnes/analysis/tools/ui/images/ImageService.java +++ /dev/null @@ -1,58 +0,0 @@ -package fr.cnes.analysis.tools.ui.images; - -import fr.cnes.analysis.tools.ui.Activator; -import org.eclipse.swt.graphics.Image; -import org.eclipse.ui.plugin.AbstractUIPlugin; - -public class ImageService { - - public static final Image ENABLED = AbstractUIPlugin - .imageDescriptorFromPlugin(Activator.PLUGIN_ID, ("./icons/enabled.png")).createImage(); - public static final Image DISABLED = AbstractUIPlugin - .imageDescriptorFromPlugin(Activator.PLUGIN_ID, ("./icons/disabled.png")).createImage(); - - public static final Image ERROR_VERY_SMALL = AbstractUIPlugin - .imageDescriptorFromPlugin(Activator.PLUGIN_ID, ("./icons/logo-i-code-rouge-8x8.png")) - .createImage(); - public static final Image ERROR_SMALL = AbstractUIPlugin - .imageDescriptorFromPlugin(Activator.PLUGIN_ID, ("./icons/logo-i-code-rouge-16x16.png")) - .createImage(); - - public static final Image ERROR_MEDIUM = AbstractUIPlugin - .imageDescriptorFromPlugin(Activator.PLUGIN_ID, "./icons/logo-i-code-rouge-32x32.png") - .createImage(); - - public static final Image ERROR_BIG = AbstractUIPlugin - .imageDescriptorFromPlugin(Activator.PLUGIN_ID, "./icons/logo-i-code-rouge-45x45.png") - .createImage(); - - public static final Image INFO_VERY_SMALL = AbstractUIPlugin - .imageDescriptorFromPlugin(Activator.PLUGIN_ID, ("./icons/logo-i-code-bleue-8x8.png")) - .createImage(); - public static final Image INFO_SMALL = AbstractUIPlugin - .imageDescriptorFromPlugin(Activator.PLUGIN_ID, ("./icons/logo-i-code-bleue-16x16.png")) - .createImage(); - - public static final Image INFO_MEDIUM = AbstractUIPlugin - .imageDescriptorFromPlugin(Activator.PLUGIN_ID, "./icons/logo-i-code-bleue-32x32.png") - .createImage(); - - public static final Image INFO_BIG = AbstractUIPlugin - .imageDescriptorFromPlugin(Activator.PLUGIN_ID, "./icons/logo-i-code-bleue-45x45.png") - .createImage(); - - public static final Image WARNING_VERY_SMALL = AbstractUIPlugin - .imageDescriptorFromPlugin(Activator.PLUGIN_ID, ("./icons/logo-i-code-orange-8x8.png")) - .createImage(); - public static final Image WARNING_SMALL = AbstractUIPlugin.imageDescriptorFromPlugin( - Activator.PLUGIN_ID, ("./icons/logo-i-code-orange-16x16.png")).createImage(); - - public static final Image WARNING_MEDIUM = AbstractUIPlugin - .imageDescriptorFromPlugin(Activator.PLUGIN_ID, "./icons/logo-i-code-orange-32x32.png") - .createImage(); - - public static final Image WARNING_BIG = AbstractUIPlugin - .imageDescriptorFromPlugin(Activator.PLUGIN_ID, "./icons/logo-i-code-orange-45x45.png") - .createImage(); - -} diff --git a/fr.cnes.analysis.tools.ui/src/fr/cnes/analysis/tools/ui/preferences/ConfigurationPreferencePage.java b/fr.cnes.analysis.tools.ui/src/fr/cnes/analysis/tools/ui/preferences/ConfigurationPreferencePage.java index 5d9abcb9..c1b72bb8 100644 --- a/fr.cnes.analysis.tools.ui/src/fr/cnes/analysis/tools/ui/preferences/ConfigurationPreferencePage.java +++ b/fr.cnes.analysis.tools.ui/src/fr/cnes/analysis/tools/ui/preferences/ConfigurationPreferencePage.java @@ -4,6 +4,7 @@ import fr.cnes.analysis.tools.ui.Activator; import fr.cnes.analysis.tools.ui.configurations.ConfigurationContainer; import fr.cnes.analysis.tools.ui.configurations.ConfigurationService; +import fr.cnes.analysis.tools.ui.images.ImageFactory; import fr.cnes.analysis.tools.ui.preferences.checkerstables.CheckerMetricTableViewer; import fr.cnes.analysis.tools.ui.preferences.checkerstables.CheckerTableViewer; import java.util.ArrayList; @@ -132,8 +133,7 @@ public int compare(CheckerPreferencesContainer arg0, final ExpandItem ruleExpandItem = new ExpandItem(expandBar, SWT.NONE, 0); ruleExpandItem.setText("Rules"); - ruleExpandItem.setImage(AbstractUIPlugin.imageDescriptorFromPlugin(Activator.PLUGIN_ID, - "./icons/logo-i-code-rouge-16x16.png").createImage()); + ruleExpandItem.setImage(ImageFactory.getImage(ImageFactory.ERROR_SMALL)); checkersTable = new CheckerTableViewer(checkersExpandBarContainer, rules); ruleExpandItem .setHeight(checkersExpandBarContainer.computeSize(SWT.DEFAULT, SWT.DEFAULT).y); @@ -144,8 +144,7 @@ public int compare(CheckerPreferencesContainer arg0, final ExpandItem metricExpandItem = new ExpandItem(expandBar, SWT.NONE, 0); metricExpandItem.setText("Metric"); - metricExpandItem.setImage(AbstractUIPlugin.imageDescriptorFromPlugin(Activator.PLUGIN_ID, - "./icons/logo-i-code-rouge-16x16.png").createImage()); + metricExpandItem.setImage(ImageFactory.getImage(ImageFactory.ERROR_SMALL)); checkersMetricTable = new CheckerMetricTableViewer(metricsExpandBarContainer, metrics); metricExpandItem .setHeight(metricsExpandBarContainer.computeSize(SWT.DEFAULT, SWT.DEFAULT).y); diff --git a/fr.cnes.analysis.tools.ui/src/fr/cnes/analysis/tools/ui/preferences/checkerstables/CheckerMetricTableViewer.java b/fr.cnes.analysis.tools.ui/src/fr/cnes/analysis/tools/ui/preferences/checkerstables/CheckerMetricTableViewer.java index ea1532ec..899a5cc6 100644 --- a/fr.cnes.analysis.tools.ui/src/fr/cnes/analysis/tools/ui/preferences/checkerstables/CheckerMetricTableViewer.java +++ b/fr.cnes.analysis.tools.ui/src/fr/cnes/analysis/tools/ui/preferences/checkerstables/CheckerMetricTableViewer.java @@ -1,6 +1,6 @@ package fr.cnes.analysis.tools.ui.preferences.checkerstables; -import fr.cnes.analysis.tools.ui.images.ImageService; +import fr.cnes.analysis.tools.ui.images.ImageFactory; import fr.cnes.analysis.tools.ui.preferences.CheckerPreferencesContainer; import fr.cnes.analysis.tools.ui.preferences.LanguagePreferencesContainer; import fr.cnes.analysis.tools.ui.preferences.UserPreferencesService; @@ -96,9 +96,9 @@ public Image getImage(Object element) { Image image; CheckerPreferencesContainer checker = (CheckerPreferencesContainer) element; if (checker.isChecked()) { - image = ImageService.ENABLED; + image = ImageFactory.getImage(ImageFactory.ENABLED); } else { - image = ImageService.DISABLED; + image = ImageFactory.getImage(ImageFactory.DISABLED); } return image; } @@ -181,14 +181,14 @@ public Image getImage(Object element) { Image severityImage; switch (checker.getSeverity()) { case UserPreferencesService.PREF_SEVERITY_ERROR_VALUE: - severityImage = ImageService.ERROR_SMALL; + severityImage = ImageFactory.getImage(ImageFactory.ERROR_SMALL); break; case UserPreferencesService.PREF_SEVERITY_WARNING_VALUE: - severityImage = ImageService.WARNING_SMALL; + severityImage = ImageFactory.getImage(ImageFactory.WARNING_SMALL); break; case UserPreferencesService.PREF_SEVERITY_INFO_VALUE: default: - severityImage = ImageService.INFO_SMALL; + severityImage = ImageFactory.getImage(ImageFactory.INFO_SMALL); break; } diff --git a/fr.cnes.analysis.tools.ui/src/fr/cnes/analysis/tools/ui/preferences/checkerstables/CheckerTableViewer.java b/fr.cnes.analysis.tools.ui/src/fr/cnes/analysis/tools/ui/preferences/checkerstables/CheckerTableViewer.java index 996e8d2c..04b6f7ee 100644 --- a/fr.cnes.analysis.tools.ui/src/fr/cnes/analysis/tools/ui/preferences/checkerstables/CheckerTableViewer.java +++ b/fr.cnes.analysis.tools.ui/src/fr/cnes/analysis/tools/ui/preferences/checkerstables/CheckerTableViewer.java @@ -1,6 +1,6 @@ package fr.cnes.analysis.tools.ui.preferences.checkerstables; -import fr.cnes.analysis.tools.ui.images.ImageService; +import fr.cnes.analysis.tools.ui.images.ImageFactory; import fr.cnes.analysis.tools.ui.preferences.CheckerPreferencesContainer; import fr.cnes.analysis.tools.ui.preferences.LanguagePreferencesContainer; import fr.cnes.analysis.tools.ui.preferences.UserPreferencesService; @@ -30,7 +30,9 @@ public class CheckerTableViewer { private TableViewer checkersTableViewer; private CheckersFilter checkersFilter; - + private Image infoImage; + private Image warningImage; + private Image errorImage; private LanguagePreferencesContainer language; private List inputs; @@ -38,6 +40,9 @@ public class CheckerTableViewer { public CheckerTableViewer(Composite parent, List checkers) { this.inputs = checkers; + infoImage = ImageFactory.getImage(ImageFactory.INFO_SMALL); + warningImage = ImageFactory.getImage(ImageFactory.WARNING_SMALL); + errorImage = ImageFactory.getImage(ImageFactory.ERROR_SMALL); GridLayout layout = new GridLayout(2, false); parent.setLayout(layout); Label searchLabel = new Label(parent, SWT.NONE); @@ -100,9 +105,9 @@ public Image getImage(Object element) { Image image; CheckerPreferencesContainer checker = (CheckerPreferencesContainer) element; if (checker.isChecked()) { - image = ImageService.ENABLED; + image = ImageFactory.getImage(ImageFactory.ENABLED); } else { - image = ImageService.DISABLED; + image = ImageFactory.getImage(ImageFactory.DISABLED); } return image; } @@ -127,6 +132,7 @@ public String getText(Object element) { col = createTableViewerColumn(titles[3], bounds[3], 3); col.setEditingSupport(new SeverityEditingSupport(pCheckersTableViewer)); col.setLabelProvider(new ColumnLabelProvider() { + @Override public String getText(Object element) { return ((CheckerPreferencesContainer) element).getSeverity(); @@ -138,14 +144,14 @@ public Image getImage(Object element) { Image severityImage; switch (checker.getSeverity()) { case UserPreferencesService.PREF_SEVERITY_ERROR_VALUE: - severityImage = ImageService.ERROR_SMALL; + severityImage = errorImage; break; case UserPreferencesService.PREF_SEVERITY_WARNING_VALUE: - severityImage = ImageService.WARNING_SMALL; + severityImage = warningImage; break; case UserPreferencesService.PREF_SEVERITY_INFO_VALUE: default: - severityImage = ImageService.INFO_SMALL; + severityImage = infoImage; break; } @@ -173,7 +179,7 @@ private TableViewerColumn createEnabledViewerColumn(int bound, final int colNumb final TableViewerColumn viewerColumn = new TableViewerColumn(this.checkersTableViewer, SWT.CENTER); final TableColumn column = viewerColumn.getColumn(); - column.setImage(ImageService.DISABLED); + column.setImage(ImageFactory.getImage(ImageFactory.DISABLED)); column.setToolTipText("Check to select or unselect every rules in the table."); column.setWidth(bound); allEnabledChecked = false; @@ -184,13 +190,13 @@ private TableViewerColumn createEnabledViewerColumn(int bound, final int colNumb @Override public void handleEvent(Event event) { if (!allEnabledChecked) { - column.setImage(ImageService.ENABLED); + column.setImage(ImageFactory.getImage(ImageFactory.ENABLED)); for (CheckerPreferencesContainer checker : inputs) { checker.setChecked(true); } allEnabledChecked = true; } else { - column.setImage(ImageService.DISABLED); + column.setImage(ImageFactory.getImage(ImageFactory.DISABLED)); for (CheckerPreferencesContainer checker : inputs) { checker.setChecked(false); }