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, 2025 Google, Inc. and others.
* Copyright (c) 2011, 2026 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 @@ -385,6 +385,7 @@ public Tool createTool() {
/**
* @return the {@link ICategory} for given {@link CategoryInfo}.
*/
@SuppressWarnings("removal")
private DesignerContainer getVisualCategory(final CategoryInfo categoryInfo) {
DesignerContainer category = m_categoryInfoToVisual.get(categoryInfo);
if (category == null) {
Expand Down Expand Up @@ -471,6 +472,7 @@ public void selectDefault() {

@Override
@Deprecated
@SuppressWarnings("removal")
public void moveCategory(ICategory _category, ICategory _nextCategory) {
CategoryInfo category = m_visualToCategoryInfo.get(_category);
CategoryInfo nextCategory = m_visualToCategoryInfo.get(_nextCategory);
Expand All @@ -479,6 +481,7 @@ public void moveCategory(ICategory _category, ICategory _nextCategory) {

@Override
@Deprecated
@SuppressWarnings("removal")
public void moveEntry(IEntry _entry, ICategory _targetCategory, IEntry _nextEntry) {
EntryInfo entry = m_visualToEntryInfo.get(_entry);
CategoryInfo category = m_visualToCategoryInfo.get(_targetCategory);
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, 2026 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 @@ -22,6 +22,7 @@
* @coverage core.control.palette
* @deprecated Replaced by {@link DesignPaletteViewerPreferences}.
*/
@SuppressWarnings("removal")
@Deprecated(forRemoval = true, since = "1.18.0")
public final class DefaultPalettePreferences implements IPalettePreferences {
@Override
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2011, 2025 Google, Inc. and others.
* Copyright (c) 2011, 2026 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 @@ -48,5 +48,6 @@ public interface ICategory {
/**
* @return the {@link List} of {@link IEntry}'s.
*/
@SuppressWarnings("removal")
List<? extends IEntry> getEntries();
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2011, 2025 Google, Inc. and others.
* Copyright (c) 2011, 2026 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 @@ -37,6 +37,7 @@ public interface IPalette {
/**
* @return the {@link List} of {@link ICategory}'s to display as roots of palette.
*/
@SuppressWarnings("removal")
List<? extends ICategory> getCategories();

/**
Expand All @@ -62,10 +63,12 @@ public interface IPalette {
/**
* Moves given <code>category</code> before given <code>nextCategory</code>.
*/
@SuppressWarnings("removal")
void moveCategory(ICategory category, ICategory nextCategory);

/**
* Moves given <code>entry</code> into given category before <code>nextEntry</code>.
*/
@SuppressWarnings("removal")
void moveEntry(IEntry entry, ICategory targetCategory, IEntry nextEntry);
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2011, 2025 Google, Inc. and others.
* Copyright (c) 2011, 2026 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 @@ -230,6 +230,7 @@ public void dispose() {
* @deprecated Use {@link #setPalette(DesignerRoot)}. This method will be
* removed after the 2027-03 release.
*/
@SuppressWarnings("removal")
@Deprecated(since = "1.19", forRemoval = true)
public void setPalette(IPalette palette) {
m_palette = palette;
Expand Down Expand Up @@ -257,6 +258,7 @@ public void refreshPalette() {
* @deprecated Use {@link #setPreferences(DesignerPaletteViewerPreferences)}.
* This method will be removed after the 2027-03 release.
*/
@SuppressWarnings("removal")
@Deprecated(since = "1.19", forRemoval = true)
public void setPreferences(IPalettePreferences preferences) {
m_preferences = preferences;
Expand All @@ -281,6 +283,7 @@ public void setPreferences(DesignerPaletteViewerPreferences preferences) {
* @deprecated Use {@link #selectEntry(DesignerEntry, boolean)} instead. This
* method will be removed after the 2027-03 release.
*/
@SuppressWarnings("removal")
@Deprecated(since = "3.19", forRemoval = true)
public void selectEntry(IEntry selectedEntry, boolean reload) {
// activate new entry
Expand Down Expand Up @@ -313,6 +316,7 @@ public void selectEntry(DesignerEntry selectedEntry, boolean reload) {
* @deprecated Use {@link #getCategoryFigure(DesignerContainer)} instead. This
* method will be removed after the 2027-03 release.
*/
@SuppressWarnings("removal")
@Deprecated(since = "3.19", forRemoval = true)
public Figure getCategoryFigure(ICategory category) {
return m_categoryFigures.get(category);
Expand All @@ -332,6 +336,7 @@ public IFigure getCategoryFigure(DesignerContainer category) {
* @deprecated Use {@link #getEntryFigure(DesignerContainer, DesignerEntry)}
* instead. This method will be removed after the 2027-03 release.
*/
@SuppressWarnings("removal")
@Deprecated(since = "3.19", forRemoval = true)
public Figure getEntryFigure(ICategory category, IEntry entry) {
CategoryFigure categoryFigure = m_categoryFigures.get(category);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2011, 2025 Google, Inc. and others.
* Copyright (c) 2011, 2026 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 @@ -172,11 +172,13 @@ public void selectDefault() {

@Override
@Deprecated
@SuppressWarnings("removal")
public void moveCategory(ICategory category, ICategory nextCategory) {
}

@Override
@Deprecated
@SuppressWarnings("removal")
public void moveEntry(IEntry entry, ICategory targetCategory, IEntry nextEntry) {
}
}
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, 2026 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 @@ -57,7 +57,7 @@ public Tool createTool() throws Exception {
// initialize
assertTrue(toolEntry.initialize(editPartViewer, panel));
// activate
assertFalse(toolEntry.activate(false));
assertNull(toolEntry.createTool(false));
}

/**
Expand All @@ -82,7 +82,7 @@ public Tool createTool() throws Exception {
// initialize
assertTrue(toolEntry.initialize(editPartViewer, panel));
// activate
assertTrue(toolEntry.activate(false));
assertNotNull(toolEntry.createTool(false));
}

/**
Expand All @@ -109,7 +109,7 @@ public Tool createTool() throws Exception {
// activate
try {
DesignerPlugin.setDisplayExceptionOnConsole(false);
assertFalse(toolEntry.activate(false));
assertNull(toolEntry.createTool(false));
} finally {
DesignerPlugin.setDisplayExceptionOnConsole(true);
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2011, 2025 Google, Inc. and others.
* Copyright (c) 2011, 2026 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 @@ -137,7 +137,7 @@ public void test_replaceGridLayout_withAbsolute() throws Exception {
{
AbsoluteLayoutEntryInfo absoluteEntry = new AbsoluteLayoutEntryInfo();
absoluteEntry.initialize(m_viewerCanvas, shell);
absoluteEntry.activate(false);
absoluteEntry.createTool(false);
canvas.target(shell).in(250, 50).move().click();
waitEventLoop(0);
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2011, 2025 Google, Inc. and others.
* Copyright (c) 2011, 2026 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 @@ -151,7 +151,7 @@ public void test_replaceGridLayout_withAbsolute() throws Exception {
{
AbsoluteLayoutEntryInfo absoluteEntry = new AbsoluteLayoutEntryInfo();
absoluteEntry.initialize(m_viewerCanvas, composite);
absoluteEntry.activate(false);
absoluteEntry.createTool(false);
canvas.target(composite).in(250, 50).move().click();
waitEventLoop(20);
}
Expand Down
Loading