Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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);
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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<? extends IFigure> I = getChildren().iterator(); I.hasNext();) {
EntryFigure entryFigure = (EntryFigure) I.next();
entryFigure.onPreferencesUpdate();
Expand Down Expand Up @@ -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));
}

////////////////////////////////////////////////////////////////////////////
Expand Down Expand Up @@ -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;
}
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion org.eclipse.wb.rcp.databinding/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -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)",
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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);
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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;
}
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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);
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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);
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -153,7 +153,7 @@ private ICompletionProposal[] createProposals(List<ObserveInfo> 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] =
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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;
}
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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);
}
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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(<clazz>, <path>))}
* @return {@code LocalResourceManager.create(ImageDescriptor.createFromFile(<clazz>, <path>))}
* @see ImageDescriptor#createFromFile(Class, String)
*/
public static String getInvocationSource(JavaInfo javaInfo, String location, String filename) throws Exception {
Expand Down
Loading