geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rotty3...@apache.org
Subject svn commit: r1834164 - in /geronimo/specs/trunk: geronimo-activation_1.1_spec/src/main/java/org/apache/geronimo/specs/activation/ geronimo-osgi-support/geronimo-osgi-locator-itests/src/test/java/org/apache/geronimo/osgi/locator/itest/ geronimo-osgi-sup...
Date Fri, 22 Jun 2018 21:00:46 GMT
Author: rotty3000
Date: Fri Jun 22 21:00:45 2018
New Revision: 1834164

URL: http://svn.apache.org/viewvc?rev=1834164&view=rev
Log:
cleanup errors and compiler compliance

Signed-off-by: Raymond Auge <rotty3000@apache.org>

Modified:
    geronimo/specs/trunk/geronimo-activation_1.1_spec/src/main/java/org/apache/geronimo/specs/activation/CommandMapBundleTrackerCustomizer.java
    geronimo/specs/trunk/geronimo-osgi-support/geronimo-osgi-locator-itests/src/test/java/org/apache/geronimo/osgi/locator/itest/NonOSGiLocatorTest.java
    geronimo/specs/trunk/geronimo-osgi-support/geronimo-osgi-registry/src/main/java/org/apache/geronimo/osgi/registry/Activator.java
    geronimo/specs/trunk/geronimo-osgi-support/geronimo-osgi-registry/src/main/java/org/apache/geronimo/osgi/registry/ProviderBundleTrackerCustomizer.java
    geronimo/specs/trunk/geronimo-websockets_1.0_spec/src/main/java/javax/websocket/ClientEndpointConfig.java
    geronimo/specs/trunk/geronimo-websockets_1.0_spec/src/main/java/javax/websocket/CloseReason.java
    geronimo/specs/trunk/geronimo-websockets_1.0_spec/src/main/java/javax/websocket/Session.java
    geronimo/specs/trunk/geronimo-websockets_1.0_spec/src/main/java/javax/websocket/server/ServerEndpointConfig.java

Modified: geronimo/specs/trunk/geronimo-activation_1.1_spec/src/main/java/org/apache/geronimo/specs/activation/CommandMapBundleTrackerCustomizer.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-activation_1.1_spec/src/main/java/org/apache/geronimo/specs/activation/CommandMapBundleTrackerCustomizer.java?rev=1834164&r1=1834163&r2=1834164&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-activation_1.1_spec/src/main/java/org/apache/geronimo/specs/activation/CommandMapBundleTrackerCustomizer.java
(original)
+++ geronimo/specs/trunk/geronimo-activation_1.1_spec/src/main/java/org/apache/geronimo/specs/activation/CommandMapBundleTrackerCustomizer.java
Fri Jun 22 21:00:45 2018
@@ -55,7 +55,6 @@ public class CommandMapBundleTrackerCust
      *
      * @return A return object.
      */
