diff --git a/org.eclipse.wb.core.databinding/src/org/eclipse/wb/internal/core/databinding/ui/providers/ObserveLabelProvider.java b/org.eclipse.wb.core.databinding/src/org/eclipse/wb/internal/core/databinding/ui/providers/ObserveLabelProvider.java index 0894b56ec..b7b34d910 100644 --- a/org.eclipse.wb.core.databinding/src/org/eclipse/wb/internal/core/databinding/ui/providers/ObserveLabelProvider.java +++ b/org.eclipse.wb.core.databinding/src/org/eclipse/wb/internal/core/databinding/ui/providers/ObserveLabelProvider.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011, 2024 Google, Inc. and others. + * Copyright (c) 2011, 2025 Google, Inc. and others. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at @@ -58,6 +58,6 @@ public String getText(final Object element) { @Override public Image getImage(final Object element) { - return ExecutionUtils.runObjectLog(() -> m_resourceManager.createImage(getPresentation(element).getImageDescriptor()), null); + return ExecutionUtils.runObjectLog(() -> m_resourceManager.create(getPresentation(element).getImageDescriptor()), null); } } \ No newline at end of file diff --git a/org.eclipse.wb.core.java/src/org/eclipse/wb/internal/core/editor/palette/dialogs/PaletteManagerDialog.java b/org.eclipse.wb.core.java/src/org/eclipse/wb/internal/core/editor/palette/dialogs/PaletteManagerDialog.java index 7be8e1e5f..7071142b5 100644 --- a/org.eclipse.wb.core.java/src/org/eclipse/wb/internal/core/editor/palette/dialogs/PaletteManagerDialog.java +++ b/org.eclipse.wb.core.java/src/org/eclipse/wb/internal/core/editor/palette/dialogs/PaletteManagerDialog.java @@ -371,7 +371,7 @@ public void dispose() { public Image getImage(Object element) { if (element instanceof EntryInfo) { return Optional.ofNullable(((EntryInfo) element).getIcon()) // - .map(m_resourceManager::createImage) // + .map(m_resourceManager::create) // .orElse(null); } return IMAGE_CATEGORY; diff --git a/org.eclipse.wb.core.java/src/org/eclipse/wb/internal/core/nls/ui/PropertiesComposite.java b/org.eclipse.wb.core.java/src/org/eclipse/wb/internal/core/nls/ui/PropertiesComposite.java index be9656b43..72efe811e 100644 --- a/org.eclipse.wb.core.java/src/org/eclipse/wb/internal/core/nls/ui/PropertiesComposite.java +++ b/org.eclipse.wb.core.java/src/org/eclipse/wb/internal/core/nls/ui/PropertiesComposite.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011, 2024 Google, Inc. and others. + * Copyright (c) 2011, 2025 Google, Inc. and others. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at @@ -491,7 +491,7 @@ public Image getImage(final Object element) { return DesignerPlugin.getImageDescriptor("nls/property.gif"); } }, null); - return imageDescriptor == null ? null : m_resourceManager.createImage(imageDescriptor); + return imageDescriptor == null ? null : m_resourceManager.create(imageDescriptor); } } } diff --git a/org.eclipse.wb.core.java/src/org/eclipse/wb/internal/core/nls/ui/SourceComposite.java b/org.eclipse.wb.core.java/src/org/eclipse/wb/internal/core/nls/ui/SourceComposite.java index e924f8699..16bafb465 100644 --- a/org.eclipse.wb.core.java/src/org/eclipse/wb/internal/core/nls/ui/SourceComposite.java +++ b/org.eclipse.wb.core.java/src/org/eclipse/wb/internal/core/nls/ui/SourceComposite.java @@ -590,7 +590,7 @@ public Image getColumnImage(Object element, int columnIndex) { final JavaInfo component = components.iterator().next(); final ImageDescriptor imageDescriptor = ExecutionUtils .runObjectLog(() -> component.getPresentation().getIcon(), null); - return imageDescriptor == null ? null : m_resourceManager.createImage(imageDescriptor); + return imageDescriptor == null ? null : m_resourceManager.create(imageDescriptor); } } return null; diff --git a/org.eclipse.wb.core/src/org/eclipse/wb/core/controls/palette/PaletteComposite.java b/org.eclipse.wb.core/src/org/eclipse/wb/core/controls/palette/PaletteComposite.java index 3aaa17303..73d15f40d 100644 --- a/org.eclipse.wb.core/src/org/eclipse/wb/core/controls/palette/PaletteComposite.java +++ b/org.eclipse.wb.core/src/org/eclipse/wb/core/controls/palette/PaletteComposite.java @@ -480,7 +480,7 @@ public CategoryFigure(ICategory category) { */ public void onPreferencesUpdate() { FontDescriptor fontDescriptor = m_preferences.getCategoryFontDescriptor(); - setFont(fontDescriptor == null ? null : m_resourceManager.createFont(fontDescriptor)); + setFont(fontDescriptor == null ? null : m_resourceManager.create(fontDescriptor)); for (Iterator I = getChildren().iterator(); I.hasNext();) { EntryFigure entryFigure = (EntryFigure) I.next(); entryFigure.onPreferencesUpdate(); @@ -820,7 +820,7 @@ public EntryFigure(IEntry entry) { */ public void onPreferencesUpdate() { FontDescriptor fontDescriptor = m_preferences.getEntryFontDescriptor(); - setFont(fontDescriptor == null ? null : m_resourceManager.createFont(fontDescriptor)); + setFont(fontDescriptor == null ? null : m_resourceManager.create(fontDescriptor)); } //////////////////////////////////////////////////////////////////////////// @@ -1159,7 +1159,7 @@ private void paintClientArea_disabled(Graphics graphics, Rectangle r) { private Image getIcon() { ImageDescriptor icon = m_entry.getIcon(); if (icon != null) { - return m_resourceManager.createImage(icon); + return m_resourceManager.create(icon); } return NO_ICON; } diff --git a/org.eclipse.wb.core/src/org/eclipse/wb/internal/core/model/util/ObjectsLabelProvider.java b/org.eclipse.wb.core/src/org/eclipse/wb/internal/core/model/util/ObjectsLabelProvider.java index bab1c9b01..e61c27dcb 100644 --- a/org.eclipse.wb.core/src/org/eclipse/wb/internal/core/model/util/ObjectsLabelProvider.java +++ b/org.eclipse.wb.core/src/org/eclipse/wb/internal/core/model/util/ObjectsLabelProvider.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011, 2023 Google, Inc. + * Copyright (c) 2011, 2025 Google, Inc. and others. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at @@ -44,7 +44,7 @@ public void dispose() { @Override public Image getImage(final Object element) { ImageDescriptor imageDescriptor = ObjectInfo.getImageDescriptor((ObjectInfo) element); - return imageDescriptor == null ? null : m_resourceManager.createImage(imageDescriptor); + return imageDescriptor == null ? null : m_resourceManager.create(imageDescriptor); } @Override diff --git a/org.eclipse.wb.rcp.databinding/META-INF/MANIFEST.MF b/org.eclipse.wb.rcp.databinding/META-INF/MANIFEST.MF index bf814be44..a38e25f92 100644 --- a/org.eclipse.wb.rcp.databinding/META-INF/MANIFEST.MF +++ b/org.eclipse.wb.rcp.databinding/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.wb.rcp.databinding;singleton:=true -Bundle-Version: 1.10.200.qualifier +Bundle-Version: 1.10.300.qualifier Bundle-Activator: org.eclipse.wb.internal.rcp.databinding.Activator Bundle-Vendor: %providerName Require-Bundle: org.eclipse.ui;bundle-version="[3.206.0,4.0.0)", diff --git a/org.eclipse.wb.rcp.databinding/src/org/eclipse/wb/internal/rcp/databinding/ui/contentproviders/ChooseClassAndTreePropertiesUiContentProvider.java b/org.eclipse.wb.rcp.databinding/src/org/eclipse/wb/internal/rcp/databinding/ui/contentproviders/ChooseClassAndTreePropertiesUiContentProvider.java index e0d9dda43..5c7af6e7f 100644 --- a/org.eclipse.wb.rcp.databinding/src/org/eclipse/wb/internal/rcp/databinding/ui/contentproviders/ChooseClassAndTreePropertiesUiContentProvider.java +++ b/org.eclipse.wb.rcp.databinding/src/org/eclipse/wb/internal/rcp/databinding/ui/contentproviders/ChooseClassAndTreePropertiesUiContentProvider.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011, 2024 Google, Inc. + * Copyright (c) 2011, 2025 Google, Inc. and others. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at @@ -420,7 +420,7 @@ public String getText(Object element) { @Override public Image getImage(Object element) { try { - return m_resourceManager.createImage(getAdapterProperty(element).getPresentation().getImageDescriptor()); + return m_resourceManager.create(getAdapterProperty(element).getPresentation().getImageDescriptor()); } catch (Throwable e) { } return super.getImage(element); diff --git a/org.eclipse.wb.rcp.databinding/src/org/eclipse/wb/internal/rcp/databinding/ui/contentproviders/ViewerColumnsUiContentProvider.java b/org.eclipse.wb.rcp.databinding/src/org/eclipse/wb/internal/rcp/databinding/ui/contentproviders/ViewerColumnsUiContentProvider.java index 46c7840dd..fd074d13d 100644 --- a/org.eclipse.wb.rcp.databinding/src/org/eclipse/wb/internal/rcp/databinding/ui/contentproviders/ViewerColumnsUiContentProvider.java +++ b/org.eclipse.wb.rcp.databinding/src/org/eclipse/wb/internal/rcp/databinding/ui/contentproviders/ViewerColumnsUiContentProvider.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011, 2024 Google, Inc. and others. + * Copyright (c) 2011, 2025 Google, Inc. and others. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at @@ -283,7 +283,7 @@ public Image getColumnImage(Object element, int column) { if (column == 0) { // Viewer column final VirtualEditingSupportInfo editingSupport = (VirtualEditingSupportInfo) element; - return ExecutionUtils.runObjectLog(() -> m_resourceManager.createImage(editingSupport.getViewerColumn().getPresentation().getImageDescriptor()), null); + return ExecutionUtils.runObjectLog(() -> m_resourceManager.create(editingSupport.getViewerColumn().getPresentation().getImageDescriptor()), null); } return null; } diff --git a/org.eclipse.wb.swing.databinding/src/org/eclipse/wb/internal/swing/databinding/ui/contentproviders/ChooseClassAndPropertiesUiContentProvider.java b/org.eclipse.wb.swing.databinding/src/org/eclipse/wb/internal/swing/databinding/ui/contentproviders/ChooseClassAndPropertiesUiContentProvider.java index 80d672a59..71cd9211d 100644 --- a/org.eclipse.wb.swing.databinding/src/org/eclipse/wb/internal/swing/databinding/ui/contentproviders/ChooseClassAndPropertiesUiContentProvider.java +++ b/org.eclipse.wb.swing.databinding/src/org/eclipse/wb/internal/swing/databinding/ui/contentproviders/ChooseClassAndPropertiesUiContentProvider.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011, 2023 Google, Inc. + * Copyright (c) 2011, 2025 Google, Inc. and others. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at @@ -450,7 +450,7 @@ public String getText(Object element) { @Override public Image getImage(Object element) { try { - return m_resourceManager.createImage(getAdapterProperty(element).getPresentation().getImageDescriptor()); + return m_resourceManager.create(getAdapterProperty(element).getPresentation().getImageDescriptor()); } catch (Throwable e) { } return super.getImage(element); diff --git a/org.eclipse.wb.swing.databinding/src/org/eclipse/wb/internal/swing/databinding/ui/contentproviders/ColumnBindingUiContentProvider.java b/org.eclipse.wb.swing.databinding/src/org/eclipse/wb/internal/swing/databinding/ui/contentproviders/ColumnBindingUiContentProvider.java index 230163256..65075ad25 100644 --- a/org.eclipse.wb.swing.databinding/src/org/eclipse/wb/internal/swing/databinding/ui/contentproviders/ColumnBindingUiContentProvider.java +++ b/org.eclipse.wb.swing.databinding/src/org/eclipse/wb/internal/swing/databinding/ui/contentproviders/ColumnBindingUiContentProvider.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011, 2024 Google, Inc. + * Copyright (c) 2011, 2025 Google, Inc. and others. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at @@ -497,7 +497,7 @@ public String getText(Object element) { @Override public Image getImage(Object element) { try { - return m_resourceManager.createImage(getAdapterProperty(element).getPresentation().getImageDescriptor()); + return m_resourceManager.create(getAdapterProperty(element).getPresentation().getImageDescriptor()); } catch (Throwable e) { } return super.getImage(element); diff --git a/org.eclipse.wb.swing.databinding/src/org/eclipse/wb/internal/swing/databinding/ui/contentproviders/el/ContentAssistProcessor.java b/org.eclipse.wb.swing.databinding/src/org/eclipse/wb/internal/swing/databinding/ui/contentproviders/el/ContentAssistProcessor.java index d4b8d1891..63e83ffe0 100644 --- a/org.eclipse.wb.swing.databinding/src/org/eclipse/wb/internal/swing/databinding/ui/contentproviders/el/ContentAssistProcessor.java +++ b/org.eclipse.wb.swing.databinding/src/org/eclipse/wb/internal/swing/databinding/ui/contentproviders/el/ContentAssistProcessor.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011, 2023 Google, Inc. + * Copyright (c) 2011, 2025 Google, Inc. and others. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at @@ -153,7 +153,7 @@ private ICompletionProposal[] createProposals(List properties, String propertyName = observe.getPresentation().getText(); String data = begin + propertyName + end; Image image = Optional.ofNullable(observe.getPresentation().getImageDescriptor()) // - .map(m_resourceManager::createImage) // + .map(m_resourceManager::create) // .orElse(null); // add proposal proposals[i] = diff --git a/org.eclipse.wb.swing.databinding/src/org/eclipse/wb/internal/swing/databinding/wizards/autobindings/ObservePropertyAdapterLabelProvider.java b/org.eclipse.wb.swing.databinding/src/org/eclipse/wb/internal/swing/databinding/wizards/autobindings/ObservePropertyAdapterLabelProvider.java index cf3bed985..e4c60c9b6 100644 --- a/org.eclipse.wb.swing.databinding/src/org/eclipse/wb/internal/swing/databinding/wizards/autobindings/ObservePropertyAdapterLabelProvider.java +++ b/org.eclipse.wb.swing.databinding/src/org/eclipse/wb/internal/swing/databinding/wizards/autobindings/ObservePropertyAdapterLabelProvider.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011, 2023 Google, Inc. + * Copyright (c) 2011, 2025 Google, Inc. and others. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at @@ -47,7 +47,7 @@ public String getText(Object element) { public Image getImage(Object element) { try { ObservePropertyAdapter adapter = (ObservePropertyAdapter) element; - return m_resourceManager.createImage(adapter.getObserve().getPresentation().getImageDescriptor()); + return m_resourceManager.create(adapter.getObserve().getPresentation().getImageDescriptor()); } catch (Throwable e) { return null; } diff --git a/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/model/layout/form/WidgetSelectDialog.java b/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/model/layout/form/WidgetSelectDialog.java index 37bc16160..adad9538c 100644 --- a/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/model/layout/form/WidgetSelectDialog.java +++ b/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/model/layout/form/WidgetSelectDialog.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011, 2023 Google, Inc. + * Copyright (c) 2011, 2025 Google, Inc. and others. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at @@ -225,7 +225,7 @@ public Image getColumnImage(Object element, int columnIndex) { C info = (C) element; try { ImageDescriptor imageDescriptor = info.getPresentation().getIcon(); - return imageDescriptor == null ? null : m_resourceManager.createImage(imageDescriptor); + return imageDescriptor == null ? null : m_resourceManager.create(imageDescriptor); } catch (Throwable e) { throw ReflectionUtils.propagate(e); } diff --git a/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/model/property/editor/image/ImagePropertyEditor.java b/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/model/property/editor/image/ImagePropertyEditor.java index 8179cbbbb..49a3569c6 100644 --- a/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/model/property/editor/image/ImagePropertyEditor.java +++ b/org.eclipse.wb.swt/src/org/eclipse/wb/internal/swt/model/property/editor/image/ImagePropertyEditor.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011, 2024 Google, Inc. and others. + * Copyright (c) 2011, 2025 Google, Inc. and others. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at @@ -60,7 +60,7 @@ private ImagePropertyEditor() { * @param javaInfo Java info the resource manager belongs to. * @param location the class whose resource directory contain the file * @param filename the file name - * @return {@code LocalResourceManager.createImage(ImageDescriptor.createFromFile(, ))} + * @return {@code LocalResourceManager.create(ImageDescriptor.createFromFile(, ))} * @see ImageDescriptor#createFromFile(Class, String) */ public static String getInvocationSource(JavaInfo javaInfo, String location, String filename) throws Exception {