Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarsten Hammer2019-05-08 15:12:45 -0400
committerAlexander Kurtakov2019-05-14 06:46:43 -0400
commit01c94e7419c45d92da9b8c012aea3d5d2c47452d (patch)
treeb7cc447981d544fd4885aa334d6aef9a48463b74
parent3a493af2ee8e4bbf2993befbf9fd50e2bfa2d000 (diff)
downloadrt.equinox.bundles-01c94e7419c45d92da9b8c012aea3d5d2c47452d.tar.gz
rt.equinox.bundles-01c94e7419c45d92da9b8c012aea3d5d2c47452d.tar.xz
rt.equinox.bundles-01c94e7419c45d92da9b8c012aea3d5d2c47452d.zip
Add @Override AnnotationI20190515-0205
Change-Id: Iabe2969d5be7221e02f06da4593d0f58aee3d23d Signed-off-by: Carsten Hammer <carsten.hammer@t-online.de>
-rw-r--r--bundles/org.eclipse.equinox.app/META-INF/MANIFEST.MF2
-rw-r--r--bundles/org.eclipse.equinox.app/osgi/org/osgi/service/application/ApplicationAdminPermission.java5
-rw-r--r--bundles/org.eclipse.equinox.app/osgi/org/osgi/service/application/ApplicationException.java1
-rw-r--r--bundles/org.eclipse.equinox.app/pom.xml2
-rw-r--r--bundles/org.eclipse.equinox.bidi/src/org/eclipse/equinox/bidi/advanced/StructuredTextEnvironment.java2
-rw-r--r--bundles/org.eclipse.equinox.bidi/src/org/eclipse/equinox/bidi/custom/StructuredTextTypeHandler.java1
-rw-r--r--bundles/org.eclipse.equinox.bidi/src/org/eclipse/equinox/bidi/internal/StructuredTextDelims.java2
-rw-r--r--bundles/org.eclipse.equinox.bidi/src/org/eclipse/equinox/bidi/internal/StructuredTextDelimsEsc.java1
-rw-r--r--bundles/org.eclipse.equinox.bidi/src/org/eclipse/equinox/bidi/internal/StructuredTextImpl.java14
-rw-r--r--bundles/org.eclipse.equinox.bidi/src/org/eclipse/equinox/bidi/internal/StructuredTextSingle.java3
-rw-r--r--bundles/org.eclipse.equinox.bidi/src/org/eclipse/equinox/bidi/internal/consumable/StructuredTextEmail.java4
-rw-r--r--bundles/org.eclipse.equinox.bidi/src/org/eclipse/equinox/bidi/internal/consumable/StructuredTextJava.java3
-rw-r--r--bundles/org.eclipse.equinox.bidi/src/org/eclipse/equinox/bidi/internal/consumable/StructuredTextRegex.java5
-rw-r--r--bundles/org.eclipse.equinox.bidi/src/org/eclipse/equinox/bidi/internal/consumable/StructuredTextSql.java3
-rw-r--r--bundles/org.eclipse.equinox.bidi/src/org/eclipse/equinox/bidi/internal/consumable/StructuredTextXPath.java2
-rw-r--r--bundles/org.eclipse.equinox.compendium.tests/src/org/eclipse/equinox/coordinator/tests/CoordinationMaxTimeoutTest.java1
-rw-r--r--bundles/org.eclipse.equinox.compendium.tests/src/org/eclipse/equinox/metatype/tests/AttributeTypePasswordTest.java1
-rw-r--r--bundles/org.eclipse.equinox.compendium.tests/src/org/eclipse/equinox/metatype/tests/Bug332161Test.java1
-rw-r--r--bundles/org.eclipse.equinox.compendium.tests/src/org/eclipse/equinox/metatype/tests/Bug395196Test.java1
-rw-r--r--bundles/org.eclipse.equinox.compendium.tests/src/org/eclipse/equinox/metatype/tests/BugTests.java1
-rw-r--r--bundles/org.eclipse.equinox.compendium.tests/src/org/eclipse/equinox/metatype/tests/ExtendableTest.java1
-rw-r--r--bundles/org.eclipse.equinox.compendium.tests/src/org/eclipse/equinox/metatype/tests/GetDefaultValueTest.java1
-rwxr-xr-xbundles/org.eclipse.equinox.compendium.tests/src/org/eclipse/equinox/metatype/tests/GetMinMaxTest.java1
-rw-r--r--bundles/org.eclipse.equinox.compendium.tests/src/org/eclipse/equinox/metatype/tests/IconTest.java1
-rwxr-xr-xbundles/org.eclipse.equinox.compendium.tests/src/org/eclipse/equinox/metatype/tests/NoADTest.java1
-rw-r--r--bundles/org.eclipse.equinox.compendium.tests/src/org/eclipse/equinox/metatype/tests/SameOcdPidFactoryPidTest.java1
-rw-r--r--bundles/org.eclipse.equinox.compendium.tests/src/org/eclipse/equinox/metatype/tests/UnresolvedBundleTest.java1
-rw-r--r--bundles/org.eclipse.equinox.concurrent/META-INF/MANIFEST.MF2
-rw-r--r--bundles/org.eclipse.equinox.concurrent/pom.xml4
-rw-r--r--bundles/org.eclipse.equinox.concurrent/src/org/eclipse/equinox/concurrent/future/SingleOperationListenableFuture.java1
-rw-r--r--bundles/org.eclipse.equinox.ds.tests/META-INF/MANIFEST.MF2
-rw-r--r--bundles/org.eclipse.equinox.ds.tests/bundles_src/tb1/org/eclipse/equinox/ds/tests/tb1/BindUnbindSuccessor.java1
-rw-r--r--bundles/org.eclipse.equinox.ds.tests/bundles_src/tb12/org/eclipse/equinox/ds/tests/tb12/Bc100.java1
-rw-r--r--bundles/org.eclipse.equinox.ds.tests/bundles_src/tb12/org/eclipse/equinox/ds/tests/tb12/Bc110.java1
-rw-r--r--bundles/org.eclipse.equinox.ds.tests/bundles_src/tb12/org/eclipse/equinox/ds/tests/tb12/NoArgs100.java1
-rw-r--r--bundles/org.eclipse.equinox.ds.tests/bundles_src/tb12/org/eclipse/equinox/ds/tests/tb12/NoArgs110.java1
-rw-r--r--bundles/org.eclipse.equinox.ds.tests/bundles_src/tb4/org/eclipse/equinox/ds/tests/tb4/impl/NamedFactory.java1
-rw-r--r--bundles/org.eclipse.equinox.ds.tests/pom.xml4
-rw-r--r--bundles/org.eclipse.equinox.ds.tests/src/org/eclipse/equinox/ds/tests/tbc/DSEvent.java1
-rw-r--r--bundles/org.eclipse.equinox.ds.tests/src/org/eclipse/equinox/ds/tests/tbc/DSTest.java5
-rw-r--r--bundles/org.eclipse.equinox.http.servlet.tests/bundles_src/tb1/org/eclipse/equinox/http/servlet/tests/tb1/TestServlet2.java1
-rw-r--r--bundles/org.eclipse.equinox.http.servlet.tests/bundles_src/tb1/org/eclipse/equinox/http/servlet/tests/tb1/TestServlet3.java1
-rw-r--r--bundles/org.eclipse.equinox.http.servlet.tests/bundles_src/tb1/org/eclipse/equinox/http/servlet/tests/tb1/TestServlet9.java1
-rw-r--r--bundles/org.eclipse.equinox.http.servlet/src/org/eclipse/equinox/http/servlet/internal/HttpServiceImpl.java2
-rw-r--r--bundles/org.eclipse.equinox.http.servlet/src/org/eclipse/equinox/http/servlet/internal/context/DispatchTargets.java1
-rw-r--r--bundles/org.eclipse.equinox.http.servlet/src/org/eclipse/equinox/http/servlet/internal/multipart/MultipartSupportImpl.java1
-rw-r--r--bundles/org.eclipse.equinox.http.servlet/src/org/eclipse/equinox/http/servlet/internal/registration/EndpointRegistration.java1
-rw-r--r--bundles/org.eclipse.equinox.http.servlet/src/org/eclipse/equinox/http/servlet/internal/registration/FilterRegistration.java2
-rw-r--r--bundles/org.eclipse.equinox.http.servlet/src/org/eclipse/equinox/http/servlet/internal/servlet/ResourceServlet.java1
-rw-r--r--bundles/org.eclipse.equinox.http.servlet/src/org/eclipse/equinox/http/servlet/internal/servlet/ServletContextAdaptor.java8
-rw-r--r--bundles/org.eclipse.equinox.metatype/src/org/eclipse/equinox/metatype/impl/AttributeDefinitionImpl.java5
-rw-r--r--bundles/org.eclipse.equinox.metatype/src/org/eclipse/equinox/metatype/impl/DataParser.java23
-rw-r--r--bundles/org.eclipse.equinox.metatype/src/org/eclipse/equinox/metatype/impl/ExtendableHelper.java2
-rw-r--r--bundles/org.eclipse.equinox.metatype/src/org/eclipse/equinox/metatype/impl/Icon.java1
-rw-r--r--bundles/org.eclipse.equinox.metatype/src/org/eclipse/equinox/metatype/impl/MetaTypeProviderTracker.java8
-rw-r--r--bundles/org.eclipse.equinox.metatype/src/org/eclipse/equinox/metatype/impl/MetaTypeServiceImpl.java2
-rw-r--r--bundles/org.eclipse.equinox.metatype/src/org/eclipse/equinox/metatype/impl/ObjectClassDefinitionImpl.java5
-rw-r--r--bundles/org.eclipse.equinox.region.tests/src/org/eclipse/equinox/region/tests/BundleInstaller.java1
-rw-r--r--bundles/org.eclipse.equinox.region.tests/src/org/eclipse/equinox/region/tests/system/Bug346127Test.java1
-rw-r--r--bundles/org.eclipse.equinox.region/META-INF/MANIFEST.MF2
-rw-r--r--bundles/org.eclipse.equinox.region/pom.xml4
-rw-r--r--bundles/org.eclipse.equinox.region/src/org/eclipse/equinox/internal/region/StandardRegionDigraph.java16
-rw-r--r--bundles/org.eclipse.equinox.region/src/org/eclipse/equinox/internal/region/StandardRegionDigraphPersistence.java2
-rw-r--r--bundles/org.eclipse.equinox.region/src/org/eclipse/equinox/internal/region/StandardRegionFilter.java5
-rw-r--r--bundles/org.eclipse.equinox.region/src/org/eclipse/equinox/internal/region/StandardRegionFilterBuilder.java3
-rw-r--r--bundles/org.eclipse.equinox.region/src/org/eclipse/equinox/internal/region/management/StandardManageableRegion.java3
-rw-r--r--bundles/org.eclipse.equinox.region/src/org/eclipse/equinox/internal/region/management/StandardManageableRegionDigraph.java4
-rw-r--r--bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/DefaultAuthorizationManager.java4
-rw-r--r--bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/SecurityStatusControl.java2
-rw-r--r--bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/storage/TabContents.java2
-rw-r--r--bundles/org.eclipse.equinox.transforms.hook/META-INF/MANIFEST.MF2
-rw-r--r--bundles/org.eclipse.equinox.transforms.hook/pom.xml2
-rw-r--r--bundles/org.eclipse.equinox.transforms.hook/src/org/eclipse/equinox/internal/transforms/LazyInputStream.java12
-rw-r--r--bundles/org.eclipse.equinox.transforms.hook/src/org/eclipse/equinox/internal/transforms/ProxyStreamTransformer.java1
-rw-r--r--bundles/org.eclipse.equinox.transforms.hook/src/org/eclipse/equinox/internal/transforms/TransformedBundleFile.java1
-rw-r--r--bundles/org.eclipse.equinox.transforms.xslt/src/org/eclipse/equinox/internal/transforms/Pipe.java6
-rw-r--r--bundles/org.eclipse.equinox.transforms.xslt/src/org/eclipse/equinox/internal/transforms/xslt/XSLTStreamTransformer.java2
-rw-r--r--bundles/org.eclipse.equinox.weaving.caching/META-INF/MANIFEST.MF2
-rw-r--r--bundles/org.eclipse.equinox.weaving.caching/pom.xml2
-rw-r--r--bundles/org.eclipse.equinox.weaving.caching/src/org/eclipse/equinox/weaving/internal/caching/CacheWriter.java1
-rw-r--r--bundles/org.eclipse.equinox.weaving.hook/META-INF/MANIFEST.MF2
-rw-r--r--bundles/org.eclipse.equinox.weaving.hook/pom.xml4
-rw-r--r--bundles/org.eclipse.equinox.weaving.hook/src/org/eclipse/equinox/weaving/hooks/SupplementerRegistry.java11
-rw-r--r--bundles/org.eclipse.equinox.weaving.hook/src/org/eclipse/equinox/weaving/hooks/WeavingHook.java3
84 files changed, 234 insertions, 18 deletions
diff --git a/bundles/org.eclipse.equinox.app/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.app/META-INF/MANIFEST.MF
index 2215eee1..8896f60b 100644
--- a/bundles/org.eclipse.equinox.app/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.equinox.app/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.equinox.app; singleton:=true
-Bundle-Version: 1.4.100.qualifier
+Bundle-Version: 1.4.200.qualifier
Bundle-Vendor: %providerName
Bundle-Activator: org.eclipse.equinox.internal.app.Activator
Bundle-Localization: plugin
diff --git a/bundles/org.eclipse.equinox.app/osgi/org/osgi/service/application/ApplicationAdminPermission.java b/bundles/org.eclipse.equinox.app/osgi/org/osgi/service/application/ApplicationAdminPermission.java
index 8c794157..d3217381 100644
--- a/bundles/org.eclipse.equinox.app/osgi/org/osgi/service/application/ApplicationAdminPermission.java
+++ b/bundles/org.eclipse.equinox.app/osgi/org/osgi/service/application/ApplicationAdminPermission.java
@@ -180,6 +180,7 @@ public class ApplicationAdminPermission extends Permission {
* @param otherPermission the implied permission
* @return true if this permission implies the {@code otherPermission}, false otherwise.
*/
+ @Override
public boolean implies(Permission otherPermission) {
if( otherPermission == null )
return false;
@@ -220,6 +221,7 @@ public class ApplicationAdminPermission extends Permission {
return true;
}
+ @Override
public boolean equals(Object with) {
if( with == null || !(with instanceof ApplicationAdminPermission) )
return false;
@@ -256,6 +258,7 @@ public class ApplicationAdminPermission extends Permission {
return a.equals(b);
}
+ @Override
public int hashCode() {
int hc = 0;
for( int i=0; i != actionsVector.size(); i++ )
@@ -270,6 +273,7 @@ public class ApplicationAdminPermission extends Permission {
* Returns the actions of this permission.
* @return the actions specified when this permission was created
*/
+ @Override
public String getActions() {
return actions;
}
@@ -318,6 +322,7 @@ public class ApplicationAdminPermission extends Permission {
this.appDesc = appDesc;
}
+ @Override
public boolean equals(Object o) {
if (!(o instanceof SignerWrapper))
return false;
diff --git a/bundles/org.eclipse.equinox.app/osgi/org/osgi/service/application/ApplicationException.java b/bundles/org.eclipse.equinox.app/osgi/org/osgi/service/application/ApplicationException.java
index be377d8e..170922ef 100644
--- a/bundles/org.eclipse.equinox.app/osgi/org/osgi/service/application/ApplicationException.java
+++ b/bundles/org.eclipse.equinox.app/osgi/org/osgi/service/application/ApplicationException.java
@@ -146,6 +146,7 @@ public class ApplicationException extends Exception {
* @return The cause of this exception or {@code null} if no cause was
* set.
*/
+ @Override
public Throwable getCause() {
return super.getCause();
}
diff --git a/bundles/org.eclipse.equinox.app/pom.xml b/bundles/org.eclipse.equinox.app/pom.xml
index c894b785..edc2bde6 100644
--- a/bundles/org.eclipse.equinox.app/pom.xml
+++ b/bundles/org.eclipse.equinox.app/pom.xml
@@ -19,7 +19,7 @@
</parent>
<groupId>org.eclipse.equinox</groupId>
<artifactId>org.eclipse.equinox.app</artifactId>
- <version>1.4.100-SNAPSHOT</version>
+ <version>1.4.200-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
<build>
<plugins>
diff --git a/bundles/org.eclipse.equinox.bidi/src/org/eclipse/equinox/bidi/advanced/StructuredTextEnvironment.java b/bundles/org.eclipse.equinox.bidi/src/org/eclipse/equinox/bidi/advanced/StructuredTextEnvironment.java
index 64d1d1b0..001c315a 100644
--- a/bundles/org.eclipse.equinox.bidi/src/org/eclipse/equinox/bidi/advanced/StructuredTextEnvironment.java
+++ b/bundles/org.eclipse.equinox.bidi/src/org/eclipse/equinox/bidi/advanced/StructuredTextEnvironment.java
@@ -211,6 +211,7 @@ public class StructuredTextEnvironment {
*
* @return the hash code.
*/
+ @Override
public int hashCode() {
final int prime = 31;
int result = 1;
@@ -229,6 +230,7 @@ public class StructuredTextEnvironment {
*
* @return true if the 2 instances can be used interchangeably.
*/
+ @Override
public boolean equals(Object obj) {
if (this == obj)
return true;
diff --git a/bundles/org.eclipse.equinox.bidi/src/org/eclipse/equinox/bidi/custom/StructuredTextTypeHandler.java b/bundles/org.eclipse.equinox.bidi/src/org/eclipse/equinox/bidi/custom/StructuredTextTypeHandler.java
index 6f23d995..53f4d9c3 100644
--- a/bundles/org.eclipse.equinox.bidi/src/org/eclipse/equinox/bidi/custom/StructuredTextTypeHandler.java
+++ b/bundles/org.eclipse.equinox.bidi/src/org/eclipse/equinox/bidi/custom/StructuredTextTypeHandler.java
@@ -363,6 +363,7 @@ public class StructuredTextTypeHandler {
return false;
}
+ @Override
public String toString() {
return super.toString() + " [" + separators + "]"; //$NON-NLS-1$ //$NON-NLS-2$
}
diff --git a/bundles/org.eclipse.equinox.bidi/src/org/eclipse/equinox/bidi/internal/StructuredTextDelims.java b/bundles/org.eclipse.equinox.bidi/src/org/eclipse/equinox/bidi/internal/StructuredTextDelims.java
index 2918a2f3..34ad1684 100644
--- a/bundles/org.eclipse.equinox.bidi/src/org/eclipse/equinox/bidi/internal/StructuredTextDelims.java
+++ b/bundles/org.eclipse.equinox.bidi/src/org/eclipse/equinox/bidi/internal/StructuredTextDelims.java
@@ -45,6 +45,7 @@ public abstract class StructuredTextDelims extends StructuredTextTypeHandler {
*
* @see #getDelimiters
*/
+ @Override
public int indexOfSpecial(IStructuredTextExpert expert, String text, StructuredTextCharTypes charTypes, StructuredTextOffsets offsets, int caseNumber, int fromIndex) {
char delim = getDelimiters().charAt((caseNumber - 1) * 2);
return text.indexOf(delim, fromIndex);
@@ -59,6 +60,7 @@ public abstract class StructuredTextDelims extends StructuredTextTypeHandler {
* @return the position after the matching end delimiter, or the length
* of <code>text</code> if no end delimiter is found.
*/
+ @Override
public int processSpecial(IStructuredTextExpert expert, String text, StructuredTextCharTypes charTypes, StructuredTextOffsets offsets, int caseNumber, int separLocation) {
StructuredTextTypeHandler.processSeparator(text, charTypes, offsets, separLocation);
int loc = separLocation + 1;
diff --git a/bundles/org.eclipse.equinox.bidi/src/org/eclipse/equinox/bidi/internal/StructuredTextDelimsEsc.java b/bundles/org.eclipse.equinox.bidi/src/org/eclipse/equinox/bidi/internal/StructuredTextDelimsEsc.java
index c468254c..79a581d8 100644
--- a/bundles/org.eclipse.equinox.bidi/src/org/eclipse/equinox/bidi/internal/StructuredTextDelimsEsc.java
+++ b/bundles/org.eclipse.equinox.bidi/src/org/eclipse/equinox/bidi/internal/StructuredTextDelimsEsc.java
@@ -49,6 +49,7 @@ public abstract class StructuredTextDelimsEsc extends StructuredTextDelims {
* and skips until after the matching end delimiter,
* ignoring possibly escaped end delimiters.
*/
+ @Override
public int processSpecial(IStructuredTextExpert expert, String text, StructuredTextCharTypes charTypes, StructuredTextOffsets offsets, int caseNumber, int separLocation) {
StructuredTextTypeHandler.processSeparator(text, charTypes, offsets, separLocation);
int location = separLocation + 1;
diff --git a/bundles/org.eclipse.equinox.bidi/src/org/eclipse/equinox/bidi/internal/StructuredTextImpl.java b/bundles/org.eclipse.equinox.bidi/src/org/eclipse/equinox/bidi/internal/StructuredTextImpl.java
index 2273fd29..e7fe0880 100644
--- a/bundles/org.eclipse.equinox.bidi/src/org/eclipse/equinox/bidi/internal/StructuredTextImpl.java
+++ b/bundles/org.eclipse.equinox.bidi/src/org/eclipse/equinox/bidi/internal/StructuredTextImpl.java
@@ -81,28 +81,34 @@ public class StructuredTextImpl implements IStructuredTextExpert {
sharedExpert = shared;
}
+ @Override
public StructuredTextTypeHandler getTypeHandler() {
return handler;
}
+ @Override
public StructuredTextEnvironment getEnvironment() {
return environment;
}
+ @Override
public int getTextDirection(String text) {
return handler.getDirection(this, text);
}
+ @Override
public void clearState() {
if (sharedExpert)
state = null;
}
+ @Override
public void setState(Object newState) {
if (sharedExpert)
state = newState;
}
+ @Override
public Object getState() {
return state;
}
@@ -248,6 +254,7 @@ public class StructuredTextImpl implements IStructuredTextExpert {
* formatting characters as either prefix or suffix of the <i>full</i> text.
* <p>
*/
+ @Override
public String leanToFullText(String text) {
int len = text.length();
if (len == 0)
@@ -259,6 +266,7 @@ public class StructuredTextImpl implements IStructuredTextExpert {
return insertMarks(text, offsets.getOffsets(), direction, prefixLength);
}
+ @Override
public int[] leanToFullMap(String text) {
int len = text.length();
if (len == 0)
@@ -279,6 +287,7 @@ public class StructuredTextImpl implements IStructuredTextExpert {
return map;
}
+ @Override
public int[] leanBidiCharOffsets(String text) {
int len = text.length();
if (len == 0)
@@ -342,6 +351,7 @@ public class StructuredTextImpl implements IStructuredTextExpert {
return offsets;
}
+ @Override
public String fullToLeanText(String full) {
if (full.length() == 0)
return full;
@@ -446,6 +456,7 @@ public class StructuredTextImpl implements IStructuredTextExpert {
return lean;
}
+ @Override
public int[] fullToLeanMap(String full) {
int lenFull = full.length();
if (lenFull == 0)
@@ -477,6 +488,7 @@ public class StructuredTextImpl implements IStructuredTextExpert {
return map;
}
+ @Override
public int[] fullBidiCharOffsets(String full) {
int lenFull = full.length();
if (lenFull == 0)
@@ -497,6 +509,7 @@ public class StructuredTextImpl implements IStructuredTextExpert {
return offsets.getOffsets();
}
+ @Override
public String insertMarks(String text, int[] offsets, int direction, int affixLength) {
if (direction != DIR_LTR && direction != DIR_RTL)
throw new IllegalArgumentException("Invalid direction"); //$NON-NLS-1$
@@ -545,6 +558,7 @@ public class StructuredTextImpl implements IStructuredTextExpert {
return new String(fullChars);
}
+ @Override
public String toString() {
return super.toString() + " [handler=" + handler.toString() + "]"; //$NON-NLS-1$ //$NON-NLS-2$
}
diff --git a/bundles/org.eclipse.equinox.bidi/src/org/eclipse/equinox/bidi/internal/StructuredTextSingle.java b/bundles/org.eclipse.equinox.bidi/src/org/eclipse/equinox/bidi/internal/StructuredTextSingle.java
index 9c5346ac..9976b10a 100644
--- a/bundles/org.eclipse.equinox.bidi/src/org/eclipse/equinox/bidi/internal/StructuredTextSingle.java
+++ b/bundles/org.eclipse.equinox.bidi/src/org/eclipse/equinox/bidi/internal/StructuredTextSingle.java
@@ -41,6 +41,7 @@ public class StructuredTextSingle extends StructuredTextTypeHandler {
*
* @see #getSeparators getSeparators
*/
+ @Override
public int indexOfSpecial(IStructuredTextExpert expert, String text, StructuredTextCharTypes charTypes, StructuredTextOffsets offsets, int caseNumber, int fromIndex) {
return text.indexOf(this.getSeparators(expert).charAt(0), fromIndex);
}
@@ -51,6 +52,7 @@ public class StructuredTextSingle extends StructuredTextTypeHandler {
*
* @return the length of <code>text</code>.
*/
+ @Override
public int processSpecial(IStructuredTextExpert expert, String text, StructuredTextCharTypes charTypes, StructuredTextOffsets offsets, int caseNumber, int separLocation) {
StructuredTextTypeHandler.processSeparator(text, charTypes, offsets, separLocation);
return text.length();
@@ -61,6 +63,7 @@ public class StructuredTextSingle extends StructuredTextTypeHandler {
*
* @return 1.
*/
+ @Override
public int getSpecialsCount(IStructuredTextExpert expert) {
return 1;
}
diff --git a/bundles/org.eclipse.equinox.bidi/src/org/eclipse/equinox/bidi/internal/consumable/StructuredTextEmail.java b/bundles/org.eclipse.equinox.bidi/src/org/eclipse/equinox/bidi/internal/consumable/StructuredTextEmail.java
index bae512f6..7e684509 100644
--- a/bundles/org.eclipse.equinox.bidi/src/org/eclipse/equinox/bidi/internal/consumable/StructuredTextEmail.java
+++ b/bundles/org.eclipse.equinox.bidi/src/org/eclipse/equinox/bidi/internal/consumable/StructuredTextEmail.java
@@ -29,6 +29,7 @@ public class StructuredTextEmail extends StructuredTextDelimsEsc {
super("<>.:,;@"); //$NON-NLS-1$
}
+ @Override
public int getDirection(IStructuredTextExpert expert, String text) {
return getDirection(expert, text, new StructuredTextCharTypes(expert, text));
}
@@ -44,6 +45,7 @@ public class StructuredTextEmail extends StructuredTextDelimsEsc {
* </ul>
* Otherwise, returns {@link IStructuredTextExpert#DIR_LTR DIR_LTR}.
*/
+ @Override
public int getDirection(IStructuredTextExpert expert, String text, StructuredTextCharTypes charTypes) {
String language = expert.getEnvironment().getLanguage();
if (!language.equals("ar")) //$NON-NLS-1$
@@ -63,6 +65,7 @@ public class StructuredTextEmail extends StructuredTextDelimsEsc {
/**
* @return 2 as number of special cases handled by this handler.
*/
+ @Override
public int getSpecialsCount(IStructuredTextExpert expert) {
return 2;
}
@@ -70,6 +73,7 @@ public class StructuredTextEmail extends StructuredTextDelimsEsc {
/**
* @return parentheses and quotation marks as delimiters.
*/
+ @Override
protected String getDelimiters() {
return "()\"\""; //$NON-NLS-1$
}
diff --git a/bundles/org.eclipse.equinox.bidi/src/org/eclipse/equinox/bidi/internal/consumable/StructuredTextJava.java b/bundles/org.eclipse.equinox.bidi/src/org/eclipse/equinox/bidi/internal/consumable/StructuredTextJava.java
index 06e4c472..7ab09a5e 100644
--- a/bundles/org.eclipse.equinox.bidi/src/org/eclipse/equinox/bidi/internal/consumable/StructuredTextJava.java
+++ b/bundles/org.eclipse.equinox.bidi/src/org/eclipse/equinox/bidi/internal/consumable/StructuredTextJava.java
@@ -45,6 +45,7 @@ public class StructuredTextJava extends StructuredTextTypeHandler {
/**
* @return 4 as the number of special cases handled by this handler.
*/
+ @Override
public int getSpecialsCount(IStructuredTextExpert expert) {
return 4;
}
@@ -58,6 +59,7 @@ public class StructuredTextJava extends StructuredTextTypeHandler {
* <li>comments starting with slash-slash</li>
* </ol>
*/
+ @Override
public int indexOfSpecial(IStructuredTextExpert expert, String text, StructuredTextCharTypes charTypes, StructuredTextOffsets offsets, int caseNumber, int fromIndex) {
switch (caseNumber) {
case 1 : /* space */
@@ -82,6 +84,7 @@ public class StructuredTextJava extends StructuredTextTypeHandler {
* <li>skip until after a line separator</li>
* </ol>
*/
+ @Override
public int processSpecial(IStructuredTextExpert expert, String text, StructuredTextCharTypes charTypes, StructuredTextOffsets offsets, int caseNumber, int separLocation) {
int location, counter, i;
diff --git a/bundles/org.eclipse.equinox.bidi/src/org/eclipse/equinox/bidi/internal/consumable/StructuredTextRegex.java b/bundles/org.eclipse.equinox.bidi/src/org/eclipse/equinox/bidi/internal/consumable/StructuredTextRegex.java
index 3c8e3d2c..e8df751c 100644
--- a/bundles/org.eclipse.equinox.bidi/src/org/eclipse/equinox/bidi/internal/consumable/StructuredTextRegex.java
+++ b/bundles/org.eclipse.equinox.bidi/src/org/eclipse/equinox/bidi/internal/consumable/StructuredTextRegex.java
@@ -71,6 +71,7 @@ public class StructuredTextRegex extends StructuredTextTypeHandler {
*
* @return the number of special cases for this handler.
*/
+ @Override
public int getSpecialsCount(IStructuredTextExpert expert) {
return maxSpecial;
}
@@ -79,6 +80,7 @@ public class StructuredTextRegex extends StructuredTextTypeHandler {
* Locates occurrences of the syntactic strings and of
* R, AL, EN, AN characters.
*/
+ @Override
public int indexOfSpecial(IStructuredTextExpert expert, String text, StructuredTextCharTypes charTypes, StructuredTextOffsets offsets, int caseNumber, int fromIndex) {
// In this method, L, R, AL, AN and EN represent bidi categories
// as defined in the Unicode Bidirectional Algorithm
@@ -147,6 +149,7 @@ public class StructuredTextRegex extends StructuredTextTypeHandler {
/**
* Processes the special cases.
*/
+ @Override
public int processSpecial(IStructuredTextExpert expert, String text, StructuredTextCharTypes charTypes, StructuredTextOffsets offsets, int caseNumber, int separLocation) {
int location;
@@ -221,6 +224,7 @@ public class StructuredTextRegex extends StructuredTextTypeHandler {
return text.length();
}
+ @Override
public int getDirection(IStructuredTextExpert expert, String text) {
return getDirection(expert, text, new StructuredTextCharTypes(expert, text));
}
@@ -237,6 +241,7 @@ public class StructuredTextRegex extends StructuredTextTypeHandler {
* </ul>
* Otherwise, returns {@link IStructuredTextExpert#DIR_LTR DIR_LTR}.
*/
+ @Override
public int getDirection(IStructuredTextExpert expert, String text, StructuredTextCharTypes charTypes) {
StructuredTextEnvironment environment = expert.getEnvironment();
String language = environment.getLanguage();
diff --git a/bundles/org.eclipse.equinox.bidi/src/org/eclipse/equinox/bidi/internal/consumable/StructuredTextSql.java b/bundles/org.eclipse.equinox.bidi/src/org/eclipse/equinox/bidi/internal/consumable/StructuredTextSql.java
index 405c0c7b..4df8339f 100644
--- a/bundles/org.eclipse.equinox.bidi/src/org/eclipse/equinox/bidi/internal/consumable/StructuredTextSql.java
+++ b/bundles/org.eclipse.equinox.bidi/src/org/eclipse/equinox/bidi/internal/consumable/StructuredTextSql.java
@@ -46,6 +46,7 @@ public class StructuredTextSql extends StructuredTextTypeHandler {
/**
* @return 5 as the number of special cases handled by this handler.
*/
+ @Override
public int getSpecialsCount(IStructuredTextExpert expert) {
return 5;
}
@@ -60,6 +61,7 @@ public class StructuredTextSql extends StructuredTextTypeHandler {
* <li>comments starting with hyphen-hyphen</li>
* </ol>
*/
+ @Override
public int indexOfSpecial(IStructuredTextExpert expert, String text, StructuredTextCharTypes charTypes, StructuredTextOffsets offsets, int caseNumber, int fromIndex) {
switch (caseNumber) {
case 1 : /* space */
@@ -87,6 +89,7 @@ public class StructuredTextSql extends StructuredTextTypeHandler {
* <li>skip until after a line separator</li>
* </ol>
*/
+ @Override
public int processSpecial(IStructuredTextExpert expert, String text, StructuredTextCharTypes charTypes, StructuredTextOffsets offsets, int caseNumber, int separLocation) {
int location;
diff --git a/bundles/org.eclipse.equinox.bidi/src/org/eclipse/equinox/bidi/internal/consumable/StructuredTextXPath.java b/bundles/org.eclipse.equinox.bidi/src/org/eclipse/equinox/bidi/internal/consumable/StructuredTextXPath.java
index ed28550b..d470fe4f 100644
--- a/bundles/org.eclipse.equinox.bidi/src/org/eclipse/equinox/bidi/internal/consumable/StructuredTextXPath.java
+++ b/bundles/org.eclipse.equinox.bidi/src/org/eclipse/equinox/bidi/internal/consumable/StructuredTextXPath.java
@@ -28,6 +28,7 @@ public class StructuredTextXPath extends StructuredTextDelims {
/**
* @return 2 as the number of special cases handled by this handler.
*/
+ @Override
public int getSpecialsCount(IStructuredTextExpert expert) {
return 2;
}
@@ -35,6 +36,7 @@ public class StructuredTextXPath extends StructuredTextDelims {
/**
* @return apostrophe and quotation mark as delimiters.
*/
+ @Override
protected String getDelimiters() {
return "''\"\""; //$NON-NLS-1$
}
diff --git a/bundles/org.eclipse.equinox.compendium.tests/src/org/eclipse/equinox/coordinator/tests/CoordinationMaxTimeoutTest.java b/bundles/org.eclipse.equinox.compendium.tests/src/org/eclipse/equinox/coordinator/tests/CoordinationMaxTimeoutTest.java
index 49b4796a..aaf89e5e 100644
--- a/bundles/org.eclipse.equinox.compendium.tests/src/org/eclipse/equinox/coordinator/tests/CoordinationMaxTimeoutTest.java
+++ b/bundles/org.eclipse.equinox.compendium.tests/src/org/eclipse/equinox/coordinator/tests/CoordinationMaxTimeoutTest.java
@@ -150,6 +150,7 @@ public class CoordinationMaxTimeoutTest extends CoordinatorTest {
}
@Before
+ @Override
public void setUp() throws Exception {
System.setProperty(PROPERTY_NAME, String.valueOf(TIMEOUT));
assertSystemProperty(PROPERTY_NAME, String.valueOf(TIMEOUT));
diff --git a/bundles/org.eclipse.equinox.compendium.tests/src/org/eclipse/equinox/metatype/tests/AttributeTypePasswordTest.java b/bundles/org.eclipse.equinox.compendium.tests/src/org/eclipse/equinox/metatype/tests/AttributeTypePasswordTest.java
index 3393f856..07f4eb18 100644
--- a/bundles/org.eclipse.equinox.compendium.tests/src/org/eclipse/equinox/metatype/tests/AttributeTypePasswordTest.java
+++ b/bundles/org.eclipse.equinox.compendium.tests/src/org/eclipse/equinox/metatype/tests/AttributeTypePasswordTest.java
@@ -21,6 +21,7 @@ public class AttributeTypePasswordTest extends AbstractTest {
private Bundle bundle;
@Before
+ @Override
public void setUp() throws Exception {
super.setUp();
bundle = bundleInstaller.installBundle("tb1"); //$NON-NLS-1$
diff --git a/bundles/org.eclipse.equinox.compendium.tests/src/org/eclipse/equinox/metatype/tests/Bug332161Test.java b/bundles/org.eclipse.equinox.compendium.tests/src/org/eclipse/equinox/metatype/tests/Bug332161Test.java
index 472a7477..1e734d18 100644
--- a/bundles/org.eclipse.equinox.compendium.tests/src/org/eclipse/equinox/metatype/tests/Bug332161Test.java
+++ b/bundles/org.eclipse.equinox.compendium.tests/src/org/eclipse/equinox/metatype/tests/Bug332161Test.java
@@ -354,6 +354,7 @@ public class Bug332161Test extends AbstractTest {
}
@Before
+ @Override
public void setUp() throws Exception {
super.setUp();
bundle = bundleInstaller.installBundle("tb4"); //$NON-NLS-1$
diff --git a/bundles/org.eclipse.equinox.compendium.tests/src/org/eclipse/equinox/metatype/tests/Bug395196Test.java b/bundles/org.eclipse.equinox.compendium.tests/src/org/eclipse/equinox/metatype/tests/Bug395196Test.java
index 86aa9899..aa6d6e8f 100644
--- a/bundles/org.eclipse.equinox.compendium.tests/src/org/eclipse/equinox/metatype/tests/Bug395196Test.java
+++ b/bundles/org.eclipse.equinox.compendium.tests/src/org/eclipse/equinox/metatype/tests/Bug395196Test.java
@@ -47,6 +47,7 @@ public class Bug395196Test extends AbstractTest {
}
@Before
+ @Override
public void setUp() throws Exception {
super.setUp();
bundle = bundleInstaller.installBundle("tb1"); //$NON-NLS-1$
diff --git a/bundles/org.eclipse.equinox.compendium.tests/src/org/eclipse/equinox/metatype/tests/BugTests.java b/bundles/org.eclipse.equinox.compendium.tests/src/org/eclipse/equinox/metatype/tests/BugTests.java
index 94e9d5c0..497683f9 100644
--- a/bundles/org.eclipse.equinox.compendium.tests/src/org/eclipse/equinox/metatype/tests/BugTests.java
+++ b/bundles/org.eclipse.equinox.compendium.tests/src/org/eclipse/equinox/metatype/tests/BugTests.java
@@ -92,6 +92,7 @@ public class BugTests extends AbstractTest {
}
@Before
+ @Override
public void setUp() throws Exception {
super.setUp();
bundle = bundleInstaller.installBundle("tb3"); //$NON-NLS-1$
diff --git a/bundles/org.eclipse.equinox.compendium.tests/src/org/eclipse/equinox/metatype/tests/ExtendableTest.java b/bundles/org.eclipse.equinox.compendium.tests/src/org/eclipse/equinox/metatype/tests/ExtendableTest.java
index 899a3d6d..28c7f450 100644
--- a/bundles/org.eclipse.equinox.compendium.tests/src/org/eclipse/equinox/metatype/tests/ExtendableTest.java
+++ b/bundles/org.eclipse.equinox.compendium.tests/src/org/eclipse/equinox/metatype/tests/ExtendableTest.java
@@ -26,6 +26,7 @@ public class ExtendableTest extends AbstractTest {
private Bundle bundle;
@Before
+ @Override
public void setUp() throws Exception {
super.setUp();
bundle = bundleInstaller.installBundle("extendable.tb1"); //$NON-NLS-1$
diff --git a/bundles/org.eclipse.equinox.compendium.tests/src/org/eclipse/equinox/metatype/tests/GetDefaultValueTest.java b/bundles/org.eclipse.equinox.compendium.tests/src/org/eclipse/equinox/metatype/tests/GetDefaultValueTest.java
index 83c3ede8..b33fade2 100644
--- a/bundles/org.eclipse.equinox.compendium.tests/src/org/eclipse/equinox/metatype/tests/GetDefaultValueTest.java
+++ b/bundles/org.eclipse.equinox.compendium.tests/src/org/eclipse/equinox/metatype/tests/GetDefaultValueTest.java
@@ -126,6 +126,7 @@ public class GetDefaultValueTest extends AbstractTest {
}
@Before
+ @Override
public void setUp() throws Exception {
super.setUp();
bundle = bundleInstaller.installBundle("tb1"); //$NON-NLS-1$
diff --git a/bundles/org.eclipse.equinox.compendium.tests/src/org/eclipse/equinox/metatype/tests/GetMinMaxTest.java b/bundles/org.eclipse.equinox.compendium.tests/src/org/eclipse/equinox/metatype/tests/GetMinMaxTest.java
index 4795d935..7d4d9a4c 100755
--- a/bundles/org.eclipse.equinox.compendium.tests/src/org/eclipse/equinox/metatype/tests/GetMinMaxTest.java
+++ b/bundles/org.eclipse.equinox.compendium.tests/src/org/eclipse/equinox/metatype/tests/GetMinMaxTest.java
@@ -25,6 +25,7 @@ public class GetMinMaxTest extends AbstractTest {
private EquinoxObjectClassDefinition ocd;
@Before
+ @Override
public void setUp() throws Exception {
super.setUp();
bundle = bundleInstaller.installBundle("getMinMax.tb1"); //$NON-NLS-1$
diff --git a/bundles/org.eclipse.equinox.compendium.tests/src/org/eclipse/equinox/metatype/tests/IconTest.java b/bundles/org.eclipse.equinox.compendium.tests/src/org/eclipse/equinox/metatype/tests/IconTest.java
index c72dfde6..d22830a2 100644
--- a/bundles/org.eclipse.equinox.compendium.tests/src/org/eclipse/equinox/metatype/tests/IconTest.java
+++ b/bundles/org.eclipse.equinox.compendium.tests/src/org/eclipse/equinox/metatype/tests/IconTest.java
@@ -80,6 +80,7 @@ public class IconTest extends AbstractTest {
}
@Before
+ @Override
public void setUp() throws Exception {
super.setUp();
bundle = bundleInstaller.installBundle("tb9"); //$NON-NLS-1$
diff --git a/bundles/org.eclipse.equinox.compendium.tests/src/org/eclipse/equinox/metatype/tests/NoADTest.java b/bundles/org.eclipse.equinox.compendium.tests/src/org/eclipse/equinox/metatype/tests/NoADTest.java
index 35ec280d..51650d79 100755
--- a/bundles/org.eclipse.equinox.compendium.tests/src/org/eclipse/equinox/metatype/tests/NoADTest.java
+++ b/bundles/org.eclipse.equinox.compendium.tests/src/org/eclipse/equinox/metatype/tests/NoADTest.java
@@ -21,6 +21,7 @@ public class NoADTest extends AbstractTest {
private Bundle bundle;
@Before
+ @Override
public void setUp() throws Exception {
super.setUp();
bundle = bundleInstaller.installBundle("tb10"); //$NON-NLS-1$
diff --git a/bundles/org.eclipse.equinox.compendium.tests/src/org/eclipse/equinox/metatype/tests/SameOcdPidFactoryPidTest.java b/bundles/org.eclipse.equinox.compendium.tests/src/org/eclipse/equinox/metatype/tests/SameOcdPidFactoryPidTest.java
index 64cd7dce..c7c67113 100644
--- a/bundles/org.eclipse.equinox.compendium.tests/src/org/eclipse/equinox/metatype/tests/SameOcdPidFactoryPidTest.java
+++ b/bundles/org.eclipse.equinox.compendium.tests/src/org/eclipse/equinox/metatype/tests/SameOcdPidFactoryPidTest.java
@@ -21,6 +21,7 @@ public class SameOcdPidFactoryPidTest extends AbstractTest {
private Bundle bundle;
@Before
+ @Override
public void setUp() throws Exception {
super.setUp();
bundle = bundleInstaller.installBundle("tb2"); //$NON-NLS-1$
diff --git a/bundles/org.eclipse.equinox.compendium.tests/src/org/eclipse/equinox/metatype/tests/UnresolvedBundleTest.java b/bundles/org.eclipse.equinox.compendium.tests/src/org/eclipse/equinox/metatype/tests/UnresolvedBundleTest.java
index 00afdf58..51e265fc 100644
--- a/bundles/org.eclipse.equinox.compendium.tests/src/org/eclipse/equinox/metatype/tests/UnresolvedBundleTest.java
+++ b/bundles/org.eclipse.equinox.compendium.tests/src/org/eclipse/equinox/metatype/tests/UnresolvedBundleTest.java
@@ -57,6 +57,7 @@ public class UnresolvedBundleTest extends AbstractTest {
}
@Before
+ @Override
public void setUp() throws Exception {
super.setUp();
bundle = bundleInstaller.installBundle("tb8"); //$NON-NLS-1$
diff --git a/bundles/org.eclipse.equinox.concurrent/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.concurrent/META-INF/MANIFEST.MF
index 55906070..e1f7e969 100644
--- a/bundles/org.eclipse.equinox.concurrent/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.equinox.concurrent/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.equinox.concurrent
-Bundle-Version: 1.1.200.qualifier
+Bundle-Version: 1.1.300.qualifier
Bundle-Vendor: %pluginProvider
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Import-Package: org.eclipse.core.runtime;version="3.4.0";common=split,
diff --git a/bundles/org.eclipse.equinox.concurrent/pom.xml b/bundles/org.eclipse.equinox.concurrent/pom.xml
index b33e66c7..571a45db 100644
--- a/bundles/org.eclipse.equinox.concurrent/pom.xml
+++ b/bundles/org.eclipse.equinox.concurrent/pom.xml
@@ -5,7 +5,7 @@
are made available under the terms of the Eclipse Distribution License v1.0
which accompanies this distribution, and is available at
http://www.eclipse.org/org/documents/edl-v10.php
-
+
Contributors:
Igor Fedorenko - initial implementation
-->
@@ -19,6 +19,6 @@
</parent>
<groupId>org.eclipse.equinox</groupId>
<artifactId>org.eclipse.equinox.concurrent</artifactId>
- <version>1.1.200-SNAPSHOT</version>
+ <version>1.1.300-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.equinox.concurrent/src/org/eclipse/equinox/concurrent/future/SingleOperationListenableFuture.java b/bundles/org.eclipse.equinox.concurrent/src/org/eclipse/equinox/concurrent/future/SingleOperationListenableFuture.java
index 70ab9c4a..66b45269 100644
--- a/bundles/org.eclipse.equinox.concurrent/src/org/eclipse/equinox/concurrent/future/SingleOperationListenableFuture.java
+++ b/bundles/org.eclipse.equinox.concurrent/src/org/eclipse/equinox/concurrent/future/SingleOperationListenableFuture.java
@@ -62,6 +62,7 @@ public class SingleOperationListenableFuture<ResultType> extends
}
}
+ @Override
public void runWithProgress(final IProgressRunnable<?> runnable) {
Assert.isNotNull(runnable);
if (!isCanceled()) {
diff --git a/bundles/org.eclipse.equinox.ds.tests/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.ds.tests/META-INF/MANIFEST.MF
index 743ba474..b6c5fd57 100644
--- a/bundles/org.eclipse.equinox.ds.tests/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.equinox.ds.tests/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: Declarative Services Tests
Bundle-Category: test
Bundle-SymbolicName: org.eclipse.equinox.ds.tests
-Bundle-Version: 1.5.300.qualifier
+Bundle-Version: 1.5.400.qualifier
Bundle-Activator: org.eclipse.equinox.ds.tests.DSTestsActivator
Bundle-ActivationPolicy: lazy
Require-Bundle: org.junit
diff --git a/bundles/org.eclipse.equinox.ds.tests/bundles_src/tb1/org/eclipse/equinox/ds/tests/tb1/BindUnbindSuccessor.java b/bundles/org.eclipse.equinox.ds.tests/bundles_src/tb1/org/eclipse/equinox/ds/tests/tb1/BindUnbindSuccessor.java
index 7d435d00..97c904a6 100644
--- a/bundles/org.eclipse.equinox.ds.tests/bundles_src/tb1/org/eclipse/equinox/ds/tests/tb1/BindUnbindSuccessor.java
+++ b/bundles/org.eclipse.equinox.ds.tests/bundles_src/tb1/org/eclipse/equinox/ds/tests/tb1/BindUnbindSuccessor.java
@@ -46,6 +46,7 @@ public class BindUnbindSuccessor extends BindUnbind implements ComponentManager,
else ctxt.disableComponent(name);
}
+ @Override
public Dictionary getProperties() {
return ctxt.getProperties();
}
diff --git a/bundles/org.eclipse.equinox.ds.tests/bundles_src/tb12/org/eclipse/equinox/ds/tests/tb12/Bc100.java b/bundles/org.eclipse.equinox.ds.tests/bundles_src/tb12/org/eclipse/equinox/ds/tests/tb12/Bc100.java
index 79d6db02..c4904196 100644
--- a/bundles/org.eclipse.equinox.ds.tests/bundles_src/tb12/org/eclipse/equinox/ds/tests/tb12/Bc100.java
+++ b/bundles/org.eclipse.equinox.ds.tests/bundles_src/tb12/org/eclipse/equinox/ds/tests/tb12/Bc100.java
@@ -16,6 +16,7 @@ package org.eclipse.equinox.ds.tests.tb12;
public class Bc100 extends CallRegistrator {
+ @Override
public String getName() {
return "org.eclipse.equinox.ds.tests.tb12.Bc100";
}
diff --git a/bundles/org.eclipse.equinox.ds.tests/bundles_src/tb12/org/eclipse/equinox/ds/tests/tb12/Bc110.java b/bundles/org.eclipse.equinox.ds.tests/bundles_src/tb12/org/eclipse/equinox/ds/tests/tb12/Bc110.java
index b44f71da..fe4d9962 100644
--- a/bundles/org.eclipse.equinox.ds.tests/bundles_src/tb12/org/eclipse/equinox/ds/tests/tb12/Bc110.java
+++ b/bundles/org.eclipse.equinox.ds.tests/bundles_src/tb12/org/eclipse/equinox/ds/tests/tb12/Bc110.java
@@ -16,6 +16,7 @@ package org.eclipse.equinox.ds.tests.tb12;
public class Bc110 extends CallRegistrator {
+ @Override
public String getName() {
return "org.eclipse.equinox.ds.tests.tb12.Bc110";
}
diff --git a/bundles/org.eclipse.equinox.ds.tests/bundles_src/tb12/org/eclipse/equinox/ds/tests/tb12/NoArgs100.java b/bundles/org.eclipse.equinox.ds.tests/bundles_src/tb12/org/eclipse/equinox/ds/tests/tb12/NoArgs100.java
index 5ba81a53..840e235d 100644
--- a/bundles/org.eclipse.equinox.ds.tests/bundles_src/tb12/org/eclipse/equinox/ds/tests/tb12/NoArgs100.java
+++ b/bundles/org.eclipse.equinox.ds.tests/bundles_src/tb12/org/eclipse/equinox/ds/tests/tb12/NoArgs100.java
@@ -16,6 +16,7 @@ package org.eclipse.equinox.ds.tests.tb12;
public class NoArgs100 extends CallRegistrator {
+ @Override
public String getName() {
return "org.eclipse.equinox.ds.tests.tb12.NoArgs100";
}
diff --git a/bundles/org.eclipse.equinox.ds.tests/bundles_src/tb12/org/eclipse/equinox/ds/tests/tb12/NoArgs110.java b/bundles/org.eclipse.equinox.ds.tests/bundles_src/tb12/org/eclipse/equinox/ds/tests/tb12/NoArgs110.java
index 35510141..68f9994e 100644
--- a/bundles/org.eclipse.equinox.ds.tests/bundles_src/tb12/org/eclipse/equinox/ds/tests/tb12/NoArgs110.java
+++ b/bundles/org.eclipse.equinox.ds.tests/bundles_src/tb12/org/eclipse/equinox/ds/tests/tb12/NoArgs110.java
@@ -16,6 +16,7 @@ package org.eclipse.equinox.ds.tests.tb12;
public class NoArgs110 extends CallRegistrator {
+ @Override
public String getName() {
return "org.eclipse.equinox.ds.tests.tb12.NoArgs110";
}
diff --git a/bundles/org.eclipse.equinox.ds.tests/bundles_src/tb4/org/eclipse/equinox/ds/tests/tb4/impl/NamedFactory.java b/bundles/org.eclipse.equinox.ds.tests/bundles_src/tb4/org/eclipse/equinox/ds/tests/tb4/impl/NamedFactory.java
index 45d6be0a..b3db0b9a 100644
--- a/bundles/org.eclipse.equinox.ds.tests/bundles_src/tb4/org/eclipse/equinox/ds/tests/tb4/impl/NamedFactory.java
+++ b/bundles/org.eclipse.equinox.ds.tests/bundles_src/tb4/org/eclipse/equinox/ds/tests/tb4/impl/NamedFactory.java
@@ -39,6 +39,7 @@ public class NamedFactory implements NamedService, ComponentContextProvider {
return name;
}
+ @Override
public String toString() {
return name;
}
diff --git a/bundles/org.eclipse.equinox.ds.tests/pom.xml b/bundles/org.eclipse.equinox.ds.tests/pom.xml
index 44f344c8..99a4bb0f 100644
--- a/bundles/org.eclipse.equinox.ds.tests/pom.xml
+++ b/bundles/org.eclipse.equinox.ds.tests/pom.xml
@@ -5,7 +5,7 @@
are made available under the terms of the Eclipse Distribution License v1.0
which accompanies this distribution, and is available at
http://www.eclipse.org/org/documents/edl-v10.php
-
+
Contributors:
Igor Fedorenko - initial implementation
-->
@@ -19,6 +19,6 @@
</parent>
<groupId>org.eclipse.equinox</groupId>
<artifactId>org.eclipse.equinox.ds.tests</artifactId>
- <version>1.5.300-SNAPSHOT</version>
+ <version>1.5.400-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.equinox.ds.tests/src/org/eclipse/equinox/ds/tests/tbc/DSEvent.java b/bundles/org.eclipse.equinox.ds.tests/src/org/eclipse/equinox/ds/tests/tbc/DSEvent.java
index 6fe75a1f..2b3848aa 100644
--- a/bundles/org.eclipse.equinox.ds.tests/src/org/eclipse/equinox/ds/tests/tbc/DSEvent.java
+++ b/bundles/org.eclipse.equinox.ds.tests/src/org/eclipse/equinox/ds/tests/tbc/DSEvent.java
@@ -86,6 +86,7 @@ public class DSEvent implements Comparable {
}
}
+ @Override
public String toString() {
StringBuffer buf = new StringBuffer("DSEvent[");
buf.append("time=" + this.time + ";action=");
diff --git a/bundles/org.eclipse.equinox.ds.tests/src/org/eclipse/equinox/ds/tests/tbc/DSTest.java b/bundles/org.eclipse.equinox.ds.tests/src/org/eclipse/equinox/ds/tests/tbc/DSTest.java
index c104494b..557dcfd4 100644
--- a/bundles/org.eclipse.equinox.ds.tests/src/org/eclipse/equinox/ds/tests/tbc/DSTest.java
+++ b/bundles/org.eclipse.equinox.ds.tests/src/org/eclipse/equinox/ds/tests/tbc/DSTest.java
@@ -1242,6 +1242,7 @@ public class DSTest {
final Bundle tb4 = installBundle("tb4");
new Thread() {
+ @Override
public void run() {
try {
tb2.start(); // start the blocking service
@@ -1252,6 +1253,7 @@ public class DSTest {
sleep0(scr_restart_timeout + timeout * 2);
new Thread() {
+ @Override
public void run() {
try {
tb4.start(); // start the other
@@ -1276,6 +1278,7 @@ public class DSTest {
// start the other blocking bundle
new Thread() {
+ @Override
public void run() {
try {
tb3.start();
@@ -1288,6 +1291,7 @@ public class DSTest {
// start the non-blocking bundle
new Thread() {
+ @Override
public void run() {
try {
tb4.start(); // start the other
@@ -2158,6 +2162,7 @@ public class DSTest {
this.lastComp = last;
}
+ @Override
public void run() {
ConfigurationAdmin cm = (ConfigurationAdmin) trackerCM.getService();
assertNotNull("The ConfigurationAdmin should be available", cm);
diff --git a/bundles/org.eclipse.equinox.http.servlet.tests/bundles_src/tb1/org/eclipse/equinox/http/servlet/tests/tb1/TestServlet2.java b/bundles/org.eclipse.equinox.http.servlet.tests/bundles_src/tb1/org/eclipse/equinox/http/servlet/tests/tb1/TestServlet2.java
index 536ec256..641421cc 100644
--- a/bundles/org.eclipse.equinox.http.servlet.tests/bundles_src/tb1/org/eclipse/equinox/http/servlet/tests/tb1/TestServlet2.java
+++ b/bundles/org.eclipse.equinox.http.servlet.tests/bundles_src/tb1/org/eclipse/equinox/http/servlet/tests/tb1/TestServlet2.java
@@ -35,6 +35,7 @@ public class TestServlet2 extends AbstractTestServlet {
}
+ @Override
protected void handleDoGet(HttpServletRequest request, PrintWriter writer) throws ServletException, IOException {
int version = getEffectiveMajorVersion();
writer.print(version);
diff --git a/bundles/org.eclipse.equinox.http.servlet.tests/bundles_src/tb1/org/eclipse/equinox/http/servlet/tests/tb1/TestServlet3.java b/bundles/org.eclipse.equinox.http.servlet.tests/bundles_src/tb1/org/eclipse/equinox/http/servlet/tests/tb1/TestServlet3.java
index e75278a1..7eb7810c 100644
--- a/bundles/org.eclipse.equinox.http.servlet.tests/bundles_src/tb1/org/eclipse/equinox/http/servlet/tests/tb1/TestServlet3.java
+++ b/bundles/org.eclipse.equinox.http.servlet.tests/bundles_src/tb1/org/eclipse/equinox/http/servlet/tests/tb1/TestServlet3.java
@@ -30,6 +30,7 @@ import org.eclipse.equinox.http.servlet.tests.tb.AbstractTestServlet;
public class TestServlet3 extends AbstractTestServlet {
private static final long serialVersionUID = 1L;
+ @Override
protected void handleDoGet(HttpServletRequest request, PrintWriter writer) throws ServletException, IOException {
String expected = "Equinox"; //$NON-NLS-1$
try {
diff --git a/bundles/org.eclipse.equinox.http.servlet.tests/bundles_src/tb1/org/eclipse/equinox/http/servlet/tests/tb1/TestServlet9.java b/bundles/org.eclipse.equinox.http.servlet.tests/bundles_src/tb1/org/eclipse/equinox/http/servlet/tests/tb1/TestServlet9.java
index 8db1fadb..5e8b7b7e 100644
--- a/bundles/org.eclipse.equinox.http.servlet.tests/bundles_src/tb1/org/eclipse/equinox/http/servlet/tests/tb1/TestServlet9.java
+++ b/bundles/org.eclipse.equinox.http.servlet.tests/bundles_src/tb1/org/eclipse/equinox/http/servlet/tests/tb1/TestServlet9.java
@@ -36,6 +36,7 @@ public class TestServlet9 extends AbstractTestServlet {
private static final long serialVersionUID = 1L;
private final DispatchTo dispatchTo = new DispatchTo();
+ @Override
public void activate(ComponentContext componentContext) throws ServletException, NamespaceException {
HttpService service = getHttpService();
HttpContext context = service.createDefaultHttpContext();
diff --git a/bundles/org.eclipse.equinox.http.servlet/src/org/eclipse/equinox/http/servlet/internal/HttpServiceImpl.java b/bundles/org.eclipse.equinox.http.servlet/src/org/eclipse/equinox/http/servlet/internal/HttpServiceImpl.java
index 8b023bd0..304ab232 100644
--- a/bundles/org.eclipse.equinox.http.servlet/src/org/eclipse/equinox/http/servlet/internal/HttpServiceImpl.java
+++ b/bundles/org.eclipse.equinox.http.servlet/src/org/eclipse/equinox/http/servlet/internal/HttpServiceImpl.java
@@ -66,6 +66,7 @@ public class HttpServiceImpl implements HttpService, ExtendedHttpService {
* @throws ServletException
* @see ExtendedHttpService#registerFilter(String, Filter, Dictionary, HttpContext)
*/
+ @Override
public synchronized void registerFilter(
final String alias, final Filter filter,
final Dictionary<String, String> initparams,
@@ -153,6 +154,7 @@ public class HttpServiceImpl implements HttpService, ExtendedHttpService {
/**
* @see ExtendedHttpService#unregisterFilter(Filter)
*/
+ @Override
public synchronized void unregisterFilter(Filter filter) {
checkShutdown();
diff --git a/bundles/org.eclipse.equinox.http.servlet/src/org/eclipse/equinox/http/servlet/internal/context/DispatchTargets.java b/bundles/org.eclipse.equinox.http.servlet/src/org/eclipse/equinox/http/servlet/internal/context/DispatchTargets.java
index 4b5b6431..d0dace99 100644
--- a/bundles/org.eclipse.equinox.http.servlet/src/org/eclipse/equinox/http/servlet/internal/context/DispatchTargets.java
+++ b/bundles/org.eclipse.equinox.http.servlet/src/org/eclipse/equinox/http/servlet/internal/context/DispatchTargets.java
@@ -246,6 +246,7 @@ public class DispatchTargets {
servletRequest.setAttribute(name, value);
}
+ @Override
public void close() {
for (Map.Entry<String, Object> oldValue : oldValues.entrySet()) {
if (oldValue.getValue() == null) {
diff --git a/bundles/org.eclipse.equinox.http.servlet/src/org/eclipse/equinox/http/servlet/internal/multipart/MultipartSupportImpl.java b/bundles/org.eclipse.equinox.http.servlet/src/org/eclipse/equinox/http/servlet/internal/multipart/MultipartSupportImpl.java
index 7f7c2b74..c40ff87e 100644
--- a/bundles/org.eclipse.equinox.http.servlet/src/org/eclipse/equinox/http/servlet/internal/multipart/MultipartSupportImpl.java
+++ b/bundles/org.eclipse.equinox.http.servlet/src/org/eclipse/equinox/http/servlet/internal/multipart/MultipartSupportImpl.java
@@ -78,6 +78,7 @@ public class MultipartSupportImpl implements MultipartSupport {
accessControlContext.checkPermission(new FilePermission(baseStorage.getAbsolutePath(), "read,write")); //$NON-NLS-1$
}
+ @Override
public Map<String, Part> parseRequest(HttpServletRequest request) throws IOException, ServletException {
if (upload == null) {
throw new IllegalStateException("Servlet was not configured for multipart!"); //$NON-NLS-1$
diff --git a/bundles/org.eclipse.equinox.http.servlet/src/org/eclipse/equinox/http/servlet/internal/registration/EndpointRegistration.java b/bundles/org.eclipse.equinox.http.servlet/src/org/eclipse/equinox/http/servlet/internal/registration/EndpointRegistration.java
index 6393e50e..19026d60 100644
--- a/bundles/org.eclipse.equinox.http.servlet/src/org/eclipse/equinox/http/servlet/internal/registration/EndpointRegistration.java
+++ b/bundles/org.eclipse.equinox.http.servlet/src/org/eclipse/equinox/http/servlet/internal/registration/EndpointRegistration.java
@@ -54,6 +54,7 @@ public abstract class EndpointRegistration<D extends DTO>
createContextAttributes();
}
+ @Override
public void destroy() {
ClassLoader original = Thread.currentThread().getContextClassLoader();
try {
diff --git a/bundles/org.eclipse.equinox.http.servlet/src/org/eclipse/equinox/http/servlet/internal/registration/FilterRegistration.java b/bundles/org.eclipse.equinox.http.servlet/src/org/eclipse/equinox/http/servlet/internal/registration/FilterRegistration.java
index 434ba452..e3e5dcd9 100644
--- a/bundles/org.eclipse.equinox.http.servlet/src/org/eclipse/equinox/http/servlet/internal/registration/FilterRegistration.java
+++ b/bundles/org.eclipse.equinox.http.servlet/src/org/eclipse/equinox/http/servlet/internal/registration/FilterRegistration.java
@@ -60,6 +60,7 @@ public class FilterRegistration
needDecode = MatchableRegistration.patternsRequireDecode(filterDTO.patterns);
}
+ @Override
public int compareTo(FilterRegistration otherFilterRegistration) {
int priorityDifference = priority - otherFilterRegistration.priority;
if (priorityDifference != 0)
@@ -72,6 +73,7 @@ public class FilterRegistration
return (thisId < otherId) ? -1 : ((thisId == otherId) ? 0 : 1);
}
+ @Override
public void destroy() {
if (!initDestoyWithContextController) {
return;
diff --git a/bundles/org.eclipse.equinox.http.servlet/src/org/eclipse/equinox/http/servlet/internal/servlet/ResourceServlet.java b/bundles/org.eclipse.equinox.http.servlet/src/org/eclipse/equinox/http/servlet/internal/servlet/ResourceServlet.java
index c3d23e40..918e55bb 100644
--- a/bundles/org.eclipse.equinox.http.servlet/src/org/eclipse/equinox/http/servlet/internal/servlet/ResourceServlet.java
+++ b/bundles/org.eclipse.equinox.http.servlet/src/org/eclipse/equinox/http/servlet/internal/servlet/ResourceServlet.java
@@ -72,6 +72,7 @@ public class ResourceServlet extends HttpServlet {
try {
AccessController.doPrivileged(new PrivilegedExceptionAction<Boolean>() {
+ @Override
public Boolean run() throws Exception {
URLConnection connection = resourceURL.openConnection();
long lastModified = connection.getLastModified();
diff --git a/bundles/org.eclipse.equinox.http.servlet/src/org/eclipse/equinox/http/servlet/internal/servlet/ServletContextAdaptor.java b/bundles/org.eclipse.equinox.http.servlet/src/org/eclipse/equinox/http/servlet/internal/servlet/ServletContextAdaptor.java
index d72037e5..6410c0b9 100644
--- a/bundles/org.eclipse.equinox.http.servlet/src/org/eclipse/equinox/http/servlet/internal/servlet/ServletContextAdaptor.java
+++ b/bundles/org.eclipse.equinox.http.servlet/src/org/eclipse/equinox/http/servlet/internal/servlet/ServletContextAdaptor.java
@@ -101,6 +101,7 @@ public class ServletContextAdaptor {
curClassLoader, interfaces, new AdaptorInvocationHandler());
}
+ @Override
public boolean equals (Object obj) {
if (!(obj instanceof ServletContext)) {
return false;
@@ -159,6 +160,7 @@ public class ServletContextAdaptor {
try {
mimeType = AccessController.doPrivileged(
new PrivilegedExceptionAction<String>() {
+ @Override
public String run() throws Exception {
return servletContextHelper.getMimeType(name);
}
@@ -187,6 +189,7 @@ public class ServletContextAdaptor {
try {
return AccessController.doPrivileged(
new PrivilegedExceptionAction<String>() {
+ @Override
public String run() throws Exception {
return servletContextHelper.getRealPath(path);
}
@@ -223,6 +226,7 @@ public class ServletContextAdaptor {
try {
return AccessController.doPrivileged(
new PrivilegedExceptionAction<URL>() {
+ @Override
public URL run() throws Exception {
return servletContextHelper.getResource(name);
}
@@ -261,6 +265,7 @@ public class ServletContextAdaptor {
try {
return AccessController.doPrivileged(
new PrivilegedExceptionAction<Set<String>>() {
+ @Override
public Set<String> run() throws Exception {
return servletContextHelper.getResourcePaths(name);
}
@@ -278,6 +283,7 @@ public class ServletContextAdaptor {
return contextController.getContextName();
}
+ @Override
public int hashCode() {
return contextController.hashCode();
}
@@ -381,6 +387,7 @@ public class ServletContextAdaptor {
}
}
+ @Override
public String toString() {
String value = string;
@@ -431,6 +438,7 @@ public class ServletContextAdaptor {
return contextController;
}
+ @Override
public Object invoke(Object proxy, Method method, Object[] args)
throws Throwable {
diff --git a/bundles/org.eclipse.equinox.metatype/src/org/eclipse/equinox/metatype/impl/AttributeDefinitionImpl.java b/bundles/org.eclipse.equinox.metatype/src/org/eclipse/equinox/metatype/impl/AttributeDefinitionImpl.java
index 7334b3ef..ccd3a6b3 100644
--- a/bundles/org.eclipse.equinox.metatype/src/org/eclipse/equinox/metatype/impl/AttributeDefinitionImpl.java
+++ b/bundles/org.eclipse.equinox.metatype/src/org/eclipse/equinox/metatype/impl/AttributeDefinitionImpl.java
@@ -68,6 +68,7 @@ public class AttributeDefinitionImpl extends LocalizationElement implements Equi
/*
*
*/
+ @Override
public Object clone() {
AttributeDefinitionImpl ad = new AttributeDefinitionImpl(_id, _name, _description, _dataType, _cardinality, _minValue, _maxValue, _isRequired, getLocalization(), logger, helper);
@@ -263,18 +264,22 @@ public class AttributeDefinitionImpl extends LocalizationElement implements Equi
return vt.validate(this);
}
+ @Override
public Map<String, String> getExtensionAttributes(String schema) {
return helper.getExtensionAttributes(schema);
}
+ @Override
public Set<String> getExtensionUris() {
return helper.getExtensionUris();
}
+ @Override
public String getMax() {
return _maxValue == null ? null : String.valueOf(_maxValue);
}
+ @Override
public String getMin() {
return _minValue == null ? null : String.valueOf(_minValue);
}
diff --git a/bundles/org.eclipse.equinox.metatype/src/org/eclipse/equinox/metatype/impl/DataParser.java b/bundles/org.eclipse.equinox.metatype/src/org/eclipse/equinox/metatype/impl/DataParser.java
index f0faf0e3..000e8f23 100644
--- a/bundles/org.eclipse.equinox.metatype/src/org/eclipse/equinox/metatype/impl/DataParser.java
+++ b/bundles/org.eclipse.equinox.metatype/src/org/eclipse/equinox/metatype/impl/DataParser.java
@@ -174,16 +174,19 @@ public class DataParser {
elementName = name;
}
+ @Override
public void endElement(String namespaceURI, String localName, String qName) {
finished();
// Let parent resume handling SAX events
_dp_xmlReader.setContentHandler(_doc_handler);
}
+ @Override
public void startElement(String uri, String localName, String qName, Attributes attributes) throws SAXException {
throw new SAXException(NLS.bind(MetaTypeMsg.UNEXPECTED_ELEMENT, new Object[] {qName, attributes.getValue(ID), _dp_url, _dp_bundle.getBundleId(), _dp_bundle.getSymbolicName()}));
}
+ @Override
public void characters(char[] buf, int start, int end) throws SAXException {
String s = new String(buf, start, end).trim();
if (s.length() > 0) {
@@ -223,6 +226,7 @@ public class DataParser {
super();
}
+ @Override
public void startElement(String uri, String localName, String qName, Attributes attributes) {
logger.log(LogTracker.LOG_DEBUG, "Here is AbstractHandler:startElement():" //$NON-NLS-1$
@@ -235,6 +239,7 @@ public class DataParser {
}
}
+ @Override
public void setDocumentLocator(Locator locator) {
// do nothing
}
@@ -249,6 +254,7 @@ public class DataParser {
super(handler);
}
+ @Override
public void init(String name, Attributes attributes) {
logger.log(LogTracker.LOG_DEBUG, "Here is MetaDataHandler():init()"); //$NON-NLS-1$
@@ -261,6 +267,7 @@ public class DataParser {
// OcdHandler and AttributeDefinitionHandler later.
}
+ @Override
public void startElement(String uri, String localName, String qName, Attributes atts) {
logger.log(LogTracker.LOG_DEBUG, "Here is MetaDataHandler:startElement():" //$NON-NLS-1$
@@ -280,6 +287,7 @@ public class DataParser {
}
}
+ @Override
protected void finished() {
logger.log(LogTracker.LOG_DEBUG, "Here is MetaDataHandler():finished()"); //$NON-NLS-1$
@@ -346,6 +354,7 @@ public class DataParser {
_ocd = new ObjectClassDefinitionImpl(ocd_name_val, ocd_description_val, _refID, _dp_localization, extensionAttributes);
}
+ @Override
public void startElement(String uri, String localName, String qName, Attributes atts) {
logger.log(LogTracker.LOG_DEBUG, "Here is OcdHandler:startElement():" //$NON-NLS-1$
@@ -367,6 +376,7 @@ public class DataParser {
}
}
+ @Override
protected void finished() {
logger.log(LogTracker.LOG_DEBUG, "Here is OcdHandler():finished()"); //$NON-NLS-1$
if (!_isParsedDataValid)
@@ -391,6 +401,7 @@ public class DataParser {
super(handler);
}
+ @Override
public void init(String name, Attributes atts) {
logger.log(LogTracker.LOG_DEBUG, "Here is IconHandler:init()"); //$NON-NLS-1$
@@ -521,6 +532,7 @@ public class DataParser {
_ad = new AttributeDefinitionImpl(ad_id_val, ad_name_val, ad_description_val, _dataType, ad_cardinality_val, convert(ad_min_val, _dataType), convert(ad_max_val, _dataType), Boolean.valueOf(ad_required_val).booleanValue(), _dp_localization, logger, extensionAttributes);
}
+ @Override
public void startElement(String uri, String localName, String qName, Attributes atts) {
logger.log(LogTracker.LOG_DEBUG, "Here is AttributeDefinitionHandler:startElement():" //$NON-NLS-1$
@@ -542,6 +554,7 @@ public class DataParser {
}
}
+ @Override
protected void finished() {
logger.log(LogTracker.LOG_DEBUG, "Here is AttributeDefinitionHandler():finished()"); //$NON-NLS-1$
@@ -577,6 +590,7 @@ public class DataParser {
super(handler);
}
+ @Override
public void init(String name, Attributes atts) {
logger.log(LogTracker.LOG_DEBUG, "Here is OptionHandler:init()"); //$NON-NLS-1$
@@ -615,6 +629,7 @@ public class DataParser {
super(handler);
}
+ @Override
public void init(String name, Attributes atts) {
logger.log(LogTracker.LOG_DEBUG, "Here is DesignateHandler():init()"); //$NON-NLS-1$
super.init(name, atts);
@@ -650,6 +665,7 @@ public class DataParser {
}
}
+ @Override
public void startElement(String uri, String localName, String qName, Attributes atts) {
logger.log(LogTracker.LOG_DEBUG, "Here is DesignateHandler:startElement():" //$NON-NLS-1$
@@ -669,6 +685,7 @@ public class DataParser {
}
}
+ @Override
protected void finished() {
logger.log(LogTracker.LOG_DEBUG, "Here is DesignateHandler():finished()"); //$NON-NLS-1$
@@ -696,6 +713,7 @@ public class DataParser {
super(handler);
}
+ @Override
public void init(String name, Attributes atts) {
logger.log(LogTracker.LOG_DEBUG, "Here is ObjectHandler():init()"); //$NON-NLS-1$
@@ -708,6 +726,7 @@ public class DataParser {
}
}
+ @Override
public void startElement(String uri, String localName, String qName, Attributes atts) {
logger.log(LogTracker.LOG_DEBUG, "Here is ObjectHandler:startElement():" //$NON-NLS-1$
@@ -740,6 +759,7 @@ public class DataParser {
super(handler);
}
+ @Override
public void init(String name, Attributes atts) {
logger.log(LogTracker.LOG_DEBUG, "Here is AttributeHandler():init()"); //$NON-NLS-1$
@@ -790,15 +810,18 @@ public class DataParser {
// The following methods are standard SAX ErrorHandler methods.
// See SAX documentation for more info.
+ @Override
public void warning(SAXParseException spe) {
_out.println("Warning: " + getParseExceptionInfo(spe)); //$NON-NLS-1$
}
+ @Override
public void error(SAXParseException spe) throws SAXException {
String message = "Error: " + getParseExceptionInfo(spe); //$NON-NLS-1$
throw new SAXException(message);
}
+ @Override
public void fatalError(SAXParseException spe) throws SAXException {
String message = "Fatal Error: " + getParseExceptionInfo(spe); //$NON-NLS-1$
throw new SAXException(message);
diff --git a/bundles/org.eclipse.equinox.metatype/src/org/eclipse/equinox/metatype/impl/ExtendableHelper.java b/bundles/org.eclipse.equinox.metatype/src/org/eclipse/equinox/metatype/impl/ExtendableHelper.java
index fc3d85d9..b432768d 100644
--- a/bundles/org.eclipse.equinox.metatype/src/org/eclipse/equinox/metatype/impl/ExtendableHelper.java
+++ b/bundles/org.eclipse.equinox.metatype/src/org/eclipse/equinox/metatype/impl/ExtendableHelper.java
@@ -33,10 +33,12 @@ public class ExtendableHelper implements Extendable {
this.extensions = extensions;
}
+ @Override
public Map<String, String> getExtensionAttributes(String schema) {
return Collections.unmodifiableMap(extensions.get(schema));
}
+ @Override
public Set<String> getExtensionUris() {
return Collections.unmodifiableSet(extensions.keySet());
}
diff --git a/bundles/org.eclipse.equinox.metatype/src/org/eclipse/equinox/metatype/impl/Icon.java b/bundles/org.eclipse.equinox.metatype/src/org/eclipse/equinox/metatype/impl/Icon.java
index db7d514c..481ff9fe 100644
--- a/bundles/org.eclipse.equinox.metatype/src/org/eclipse/equinox/metatype/impl/Icon.java
+++ b/bundles/org.eclipse.equinox.metatype/src/org/eclipse/equinox/metatype/impl/Icon.java
@@ -38,6 +38,7 @@ class Icon implements Cloneable {
this._bundle = bundle;
}
+ @Override
public Object clone() {
return new Icon(this._fileName, this._size, this._bundle);
}
diff --git a/bundles/org.eclipse.equinox.metatype/src/org/eclipse/equinox/metatype/impl/MetaTypeProviderTracker.java b/bundles/org.eclipse.equinox.metatype/src/org/eclipse/equinox/metatype/impl/MetaTypeProviderTracker.java
index 97f66247..e5019dd5 100644
--- a/bundles/org.eclipse.equinox.metatype/src/org/eclipse/equinox/metatype/impl/MetaTypeProviderTracker.java
+++ b/bundles/org.eclipse.equinox.metatype/src/org/eclipse/equinox/metatype/impl/MetaTypeProviderTracker.java
@@ -68,6 +68,7 @@ public class MetaTypeProviderTracker implements EquinoxMetaTypeInformation {
return _bundle;
}
+ @Override
public EquinoxObjectClassDefinition getObjectClassDefinition(String id, String locale) {
if (_bundle.getState() != Bundle.ACTIVE)
return null; // return none if not active
@@ -213,14 +214,17 @@ public class MetaTypeProviderTracker implements EquinoxMetaTypeInformation {
return ocd.getIcon(size);
}
+ @Override
public Map<String, String> getExtensionAttributes(String schema) {
return Collections.<String, String> emptyMap();
}
+ @Override
public Set<String> getExtensionUris() {
return Collections.<String> emptySet();
}
+ @Override
public EquinoxAttributeDefinition[] getAttributeDefinitions(int filter) {
AttributeDefinition[] ads = ocd.getAttributeDefinitions(filter);
if (ads == null || ads.length == 0)
@@ -264,18 +268,22 @@ public class MetaTypeProviderTracker implements EquinoxMetaTypeInformation {
return ad.getDefaultValue();
}
+ @Override
public Map<String, String> getExtensionAttributes(String schema) {
return Collections.<String, String> emptyMap();
}
+ @Override
public Set<String> getExtensionUris() {
return Collections.<String> emptySet();
}
+ @Override
public String getMax() {
return null;
}
+ @Override
public String getMin() {
return null;
}
diff --git a/bundles/org.eclipse.equinox.metatype/src/org/eclipse/equinox/metatype/impl/MetaTypeServiceImpl.java b/bundles/org.eclipse.equinox.metatype/src/org/eclipse/equinox/metatype/impl/MetaTypeServiceImpl.java
index 31f56fdb..591f7ff7 100644
--- a/bundles/org.eclipse.equinox.metatype/src/org/eclipse/equinox/metatype/impl/MetaTypeServiceImpl.java
+++ b/bundles/org.eclipse.equinox.metatype/src/org/eclipse/equinox/metatype/impl/MetaTypeServiceImpl.java
@@ -53,6 +53,7 @@ public class MetaTypeServiceImpl implements EquinoxMetaTypeService, SynchronousB
*
* @see org.osgi.service.metatype.MetaTypeService#getMetaTypeInformation(org.osgi.framework.Bundle)
*/
+ @Override
public EquinoxMetaTypeInformation getMetaTypeInformation(Bundle bundle) {
return getMetaTypeProvider(bundle);
}
@@ -69,6 +70,7 @@ public class MetaTypeServiceImpl implements EquinoxMetaTypeService, SynchronousB
if (_mtps.containsKey(bID))
return _mtps.get(bID);
EquinoxMetaTypeInformation mti = AccessController.doPrivileged(new PrivilegedAction<EquinoxMetaTypeInformation>() {
+ @Override
public EquinoxMetaTypeInformation run() {
MetaTypeInformationImpl impl = null;
try {
diff --git a/bundles/org.eclipse.equinox.metatype/src/org/eclipse/equinox/metatype/impl/ObjectClassDefinitionImpl.java b/bundles/org.eclipse.equinox.metatype/src/org/eclipse/equinox/metatype/impl/ObjectClassDefinitionImpl.java
index a4636fb3..eec2ede6 100644
--- a/bundles/org.eclipse.equinox.metatype/src/org/eclipse/equinox/metatype/impl/ObjectClassDefinitionImpl.java
+++ b/bundles/org.eclipse.equinox.metatype/src/org/eclipse/equinox/metatype/impl/ObjectClassDefinitionImpl.java
@@ -27,6 +27,7 @@ import org.osgi.framework.Bundle;
*/
public class ObjectClassDefinitionImpl extends LocalizationElement implements EquinoxObjectClassDefinition, Cloneable {
private static final Comparator<Icon> iconComparator = new Comparator<Icon>() {
+ @Override
public int compare(Icon icon1, Icon icon2) {
return icon1.getIconSize().compareTo(icon2.getIconSize());
}
@@ -64,6 +65,7 @@ public class ObjectClassDefinitionImpl extends LocalizationElement implements Eq
/*
*
*/
+ @Override
public Object clone() {
ObjectClassDefinitionImpl ocd = new ObjectClassDefinitionImpl(_name, _description, _id, _type, getLocalization(), helper);
@@ -111,6 +113,7 @@ public class ObjectClassDefinitionImpl extends LocalizationElement implements Eq
*
* @see org.osgi.service.metatype.ObjectClassDefinition#getAttributeDefinitions(int)
*/
+ @Override
public EquinoxAttributeDefinition[] getAttributeDefinitions(int filter) {
EquinoxAttributeDefinition[] atts;
@@ -227,10 +230,12 @@ public class ObjectClassDefinitionImpl extends LocalizationElement implements Eq
}
}
+ @Override
public Map<String, String> getExtensionAttributes(String schema) {
return helper.getExtensionAttributes(schema);
}
+ @Override
public Set<String> getExtensionUris() {
return helper.getExtensionUris();
}
diff --git a/bundles/org.eclipse.equinox.region.tests/src/org/eclipse/equinox/region/tests/BundleInstaller.java b/bundles/org.eclipse.equinox.region.tests/src/org/eclipse/equinox/region/tests/BundleInstaller.java
index 6ceec24d..c269c44c 100644
--- a/bundles/org.eclipse.equinox.region.tests/src/org/eclipse/equinox/region/tests/BundleInstaller.java
+++ b/bundles/org.eclipse.equinox.region.tests/src/org/eclipse/equinox/region/tests/BundleInstaller.java
@@ -68,6 +68,7 @@ public class BundleInstaller {
return getBundleLocation0(name);
try {
return AccessController.doPrivileged(new PrivilegedExceptionAction<String>() {
+ @Override
public String run() throws Exception {
return getBundleLocation0(name);
}
diff --git a/bundles/org.eclipse.equinox.region.tests/src/org/eclipse/equinox/region/tests/system/Bug346127Test.java b/bundles/org.eclipse.equinox.region.tests/src/org/eclipse/equinox/region/tests/system/Bug346127Test.java
index a8a36d62..ec5c3225 100644
--- a/bundles/org.eclipse.equinox.region.tests/src/org/eclipse/equinox/region/tests/system/Bug346127Test.java
+++ b/bundles/org.eclipse.equinox.region.tests/src/org/eclipse/equinox/region/tests/system/Bug346127Test.java
@@ -52,6 +52,7 @@ public class Bug346127Test extends AbstractRegionSystemTest {
}
@Before
+ @Override
public void setUp() throws Exception {
super.setUp();
Hashtable<String, Object> properties = new Hashtable<String, Object>();
diff --git a/bundles/org.eclipse.equinox.region/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.region/META-INF/MANIFEST.MF
index 71470fbe..48252aaf 100644
--- a/bundles/org.eclipse.equinox.region/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.equinox.region/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.equinox.region
-Bundle-Version: 1.4.300.qualifier
+Bundle-Version: 1.4.400.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Fragment-Host: system.bundle
ExtensionBundle-Activator: org.eclipse.equinox.internal.region.RegionManager
diff --git a/bundles/org.eclipse.equinox.region/pom.xml b/bundles/org.eclipse.equinox.region/pom.xml
index b128c3da..bbe4ae11 100644
--- a/bundles/org.eclipse.equinox.region/pom.xml
+++ b/bundles/org.eclipse.equinox.region/pom.xml
@@ -5,7 +5,7 @@
are made available under the terms of the Eclipse Distribution License v1.0
which accompanies this distribution, and is available at
http://www.eclipse.org/org/documents/edl-v10.php
-
+
Contributors:
Igor Fedorenko - initial implementation
-->
@@ -19,6 +19,6 @@
</parent>
<groupId>org.eclipse.equinox</groupId>
<artifactId>org.eclipse.equinox.region</artifactId>
- <version>1.4.300-SNAPSHOT</version>
+ <version>1.4.400-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.equinox.region/src/org/eclipse/equinox/internal/region/StandardRegionDigraph.java b/bundles/org.eclipse.equinox.region/src/org/eclipse/equinox/internal/region/StandardRegionDigraph.java
index 449d7616..68fa2ab1 100644
--- a/bundles/org.eclipse.equinox.region/src/org/eclipse/equinox/internal/region/StandardRegionDigraph.java
+++ b/bundles/org.eclipse.equinox.region/src/org/eclipse/equinox/internal/region/StandardRegionDigraph.java
@@ -110,6 +110,7 @@ public final class StandardRegionDigraph implements BundleIdToRegionMapping, Reg
/**
* {@inheritDoc}
*/
+ @Override
public Region createRegion(String regionName) throws BundleException {
return createRegion(regionName, true);
}
@@ -133,6 +134,7 @@ public final class StandardRegionDigraph implements BundleIdToRegionMapping, Reg
/**
* {@inheritDoc}
*/
+ @Override
public void connect(Region tailRegion, RegionFilter filter, Region headRegion) throws BundleException {
createConnection(tailRegion, filter, headRegion, false);
}
@@ -140,6 +142,7 @@ public final class StandardRegionDigraph implements BundleIdToRegionMapping, Reg
/**
* {@inheritDoc}
*/
+ @Override
public RegionFilter replaceConnection(Region tailRegion, RegionFilter filter, Region headRegion) throws BundleException {
return createConnection(tailRegion, filter, headRegion, true);
}
@@ -211,6 +214,7 @@ public final class StandardRegionDigraph implements BundleIdToRegionMapping, Reg
/**
* {@inheritDoc}
*/
+ @Override
public Iterator<Region> iterator() {
synchronized (this.monitor) {
Set<Region> snapshot = new HashSet<Region>(this.regions.size());
@@ -222,6 +226,7 @@ public final class StandardRegionDigraph implements BundleIdToRegionMapping, Reg
/**
* {@inheritDoc}
*/
+ @Override
public Set<FilteredRegion> getEdges(Region tailRegion) {
synchronized (this.monitor) {
// Cope with the case where tailRegion is not in the digraph
@@ -241,10 +246,12 @@ public final class StandardRegionDigraph implements BundleIdToRegionMapping, Reg
this.regionFilter = regionFilter;
}
+ @Override
public Region getRegion() {
return this.region;
}
+ @Override
public RegionFilter getFilter() {
return this.regionFilter;
}
@@ -254,6 +261,7 @@ public final class StandardRegionDigraph implements BundleIdToRegionMapping, Reg
/**
* {@inheritDoc}
*/
+ @Override
public Region getRegion(String regionName) {
synchronized (this.monitor) {
return regions.get(regionName);
@@ -263,6 +271,7 @@ public final class StandardRegionDigraph implements BundleIdToRegionMapping, Reg
/**
* {@inheritDoc}
*/
+ @Override
public Region getRegion(Bundle bundle) {
return getRegion(bundle.getBundleId());
}
@@ -270,6 +279,7 @@ public final class StandardRegionDigraph implements BundleIdToRegionMapping, Reg
/**
* {@inheritDoc}
*/
+ @Override
public Region getRegion(long bundleId) {
synchronized (this.monitor) {
return this.bundleIdToRegionMapping.getRegion(bundleId);
@@ -279,6 +289,7 @@ public final class StandardRegionDigraph implements BundleIdToRegionMapping, Reg
/**
* {@inheritDoc}
*/
+ @Override
public void removeRegion(Region region) {
if (region == null)
throw new IllegalArgumentException("The region cannot be null."); //$NON-NLS-1$
@@ -309,6 +320,7 @@ public final class StandardRegionDigraph implements BundleIdToRegionMapping, Reg
/**
* {@inheritDoc}
*/
+ @Override
public String toString() {
synchronized (this.monitor) {
StringBuffer s = new StringBuffer();
@@ -342,6 +354,7 @@ public final class StandardRegionDigraph implements BundleIdToRegionMapping, Reg
}
}
+ @Override
public Set<Region> getRegions() {
Set<Region> result = new HashSet<Region>();
synchronized (this.monitor) {
@@ -350,6 +363,7 @@ public final class StandardRegionDigraph implements BundleIdToRegionMapping, Reg
return result;
}
+ @Override
public RegionFilterBuilder createRegionFilterBuilder() {
return new StandardRegionFilterBuilder();
}
@@ -389,6 +403,7 @@ public final class StandardRegionDigraph implements BundleIdToRegionMapping, Reg
/**
* {@inheritDoc}
*/
+ @Override
public void visitSubgraph(Region startingRegion, RegionDigraphVisitor visitor) {
this.subgraphTraverser.visitSubgraph(startingRegion, visitor);
}
@@ -407,6 +422,7 @@ public final class StandardRegionDigraph implements BundleIdToRegionMapping, Reg
/**
* {@inheritDoc}
*/
+ @Override
public RegionDigraphPersistence getRegionDigraphPersistence() {
return new StandardRegionDigraphPersistence();
}
diff --git a/bundles/org.eclipse.equinox.region/src/org/eclipse/equinox/internal/region/StandardRegionDigraphPersistence.java b/bundles/org.eclipse.equinox.region/src/org/eclipse/equinox/internal/region/StandardRegionDigraphPersistence.java
index 96ec2dff..c26ecda0 100644
--- a/bundles/org.eclipse.equinox.region/src/org/eclipse/equinox/internal/region/StandardRegionDigraphPersistence.java
+++ b/bundles/org.eclipse.equinox.region/src/org/eclipse/equinox/internal/region/StandardRegionDigraphPersistence.java
@@ -179,6 +179,7 @@ public final class StandardRegionDigraphPersistence implements RegionDigraphPers
/**
* {@inheritDoc}
*/
+ @Override
public RegionDigraph load(InputStream input) throws IOException {
try {
return readRegionDigraph(new DataInputStream(input), null, null);
@@ -196,6 +197,7 @@ public final class StandardRegionDigraphPersistence implements RegionDigraphPers
/**
* {@inheritDoc}
*/
+ @Override
public void save(RegionDigraph digraph, OutputStream output) throws IOException {
writeRegionDigraph(new DataOutputStream(output), digraph);
}
diff --git a/bundles/org.eclipse.equinox.region/src/org/eclipse/equinox/internal/region/StandardRegionFilter.java b/bundles/org.eclipse.equinox.region/src/org/eclipse/equinox/internal/region/StandardRegionFilter.java
index 7e1e863f..d20adbfe 100644
--- a/bundles/org.eclipse.equinox.region/src/org/eclipse/equinox/internal/region/StandardRegionFilter.java
+++ b/bundles/org.eclipse.equinox.region/src/org/eclipse/equinox/internal/region/StandardRegionFilter.java
@@ -49,6 +49,7 @@ public final class StandardRegionFilter implements RegionFilter {
}
}
+ @Override
public boolean isAllowed(Bundle bundle) {
if (bundle == null) {
return false;
@@ -64,6 +65,7 @@ public final class StandardRegionFilter implements RegionFilter {
return isBundleAllowed(attrs);
}
+ @Override
public boolean isAllowed(BundleRevision bundle) {
HashMap<String, Object> attrs = new HashMap<String, Object>(4);
String bsn = bundle.getSymbolicName();
@@ -112,6 +114,7 @@ public final class StandardRegionFilter implements RegionFilter {
return matchAll(VISIBLE_OSGI_SERVICE_NAMESPACE, service);
}
+ @Override
public boolean isAllowed(BundleCapability capability) {
return isAllowed(capability.getNamespace(), capability.getAttributes());
}
@@ -179,6 +182,7 @@ public final class StandardRegionFilter implements RegionFilter {
});
}
+ @Override
public Map<String, Collection<String>> getSharingPolicy() {
Map<String, Collection<String>> result = new HashMap<String, Collection<String>>((int) ((filters.size() / 0.75) + 1));
for (Map.Entry<String, Collection<Filter>> namespace : filters.entrySet()) {
@@ -195,6 +199,7 @@ public final class StandardRegionFilter implements RegionFilter {
return result;
}
+ @Override
public String toString() {
return getSharingPolicy().toString();
}
diff --git a/bundles/org.eclipse.equinox.region/src/org/eclipse/equinox/internal/region/StandardRegionFilterBuilder.java b/bundles/org.eclipse.equinox.region/src/org/eclipse/equinox/internal/region/StandardRegionFilterBuilder.java
index dfe99c91..befd8149 100644
--- a/bundles/org.eclipse.equinox.region/src/org/eclipse/equinox/internal/region/StandardRegionFilterBuilder.java
+++ b/bundles/org.eclipse.equinox.region/src/org/eclipse/equinox/internal/region/StandardRegionFilterBuilder.java
@@ -29,6 +29,7 @@ public final class StandardRegionFilterBuilder implements RegionFilterBuilder {
private final Map<String, Collection<Filter>> policy = new HashMap<String, Collection<Filter>>();
@SuppressWarnings("deprecation")
+ @Override
public RegionFilterBuilder allow(String namespace, String filter) throws InvalidSyntaxException {
if (namespace == null)
throw new IllegalArgumentException("The namespace must not be null."); //$NON-NLS-1$
@@ -58,6 +59,7 @@ public final class StandardRegionFilterBuilder implements RegionFilterBuilder {
}
@SuppressWarnings("deprecation")
+ @Override
public RegionFilterBuilder allowAll(String namespace) {
if (namespace == null)
throw new IllegalArgumentException("The namespace must not be null."); //$NON-NLS-1$
@@ -79,6 +81,7 @@ public final class StandardRegionFilterBuilder implements RegionFilterBuilder {
return this;
}
+ @Override
public RegionFilter build() {
synchronized (this.monitor) {
return new StandardRegionFilter(policy);
diff --git a/bundles/org.eclipse.equinox.region/src/org/eclipse/equinox/internal/region/management/StandardManageableRegion.java b/bundles/org.eclipse.equinox.region/src/org/eclipse/equinox/internal/region/management/StandardManageableRegion.java
index a05cb9e9..bf828743 100644
--- a/bundles/org.eclipse.equinox.region/src/org/eclipse/equinox/internal/region/management/StandardManageableRegion.java
+++ b/bundles/org.eclipse.equinox.region/src/org/eclipse/equinox/internal/region/management/StandardManageableRegion.java
@@ -48,6 +48,7 @@ public class StandardManageableRegion implements ManageableRegion {
/**
* {@inheritDoc}
*/
+ @Override
public String getName() {
return region.getName();
}
@@ -55,6 +56,7 @@ public class StandardManageableRegion implements ManageableRegion {
/**
* {@inheritDoc}
*/
+ @Override
public ManageableRegion[] getDependencies() {
Set<FilteredRegion> edges = this.regionDigraph.getEdges(this.region);
List<ManageableRegion> dependencies = new ArrayList<ManageableRegion>();
@@ -70,6 +72,7 @@ public class StandardManageableRegion implements ManageableRegion {
/**
* {@inheritDoc}
*/
+ @Override
public long[] getBundleIds() {
Set<Long> bundleIds = this.region.getBundleIds();
long[] result = new long[bundleIds.size()];
diff --git a/bundles/org.eclipse.equinox.region/src/org/eclipse/equinox/internal/region/management/StandardManageableRegionDigraph.java b/bundles/org.eclipse.equinox.region/src/org/eclipse/equinox/internal/region/management/StandardManageableRegionDigraph.java
index fe22660e..49eac3e7 100644
--- a/bundles/org.eclipse.equinox.region/src/org/eclipse/equinox/internal/region/management/StandardManageableRegionDigraph.java
+++ b/bundles/org.eclipse.equinox.region/src/org/eclipse/equinox/internal/region/management/StandardManageableRegionDigraph.java
@@ -57,10 +57,12 @@ public final class StandardManageableRegionDigraph implements ManageableRegionDi
private final RegionLifecycleListener regionLifecycleListener = new RegionLifecycleListener() {
+ @Override
public void regionAdded(Region region) {
addRegion(region);
}
+ @Override
public void regionRemoving(Region region) {
removeRegion(region);
}
@@ -148,6 +150,7 @@ public final class StandardManageableRegionDigraph implements ManageableRegionDi
/**
* {@inheritDoc}
*/
+ @Override
public ManageableRegion[] getRegions() {
List<ManageableRegion> regions = new ArrayList<ManageableRegion>();
synchronized (this.monitor) {
@@ -161,6 +164,7 @@ public final class StandardManageableRegionDigraph implements ManageableRegionDi
/**
* {@inheritDoc}
*/
+ @Override
public ManageableRegion getRegion(String regionName) {
return this.manageableRegions.get(regionName);
}
diff --git a/bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/DefaultAuthorizationManager.java b/bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/DefaultAuthorizationManager.java
index 3019ede3..37d68462 100644
--- a/bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/DefaultAuthorizationManager.java
+++ b/bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/DefaultAuthorizationManager.java
@@ -33,19 +33,23 @@ public class DefaultAuthorizationManager extends AuthorizationManager {
currentStatus = enabled ? Activator.getAuthorizationEngine().getStatus() : IStatus.OK;
}
+ @Override
public boolean isEnabled() {
return true;
}
+ @Override
public boolean needsAttention() {
return needsAttention; //TODO: make it happen
}
+ @Override
public IStatus getStatus() {
currentStatus = enabled ? Activator.getAuthorizationEngine().getStatus() : IStatus.OK;
return transformStatus(currentStatus);
}
+ @Override
public void displayManager(IWorkbenchWindow workbenchWindow) {
//TODO: manager UI
}
diff --git a/bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/SecurityStatusControl.java b/bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/SecurityStatusControl.java
index 7d6a9dfa..362ffb13 100644
--- a/bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/SecurityStatusControl.java
+++ b/bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/SecurityStatusControl.java
@@ -182,6 +182,7 @@ public class SecurityStatusControl extends ControlContribution {
return status;
}
+ @Override
public boolean equals(Object another) {
boolean returnValue = false;
if (another instanceof IconState) {
@@ -196,6 +197,7 @@ public class SecurityStatusControl extends ControlContribution {
return returnValue;
}
+ @Override
public int hashCode() {
return Boolean.valueOf(enabled).hashCode() + status.hashCode() + Boolean.valueOf(needsAttention).hashCode();
}
diff --git a/bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/storage/TabContents.java b/bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/storage/TabContents.java
index 7ea2dae1..a022cb3b 100644
--- a/bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/storage/TabContents.java
+++ b/bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/storage/TabContents.java
@@ -39,6 +39,7 @@ public class TabContents implements ISecurePreferencesSelection, IDeleteListener
protected ValuesView valuesView = null;
protected Button buttonSave = null;
+ @Override
public void setSelection(ISecurePreferences selectedNode) {
valuesView.setInput(selectedNode);
}
@@ -125,6 +126,7 @@ public class TabContents implements ISecurePreferencesSelection, IDeleteListener
validateSave();
}
+ @Override
public void modified() {
validateSave();
}
diff --git a/bundles/org.eclipse.equinox.transforms.hook/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.transforms.hook/META-INF/MANIFEST.MF
index 5bba8130..3b9ed32b 100644
--- a/bundles/org.eclipse.equinox.transforms.hook/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.equinox.transforms.hook/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: %bundleName
Bundle-Vendor: %providerName
Bundle-SymbolicName: org.eclipse.equinox.transforms.hook
-Bundle-Version: 1.2.300.qualifier
+Bundle-Version: 1.2.400.qualifier
Fragment-Host: org.eclipse.osgi;bundle-version="[3.10.0,4.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Bundle-Localization: transformsHook
diff --git a/bundles/org.eclipse.equinox.transforms.hook/pom.xml b/bundles/org.eclipse.equinox.transforms.hook/pom.xml
index f56f1909..3fd34e2a 100644
--- a/bundles/org.eclipse.equinox.transforms.hook/pom.xml
+++ b/bundles/org.eclipse.equinox.transforms.hook/pom.xml
@@ -19,6 +19,6 @@
</parent>
<groupId>org.eclipse.equinox</groupId>
<artifactId>org.eclipse.equinox.transforms.hook</artifactId>
- <version>1.2.300-SNAPSHOT</version>
+ <version>1.2.400-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.equinox.transforms.hook/src/org/eclipse/equinox/internal/transforms/LazyInputStream.java b/bundles/org.eclipse.equinox.transforms.hook/src/org/eclipse/equinox/internal/transforms/LazyInputStream.java
index cb1e82e7..a2aaff2c 100644
--- a/bundles/org.eclipse.equinox.transforms.hook/src/org/eclipse/equinox/internal/transforms/LazyInputStream.java
+++ b/bundles/org.eclipse.equinox.transforms.hook/src/org/eclipse/equinox/internal/transforms/LazyInputStream.java
@@ -42,16 +42,19 @@ public class LazyInputStream extends InputStream {
original = provider.getInputStream();
}
+ @Override
public int available() throws IOException {
initOriginal();
return original.available();
}
+ @Override
public void close() throws IOException {
initOriginal();
original.close();
}
+ @Override
public boolean equals(Object obj) {
try {
initOriginal();
@@ -61,6 +64,7 @@ public class LazyInputStream extends InputStream {
}
}
+ @Override
public int hashCode() {
try {
initOriginal();
@@ -70,6 +74,7 @@ public class LazyInputStream extends InputStream {
}
}
+ @Override
public void mark(int readlimit) {
try {
initOriginal();
@@ -79,6 +84,7 @@ public class LazyInputStream extends InputStream {
}
}
+ @Override
public boolean markSupported() {
try {
initOriginal();
@@ -88,31 +94,37 @@ public class LazyInputStream extends InputStream {
}
}
+ @Override
public int read() throws IOException {
initOriginal();
return original.read();
}
+ @Override
public int read(byte[] b, int off, int len) throws IOException {
initOriginal();
return original.read(b, off, len);
}
+ @Override
public int read(byte[] b) throws IOException {
initOriginal();
return original.read(b);
}
+ @Override
public void reset() throws IOException {
initOriginal();
original.reset();
}
+ @Override
public long skip(long n) throws IOException {
initOriginal();
return original.skip(n);
}
+ @Override
public String toString() {
try {
initOriginal();
diff --git a/bundles/org.eclipse.equinox.transforms.hook/src/org/eclipse/equinox/internal/transforms/ProxyStreamTransformer.java b/bundles/org.eclipse.equinox.transforms.hook/src/org/eclipse/equinox/internal/transforms/ProxyStreamTransformer.java
index 218a9a46..af7409f4 100644
--- a/bundles/org.eclipse.equinox.transforms.hook/src/org/eclipse/equinox/internal/transforms/ProxyStreamTransformer.java
+++ b/bundles/org.eclipse.equinox.transforms.hook/src/org/eclipse/equinox/internal/transforms/ProxyStreamTransformer.java
@@ -44,6 +44,7 @@ public class ProxyStreamTransformer extends StreamTransformer {
}
+ @Override
public InputStream getInputStream(InputStream inputStream, URL transformerUrl) throws IOException {
try {
return (InputStream) method.invoke(object, new Object[] {inputStream, transformerUrl});
diff --git a/bundles/org.eclipse.equinox.transforms.hook/src/org/eclipse/equinox/internal/transforms/TransformedBundleFile.java b/bundles/org.eclipse.equinox.transforms.hook/src/org/eclipse/equinox/internal/transforms/TransformedBundleFile.java
index 3a795631..77cfb99b 100644
--- a/bundles/org.eclipse.equinox.transforms.hook/src/org/eclipse/equinox/internal/transforms/TransformedBundleFile.java
+++ b/bundles/org.eclipse.equinox.transforms.hook/src/org/eclipse/equinox/internal/transforms/TransformedBundleFile.java
@@ -69,6 +69,7 @@ public class TransformedBundleFile extends BundleFileWrapper {
LazyInputStream stream = new LazyInputStream(new InputStreamProvider() {
+ @Override
public InputStream getInputStream() throws IOException {
return original.getInputStream();
}
diff --git a/bundles/org.eclipse.equinox.transforms.xslt/src/org/eclipse/equinox/internal/transforms/Pipe.java b/bundles/org.eclipse.equinox.transforms.xslt/src/org/eclipse/equinox/internal/transforms/Pipe.java
index 8b947b0b..d5b8a8e8 100644
--- a/bundles/org.eclipse.equinox.transforms.xslt/src/org/eclipse/equinox/internal/transforms/Pipe.java
+++ b/bundles/org.eclipse.equinox.transforms.xslt/src/org/eclipse/equinox/internal/transforms/Pipe.java
@@ -55,6 +55,7 @@ public class Pipe {
if (!started) {
started = true;
Thread pipeThread = new Thread(new Runnable() {
+ @Override
public void run() {
try {
pipeInput(input, pipedOutputStream);
@@ -71,27 +72,32 @@ public class Pipe {
}
}
+ @Override
public synchronized int available() throws IOException {
start();
return super.available();
}
+ @Override
public synchronized int read() throws IOException {
start();
int c = super.read();
return c;
}
+ @Override
public int read(byte[] b) throws IOException {
start();
return super.read(b);
}
+ @Override
public synchronized int read(byte[] b, int off, int len) throws IOException {
start();
return super.read(b, off, len);
}
+ @Override
public synchronized void reset() throws IOException {
started = false;
failure = null;
diff --git a/bundles/org.eclipse.equinox.transforms.xslt/src/org/eclipse/equinox/internal/transforms/xslt/XSLTStreamTransformer.java b/bundles/org.eclipse.equinox.transforms.xslt/src/org/eclipse/equinox/internal/transforms/xslt/XSLTStreamTransformer.java
index 40d8bb88..fcd8b1d7 100644
--- a/bundles/org.eclipse.equinox.transforms.xslt/src/org/eclipse/equinox/internal/transforms/xslt/XSLTStreamTransformer.java
+++ b/bundles/org.eclipse.equinox.transforms.xslt/src/org/eclipse/equinox/internal/transforms/xslt/XSLTStreamTransformer.java
@@ -48,6 +48,7 @@ public class XSLTStreamTransformer {
this.transformer = transformer;
}
+ @Override
protected void pipeInput(InputStream original, OutputStream result) throws IOException {
try {
InputSource streamSource = new InputSource(original);
@@ -74,6 +75,7 @@ public class XSLTStreamTransformer {
* The dummy entity resolver which returns empty content for all external entity requests.
*/
protected EntityResolver resolver = new EntityResolver() {
+ @Override
public InputSource resolveEntity(String publicId, String systemId) {
// don't validate external entities - too expensive
return new InputSource(new StringReader("")); //$NON-NLS-1$
diff --git a/bundles/org.eclipse.equinox.weaving.caching/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.weaving.caching/META-INF/MANIFEST.MF
index 0390307c..ce445961 100644
--- a/bundles/org.eclipse.equinox.weaving.caching/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.equinox.weaving.caching/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.eclipse.equinox.weaving.caching
-Bundle-Version: 1.1.200.qualifier
+Bundle-Version: 1.1.300.qualifier
Bundle-Name: Standard Caching Service for Equinox Aspects
Bundle-Vendor: Eclipse.org - Equinox
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
diff --git a/bundles/org.eclipse.equinox.weaving.caching/pom.xml b/bundles/org.eclipse.equinox.weaving.caching/pom.xml
index 170d174b..fd21ba62 100644
--- a/bundles/org.eclipse.equinox.weaving.caching/pom.xml
+++ b/bundles/org.eclipse.equinox.weaving.caching/pom.xml
@@ -19,7 +19,7 @@
</parent>
<groupId>org.eclipse.equinox</groupId>
<artifactId>org.eclipse.equinox.weaving.caching</artifactId>
- <version>1.1.200-SNAPSHOT</version>
+ <version>1.1.300-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
<build>
diff --git a/bundles/org.eclipse.equinox.weaving.caching/src/org/eclipse/equinox/weaving/internal/caching/CacheWriter.java b/bundles/org.eclipse.equinox.weaving.caching/src/org/eclipse/equinox/weaving/internal/caching/CacheWriter.java
index d9d0edd6..8acdde67 100644
--- a/bundles/org.eclipse.equinox.weaving.caching/src/org/eclipse/equinox/weaving/internal/caching/CacheWriter.java
+++ b/bundles/org.eclipse.equinox.weaving.caching/src/org/eclipse/equinox/weaving/internal/caching/CacheWriter.java
@@ -44,6 +44,7 @@ public class CacheWriter {
public CacheWriter(final BlockingQueue<CacheItem> cacheQueue) {
this.writerThread = new Thread(new Runnable() {
+ @Override
public void run() {
try {
while (true) {
diff --git a/bundles/org.eclipse.equinox.weaving.hook/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.weaving.hook/META-INF/MANIFEST.MF
index 7f3266f7..7c25a0ef 100644
--- a/bundles/org.eclipse.equinox.weaving.hook/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.equinox.weaving.hook/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Aspect Weaving Hooks Plug-in
Bundle-SymbolicName: org.eclipse.equinox.weaving.hook
-Bundle-Version: 1.2.200.qualifier
+Bundle-Version: 1.2.300.qualifier
Fragment-Host: org.eclipse.osgi;bundle-version="[3.10.0,4.0.0)"
Bundle-Vendor: Eclipse.org - Equinox
Export-Package: org.eclipse.equinox.service.weaving,
diff --git a/bundles/org.eclipse.equinox.weaving.hook/pom.xml b/bundles/org.eclipse.equinox.weaving.hook/pom.xml
index 6d409272..e25ebaed 100644
--- a/bundles/org.eclipse.equinox.weaving.hook/pom.xml
+++ b/bundles/org.eclipse.equinox.weaving.hook/pom.xml
@@ -5,7 +5,7 @@
are made available under the terms of the Eclipse Distribution License v1.0
which accompanies this distribution, and is available at
http://www.eclipse.org/org/documents/edl-v10.php
-
+
Contributors:
Igor Fedorenko - initial implementation
-->
@@ -19,6 +19,6 @@
</parent>
<groupId>org.eclipse.equinox</groupId>
<artifactId>org.eclipse.equinox.weaving.hook</artifactId>
- <version>1.2.200-SNAPSHOT</version>
+ <version>1.2.300-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.equinox.weaving.hook/src/org/eclipse/equinox/weaving/hooks/SupplementerRegistry.java b/bundles/org.eclipse.equinox.weaving.hook/src/org/eclipse/equinox/weaving/hooks/SupplementerRegistry.java
index ee47dc26..2f6cf199 100644
--- a/bundles/org.eclipse.equinox.weaving.hook/src/org/eclipse/equinox/weaving/hooks/SupplementerRegistry.java
+++ b/bundles/org.eclipse.equinox.weaving.hook/src/org/eclipse/equinox/weaving/hooks/SupplementerRegistry.java
@@ -119,6 +119,7 @@ public class SupplementerRegistry implements ISupplementerRegistry {
/**
* @see org.eclipse.equinox.service.weaving.ISupplementerRegistry#addBundle(org.osgi.framework.Bundle)
*/
+ @Override
public void addBundle(final Bundle bundle) {
// First analyze which supplementers already exists for this bundle
addSupplementedBundle(bundle);
@@ -130,6 +131,7 @@ public class SupplementerRegistry implements ISupplementerRegistry {
/**
* @see org.eclipse.equinox.service.weaving.ISupplementerRegistry#addSupplementedBundle(org.osgi.framework.Bundle)
*/
+ @Override
public void addSupplementedBundle(final Bundle bundle) {
try {
final Dictionary<?, ?> manifest = bundle.getHeaders(""); //$NON-NLS-1$
@@ -164,6 +166,7 @@ public class SupplementerRegistry implements ISupplementerRegistry {
* @see org.eclipse.equinox.service.weaving.ISupplementerRegistry#addSupplementer(org.osgi.framework.Bundle,
* boolean)
*/
+ @Override
public void addSupplementer(final Bundle bundle, final boolean updateBundles) {
try {
final Dictionary<?, ?> manifest = bundle.getHeaders(""); //$NON-NLS-1$
@@ -203,6 +206,7 @@ public class SupplementerRegistry implements ISupplementerRegistry {
* org.eclipse.osgi.util.ManifestElement[],
* org.eclipse.osgi.util.ManifestElement[])
*/
+ @Override
public List<Supplementer> getMatchingSupplementers(
final String symbolicName, final ManifestElement[] imports,
final ManifestElement[] exports) {
@@ -227,6 +231,7 @@ public class SupplementerRegistry implements ISupplementerRegistry {
/**
* @see org.eclipse.equinox.service.weaving.ISupplementerRegistry#getPackageAdmin()
*/
+ @Override
public PackageAdmin getPackageAdmin() {
return packageAdmin;
}
@@ -234,6 +239,7 @@ public class SupplementerRegistry implements ISupplementerRegistry {
/**
* @see org.eclipse.equinox.service.weaving.ISupplementerRegistry#getSupplementers(org.osgi.framework.Bundle)
*/
+ @Override
public Supplementer[] getSupplementers(final Bundle bundle) {
return getSupplementers(bundle.getBundleId());
}
@@ -241,6 +247,7 @@ public class SupplementerRegistry implements ISupplementerRegistry {
/**
* @see org.eclipse.equinox.service.weaving.ISupplementerRegistry#getSupplementers(long)
*/
+ @Override
public Supplementer[] getSupplementers(final long bundleID) {
if (supplementersByBundle.containsKey(bundleID)) {
return supplementersByBundle.get(bundleID);
@@ -270,6 +277,7 @@ public class SupplementerRegistry implements ISupplementerRegistry {
*
* @param bundles The bundles to refresh
*/
+ @Override
public void refreshBundles(final Bundle[] bundles) {
// if (this.packageAdmin != null) {
// if (AbstractWeavingHook.verbose) {
@@ -286,6 +294,7 @@ public class SupplementerRegistry implements ISupplementerRegistry {
/**
* @see org.eclipse.equinox.service.weaving.ISupplementerRegistry#removeBundle(org.osgi.framework.Bundle)
*/
+ @Override
public void removeBundle(final Bundle bundle) {
// if this bundle is itself supplemented by others, remove the bundle from those lists
removeSupplementedBundle(bundle);
@@ -416,6 +425,7 @@ public class SupplementerRegistry implements ISupplementerRegistry {
/**
* @see org.eclipse.equinox.service.weaving.ISupplementerRegistry#setBundleContext(org.osgi.framework.BundleContext)
*/
+ @Override
public void setBundleContext(final BundleContext context) {
this.context = context;
}
@@ -423,6 +433,7 @@ public class SupplementerRegistry implements ISupplementerRegistry {
/**
* @see org.eclipse.equinox.service.weaving.ISupplementerRegistry#setPackageAdmin(org.osgi.service.packageadmin.PackageAdmin)
*/
+ @Override
public void setPackageAdmin(final PackageAdmin packageAdmin) {
this.packageAdmin = packageAdmin;
}
diff --git a/bundles/org.eclipse.equinox.weaving.hook/src/org/eclipse/equinox/weaving/hooks/WeavingHook.java b/bundles/org.eclipse.equinox.weaving.hook/src/org/eclipse/equinox/weaving/hooks/WeavingHook.java
index 60dc8535..ab7b6945 100644
--- a/bundles/org.eclipse.equinox.weaving.hook/src/org/eclipse/equinox/weaving/hooks/WeavingHook.java
+++ b/bundles/org.eclipse.equinox.weaving.hook/src/org/eclipse/equinox/weaving/hooks/WeavingHook.java
@@ -96,10 +96,12 @@ public class WeavingHook extends AbstractWeavingHook {
return adaptor;
}
+ @Override
public IWeavingAdaptor getAdaptor(final long bundleID) {
return this.adaptors.get(bundleID);
}
+ @Override
public IWeavingAdaptor getHostBundleAdaptor(final long bundleID) {
final Bundle bundle = this.bundleContext.getBundle(bundleID);
if (bundle != null) {
@@ -197,6 +199,7 @@ public class WeavingHook extends AbstractWeavingHook {
}
}
+ @Override
public void resetAdaptor(final long bundleID) {
this.adaptors.remove(bundleID);
}

Back to the top