Skip to content

Commit dfad87d

Browse files
EcljpseB0Tjukzi
authored andcommitted
various javadoc fixes
reduce ecj warnings in workspace
1 parent a984db2 commit dfad87d

File tree

19 files changed

+28
-70
lines changed

19 files changed

+28
-70
lines changed

bundles/org.eclipse.e4.ui.workbench.renderers.swt/src/org/eclipse/e4/ui/workbench/renderers/swt/MenuManagerShowProcessor.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -116,8 +116,7 @@ public void menuAboutToHide(IMenuManager manager) {
116116
}
117117

118118
/**
119-
* HashMap key for storage of {@link MDynamicMenuContribution} elements used
120-
* in {@link #processDynamicElements(MMenu, MenuManager)}
119+
* HashMap key for storage of {@link MDynamicMenuContribution} elements
121120
*/
122121
protected static final String DYNAMIC_ELEMENT_STORAGE_KEY = MenuManagerShowProcessor.class
123122
.getSimpleName() + ".dynamicElements"; //$NON-NLS-1$

bundles/org.eclipse.e4.ui.workbench.renderers.swt/src/org/eclipse/e4/ui/workbench/renderers/swt/ToolControlRenderer.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ public class ToolControlRenderer extends SWTPartRenderer {
7575
/**
7676
* The state ID for a toggle state understood by the system.
7777
*
78-
* @see RegistryToggleState.STATE_ID
78+
* see org.eclipse.ui.handlers.RegistryToggleState.STATE_ID
7979
*/
8080
public static final String STATE_ID = "org.eclipse.ui.commands.toggleState"; //$NON-NLS-1$
8181

bundles/org.eclipse.e4.ui.workbench/src/org/eclipse/e4/ui/internal/workbench/URIHelper.java

+3-4
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ static public String EMFtoPlatform(org.eclipse.emf.common.util.URI uri) {
111111
* @param uri
112112
* a possible Platform URI
113113
* @return true if the given string is not {@code null} and starts with
114-
* {@value #PLATFORM_SCHEMA}; false otherwise
114+
* {@code "platform:/"}; false otherwise
115115
*/
116116
public static boolean isPlatformURI(String uri) {
117117
return uri != null && uri.startsWith(PLATFORM_SCHEMA);
@@ -120,10 +120,9 @@ public static boolean isPlatformURI(String uri) {
120120
/**
121121
* Helper method which checks if given String represents a Bundleclass URI.
122122
*
123-
* @param uri
124-
* a possible Bundleclass URI
123+
* @param uri a possible Bundleclass URI
125124
* @return true if the given string is not {@code null} and starts with
126-
* {@value #BUNDLECLASS_SCHEMA}; false otherwise
125+
* {@code "bundleclass://"}. false otherwise
127126
*/
128127
public static boolean isBundleClassUri(String uri) {
129128
if (uri != null && uri.startsWith(BUNDLECLASS_SCHEMA)) {

bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/TextViewer.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1082,7 +1082,7 @@ private static final class ColumnPosition extends Position {
10821082
private final class ViewerState {
10831083
/** The position tracking the selection. */
10841084
private Position[] fSelections;
1085-
/** <code>true</code> if {@link #fSelection} was originally backwards. */
1085+
/** <code>true</code> if {@link #fSelections} was originally backwards. */
10861086
private boolean fReverseSelection;
10871087
/** <code>true</code> if the selection has been updated while in redraw(off) mode. */
10881088
private boolean fSelectionSet;
@@ -1091,7 +1091,7 @@ private final class ViewerState {
10911091
/** The pixel offset of the stable line measured from the client area. */
10921092
private int fStablePixel;
10931093

1094-
/** The position updater for {@link #fSelection} and {@link #fStableLine}. */
1094+
/** The position updater for {@link #fSelections} and {@link #fStableLine}. */
10951095
private IPositionUpdater fUpdater;
10961096
/** The document that the position updater and the positions are registered with. */
10971097
private IDocument fUpdaterDocument;

bundles/org.eclipse.ui.ide/src/org/eclipse/ui/ide/IDE.java

-1
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,6 @@ public interface Preferences {
219219
* </p>
220220
*
221221
* @see org.eclipse.ui.IWorkbenchPreferenceConstants#OPEN_PERSPECTIVE_WINDOW
222-
* @see org.eclipse.ui.IWorkbenchPreferenceConstants#OPEN_PERSPECTIVE_PAGE
223222
* @see org.eclipse.ui.IWorkbenchPreferenceConstants#OPEN_PERSPECTIVE_REPLACE
224223
* @see org.eclipse.ui.IWorkbenchPreferenceConstants#NO_NEW_PERSPECTIVE
225224
*/

bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/views/markers/GroupFilterConfigurationArea.java

-5
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,6 @@
1616

1717
import org.eclipse.ui.views.markers.FilterConfigurationArea;
1818

19-
/**
20-
* GroupFilterConfigurationArea is the FilterConfigurationArea for the special case
21-
* group level settings for a {@link MarkerFieldFilterGroup}
22-
* @since 3.4
23-
*/
2419
abstract class GroupFilterConfigurationArea extends FilterConfigurationArea {
2520

2621
/**

bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/navigator/CommonNavigator.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ public class CommonNavigator extends ViewPart implements ISetSelectionTarget, IS
134134

135135
/**
136136
* <p>
137-
* Used to track changes to the {@link #isLinkingEnabled}&nbsp;property.
137+
* Used to track changes to {@link #isLinkingEnabled()}.
138138
* </p>
139139
*
140140
* Make sure this does not conflict with anything in IWorkbenchPartConstants.

bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/navigator/INavigatorContentService.java

+6-7
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
import org.eclipse.jface.viewers.ILabelProvider;
2121
import org.eclipse.jface.viewers.IStructuredContentProvider;
2222
import org.eclipse.jface.viewers.ITreeContentProvider;
23-
import org.eclipse.jface.viewers.ViewerSorter;
23+
import org.eclipse.jface.viewers.ViewerComparator;
2424
import org.eclipse.ui.IMemento;
2525
import org.eclipse.ui.ISaveablesSource;
2626

@@ -379,14 +379,13 @@ INavigatorContentDescriptor[] bindExtensions(String[] extensionIds,
379379
INavigatorFilterService getFilterService();
380380

381381
/**
382-
* The sorter service provides the appropriate sorter based on the current
383-
* items being sorted. By default, the CommonViewer uses
384-
* {@link CommonViewerSorter} which delegates to this service. Clients do
385-
* not need to provide their own {@link ViewerSorter} unless they wish to
386-
* override this functionality.
382+
* The sorter service provides the appropriate sorter based on the current items
383+
* being sorted. By default, the CommonViewer uses {@link CommonViewerSorter}
384+
* which delegates to this service. Clients do not need to provide their own
385+
* {@link ViewerComparator} unless they wish to override this functionality.
387386
*
388387
* @return An {@link INavigatorSorterService} that can provide
389-
* {@link ViewerSorter} based on the context of the parent.
388+
* {@link ViewerComparator} based on the context of the parent.
390389
*/
391390
INavigatorSorterService getSorterService();
392391

bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/BasicWorkingSetElementAdapter.java

-1
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,6 @@ private static class Type {
8787
* @see org.eclipse.ui.IWorkingSetElementAdapter#adaptElements(org.eclipse.ui.IWorkingSet,
8888
* org.eclipse.core.runtime.IAdaptable[])
8989
* @see org.eclipse.core.runtime.IAdapterManager#getAdapter(Object, String)
90-
* @see org.osgi.service.packageadmin.PackageAdmin#getExportedPackage(String)
9190
*/
9291
@Override
9392
public IAdaptable[] adaptElements(IWorkingSet ws, IAdaptable[] elements) {

bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/activities/ITriggerPointManager.java

+1-3
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,7 @@
3030
public interface ITriggerPointManager {
3131

3232
/**
33-
* Constant representing the id of an unknown trigger point. Used by clients of
34-
* {@link WorkbenchActivityHelper#allowUseOf(Object)} for trigger point
35-
* determination logic.
33+
* Constant representing the id of an unknown trigger point.
3634
*/
3735
String UNKNOWN_TRIGGER_POINT_ID = "org.eclipse.ui.internal.UnknownTriggerPoint"; //$NON-NLS-1$
3836

bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/activities/WorkbenchActivityHelper.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ public static IIdentifier getIdentifier(IPluginContribution contribution) {
6868
* enablement.
6969
* @see #allowUseOf(ITriggerPoint, Object)
7070
*/
71-
@Deprecated
71+
@Deprecated(forRemoval = true, since = "2024-03")
7272
public static boolean allowUseOf(Object object) {
7373
return allowUseOf(PlatformUI.getWorkbench().getActivitySupport().getTriggerPointManager()
7474
.getTriggerPoint(ITriggerPointManager.UNKNOWN_TRIGGER_POINT_ID), object);

bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/commands/AbstractHandler.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
* @noreference This class is scheduled for deletion.
4141
* @noextend This class is not intended to be extended by clients.
4242
*/
43-
@Deprecated
43+
@Deprecated(forRemoval = true, since = "2024-03")
4444
@SuppressWarnings({ "unchecked" })
4545
public abstract class AbstractHandler extends org.eclipse.core.commands.AbstractHandler implements IHandler {
4646

bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkbenchPage.java

+5-4
Original file line numberDiff line numberDiff line change
@@ -5501,10 +5501,11 @@ public void resetToolBarLayout() {
55015501
}
55025502

55035503
/**
5504-
* Call {@link #firePartDeactivated(MPart)} if the passed part is the currently
5505-
* active part according to the part service. This method should only be called
5506-
* in the case of workbench shutdown, where E4 does not fire deactivate
5507-
* listeners on the active part.
5504+
* Fires
5505+
* {@link org.eclipse.ui.IPartListener2#partDeactivated(IWorkbenchPartReference)}
5506+
* if the passed part is the currently active part according to the part
5507+
* service. This method should only be called in the case of workbench shutdown,
5508+
* where E4 does not fire deactivate listeners on the active part.
55085509
*/
55095510
public void firePartDeactivatedIfActive(MPart part) {
55105511
if (partService.getActivePart() == part) {

bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/about/AboutUtils.java

+4-3
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import java.net.URL;
2222
import java.util.ArrayList;
2323
import java.util.StringTokenizer;
24+
import org.eclipse.core.runtime.FileLocator;
2425
import org.eclipse.core.runtime.IPath;
2526
import org.eclipse.core.runtime.IStatus;
2627
import org.eclipse.core.runtime.Platform;
@@ -108,15 +109,15 @@ else if (nextWhitespace != -1)
108109
* to a resource within a bundle, then a temp copy of the file will be extracted
109110
* and opened.
110111
*
111-
* @see Platform#asLocalURL(URL)
112+
* @see FileLocator#toFileURL(URL)
112113
*
113114
* @param url The target url to be displayed, null will be safely ignored
114115
* @return true if the url was successfully displayed and false otherwise
115116
*/
116-
public static boolean openBrowser(Shell shell, URL url) {
117+
public static boolean openBrowser(@SuppressWarnings("unused") Shell shell, URL url) {
117118
if (url != null) {
118119
try {
119-
url = Platform.asLocalURL(url);
120+
url = FileLocator.toFileURL(url);
120121
} catch (IOException e) {
121122
return false;
122123
}

bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/cpd/ItemDetailToolTip.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,7 @@
5959

6060
/**
6161
* A tooltip with useful information based on the type of ContributionItem the
62-
* cursor hovers over in a Tree. In addition to the content provided by the
63-
* {@link NameAndDescriptionToolTip} this includes action set information and
62+
* cursor hovers over in a Tree. This adds action set information and
6463
* key binding data.
6564
*
6665
* @since 3.5

bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/LegacyHandlerProxy.java

-6
Original file line numberDiff line numberDiff line change
@@ -80,9 +80,6 @@ public void dispose() {
8080
}
8181
}
8282

83-
/**
84-
* @see IHandler#execute(Map)
85-
*/
8683
@Override
8784
public Object execute(Map parameters) throws ExecutionException {
8885
if (loadHandler()) {
@@ -92,9 +89,6 @@ public Object execute(Map parameters) throws ExecutionException {
9289
return null;
9390
}
9491

95-
/**
96-
* @see IHandler#getAttributeValuesByName()
97-
*/
9892
@Override
9993
public Map getAttributeValuesByName() {
10094
if (loadHandler()) {

bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/keys/SchemeLegacyWrapper.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
/**
2323
* A wrapper around the new {@link Scheme} class, providing supported for the
24-
* old {@link IKeyConfiguration} interface.
24+
* old {@code IKeyConfiguration} interface.
2525
*
2626
* @since 3.1
2727
*/

bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/registry/IWorkbenchRegistryConstants.java

-24
Original file line numberDiff line numberDiff line change
@@ -810,30 +810,6 @@ public interface IWorkbenchRegistryConstants {
810810
*/
811811
String EXTENSION_VIEW_ACTIONS = PlatformUI.PLUGIN_ID + '.' + PL_VIEW_ACTIONS;
812812

813-
/**
814-
* The constant for the position attribute corresponding to
815-
* {@link SOrder#POSITION_AFTER}.
816-
*/
817-
String POSITION_AFTER = "after"; //$NON-NLS-1$
818-
819-
/**
820-
* The constant for the position attribute corresponding to
821-
* {@link SOrder#POSITION_BEFORE}.
822-
*/
823-
String POSITION_BEFORE = "before"; //$NON-NLS-1$
824-
825-
/**
826-
* The constant for the position attribute corresponding to
827-
* {@link SOrder#POSITION_END}.
828-
*/
829-
String POSITION_END = "end"; //$NON-NLS-1$
830-
831-
/**
832-
* The constant for the position attribute corresponding to
833-
* {@link SOrder#POSITION_START}.
834-
*/
835-
String POSITION_START = "start"; //$NON-NLS-1$
836-
837813
/**
838814
* The action style for drop-down menus.
839815
*/

bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/themes/ColorsAndFontsPreferencePage.java

-1
Original file line numberDiff line numberDiff line change
@@ -514,7 +514,6 @@ private boolean isDefault(IThemeElementDefinition def) {
514514
* Returns the DEFINITION_NOT_AVAIL_COLOR color when definition is not present
515515
* in the current theme or null when it is available
516516
*
517-
* @param def the definition
518517
* @return the DEFINITION_NOT_AVAIL_COLOR color or null
519518
*/
520519
@Override

0 commit comments

Comments
 (0)