aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars Vogel2018-04-26 12:36:23 -0400
committerLars Vogel2018-04-26 12:44:16 -0400
commitd34f0b7771fb506cf7a94b4032f48e53f88ad53d (patch)
treefa61b58fa1117b99b7115f9525d9ecc748ed34be
parent78a1ea04305717f1a9b8102d1e60cd703eb2e46b (diff)
downloadeclipse.platform.runtime-d34f0b7771fb506cf7a94b4032f48e53f88ad53d.tar.gz
eclipse.platform.runtime-d34f0b7771fb506cf7a94b4032f48e53f88ad53d.tar.xz
eclipse.platform.runtime-d34f0b7771fb506cf7a94b4032f48e53f88ad53d.zip
Remove redundant modifiers from org.eclipse.core.expressions
Includes activation of the save action Change-Id: I3a4ca3373771e24742b87fc9ddd5e97fb810e6a8 Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>
-rw-r--r--bundles/org.eclipse.core.contenttype/.settings/org.eclipse.jdt.ui.prefs1
-rw-r--r--bundles/org.eclipse.core.contenttype/src/org/eclipse/core/internal/content/ContentTypeVisitor.java2
-rw-r--r--bundles/org.eclipse.core.contenttype/src/org/eclipse/core/internal/content/IContentConstants.java4
-rw-r--r--bundles/org.eclipse.core.contenttype/src/org/eclipse/core/internal/content/IContentTypeInfo.java4
-rw-r--r--bundles/org.eclipse.core.contenttype/src/org/eclipse/core/internal/content/ILazySource.java4
-rw-r--r--bundles/org.eclipse.core.contenttype/src/org/eclipse/core/internal/content/XMLRootHandler.java18
-rw-r--r--bundles/org.eclipse.core.contenttype/src/org/eclipse/core/runtime/content/IContentDescriber.java10
-rw-r--r--bundles/org.eclipse.core.contenttype/src/org/eclipse/core/runtime/content/IContentDescription.java22
-rw-r--r--bundles/org.eclipse.core.contenttype/src/org/eclipse/core/runtime/content/IContentType.java37
-rw-r--r--bundles/org.eclipse.core.contenttype/src/org/eclipse/core/runtime/content/IContentTypeManager.java18
-rw-r--r--bundles/org.eclipse.core.contenttype/src/org/eclipse/core/runtime/content/IContentTypeMatcher.java12
-rw-r--r--bundles/org.eclipse.core.contenttype/src/org/eclipse/core/runtime/content/IContentTypeSettings.java22
-rw-r--r--bundles/org.eclipse.core.contenttype/src/org/eclipse/core/runtime/content/ITextContentDescriber.java2
-rw-r--r--bundles/org.eclipse.core.expressions/.settings/org.eclipse.jdt.ui.prefs1
-rw-r--r--bundles/org.eclipse.core.expressions/src/org/eclipse/core/expressions/ICountable.java2
-rw-r--r--bundles/org.eclipse.core.expressions/src/org/eclipse/core/expressions/IEvaluationContext.java20
-rw-r--r--bundles/org.eclipse.core.expressions/src/org/eclipse/core/expressions/IIterable.java2
-rw-r--r--bundles/org.eclipse.core.expressions/src/org/eclipse/core/expressions/IPropertyTester.java10
-rw-r--r--bundles/org.eclipse.core.expressions/src/org/eclipse/core/expressions/IVariableResolver.java2
19 files changed, 96 insertions, 97 deletions
diff --git a/bundles/org.eclipse.core.contenttype/.settings/org.eclipse.jdt.ui.prefs b/bundles/org.eclipse.core.contenttype/.settings/org.eclipse.jdt.ui.prefs
index 9e6712ce3..5a3ad42cd 100644
--- a/bundles/org.eclipse.core.contenttype/.settings/org.eclipse.jdt.ui.prefs
+++ b/bundles/org.eclipse.core.contenttype/.settings/org.eclipse.jdt.ui.prefs
@@ -100,6 +100,7 @@ sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=
sp_cleanup.qualify_static_member_accesses_with_declaring_class=false
sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
sp_cleanup.remove_private_constructors=false
+sp_cleanup.remove_redundant_modifiers=true
sp_cleanup.remove_redundant_type_arguments=false
sp_cleanup.remove_trailing_whitespaces=true
sp_cleanup.remove_trailing_whitespaces_all=true
diff --git a/bundles/org.eclipse.core.contenttype/src/org/eclipse/core/internal/content/ContentTypeVisitor.java b/bundles/org.eclipse.core.contenttype/src/org/eclipse/core/internal/content/ContentTypeVisitor.java
index 72e8c1c37..2ca6829d9 100644
--- a/bundles/org.eclipse.core.contenttype/src/org/eclipse/core/internal/content/ContentTypeVisitor.java
+++ b/bundles/org.eclipse.core.contenttype/src/org/eclipse/core/internal/content/ContentTypeVisitor.java
@@ -18,5 +18,5 @@ public interface ContentTypeVisitor {
/**
* @return CONTINUE, RETURN or STOP
*/
- public int visit(ContentType contentType);
+ int visit(ContentType contentType);
}
diff --git a/bundles/org.eclipse.core.contenttype/src/org/eclipse/core/internal/content/IContentConstants.java b/bundles/org.eclipse.core.contenttype/src/org/eclipse/core/internal/content/IContentConstants.java
index b9afcf63b..e386c4e32 100644
--- a/bundles/org.eclipse.core.contenttype/src/org/eclipse/core/internal/content/IContentConstants.java
+++ b/bundles/org.eclipse.core.contenttype/src/org/eclipse/core/internal/content/IContentConstants.java
@@ -19,11 +19,11 @@ public interface IContentConstants {
/**
* Backward compatibility: name of the original runtime plugin
*/
- public static final String RUNTIME_NAME = "org.eclipse.core.runtime"; //$NON-NLS-1$
+ String RUNTIME_NAME = "org.eclipse.core.runtime"; //$NON-NLS-1$
/**
* Name of this plugin
*/
- public static final String CONTENT_NAME = "org.eclipse.core.contenttype"; //$NON-NLS-1$
+ String CONTENT_NAME = "org.eclipse.core.contenttype"; //$NON-NLS-1$
}
diff --git a/bundles/org.eclipse.core.contenttype/src/org/eclipse/core/internal/content/IContentTypeInfo.java b/bundles/org.eclipse.core.contenttype/src/org/eclipse/core/internal/content/IContentTypeInfo.java
index 3021ac613..e8dc8310d 100644
--- a/bundles/org.eclipse.core.contenttype/src/org/eclipse/core/internal/content/IContentTypeInfo.java
+++ b/bundles/org.eclipse.core.contenttype/src/org/eclipse/core/internal/content/IContentTypeInfo.java
@@ -19,11 +19,11 @@ public abstract interface IContentTypeInfo {
/**
* Returns a reference to the corresponding content type.
*/
- public abstract ContentType getContentType();
+ ContentType getContentType();
/**
* Returns the default value for the given property, delegating to the
* ancestor type if necessary.
*/
- public abstract String getDefaultProperty(QualifiedName key);
+ String getDefaultProperty(QualifiedName key);
}
diff --git a/bundles/org.eclipse.core.contenttype/src/org/eclipse/core/internal/content/ILazySource.java b/bundles/org.eclipse.core.contenttype/src/org/eclipse/core/internal/content/ILazySource.java
index 9fd9d45a1..22fb2402e 100644
--- a/bundles/org.eclipse.core.contenttype/src/org/eclipse/core/internal/content/ILazySource.java
+++ b/bundles/org.eclipse.core.contenttype/src/org/eclipse/core/internal/content/ILazySource.java
@@ -19,10 +19,10 @@ public interface ILazySource {
/**
* @return a boolean indicating whether this stream is character or byte-based
*/
- public boolean isText();
+ boolean isText();
/**
* Rewinds the stream.
*/
- public void rewind();
+ void rewind();
}
diff --git a/bundles/org.eclipse.core.contenttype/src/org/eclipse/core/internal/content/XMLRootHandler.java b/bundles/org.eclipse.core.contenttype/src/org/eclipse/core/internal/content/XMLRootHandler.java
index 457b51b59..d2c0bab94 100644
--- a/bundles/org.eclipse.core.contenttype/src/org/eclipse/core/internal/content/XMLRootHandler.java
+++ b/bundles/org.eclipse.core.contenttype/src/org/eclipse/core/internal/content/XMLRootHandler.java
@@ -78,7 +78,7 @@ public final class XMLRootHandler extends DefaultHandler implements LexicalHandl
}
@Override
- public final void comment(final char[] ch, final int start, final int length) {
+ public void comment(final char[] ch, final int start, final int length) {
// Not interested.
}
@@ -98,7 +98,7 @@ public final class XMLRootHandler extends DefaultHandler implements LexicalHandl
* If the <code>XMLReader</code> does not support the lexical
* handler configuration option.
*/
- private final SAXParser createParser(SAXParserFactory parserFactory) throws ParserConfigurationException, SAXException, SAXNotRecognizedException, SAXNotSupportedException {
+ private SAXParser createParser(SAXParserFactory parserFactory) throws ParserConfigurationException, SAXException, SAXNotRecognizedException, SAXNotSupportedException {
// Initialize the parser.
final SAXParser parser = parserFactory.newSAXParser();
final XMLReader reader = parser.getXMLReader();
@@ -117,17 +117,17 @@ public final class XMLRootHandler extends DefaultHandler implements LexicalHandl
}
@Override
- public final void endCDATA() {
+ public void endCDATA() {
// Not interested.
}
@Override
- public final void endDTD() {
+ public void endDTD() {
// Not interested.
}
@Override
- public final void endEntity(final String name) {
+ public void endEntity(final String name) {
// Not interested.
}
@@ -174,12 +174,12 @@ public final class XMLRootHandler extends DefaultHandler implements LexicalHandl
}
@Override
- public final void startCDATA() {
+ public void startCDATA() {
// Not interested.
}
@Override
- public final void startDTD(final String name, final String publicId, final String systemId) throws SAXException {
+ public void startDTD(final String name, final String publicId, final String systemId) throws SAXException {
dtdFound = systemId;
// If we don't care about the top-level element, we can stop here.
if (!checkRoot)
@@ -187,14 +187,14 @@ public final class XMLRootHandler extends DefaultHandler implements LexicalHandl
}
@Override
- public final void startElement(final String uri, final String elementName, final String qualifiedName, final Attributes attributes) throws SAXException {
+ public void startElement(final String uri, final String elementName, final String qualifiedName, final Attributes attributes) throws SAXException {
elementFound = elementName;
namespaceFound = uri;
throw new StopParsingException();
}
@Override
- public final void startEntity(final String name) {
+ public void startEntity(final String name) {
// Not interested.
}
}
diff --git a/bundles/org.eclipse.core.contenttype/src/org/eclipse/core/runtime/content/IContentDescriber.java b/bundles/org.eclipse.core.contenttype/src/org/eclipse/core/runtime/content/IContentDescriber.java
index 905f29664..e9532b277 100644
--- a/bundles/org.eclipse.core.contenttype/src/org/eclipse/core/runtime/content/IContentDescriber.java
+++ b/bundles/org.eclipse.core.contenttype/src/org/eclipse/core/runtime/content/IContentDescriber.java
@@ -45,21 +45,21 @@ public interface IContentDescriber {
*
* @see #describe
*/
- public final static int INDETERMINATE = 1;
+ int INDETERMINATE = 1;
/**
* Description result constant, indicating the contents are invalid for
* the intended content type.
*
* @see #describe
*/
- public final static int INVALID = 0;
+ int INVALID = 0;
/**
* Description result constant, indicating the contents are valid for
* the intended content type.
*
* @see #describe
*/
- public final static int VALID = 2;
+ int VALID = 2;
/**
* Tries to fill a description for the given contents. Returns
@@ -86,7 +86,7 @@ public interface IContentDescriber {
* @see #INVALID
* @see #INDETERMINATE
*/
- public int describe(InputStream contents, IContentDescription description) throws IOException;
+ int describe(InputStream contents, IContentDescription description) throws IOException;
/**
* Returns the properties supported by this describer.
@@ -94,5 +94,5 @@ public interface IContentDescriber {
* @return the supported properties
* @see #describe
*/
- public QualifiedName[] getSupportedOptions();
+ QualifiedName[] getSupportedOptions();
}
diff --git a/bundles/org.eclipse.core.contenttype/src/org/eclipse/core/runtime/content/IContentDescription.java b/bundles/org.eclipse.core.contenttype/src/org/eclipse/core/runtime/content/IContentDescription.java
index 0632820db..c7b2c3057 100644
--- a/bundles/org.eclipse.core.contenttype/src/org/eclipse/core/runtime/content/IContentDescription.java
+++ b/bundles/org.eclipse.core.contenttype/src/org/eclipse/core/runtime/content/IContentDescription.java
@@ -48,31 +48,31 @@ public interface IContentDescription {
/**
* Key for the "charset" property.
*/
- public final static QualifiedName CHARSET = new QualifiedName(IContentConstants.RUNTIME_NAME, "charset"); //$NON-NLS-1$
+ QualifiedName CHARSET = new QualifiedName(IContentConstants.RUNTIME_NAME, "charset"); //$NON-NLS-1$
/**
* Key for the "byte order mark" property. This property is only meaningful
* when describing byte streams.
*/
- public final static QualifiedName BYTE_ORDER_MARK = new QualifiedName(IContentConstants.RUNTIME_NAME, "bom"); //$NON-NLS-1$
+ QualifiedName BYTE_ORDER_MARK = new QualifiedName(IContentConstants.RUNTIME_NAME, "bom"); //$NON-NLS-1$
/**
* Options constant meaning that all properties should be described.
*/
- public final static QualifiedName[] ALL = null;
+ QualifiedName[] ALL = null;
/**
* Constant that identifies the Byte-Order-Mark for contents encoded with
* the UTF-8 character encoding scheme.
*/
- public final static byte[] BOM_UTF_8 = {(byte) 0xEF, (byte) 0xBB, (byte) 0xBF};
+ byte[] BOM_UTF_8 = {(byte) 0xEF, (byte) 0xBB, (byte) 0xBF};
/**
* Constant that identifies the Byte-Order-Mark for contents encoded with
* the UTF-16 Big Endian character encoding scheme.
*/
- public final static byte[] BOM_UTF_16BE = {(byte) 0xFE, (byte) 0xFF};
+ byte[] BOM_UTF_16BE = {(byte) 0xFE, (byte) 0xFF};
/**
* Constant that identifies the Byte-Order-Mark for contents encoded with
* the UTF-16 Little Endian character encoding scheme.
*/
- public final static byte[] BOM_UTF_16LE = {(byte) 0xFF, (byte) 0xFE};
+ byte[] BOM_UTF_16LE = {(byte) 0xFF, (byte) 0xFE};
/**
* Returns whether the given property is requested to be described. This
@@ -83,7 +83,7 @@ public interface IContentDescription {
* @return <code>true</code> if the property is to be described,
* <code>false</code> otherwise
*/
- public boolean isRequested(QualifiedName key);
+ boolean isRequested(QualifiedName key);
/**
* Returns the charset name to be used when reading the contents
@@ -97,7 +97,7 @@ public interface IContentDescription {
* </p>
* @return a charset name, or <code>null</code>
*/
- public String getCharset();
+ String getCharset();
/**
* Returns the content type detected. Returns <code>null</code> if the
@@ -105,7 +105,7 @@ public interface IContentDescription {
*
* @return the corresponding content type, or <code>null</code>
*/
- public IContentType getContentType();
+ IContentType getContentType();
/**
* Returns the value of custom property set by the content describer,
@@ -119,7 +119,7 @@ public interface IContentDescription {
* @return the property value, or <code>null</code>, if the property is not
* found
*/
- public Object getProperty(QualifiedName key);
+ Object getProperty(QualifiedName key);
/**
* Sets the given property to the given value.
@@ -139,5 +139,5 @@ public interface IContentDescription {
* @throws IllegalStateException if called after this description has been
* filled in
*/
- public void setProperty(QualifiedName key, Object value);
+ void setProperty(QualifiedName key, Object value);
}
diff --git a/bundles/org.eclipse.core.contenttype/src/org/eclipse/core/runtime/content/IContentType.java b/bundles/org.eclipse.core.contenttype/src/org/eclipse/core/runtime/content/IContentType.java
index 953ea0c67..2163dc748 100644
--- a/bundles/org.eclipse.core.contenttype/src/org/eclipse/core/runtime/content/IContentType.java
+++ b/bundles/org.eclipse.core.contenttype/src/org/eclipse/core/runtime/content/IContentType.java
@@ -27,20 +27,20 @@ public interface IContentType extends IContentTypeSettings {
* File spec type flag constant, indicating that predefined file
* specifications should not be taken into account.
*/
- public static final int IGNORE_PRE_DEFINED = 0b1;
+ int IGNORE_PRE_DEFINED = 0b1;
/**
* File spec type flag constant, indicating that user-defined file
* specifications should not be taken into account.
*/
- public static final int IGNORE_USER_DEFINED = 0b10;
+ int IGNORE_USER_DEFINED = 0b10;
/**
* File spec type constant, indicating a file name specification.
*/
- public static final int FILE_NAME_SPEC = 0b100;
+ int FILE_NAME_SPEC = 0b100;
/**
* File spec type constant, indicating a file extension specification.
*/
- public static final int FILE_EXTENSION_SPEC = 0b1000;
+ int FILE_EXTENSION_SPEC = 0b1000;
/**
* File spec type constant, indicating a file name pattern specification.
* <code>?</code> represents any single character, <code>*<code> represent any
@@ -48,7 +48,7 @@ public interface IContentType extends IContentTypeSettings {
*
* @since 3.7
*/
- public static final int FILE_PATTERN_SPEC = 0b10000;
+ int FILE_PATTERN_SPEC = 0b10000;
/**
* Returns a reference to this content type's base type. If this content type
@@ -56,7 +56,7 @@ public interface IContentType extends IContentTypeSettings {
*
* @return this content type's base type, or <code>null</code>
*/
- public IContentType getBaseType();
+ IContentType getBaseType();
/**
* Returns the default content description for this content type. A default
@@ -73,7 +73,7 @@ public interface IContentType extends IContentTypeSettings {
* @return a content description
* @since 3.1
*/
- public IContentDescription getDefaultDescription();
+ IContentDescription getDefaultDescription();
/**
* Tries to obtain a description for the given contents.
@@ -90,7 +90,7 @@ public interface IContentType extends IContentTypeSettings {
* @throws IOException if an error occurs while reading the contents
* @see IContentDescription
*/
- public IContentDescription getDescriptionFor(InputStream contents, QualifiedName[] options) throws IOException;
+ IContentDescription getDescriptionFor(InputStream contents, QualifiedName[] options) throws IOException;
/**
* Tries to obtain a description for the given contents.
@@ -110,7 +110,7 @@ public interface IContentType extends IContentTypeSettings {
* @throws IOException if an error occurs while reading the contents
* @see IContentDescription
*/
- public IContentDescription getDescriptionFor(Reader contents, QualifiedName[] options) throws IOException;
+ IContentDescription getDescriptionFor(Reader contents, QualifiedName[] options) throws IOException;
/**
* Returns the default charset for this content type if one has been defined,
@@ -121,8 +121,7 @@ public interface IContentType extends IContentTypeSettings {
*
* @return the default charset, or <code>null</code>
*/
- @Override
- public String getDefaultCharset();
+ @Override String getDefaultCharset();
/**
* Returns file specifications from this content type. The type mask
@@ -147,8 +146,7 @@ public interface IContentType extends IContentTypeSettings {
* @see #IGNORE_PRE_DEFINED
* @see #IGNORE_USER_DEFINED
*/
- @Override
- public String[] getFileSpecs(int type);
+ @Override String[] getFileSpecs(int type);
/**
* Returns this content type's unique identifier. Each content type has an
@@ -156,15 +154,14 @@ public interface IContentType extends IContentTypeSettings {
*
* @return this content type's unique identifier
*/
- @Override
- public String getId();
+ @Override String getId();
/**
* Returns a user-friendly name for this content type.
*
* @return this content type's name
*/
- public String getName();
+ String getName();
/**
* Returns whether this content type is associated with the
@@ -175,7 +172,7 @@ public interface IContentType extends IContentTypeSettings {
* the given file name, <code>false</code> otherwise
* @see #isAssociatedWith(String, IScopeContext)
*/
- public boolean isAssociatedWith(String fileName);
+ boolean isAssociatedWith(String fileName);
/**
* Returns whether this content type is associated with the
@@ -187,7 +184,7 @@ public interface IContentType extends IContentTypeSettings {
* the given file name, <code>false</code> otherwise
* @since 3.1
*/
- public boolean isAssociatedWith(String fileName, IScopeContext context);
+ boolean isAssociatedWith(String fileName, IScopeContext context);
/**
* Returns whether this content type is a kind of the given content
@@ -202,7 +199,7 @@ public interface IContentType extends IContentTypeSettings {
* @return <code>true</code> if this content type is a kind of the
* given content type, <code>false</code> otherwise
*/
- public boolean isKindOf(IContentType another);
+ boolean isKindOf(IContentType another);
/**
* Returns the settings for this content type in the given
@@ -216,5 +213,5 @@ public interface IContentType extends IContentTypeSettings {
* </ul>
* @since 3.1
*/
- public IContentTypeSettings getSettings(IScopeContext context) throws CoreException;
+ IContentTypeSettings getSettings(IScopeContext context) throws CoreException;
}
diff --git a/bundles/org.eclipse.core.contenttype/src/org/eclipse/core/runtime/content/IContentTypeManager.java b/bundles/org.eclipse.core.contenttype/src/org/eclipse/core/runtime/content/IContentTypeManager.java
index 246a2c61d..74bbd58f0 100644
--- a/bundles/org.eclipse.core.contenttype/src/org/eclipse/core/runtime/content/IContentTypeManager.java
+++ b/bundles/org.eclipse.core.contenttype/src/org/eclipse/core/runtime/content/IContentTypeManager.java
@@ -113,7 +113,7 @@ public interface IContentTypeManager extends IContentTypeMatcher {
*
* @param event the content type change event
*/
- public void contentTypeChanged(ContentTypeChangeEvent event);
+ void contentTypeChanged(ContentTypeChangeEvent event);
}
/**
@@ -163,7 +163,7 @@ public interface IContentTypeManager extends IContentTypeMatcher {
* </pre>
* </p>
*/
- public final static String CT_TEXT = "org.eclipse.core.runtime.text"; //$NON-NLS-1$
+ String CT_TEXT = "org.eclipse.core.runtime.text"; //$NON-NLS-1$
/**
* Register the given listener for notification of content type changes.
@@ -174,7 +174,7 @@ public interface IContentTypeManager extends IContentTypeMatcher {
* @see #removeContentTypeChangeListener(IContentTypeManager.IContentTypeChangeListener)
* @see IContentTypeManager.IContentTypeChangeListener
*/
- public void addContentTypeChangeListener(IContentTypeChangeListener listener);
+ void addContentTypeChangeListener(IContentTypeChangeListener listener);
/**
* Returns all content types known by the platform.
@@ -184,7 +184,7 @@ public interface IContentTypeManager extends IContentTypeMatcher {
*
* @return all content types known by the platform.
*/
- public IContentType[] getAllContentTypes();
+ IContentType[] getAllContentTypes();
/**
* Returns the content type with the given identifier, or <code>null</code>
@@ -193,7 +193,7 @@ public interface IContentTypeManager extends IContentTypeMatcher {
* @param contentTypeIdentifier the identifier for the content type
* @return the content type, or <code>null</code>
*/
- public IContentType getContentType(String contentTypeIdentifier);
+ IContentType getContentType(String contentTypeIdentifier);
/**
* Returns a newly created content type matcher using the given content type selection policy
@@ -205,7 +205,7 @@ public interface IContentTypeManager extends IContentTypeMatcher {
* @return a content type matcher that uses the given policy
* @since 3.1
*/
- public IContentTypeMatcher getMatcher(ISelectionPolicy customPolicy, IScopeContext context);
+ IContentTypeMatcher getMatcher(ISelectionPolicy customPolicy, IScopeContext context);
/**
* De-register the given listener from receiving notification of content type changes.
@@ -216,7 +216,7 @@ public interface IContentTypeManager extends IContentTypeMatcher {
* @see #addContentTypeChangeListener(IContentTypeManager.IContentTypeChangeListener)
* @see IContentTypeManager.IContentTypeChangeListener
*/
- public void removeContentTypeChangeListener(IContentTypeChangeListener listener);
+ void removeContentTypeChangeListener(IContentTypeChangeListener listener);
/**
* Adds a new content-type to the registry. The content-type identifier
@@ -234,7 +234,7 @@ public interface IContentTypeManager extends IContentTypeMatcher {
* If the type was not added due to an internal error.
* @since 3.6
*/
- public IContentType addContentType(String contentTypeIdentifier, String name, IContentType baseType)
+ IContentType addContentType(String contentTypeIdentifier, String name, IContentType baseType)
throws CoreException;
/**
@@ -257,5 +257,5 @@ public interface IContentTypeManager extends IContentTypeMatcher {
* removed.
* @since 3.6
*/
- public void removeContentType(String contentTypeIdentifier) throws CoreException;
+ void removeContentType(String contentTypeIdentifier) throws CoreException;
}
diff --git a/bundles/org.eclipse.core.contenttype/src/org/eclipse/core/runtime/content/IContentTypeMatcher.java b/bundles/org.eclipse.core.contenttype/src/org/eclipse/core/runtime/content/IContentTypeMatcher.java
index 41d6d8a4f..35a985fca 100644
--- a/bundles/org.eclipse.core.contenttype/src/org/eclipse/core/runtime/content/IContentTypeMatcher.java
+++ b/bundles/org.eclipse.core.contenttype/src/org/eclipse/core/runtime/content/IContentTypeMatcher.java
@@ -46,7 +46,7 @@ public interface IContentTypeMatcher {
* @return the preferred content type associated to the given file name, or <code>null</code>
* @throws IOException if an error occurs while reading the contents
*/
- public IContentType findContentTypeFor(InputStream contents, String fileName) throws IOException;
+ IContentType findContentTypeFor(InputStream contents, String fileName) throws IOException;
/**
* Returns the preferred content type for the given file name. If multiple content types
@@ -56,7 +56,7 @@ public interface IContentTypeMatcher {
* @param fileName the name of the file
* @return the preferred content type associated to the given file name, or <code>null</code>
*/
- public IContentType findContentTypeFor(String fileName);
+ IContentType findContentTypeFor(String fileName);
/**
* Returns the content types associated to the given contents and file name.
@@ -79,7 +79,7 @@ public interface IContentTypeMatcher {
* @return all content types associated to the given contents and file name
* @throws IOException if an error occurs while reading the contents
*/
- public IContentType[] findContentTypesFor(InputStream contents, String fileName) throws IOException;
+ IContentType[] findContentTypesFor(InputStream contents, String fileName) throws IOException;
/**
* Returns all content types known by the platform that are associated to the given file name.
@@ -90,7 +90,7 @@ public interface IContentTypeMatcher {
* @param fileName the name of the file
* @return all content types associated to the given file spec
*/
- public IContentType[] findContentTypesFor(String fileName);
+ IContentType[] findContentTypesFor(String fileName);
/**
* Tries to obtain a description for the given contents and file name.
@@ -113,7 +113,7 @@ public interface IContentTypeMatcher {
* @throws IOException if an error occurs while reading the contents
* @see IContentDescription
*/
- public IContentDescription getDescriptionFor(InputStream contents, String fileName, QualifiedName[] options) throws IOException;
+ IContentDescription getDescriptionFor(InputStream contents, String fileName, QualifiedName[] options) throws IOException;
/**
* Tries to obtain a description for the given contents and file name.
@@ -136,5 +136,5 @@ public interface IContentTypeMatcher {
* @throws IOException if an error occurs while reading the contents
* @see IContentDescription
*/
- public IContentDescription getDescriptionFor(Reader contents, String fileName, QualifiedName[] options) throws IOException;
+ IContentDescription getDescriptionFor(Reader contents, String fileName, QualifiedName[] options) throws IOException;
} \ No newline at end of file
diff --git a/bundles/org.eclipse.core.contenttype/src/org/eclipse/core/runtime/content/IContentTypeSettings.java b/bundles/org.eclipse.core.contenttype/src/org/eclipse/core/runtime/content/IContentTypeSettings.java
index 8156e7a1a..a8ffaedfc 100644
--- a/bundles/org.eclipse.core.contenttype/src/org/eclipse/core/runtime/content/IContentTypeSettings.java
+++ b/bundles/org.eclipse.core.contenttype/src/org/eclipse/core/runtime/content/IContentTypeSettings.java
@@ -28,18 +28,18 @@ public interface IContentTypeSettings {
/**
* File spec type constant, indicating a file extension specification.
*/
- public static final int FILE_EXTENSION_SPEC = 0b1000;
+ int FILE_EXTENSION_SPEC = 0b1000;
/**
* File spec type constant, indicating a file name specification.
*/
- public static final int FILE_NAME_SPEC = 0b100;
+ int FILE_NAME_SPEC = 0b100;
/**
* File spec type constant, indicating a file pattern specification
- *
+ *
* @since 3.7
*/
- public static final int FILE_PATTERN_SPEC = 0b10000;
+ int FILE_PATTERN_SPEC = 0b10000;
/**
* Adds a user-defined file specification to the corresponding content type. Has no
@@ -60,7 +60,7 @@ public interface IContentTypeSettings {
* @see #FILE_EXTENSION_SPEC
* @see #FILE_PATTERN_SPEC
*/
- public void addFileSpec(String fileSpec, int type) throws CoreException;
+ void addFileSpec(String fileSpec, int type) throws CoreException;
/**
* Returns the default charset for the corresponding content type if
@@ -69,7 +69,7 @@ public interface IContentTypeSettings {
*
* @return the default charset, or <code>null</code>
*/
- public String getDefaultCharset();
+ String getDefaultCharset();
/**
* Returns the file specifications for the corresponding content type. The type mask
@@ -83,7 +83,7 @@ public interface IContentTypeSettings {
* @see #FILE_NAME_SPEC
* @see #FILE_EXTENSION_SPEC
*/
- public String[] getFileSpecs(int type);
+ String[] getFileSpecs(int type);
/**
* Returns the corresponding content type's unique identifier. Each content
@@ -92,7 +92,7 @@ public interface IContentTypeSettings {
*
* @return the content type unique identifier
*/
- public String getId();
+ String getId();
/**
* Removes a user-defined file specification from the corresponding content type. Has no
@@ -111,7 +111,7 @@ public interface IContentTypeSettings {
* @see #FILE_NAME_SPEC
* @see #FILE_EXTENSION_SPEC
*/
- public void removeFileSpec(String fileSpec, int type) throws CoreException;
+ void removeFileSpec(String fileSpec, int type) throws CoreException;
/**
* Sets the default charset for the corresponding content type. If
@@ -124,12 +124,12 @@ public interface IContentTypeSettings {
* <li> An error occurred persisting this setting.</li>
* </ul>
*/
- public void setDefaultCharset(String userCharset) throws CoreException;
+ void setDefaultCharset(String userCharset) throws CoreException;
/**
* @return whether the content-type was defined via user action, using
* {@link IContentTypeManager#addContentType(String, String, IContentType)}
* @since 3.6
*/
- public boolean isUserDefined();
+ boolean isUserDefined();
}
diff --git a/bundles/org.eclipse.core.contenttype/src/org/eclipse/core/runtime/content/ITextContentDescriber.java b/bundles/org.eclipse.core.contenttype/src/org/eclipse/core/runtime/content/ITextContentDescriber.java
index bd248a5eb..793ecac33 100644
--- a/bundles/org.eclipse.core.contenttype/src/org/eclipse/core/runtime/content/ITextContentDescriber.java
+++ b/bundles/org.eclipse.core.contenttype/src/org/eclipse/core/runtime/content/ITextContentDescriber.java
@@ -60,5 +60,5 @@ public interface ITextContentDescriber extends IContentDescriber {
* @see #INVALID
* @see #INDETERMINATE
*/
- public int describe(Reader contents, IContentDescription description) throws IOException;
+ int describe(Reader contents, IContentDescription description) throws IOException;
}
diff --git a/bundles/org.eclipse.core.expressions/.settings/org.eclipse.jdt.ui.prefs b/bundles/org.eclipse.core.expressions/.settings/org.eclipse.jdt.ui.prefs
index 4b1a42dc6..9296978d6 100644
--- a/bundles/org.eclipse.core.expressions/.settings/org.eclipse.jdt.ui.prefs
+++ b/bundles/org.eclipse.core.expressions/.settings/org.eclipse.jdt.ui.prefs
@@ -103,6 +103,7 @@ sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=
sp_cleanup.qualify_static_member_accesses_with_declaring_class=false
sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
sp_cleanup.remove_private_constructors=false
+sp_cleanup.remove_redundant_modifiers=true
sp_cleanup.remove_redundant_type_arguments=false
sp_cleanup.remove_trailing_whitespaces=true
sp_cleanup.remove_trailing_whitespaces_all=true
diff --git a/bundles/org.eclipse.core.expressions/src/org/eclipse/core/expressions/ICountable.java b/bundles/org.eclipse.core.expressions/src/org/eclipse/core/expressions/ICountable.java
index f8f6b455c..a1f461b96 100644
--- a/bundles/org.eclipse.core.expressions/src/org/eclipse/core/expressions/ICountable.java
+++ b/bundles/org.eclipse.core.expressions/src/org/eclipse/core/expressions/ICountable.java
@@ -29,5 +29,5 @@ public interface ICountable {
*
* @return the number of elements
*/
- public int count();
+ int count();
} \ No newline at end of file
diff --git a/bundles/org.eclipse.core.expressions/src/org/eclipse/core/expressions/IEvaluationContext.java b/bundles/org.eclipse.core.expressions/src/org/eclipse/core/expressions/IEvaluationContext.java
index 7e7721b64..e09adb91c 100644
--- a/bundles/org.eclipse.core.expressions/src/org/eclipse/core/expressions/IEvaluationContext.java
+++ b/bundles/org.eclipse.core.expressions/src/org/eclipse/core/expressions/IEvaluationContext.java
@@ -37,7 +37,7 @@ public interface IEvaluationContext {
*
* @since 3.4
*/
- public static Object UNDEFINED_VARIABLE = new Object();
+ Object UNDEFINED_VARIABLE = new Object();
/**
* Returns the parent context or <code>null</code> if
@@ -45,14 +45,14 @@ public interface IEvaluationContext {
*
* @return the parent evaluation context or <code>null</code>
*/
- public IEvaluationContext getParent();
+ IEvaluationContext getParent();
/**
* Returns the root evaluation context.
*
* @return the root evaluation context
*/
- public IEvaluationContext getRoot();
+ IEvaluationContext getRoot();
/**
* Specifies whether this evaluation context allows activation
@@ -65,7 +65,7 @@ public interface IEvaluationContext {
* @param value whether this evaluation context allows plug-in activation
* @since 3.2
*/
- public void setAllowPluginActivation(boolean value);
+ void setAllowPluginActivation(boolean value);
/**
* Returns whether this evaluation context supports plug-in
@@ -76,7 +76,7 @@ public interface IEvaluationContext {
* @return whether plug-in activation is supported or not
* @since 3.2
*/
- public boolean getAllowPluginActivation();
+ boolean getAllowPluginActivation();
/**
* Returns the default variable.
@@ -84,7 +84,7 @@ public interface IEvaluationContext {
* @return the default variable or <code>null</code> if
* no default variable is managed.
*/
- public Object getDefaultVariable();
+ Object getDefaultVariable();
/**
* Adds a new named variable to this context. If a variable
@@ -94,7 +94,7 @@ public interface IEvaluationContext {
* @param name the variable's name
* @param value the variable's value
*/
- public void addVariable(String name, Object value);
+ void addVariable(String name, Object value);
/**
* Removes the variable managed under the given name
@@ -104,7 +104,7 @@ public interface IEvaluationContext {
* @return the currently stored value or <code>null</code> if
* the variable doesn't exist
*/
- public Object removeVariable(String name);
+ Object removeVariable(String name);
/**
* Returns the variable managed under the given name.
@@ -113,7 +113,7 @@ public interface IEvaluationContext {
* @return the variable's value or <code>null</code> if the content
* doesn't manage a variable with the given name
*/
- public Object getVariable(String name);
+ Object getVariable(String name);
/**
* Resolves a variable for the given name and arguments. This
@@ -129,5 +129,5 @@ public interface IEvaluationContext {
* @exception CoreException if an errors occurs while resolving
* the variable
*/
- public Object resolveVariable(String name, Object[] args) throws CoreException;
+ Object resolveVariable(String name, Object[] args) throws CoreException;
} \ No newline at end of file
diff --git a/bundles/org.eclipse.core.expressions/src/org/eclipse/core/expressions/IIterable.java b/bundles/org.eclipse.core.expressions/src/org/eclipse/core/expressions/IIterable.java
index 50c85e413..45b24972c 100644
--- a/bundles/org.eclipse.core.expressions/src/org/eclipse/core/expressions/IIterable.java
+++ b/bundles/org.eclipse.core.expressions/src/org/eclipse/core/expressions/IIterable.java
@@ -32,5 +32,5 @@ public interface IIterable<T> {
*
* @return an iterator
*/
- public Iterator<T> iterator();
+ Iterator<T> iterator();
} \ No newline at end of file
diff --git a/bundles/org.eclipse.core.expressions/src/org/eclipse/core/expressions/IPropertyTester.java b/bundles/org.eclipse.core.expressions/src/org/eclipse/core/expressions/IPropertyTester.java
index 1a95db076..307ea96e2 100644
--- a/bundles/org.eclipse.core.expressions/src/org/eclipse/core/expressions/IPropertyTester.java
+++ b/bundles/org.eclipse.core.expressions/src/org/eclipse/core/expressions/IPropertyTester.java
@@ -36,7 +36,7 @@ public interface IPropertyTester {
* @return <code>true</code> if the tester provides an implementation
* for the given property; otherwise <code>false</code> is returned
*/
- public boolean handles(String namespace, String property);
+ boolean handles(String namespace, String property);
/**
* Returns whether the implementation class for this property tester is
@@ -45,7 +45,7 @@ public interface IPropertyTester {
* @return <code>true</code>if the implementation class is loaded;
* <code>false</code> otherwise
*/
- public boolean isInstantiated();
+ boolean isInstantiated();
/**
* Returns <code>true</code> if the implementation class of this property
@@ -54,7 +54,7 @@ public interface IPropertyTester {
*
* @return whether the implementation class can be loaded or not
*/
- public boolean isDeclaringPluginActive();
+ boolean isDeclaringPluginActive();
/**
* Loads the implementation class for this property tester and returns an
@@ -64,7 +64,7 @@ public interface IPropertyTester {
*
* @throws CoreException if the implementation class cannot be loaded
*/
- public IPropertyTester instantiate() throws CoreException;
+ IPropertyTester instantiate() throws CoreException;
/**
* Executes the property test determined by the parameter <code>property</code>.
@@ -80,5 +80,5 @@ public interface IPropertyTester {
* @return returns <code>true</code> if the property is equal to the expected value; otherwise
* <code>false</code> is returned
*/
- public boolean test(Object receiver, String property, Object[] args, Object expectedValue);
+ boolean test(Object receiver, String property, Object[] args, Object expectedValue);
}
diff --git a/bundles/org.eclipse.core.expressions/src/org/eclipse/core/expressions/IVariableResolver.java b/bundles/org.eclipse.core.expressions/src/org/eclipse/core/expressions/IVariableResolver.java
index 2adb2581d..c221863ac 100644
--- a/bundles/org.eclipse.core.expressions/src/org/eclipse/core/expressions/IVariableResolver.java
+++ b/bundles/org.eclipse.core.expressions/src/org/eclipse/core/expressions/IVariableResolver.java
@@ -35,5 +35,5 @@ public interface IVariableResolver {
* @exception CoreException if an errors occurs while resolving
* the variable
*/
- public Object resolve(String name, Object[] args) throws CoreException;
+ Object resolve(String name, Object[] args) throws CoreException;
}