servicemix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ge...@apache.org
Subject svn commit: r752228 - in /servicemix/smx4/kernel/trunk/gshell: gshell-config/ gshell-config/src/main/java/org/apache/servicemix/kernel/gshell/config/completers/ gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/completers/
Date Tue, 10 Mar 2009 19:43:55 GMT
Author: gertv
Date: Tue Mar 10 19:43:54 2009
New Revision: 752228

URL: http://svn.apache.org/viewvc?rev=752228&view=rev
Log:
Fix compile errors with JDK 5

Modified:
    servicemix/smx4/kernel/trunk/gshell/gshell-config/pom.xml
    servicemix/smx4/kernel/trunk/gshell/gshell-config/src/main/java/org/apache/servicemix/kernel/gshell/config/completers/ConfigurationCompleter.java
    servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/completers/AvailableFeatureCompleter.java
    servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/completers/FeatureRepositoryCompleter.java
    servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/completers/InstalledFeatureCompleter.java

Modified: servicemix/smx4/kernel/trunk/gshell/gshell-config/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/gshell/gshell-config/pom.xml?rev=752228&r1=752227&r2=752228&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/gshell/gshell-config/pom.xml (original)
+++ servicemix/smx4/kernel/trunk/gshell/gshell-config/pom.xml Tue Mar 10 19:43:54 2009
@@ -59,6 +59,11 @@
             <groupId>org.springframework.osgi</groupId>
             <artifactId>spring-osgi-core</artifactId>
         </dependency>
+
+        <dependency>
+             <groupId>org.apache.geronimo.specs</groupId>
+             <artifactId>geronimo-annotation_1.0_spec</artifactId>
+        </dependency>
     </dependencies>
 
     <build>
@@ -85,4 +90,4 @@
             </plugin>
         </plugins>
     </build>
-</project>
\ No newline at end of file
+</project>

Modified: servicemix/smx4/kernel/trunk/gshell/gshell-config/src/main/java/org/apache/servicemix/kernel/gshell/config/completers/ConfigurationCompleter.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/gshell/gshell-config/src/main/java/org/apache/servicemix/kernel/gshell/config/completers/ConfigurationCompleter.java?rev=752228&r1=752227&r2=752228&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/gshell/gshell-config/src/main/java/org/apache/servicemix/kernel/gshell/config/completers/ConfigurationCompleter.java
(original)
+++ servicemix/smx4/kernel/trunk/gshell/gshell-config/src/main/java/org/apache/servicemix/kernel/gshell/config/completers/ConfigurationCompleter.java
Tue Mar 10 19:43:54 2009
@@ -38,9 +38,8 @@
  * Displays a list of existing config admin configurations for completion.
  *
  */
-public class ConfigurationCompleter
-    implements Completor, ConfigurationListener
-{
+public class ConfigurationCompleter implements Completor, ConfigurationListener {
+
     private final StringsCompleter delegate = new StringsCompleter();
 
     private ConfigurationAdmin admin;
@@ -72,12 +71,10 @@
 
     }
 
-    @Override
     public int complete(final String buffer, final int cursor, final List candidates) {
         return delegate.complete(buffer, cursor, candidates);
     }
 
-    @Override
     public void configurationEvent(ConfigurationEvent configurationEvent) {
         String pid = configurationEvent.getFactoryPid()!=null ? configurationEvent.getFactoryPid()
: configurationEvent.getPid();
         if (configurationEvent.getType() == ConfigurationEvent.CM_DELETED) {
@@ -86,4 +83,4 @@
             delegate.getStrings().add(pid);
         }
     }
-}
\ No newline at end of file
+}

Modified: servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/completers/AvailableFeatureCompleter.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/completers/AvailableFeatureCompleter.java?rev=752228&r1=752227&r2=752228&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/completers/AvailableFeatureCompleter.java
(original)
+++ servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/completers/AvailableFeatureCompleter.java
Tue Mar 10 19:43:54 2009
@@ -39,7 +39,6 @@
         this.featuresRegistry = featuresRegistry;
     }
 
-    @Override
     public int complete(final String buffer, final int cursor, final List candidates) {
 
         Collection<ManagedFeature> features = featuresRegistry.getAvailableFeatures().values();
@@ -53,4 +52,4 @@
     }
 
 
-}
\ No newline at end of file
+}

Modified: servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/completers/FeatureRepositoryCompleter.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/completers/FeatureRepositoryCompleter.java?rev=752228&r1=752227&r2=752228&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/completers/FeatureRepositoryCompleter.java
(original)
+++ servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/completers/FeatureRepositoryCompleter.java
Tue Mar 10 19:43:54 2009
@@ -37,11 +37,9 @@
         this.featuresRegistry = featuresRegistry;
     }
 
-    @Override
     public int complete(final String buffer, final int cursor, final List candidates) {
         StringsCompleter delegate = new StringsCompleter(featuresRegistry.getRepositories().keySet());
         return delegate.complete(buffer, cursor, candidates);
     }
 
-
-}
\ No newline at end of file
+}

Modified: servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/completers/InstalledFeatureCompleter.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/completers/InstalledFeatureCompleter.java?rev=752228&r1=752227&r2=752228&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/completers/InstalledFeatureCompleter.java
(original)
+++ servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/completers/InstalledFeatureCompleter.java
Tue Mar 10 19:43:54 2009
@@ -39,7 +39,6 @@
         this.featuresRegistry = featuresRegistry;
     }
 
-    @Override
     public int complete(final String buffer, final int cursor, final List candidates) {
         Collection<ManagedFeature> features = featuresRegistry.getInstalledFeatures().values();
         delegate = new StringsCompleter();
@@ -52,4 +51,4 @@
     }
 
 
-}
\ No newline at end of file
+}



Mime
View raw message