You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by gn...@apache.org on 2008/09/08 16:59:28 UTC
svn commit: r693123 - in
/servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/gshell/features:
Feature.java internal/FeatureImpl.java internal/FeaturesServiceImpl.java
Author: gnodet
Date: Mon Sep 8 07:59:26 2008
New Revision: 693123
URL: http://svn.apache.org/viewvc?rev=693123&view=rev
Log:
SMX4KNL-78: Small refactoring of the Feature interface
Modified:
servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/gshell/features/Feature.java
servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/gshell/features/internal/FeatureImpl.java
servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/gshell/features/internal/FeaturesServiceImpl.java
Modified: servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/gshell/features/Feature.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/gshell/features/Feature.java?rev=693123&r1=693122&r2=693123&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/gshell/features/Feature.java (original)
+++ servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/gshell/features/Feature.java Mon Sep 8 07:59:26 2008
@@ -26,17 +26,14 @@
String getName();
+ String getVersion();
+
List<String> getDependencies();
List<String> getBundles();
Map<String, Map<String, String>> getConfigurations();
- boolean getInstallStatus();
-
- void setInstallStatus(boolean status);
-
- void setVersion(String version);
-
- String getVersion();
+ boolean isInstalled();
+
}
Modified: servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/gshell/features/internal/FeatureImpl.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/gshell/features/internal/FeatureImpl.java?rev=693123&r1=693122&r2=693123&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/gshell/features/internal/FeatureImpl.java (original)
+++ servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/gshell/features/internal/FeatureImpl.java Mon Sep 8 07:59:26 2008
@@ -33,7 +33,7 @@
private List<String> dependencies = new ArrayList<String>();
private List<String> bundles = new ArrayList<String>();
private Map<String, Map<String,String>> configs = new HashMap<String, Map<String,String>>();
- private boolean installStatus = false;
+ private boolean installed = false;
public FeatureImpl(String name) {
@@ -69,15 +69,15 @@
configs.put(name, properties);
}
- public boolean getInstallStatus() {
- return installStatus;
- }
+ public boolean isInstalled() {
+ return installed;
+ }
- public void setInstallStatus(boolean status) {
- installStatus = status;
- }
+ public void setInstalled(boolean installed) {
+ this.installed = installed;
+ }
- public String getVersion() {
+ public String getVersion() {
return version;
}
Modified: servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/gshell/features/internal/FeaturesServiceImpl.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/gshell/features/internal/FeaturesServiceImpl.java?rev=693123&r1=693122&r2=693123&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/gshell/features/internal/FeaturesServiceImpl.java (original)
+++ servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/gshell/features/internal/FeaturesServiceImpl.java Mon Sep 8 07:59:26 2008
@@ -137,7 +137,7 @@
}
public void installFeature(String name) throws Exception {
- Feature f = getFeature(name);
+ FeatureImpl f = (FeatureImpl) getFeature(name);
if (f == null) {
throw new Exception("No feature named '" + name + "' available");
}
@@ -163,7 +163,7 @@
bundles.add(b.getBundleId());
}
installed.put(name, bundles);
- f.setInstallStatus(true);
+ f.setInstalled(true);
saveState();
}
@@ -221,7 +221,7 @@
Collection<String> features = new ArrayList<String>();
for (Repository repo : repositories.values()) {
for (Feature f : repo.getFeatures()) {
- String installStatus = f.getInstallStatus() ? "installed " : "uninstalled";
+ String installStatus = f.isInstalled() ? "installed " : "uninstalled";
String version = f.getVersion();
switch (version.length()) {
case 1: version = " " + version;