-    @Override
     public Object addingBundle(Bundle bundle, BundleEvent event) {
         if (bundle.equals(activationBundle)) {
             return null;
@@ -99,14 +98,12 @@ public class CommandMapBundleTrackerCust
     }
 
 
-    @Override
     public void modifiedBundle(Bundle bundle, BundleEvent event, Object object) {
         log(LogService.LOG_DEBUG, "Bundle Considered for mailcap providers: " + bundle.getSymbolicName());
         // this will update for the new bundle
         registerBundle(bundle);
     }
 
-    @Override
     public void removedBundle(Bundle bundle, BundleEvent event, Object object) {
         unregisterBundle(bundle);
     }

Modified: geronimo/specs/trunk/geronimo-osgi-support/geronimo-osgi-locator-itests/src/test/java/org/apache/geronimo/osgi/locator/itest/NonOSGiLocatorTest.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-osgi-support/geronimo-osgi-locator-itests/src/test/java/org/apache/geronimo/osgi/locator/itest/NonOSGiLocatorTest.java?rev=1834164&r1=1834163&r2=1834164&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-osgi-support/geronimo-osgi-locator-itests/src/test/java/org/apache/geronimo/osgi/locator/itest/NonOSGiLocatorTest.java
(original)
+++ geronimo/specs/trunk/geronimo-osgi-support/geronimo-osgi-locator-itests/src/test/java/org/apache/geronimo/osgi/locator/itest/NonOSGiLocatorTest.java
Fri Jun 22 21:00:45 2018
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.geronimo.osgi.loader.itest;
+package org.apache.geronimo.osgi.locator.itest;
 
 import java.io.InputStream;
 import java.io.IOException;

Modified: geronimo/specs/trunk/geronimo-osgi-support/geronimo-osgi-registry/src/main/java/org/apache/geronimo/osgi/registry/Activator.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-osgi-support/geronimo-osgi-registry/src/main/java/org/apache/geronimo/osgi/registry/Activator.java?rev=1834164&r1=1834163&r2=1834164&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-osgi-support/geronimo-osgi-registry/src/main/java/org/apache/geronimo/osgi/registry/Activator.java
(original)
+++ geronimo/specs/trunk/geronimo-osgi-support/geronimo-osgi-registry/src/main/java/org/apache/geronimo/osgi/registry/Activator.java
Fri Jun 22 21:00:45 2018
@@ -52,7 +52,6 @@ public class Activator implements Bundle
     List<LogService> logServices = new ArrayList<LogService>();
 
 
-    @Override
     public synchronized void start(final BundleContext context) throws Exception {
         this.context = context;
         lst = new LogServiceTracker(context, LogService.class.getName(), null);
@@ -66,7 +65,6 @@ public class Activator implements Bundle
 	    bt.open();
 	}
 
-    @Override
 	public synchronized void stop(BundleContext context) throws Exception {
 	    bt.close();
 	    lst.close();

Modified: geronimo/specs/trunk/geronimo-osgi-support/geronimo-osgi-registry/src/main/java/org/apache/geronimo/osgi/registry/ProviderBundleTrackerCustomizer.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-osgi-support/geronimo-osgi-registry/src/main/java/org/apache/geronimo/osgi/registry/ProviderBundleTrackerCustomizer.java?rev=1834164&r1=1834163&r2=1834164&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-osgi-support/geronimo-osgi-registry/src/main/java/org/apache/geronimo/osgi/registry/ProviderBundleTrackerCustomizer.java
(original)
+++ geronimo/specs/trunk/geronimo-osgi-support/geronimo-osgi-registry/src/main/java/org/apache/geronimo/osgi/registry/ProviderBundleTrackerCustomizer.java
Fri Jun 22 21:00:45 2018
@@ -45,7 +45,6 @@ public class ProviderBundleTrackerCustom
      *
      * @return A return object.
      */
-    @Override
     public Object addingBundle(Bundle bundle, BundleEvent event) {
         log(LogService.LOG_DEBUG, "Bundle Considered for class providers: " + bundle.getSymbolicName());
         if (bundle.equals(registryBundle)) {
@@ -55,12 +54,10 @@ public class ProviderBundleTrackerCustom
         return registry.addBundle(bundle);
     }
 
-    @Override
     public void modifiedBundle(Bundle bundle, BundleEvent event, Object object) {
         // nothing to do here
     }
 
-    @Override
     public void removedBundle(Bundle bundle, BundleEvent event, Object object) {
         // have the registry process this
         registry.removeBundle(bundle, object);

Modified: geronimo/specs/trunk/geronimo-websockets_1.0_spec/src/main/java/javax/websocket/ClientEndpointConfig.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-websockets_1.0_spec/src/main/java/javax/websocket/ClientEndpointConfig.java?rev=1834164&r1=1834163&r2=1834164&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-websockets_1.0_spec/src/main/java/javax/websocket/ClientEndpointConfig.java
(original)
+++ geronimo/specs/trunk/geronimo-websockets_1.0_spec/src/main/java/javax/websocket/ClientEndpointConfig.java
Fri Jun 22 21:00:45 2018
@@ -82,32 +82,26 @@ public interface ClientEndpointConfig ex
             
             return new ClientEndpointConfig() {
 
-                @Override
                 public List<Class<? extends Encoder>> getEncoders() {
                     return encoders;
                 }
 
-                @Override
                 public List<Class<? extends Decoder>> getDecoders() {
                     return decoders;
                 }
 
-                @Override
                 public Map<String, Object> getUserProperties() {
                     return userProperties;
                 }
 
-                @Override
                 public List<String> getPreferredSubprotocols() {
                     return preferredSubprotocols;
                 }
 
-                @Override
                 public List<Extension> getExtensions() {
                     return extensions;
                 }
 
-                @Override
                 public Configurator getConfigurator() {
                     return configurator;
                 }

Modified: geronimo/specs/trunk/geronimo-websockets_1.0_spec/src/main/java/javax/websocket/CloseReason.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-websockets_1.0_spec/src/main/java/javax/websocket/CloseReason.java?rev=1834164&r1=1834163&r2=1834164&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-websockets_1.0_spec/src/main/java/javax/websocket/CloseReason.java
(original)
+++ geronimo/specs/trunk/geronimo-websockets_1.0_spec/src/main/java/javax/websocket/CloseReason.java
Fri Jun 22 21:00:45 2018
@@ -131,7 +131,6 @@ public class CloseReason {
          * 
          * @return the code.
          */
-        @Override
         public int getCode() {
             return this.code;
         }

Modified: geronimo/specs/trunk/geronimo-websockets_1.0_spec/src/main/java/javax/websocket/Session.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-websockets_1.0_spec/src/main/java/javax/websocket/Session.java?rev=1834164&r1=1834163&r2=1834164&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-websockets_1.0_spec/src/main/java/javax/websocket/Session.java
(original)
+++ geronimo/specs/trunk/geronimo-websockets_1.0_spec/src/main/java/javax/websocket/Session.java
Fri Jun 22 21:00:45 2018
@@ -204,7 +204,6 @@ public interface Session extends Closeab
      * @throws IOException
      *             - if there was a connection error closing the connection.
      */
-    @Override
     void close() throws IOException;
 
     /**

Modified: geronimo/specs/trunk/geronimo-websockets_1.0_spec/src/main/java/javax/websocket/server/ServerEndpointConfig.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-websockets_1.0_spec/src/main/java/javax/websocket/server/ServerEndpointConfig.java?rev=1834164&r1=1834163&r2=1834164&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-websockets_1.0_spec/src/main/java/javax/websocket/server/ServerEndpointConfig.java
(original)
+++ geronimo/specs/trunk/geronimo-websockets_1.0_spec/src/main/java/javax/websocket/server/ServerEndpointConfig.java
Fri Jun 22 21:00:45 2018
@@ -117,42 +117,34 @@ public interface ServerEndpointConfig ex
 
             return new ServerEndpointConfig() {
 
-                @Override
                 public List<Class<? extends Encoder>> getEncoders() {
                     return encoders;
                 }
 
-                @Override
                 public List<Class<? extends Decoder>> getDecoders() {
                     return decoders;
                 }
 
-                @Override
                 public Map<String, Object> getUserProperties() {
                     return userProperties;
                 }
 
-                @Override
                 public Class<?> getEndpointClass() {
                     return endpointClass;
                 }
 
-                @Override
                 public String getPath() {
                     return path;
                 }
 
-                @Override
                 public List<String> getSubprotocols() {
                     return subprotocols;
                 }
 
-                @Override
                 public List<Extension> getExtensions() {
                     return extensions;
                 }
 
-                @Override
                 public Configurator getConfigurator() {
                     return configurator;
                 }



Mime
View raw message