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 All @@ -14,6 +14,7 @@
package org.eclipse.wb.internal.core.editor.palette;

import org.eclipse.wb.core.controls.palette.IPalette;
import org.eclipse.wb.core.editor.constants.CoreImages;
import org.eclipse.wb.core.editor.constants.IEditorPreferenceConstants;
import org.eclipse.wb.core.editor.palette.model.CategoryInfo;
import org.eclipse.wb.core.editor.palette.model.EntryInfo;
Expand Down Expand Up @@ -51,7 +52,7 @@
*/
final class DesignerPalettePopupActions {
// image constants
private static final ImageDescriptor ID_ADD_CATEGORY = getImageDescription("add_category.gif");
private static final ImageDescriptor ID_ADD_CATEGORY = CoreImages.FOLDER_OPEN;
private static final ImageDescriptor ID_ADD_COMPONENT = getImageDescription("add_component.gif");
private static final ImageDescriptor IMPORT_JAR_IMAGE = getImageDescription("import_jar.png");
private static final ImageDescriptor ID_REMOVE = getImageDescription("remove.gif");
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2011 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 All @@ -12,6 +12,7 @@
*******************************************************************************/
package org.eclipse.wb.internal.core.editor.palette.dialogs;

import org.eclipse.wb.core.editor.constants.CoreImages;
import org.eclipse.wb.core.editor.palette.model.CategoryInfo;
import org.eclipse.wb.core.editor.palette.model.PaletteInfo;
import org.eclipse.wb.internal.core.DesignerPlugin;
Expand Down Expand Up @@ -208,7 +209,7 @@ public void widgetSelected(SelectionEvent e) {
// choose menu
m_browseItem = new ToolItem(browseToolBar, SWT.DROP_DOWN);
m_browseItem.setToolTipText(Messages.ImportArchiveDialog_browseToolTip);
m_browseItem.setImage(DesignerPlugin.getImage("palette/category.gif"));
m_browseItem.setImage(CoreImages.getSharedImage(CoreImages.FOLDER_OPEN));
//
m_browseMenu = new Menu(browseToolBar);
// Classpath
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 All @@ -12,6 +12,7 @@
*******************************************************************************/
package org.eclipse.wb.internal.core.editor.palette.dialogs;

import org.eclipse.wb.core.editor.constants.CoreImages;
import org.eclipse.wb.core.editor.palette.model.AbstractElementInfo;
import org.eclipse.wb.core.editor.palette.model.CategoryInfo;
import org.eclipse.wb.core.editor.palette.model.EntryInfo;
Expand Down Expand Up @@ -106,7 +107,7 @@ public final class PaletteManagerDialog extends ResizableTitleAreaDialog {
////////////////////////////////////////////////////////////////////////////
private static final Image IMAGE_CLEAR_FILTER =
DesignerPlugin.getImage("palette/clear_filter.gif");
private static final Image IMAGE_CATEGORY = DesignerPlugin.getImage("palette/category.gif");
private static final Image IMAGE_CATEGORY = CoreImages.getSharedImage(CoreImages.FOLDER_OPEN);
////////////////////////////////////////////////////////////////////////////
//
// Instance fields
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 All @@ -12,9 +12,9 @@
*******************************************************************************/
package org.eclipse.wb.internal.core.model.creation.factory;

import org.eclipse.wb.core.editor.constants.CoreImages;
import org.eclipse.wb.core.model.JavaInfo;
import org.eclipse.wb.core.model.ObjectInfo;
import org.eclipse.wb.internal.core.DesignerPlugin;
import org.eclipse.wb.internal.core.model.presentation.DefaultObjectPresentation;
import org.eclipse.wb.internal.core.model.presentation.IObjectPresentation;

Expand Down Expand Up @@ -82,7 +82,7 @@ public String getText() throws Exception {

@Override
public ImageDescriptor getIcon() throws Exception {
return DesignerPlugin.getImageDescriptor("components/factory_container.gif");
return CoreImages.FOLDER_OPEN;
}
};
}
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 All @@ -12,13 +12,13 @@
*******************************************************************************/
package org.eclipse.wb.internal.core.model.nonvisual;

import org.eclipse.wb.core.editor.constants.CoreImages;
import org.eclipse.wb.core.model.JavaInfo;
import org.eclipse.wb.core.model.ObjectInfo;
import org.eclipse.wb.core.model.association.Association;
import org.eclipse.wb.core.model.association.AssociationUtils;
import org.eclipse.wb.core.model.broadcast.ObjectInfoChildAddAfter;
import org.eclipse.wb.core.model.broadcast.ObjectInfoChildAddBefore;
import org.eclipse.wb.internal.core.DesignerPlugin;
import org.eclipse.wb.internal.core.model.creation.CreationSupport;
import org.eclipse.wb.internal.core.model.presentation.DefaultObjectPresentation;
import org.eclipse.wb.internal.core.model.presentation.IObjectPresentation;
Expand Down Expand Up @@ -87,7 +87,7 @@ public String getText() throws Exception {

@Override
public ImageDescriptor getIcon() throws Exception {
return DesignerPlugin.getImageDescriptor("components/non_visual_beans_container.gif");
return CoreImages.FOLDER_OPEN;
}

@Override
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 All @@ -12,10 +12,10 @@
*******************************************************************************/
package org.eclipse.wb.internal.core.model.nonvisual;

import org.eclipse.wb.core.editor.constants.CoreImages;
import org.eclipse.wb.core.model.AbstractComponentInfo;
import org.eclipse.wb.core.model.ObjectInfo;
import org.eclipse.wb.core.model.broadcast.ObjectInfoChildTree;
import org.eclipse.wb.internal.core.DesignerPlugin;
import org.eclipse.wb.internal.core.model.presentation.DefaultObjectPresentation;
import org.eclipse.wb.internal.core.model.presentation.IObjectPresentation;
import org.eclipse.wb.internal.core.utils.ast.AstEditor;
Expand Down Expand Up @@ -105,7 +105,7 @@ public String getText() throws Exception {

@Override
public ImageDescriptor getIcon() throws Exception {
return DesignerPlugin.getImageDescriptor("components/non_visual_beans_container.gif");
return CoreImages.FOLDER_OPEN;
}

@Override
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 All @@ -12,11 +12,11 @@
*******************************************************************************/
package org.eclipse.wb.internal.core.model.nonvisual;

import org.eclipse.wb.core.editor.constants.CoreImages;
import org.eclipse.wb.core.eval.ExecutionFlowDescription;
import org.eclipse.wb.core.model.JavaInfo;
import org.eclipse.wb.core.model.ObjectInfo;
import org.eclipse.wb.core.model.association.AssociationObjects;
import org.eclipse.wb.internal.core.DesignerPlugin;
import org.eclipse.wb.internal.core.model.JavaInfoUtils;
import org.eclipse.wb.internal.core.model.generation.GenerationUtils;
import org.eclipse.wb.internal.core.model.generation.statement.PureFlatStatementGenerator;
Expand Down Expand Up @@ -158,7 +158,7 @@ public String getText() throws Exception {

@Override
public ImageDescriptor getIcon() throws Exception {
return DesignerPlugin.getImageDescriptor("components/non_visual_beans_container.gif");
return CoreImages.FOLDER_OPEN;
}
};
}
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 All @@ -13,6 +13,7 @@
package org.eclipse.wb.internal.core.model.util.factory;

import org.eclipse.wb.core.editor.IDesignPageSite;
import org.eclipse.wb.core.editor.constants.CoreImages;
import org.eclipse.wb.core.editor.palette.model.CategoryInfo;
import org.eclipse.wb.core.editor.palette.model.IPaletteSite;
import org.eclipse.wb.core.editor.palette.model.PaletteInfo;
Expand Down Expand Up @@ -853,7 +854,7 @@ public void handleEvent(Event event) {
// creation
{
TreeItem creationItem = new TreeItem(tree, SWT.NONE);
creationItem.setImage(DesignerPlugin.getImage("actions/factory/folder.png"));
creationItem.setImage(CoreImages.getSharedImage(CoreImages.FOLDER_OPEN));
creationItem.setText(ModelMessages.FactoryCreateAction_dialogArgumentsCreation);
creationItem.setGrayed(true);
creationItem.setChecked(true);
Expand All @@ -873,7 +874,7 @@ public void handleEvent(Event event) {
{
TreeItem invocationsItem = new TreeItem(tree, SWT.NONE);
invocationsItem.setText(ModelMessages.FactoryCreateAction_dialogArgumentsInvocations);
invocationsItem.setImage(DesignerPlugin.getImage("actions/factory/folder.png"));
invocationsItem.setImage(CoreImages.getSharedImage(CoreImages.FOLDER_OPEN));
invocationsItem.setGrayed(true);
invocationsItem.setChecked(true);
// for each invocation
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2011 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 All @@ -12,7 +12,7 @@
*******************************************************************************/
package org.eclipse.wb.internal.core.utils.ui.dialogs.image.pages.browse.classpath;

import org.eclipse.wb.internal.core.DesignerPlugin;
import org.eclipse.wb.core.editor.constants.CoreImages;
import org.eclipse.wb.internal.core.utils.ui.dialogs.image.pages.browse.model.IImageContainer;

import org.eclipse.jdt.core.IJavaElement;
Expand Down Expand Up @@ -65,7 +65,7 @@ public SrcImageContainer(String id, IPackageFragmentRoot packageFragmentRoot) th
////////////////////////////////////////////////////////////////////////////
@Override
public Image getImage() {
return DesignerPlugin.getImage("folder_package.gif");
return CoreImages.getSharedImage(CoreImages.FOLDER_PACKAGE);
}

@Override
Expand Down
Binary file removed org.eclipse.wb.core/icons/actions/factory/folder.png
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file added org.eclipse.wb.core/icons/folder_closed.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Loading