diff options
author | Eike Stepper | 2019-12-13 19:06:44 +0000 |
---|---|---|
committer | Eike Stepper | 2019-12-13 19:56:07 +0000 |
commit | 3057ec447b4764b8a6a9cc535e5bcc37c3e01479 (patch) | |
tree | 8859f70412e9dbc754294ec157b8c6a9f81dc40c /plugins/org.eclipse.net4j.tests | |
parent | 3960a2be32acacca909cdc5868d1a0f018c15827 (diff) | |
download | cdo-3057ec447b4764b8a6a9cc535e5bcc37c3e01479.tar.gz cdo-3057ec447b4764b8a6a9cc535e5bcc37c3e01479.tar.xz cdo-3057ec447b4764b8a6a9cc535e5bcc37c3e01479.zip |
[558310] [Releng] Update Bundle-RequiredExecutionEnvironment to JavaSE-1.8
https://bugs.eclipse.org/bugs/show_bug.cgi?id=558310
Diffstat (limited to 'plugins/org.eclipse.net4j.tests')
17 files changed, 102 insertions, 30 deletions
diff --git a/plugins/org.eclipse.net4j.tests/.classpath b/plugins/org.eclipse.net4j.tests/.classpath index 64c5e31b7a..3e5654f17e 100644 --- a/plugins/org.eclipse.net4j.tests/.classpath +++ b/plugins/org.eclipse.net4j.tests/.classpath @@ -1,7 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> - <classpathentry kind="src" path="src"/> + <classpathentry kind="src" path="src"> + <attributes> + <attribute name="test" value="true"/> + </attributes> + </classpathentry> <classpathentry kind="output" path="bin"/> </classpath> diff --git a/plugins/org.eclipse.net4j.tests/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.net4j.tests/.settings/org.eclipse.jdt.core.prefs index c34896d50d..d01a60209c 100644 --- a/plugins/org.eclipse.net4j.tests/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/org.eclipse.net4j.tests/.settings/org.eclipse.jdt.core.prefs @@ -15,9 +15,9 @@ org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annota org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.5 +org.eclipse.jdt.core.compiler.compliance=1.8 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -115,11 +115,12 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disa org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=1.5 +org.eclipse.jdt.core.compiler.source=1.8 org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,HIGH,LOW,LOW,LOW,LOW,LOW org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX,PERF,MEM,POLISH,@generated NOT,@ADDED org.eclipse.jdt.core.formatter.align_type_members_on_columns=false +org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 @@ -127,17 +128,20 @@ org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_c org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_assignment=0 -org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_bitwise_operator=16 org.eclipse.jdt.core.formatter.alignment_for_compact_if=16 org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80 org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0 org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16 +org.eclipse.jdt.core.formatter.alignment_for_logical_operator=16 org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0 org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16 +org.eclipse.jdt.core.formatter.alignment_for_multiplicative_operator=16 org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16 org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16 org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80 org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16 +org.eclipse.jdt.core.formatter.alignment_for_string_concatenation=16 org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16 org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16 org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16 @@ -221,11 +225,12 @@ org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_after_additive_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_bitwise_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert @@ -255,6 +260,8 @@ org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=inser org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert +org.eclipse.jdt.core.formatter.insert_space_after_logical_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_multiplicative_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert @@ -279,13 +286,17 @@ org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_relational_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert +org.eclipse.jdt.core.formatter.insert_space_after_shift_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_string_concatenation=insert org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_additive_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_bitwise_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert @@ -332,6 +343,8 @@ org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do n org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_logical_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_multiplicative_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert @@ -368,9 +381,12 @@ org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not inser org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_relational_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_shift_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_string_concatenation=insert org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert @@ -396,6 +412,10 @@ org.eclipse.jdt.core.formatter.tabulation.char=space org.eclipse.jdt.core.formatter.tabulation.size=2 org.eclipse.jdt.core.formatter.use_on_off_tags=false org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false -org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true +org.eclipse.jdt.core.formatter.wrap_before_additive_operator=true +org.eclipse.jdt.core.formatter.wrap_before_bitwise_operator=true +org.eclipse.jdt.core.formatter.wrap_before_logical_operator=true +org.eclipse.jdt.core.formatter.wrap_before_multiplicative_operator=true org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true +org.eclipse.jdt.core.formatter.wrap_before_string_concatenation=true org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true diff --git a/plugins/org.eclipse.net4j.tests/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.tests/META-INF/MANIFEST.MF index 85b5b5580a..d9e5756fb0 100644 --- a/plugins/org.eclipse.net4j.tests/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.net4j.tests/META-INF/MANIFEST.MF @@ -1,13 +1,13 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.net4j.tests;singleton:=true -Bundle-Version: 4.1.700.qualifier +Bundle-Version: 4.2.0.qualifier Bundle-Name: %pluginName Bundle-Vendor: %providerName Bundle-Localization: plugin Bundle-ActivationPolicy: lazy Bundle-Activator: org.eclipse.net4j.tests.bundle.OM$Activator -Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ClassPath: . Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)";visibility:=reexport, org.eclipse.net4j.tcp;bundle-version="[4.0.0,5.0.0)";visibility:=reexport, @@ -16,12 +16,12 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)";visibili org.eclipse.net4j.http.server;bundle-version="[4.0.0,5.0.0)";visibility:=reexport, org.apache.log4j;bundle-version="[1.2.0,2.0.0)", org.junit;bundle-version="[4.0.0,5.0.0)";visibility:=reexport -Export-Package: org.eclipse.net4j.tests;version="4.1.700", - org.eclipse.net4j.tests.apps;version="4.1.700", - org.eclipse.net4j.tests.bugzilla;version="4.1.700", - org.eclipse.net4j.tests.bundle;version="4.1.700";x-internal:=true, - org.eclipse.net4j.tests.data;version="4.1.700", - org.eclipse.net4j.tests.signal;version="4.1.700", +Export-Package: org.eclipse.net4j.tests;version="4.2.0", + org.eclipse.net4j.tests.apps;version="4.2.0", + org.eclipse.net4j.tests.bugzilla;version="4.2.0", + org.eclipse.net4j.tests.bundle;version="4.2.0";x-internal:=true, + org.eclipse.net4j.tests.data;version="4.2.0", + org.eclipse.net4j.tests.signal;version="4.2.0", org.eclipse.net4j.util.tests;version="4.1.500", org.eclipse.net4j.util.tests.cache;version="4.1.500" Automatic-Module-Name: org.eclipse.net4j.tests diff --git a/plugins/org.eclipse.net4j.tests/pom.xml b/plugins/org.eclipse.net4j.tests/pom.xml index 7a828475bb..0bb1bb2292 100644 --- a/plugins/org.eclipse.net4j.tests/pom.xml +++ b/plugins/org.eclipse.net4j.tests/pom.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright (c) 2017, 2018 Eike Stepper (Loehne, Germany) and others. + Copyright (c) 2017-2019 Eike Stepper (Loehne, Germany) and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at @@ -25,7 +25,7 @@ <groupId>org.eclipse.emf.cdo</groupId> <artifactId>org.eclipse.net4j.tests</artifactId> - <version>4.1.700-SNAPSHOT</version> + <version>4.2.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project> diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/SignalMonitorTest.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/SignalMonitorTest.java index ed4a50ebf1..94599daec5 100644 --- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/SignalMonitorTest.java +++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/SignalMonitorTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2009, 2011, 2012, 2015 Eike Stepper (Loehne, Germany) and others. + * Copyright (c) 2008, 2009, 2011, 2012, 2015, 2019 Eike Stepper (Loehne, Germany) and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -42,6 +42,7 @@ public class SignalMonitorTest extends AbstractTransportTest IManagedContainer container = super.createContainer(); container.registerFactory(new ServerProtocolFactory(PROTOCOL_TYPE) { + @Override public Object create(String description) throws ProductCreationException { return new SignalProtocol<Object>(PROTOCOL_TYPE) diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/TransportTest.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/TransportTest.java index d809ee176b..95e096c9dc 100644 --- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/TransportTest.java +++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/TransportTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2009, 2011, 2012 Eike Stepper (Loehne, Germany) and others. + * Copyright (c) 2008, 2009, 2011, 2012, 2019 Eike Stepper (Loehne, Germany) and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -224,6 +224,7 @@ public abstract class TransportTest extends AbstractProtocolTest getAcceptor().addListener(new IListener() { + @Override public void notifyEvent(IEvent event) { if (event instanceof IContainerEvent<?>) @@ -232,6 +233,7 @@ public abstract class TransportTest extends AbstractProtocolTest IContainerEvent<IConnector> e = (IContainerEvent<IConnector>)event; e.getDeltaElement().addListener(new IListener() { + @Override public void notifyEvent(IEvent event) { if (event instanceof IContainerEvent<?>) @@ -288,6 +290,7 @@ public abstract class TransportTest extends AbstractProtocolTest getAcceptor().addListener(new IListener() { + @Override public void notifyEvent(IEvent event) { if (event instanceof IContainerEvent<?>) @@ -296,6 +299,7 @@ public abstract class TransportTest extends AbstractProtocolTest IContainerEvent<IConnector> e = (IContainerEvent<IConnector>)event; e.getDeltaElement().addListener(new IListener() { + @Override public void notifyEvent(IEvent event) { if (event instanceof IContainerEvent<?>) @@ -356,6 +360,7 @@ public abstract class TransportTest extends AbstractProtocolTest getAcceptor().addListener(new IListener() { + @Override public void notifyEvent(IEvent event) { if (event instanceof IContainerEvent<?>) @@ -364,6 +369,7 @@ public abstract class TransportTest extends AbstractProtocolTest IContainerEvent<IConnector> e = (IContainerEvent<IConnector>)event; e.getDeltaElement().addListener(new IListener() { + @Override public void notifyEvent(IEvent event) { if (event instanceof IContainerEvent<?>) @@ -441,6 +447,7 @@ public abstract class TransportTest extends AbstractProtocolTest getAcceptor().addListener(new IListener() { + @Override public void notifyEvent(IEvent event) { if (event instanceof IContainerEvent<?>) @@ -449,6 +456,7 @@ public abstract class TransportTest extends AbstractProtocolTest IContainerEvent<IConnector> e = (IContainerEvent<IConnector>)event; e.getDeltaElement().addListener(new IListener() { + @Override public void notifyEvent(IEvent event) { if (event instanceof IContainerEvent<?>) @@ -499,6 +507,7 @@ public abstract class TransportTest extends AbstractProtocolTest setInfraStructure(counter); } + @Override public void handleBuffer(IBuffer buffer) { IOUtil.OUT().println("BUFFER ARRIVED"); //$NON-NLS-1$ @@ -521,6 +530,7 @@ public abstract class TransportTest extends AbstractProtocolTest this.counter = counter; } + @Override public TestProtocol create(String description) throws ProductCreationException { return new TestProtocol(counter); @@ -539,6 +549,7 @@ public abstract class TransportTest extends AbstractProtocolTest super(TYPE); } + @Override public TestProtocol create(String description) throws ProductCreationException { return new TestProtocol(null); diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/bugzilla/Bugzilla_262875_Test.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/bugzilla/Bugzilla_262875_Test.java index 6728e90373..ccd23dacef 100644 --- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/bugzilla/Bugzilla_262875_Test.java +++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/bugzilla/Bugzilla_262875_Test.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012, 2015 Eike Stepper (Loehne, Germany) and others. + * Copyright (c) 2010-2012, 2015, 2019 Eike Stepper (Loehne, Germany) and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -81,6 +81,7 @@ public class Bugzilla_262875_Test extends AbstractOMTest final CountDownLatch latch = new CountDownLatch(1); IErrorHandler oldErrorHandler = Worker.setGlobalErrorHandler(new IErrorHandler() { + @Override public void handleError(Throwable t) { t.printStackTrace(); @@ -201,6 +202,7 @@ public class Bugzilla_262875_Test extends AbstractOMTest super(NAME); } + @Override public Object create(String description) throws ProductCreationException { return new TestProtocol(); diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/TestSignalProtocol.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/TestSignalProtocol.java index 5c759b4721..70023ab528 100644 --- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/TestSignalProtocol.java +++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/TestSignalProtocol.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006-2012 Eike Stepper (Loehne, Germany) and others. + * Copyright (c) 2006-2012, 2019 Eike Stepper (Loehne, Germany) and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -141,6 +141,7 @@ public class TestSignalProtocol extends SignalProtocol<Object> super(PROTOCOL_NAME); } + @Override public TestSignalProtocol create(String description) throws ProductCreationException { TestSignalProtocol protocol = new TestSignalProtocol(); diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/AbstractOMTest.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/AbstractOMTest.java index 7aa4e3e4b3..aca6bd829f 100644 --- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/AbstractOMTest.java +++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/AbstractOMTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007-2016, 2018 Eike Stepper (Loehne, Germany) and others. + * Copyright (c) 2007-2016, 2018, 2019 Eike Stepper (Loehne, Germany) and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -82,6 +82,7 @@ public abstract class AbstractOMTest extends TestCase private static final IListener DUMPER = new IListener() { + @Override public void notifyEvent(IEvent event) { IOUtil.OUT().println(event); @@ -293,6 +294,7 @@ public abstract class AbstractOMTest extends TestCase { TestExecuter.execute(this, new TestExecuter.Executable() { + @Override public void execute() throws Throwable { try @@ -804,55 +806,67 @@ public abstract class AbstractOMTest extends TestCase { BasicConfigurator.configure(new Appender() { + @Override public void setName(String arg0) { } + @Override public void setLayout(Layout arg0) { } + @Override public void setErrorHandler(ErrorHandler arg0) { } + @Override public boolean requiresLayout() { return false; } + @Override public String getName() { return null; } + @Override public Layout getLayout() { return null; } + @Override public Filter getFilter() { return null; } + @Override public ErrorHandler getErrorHandler() { return null; } + @Override public void doAppend(LoggingEvent arg0) { } + @Override public void close() { } + @Override public void clearFilters() { } + @Override public void addFilter(Filter arg0) { } @@ -979,6 +993,7 @@ public abstract class AbstractOMTest extends TestCase { } + @Override public boolean timedOut(long timeoutMillis) throws InterruptedException { int retries = (int)Math.round(timeoutMillis / sleepMillis + .5d); @@ -1015,6 +1030,7 @@ public abstract class AbstractOMTest extends TestCase return lock; } + @Override public boolean timedOut(long timeoutMillis) throws InterruptedException { Condition condition = lock.newCondition(); @@ -1067,6 +1083,7 @@ public abstract class AbstractOMTest extends TestCase } } + @Override public boolean timedOut(long timeoutMillis) throws InterruptedException { return !latch.await(timeoutMillis, TimeUnit.MILLISECONDS); diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/ConcurrentRunner.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/ConcurrentRunner.java index 82f02f7e46..ce4cbc60b7 100644 --- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/ConcurrentRunner.java +++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/ConcurrentRunner.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2011, 2012, 2015, 2016 Eike Stepper (Loehne, Germany) and others. + * Copyright (c) 2009, 2011, 2012, 2015, 2016, 2019 Eike Stepper (Loehne, Germany) and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -123,6 +123,7 @@ public class ConcurrentRunner * @throws Exception * the exception */ + @Override public Throwable call() throws Exception { try diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/ExecutorWorkSerializerTest.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/ExecutorWorkSerializerTest.java index c2298aa048..0619981ec2 100644 --- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/ExecutorWorkSerializerTest.java +++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/ExecutorWorkSerializerTest.java @@ -74,6 +74,7 @@ public class ExecutorWorkSerializerTest extends AbstractOMTest { createWorkProducerThreads(new WorkProducerFactory() { + @Override public WorkProducer createWorkProducer() { return new WorkProducer() @@ -99,6 +100,7 @@ public class ExecutorWorkSerializerTest extends AbstractOMTest { createWorkProducerThreads(new WorkProducerFactory() { + @Override public WorkProducer createWorkProducer() { return new WorkProducer() @@ -158,6 +160,7 @@ public class ExecutorWorkSerializerTest extends AbstractOMTest /** * Produce work: add work units to the queue worker */ + @Override public void run() { try @@ -204,6 +207,7 @@ public class ExecutorWorkSerializerTest extends AbstractOMTest IOUtil.OUT().println("work unit " + id + " created"); } + @Override public void run() { workConsumedLatch.countDown(); diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/NonFairReentrantLockTest.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/NonFairReentrantLockTest.java index 17fd20cc52..77b03440bf 100644 --- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/NonFairReentrantLockTest.java +++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/NonFairReentrantLockTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016 Eike Stepper (Loehne, Germany) and others. + * Copyright (c) 2016, 2019 Eike Stepper (Loehne, Germany) and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -57,6 +57,7 @@ public class NonFairReentrantLockTest { CountDownLatch latch = new CountDownLatch(1); + @Override public void run() { System.out.println("event"); diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/SecurityTest.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/SecurityTest.java index 47193f08d9..91701ae0d6 100644 --- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/SecurityTest.java +++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/SecurityTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007-2009, 2011, 2012, 2015 Eike Stepper (Loehne, Germany) and others. + * Copyright (c) 2007-2009, 2011, 2012, 2015, 2019 Eike Stepper (Loehne, Germany) and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -187,16 +187,19 @@ public class SecurityTest extends AbstractOMTest return userID; } + @Override public void setUserID(String userID) { this.userID = userID; } + @Override public ByteBuffer getBuffer() { return ByteBuffer.allocateDirect(4096); } + @Override public void transmitBuffer(ByteBuffer buffer) { buffer.flip(); @@ -208,6 +211,7 @@ public class SecurityTest extends AbstractOMTest running = false; } + @Override public void run() { running = true; diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/TestListener.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/TestListener.java index 67a91d0690..7ea3f56135 100644 --- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/TestListener.java +++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/TestListener.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018 Eike Stepper (Loehne, Germany) and others. + * Copyright (c) 2018, 2019 Eike Stepper (Loehne, Germany) and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -84,6 +84,7 @@ public class TestListener implements IListener } } + @Override public void notifyEvent(IEvent event) { synchronized (events) diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/TestListener2.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/TestListener2.java index 0930b4f13a..28e8bce13e 100644 --- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/TestListener2.java +++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/TestListener2.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018 Eike Stepper (Loehne, Germany) and others. + * Copyright (c) 2018, 2019 Eike Stepper (Loehne, Germany) and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -87,6 +87,7 @@ public class TestListener2 implements IListener return false; } + @Override public void notifyEvent(IEvent event) { if (isApplicable(event)) diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/ThreadPoolTest.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/ThreadPoolTest.java index d479e0c049..570a8f1e60 100644 --- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/ThreadPoolTest.java +++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/ThreadPoolTest.java @@ -43,6 +43,7 @@ public class ThreadPoolTest extends AbstractOMTest msg("scheduling " + n); pool.execute(new Runnable() { + @Override public void run() { msg("started " + n + " (wc=" + pool.getPoolSize() + ")"); @@ -224,6 +225,7 @@ public class ThreadPoolTest extends AbstractOMTest return new ThreadFactory() { + @Override public Thread newThread(Runnable task) { System.out.println("Creating new worker"); @@ -257,6 +259,7 @@ public class ThreadPoolTest extends AbstractOMTest countDown(); } + @Override public final void run() { if (!used.compareAndSet(false, true)) diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/cache/RevisionManager.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/cache/RevisionManager.java index 90841637cf..1c71d579d7 100644 --- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/cache/RevisionManager.java +++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/cache/RevisionManager.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007-2009, 2011, 2012, 2015 Eike Stepper (Loehne, Germany) and others. + * Copyright (c) 2007-2009, 2011, 2012, 2015, 2019 Eike Stepper (Loehne, Germany) and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -38,6 +38,7 @@ public class RevisionManager extends Cache<Revision> return timeLine.getRevision(version); } + @Override public void evictElements(int elementCount) { } |