Fix some internal methods visibility Project: http://git-wip-us.apache.org/repos/asf/karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/6abc7dac Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/6abc7dac Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/6abc7dac
Branch: refs/heads/master Commit: 6abc7dac1565c31622f84eb08b50c073fefa2f12 Parents: 6abe137 Author: Guillaume Nodet <gno...@apache.org> Authored: Mon May 15 14:33:20 2017 +0200 Committer: Guillaume Nodet <gno...@apache.org> Committed: Mon May 15 14:33:20 2017 +0200 ---------------------------------------------------------------------- .../features/internal/service/FeaturesServiceImpl.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf/blob/6abc7dac/features/core/src/main/java/org/apache/karaf/features/internal/service/FeaturesServiceImpl.java ---------------------------------------------------------------------- diff --git a/features/core/src/main/java/org/apache/karaf/features/internal/service/FeaturesServiceImpl.java b/features/core/src/main/java/org/apache/karaf/features/internal/service/FeaturesServiceImpl.java index b22ae3c..d3640f9 100644 --- a/features/core/src/main/java/org/apache/karaf/features/internal/service/FeaturesServiceImpl.java +++ b/features/core/src/main/java/org/apache/karaf/features/internal/service/FeaturesServiceImpl.java @@ -671,7 +671,7 @@ public class FeaturesServiceImpl implements FeaturesService, Deployer.DeployCall return features.toArray(new Feature[features.size()]); } - protected Feature getFeatureMatching(Map<String, Feature> versions, String version) { + private Feature getFeatureMatching(Map<String, Feature> versions, String version) { if (version != null) { version = version.trim(); if (version.equals(org.apache.karaf.features.internal.model.Feature.DEFAULT_VERSION)) { @@ -1068,7 +1068,7 @@ public class FeaturesServiceImpl implements FeaturesService, Deployer.DeployCall } } - protected String normalize(String feature) { + private String normalize(String feature) { if (!feature.contains(VERSION_SEPARATOR)) { feature += "/0.0.0"; } @@ -1090,7 +1090,7 @@ public class FeaturesServiceImpl implements FeaturesService, Deployer.DeployCall * @param options the provisioning options. * @throws Exception in case of provisioning failure. */ - public void doProvisionInThread(final Map<String, Set<String>> requirements, + private void doProvisionInThread(final Map<String, Set<String>> requirements, final Map<String, Map<String, FeatureState>> stateChanges, final State state, final EnumSet<Option> options) throws Exception { @@ -1115,7 +1115,7 @@ public class FeaturesServiceImpl implements FeaturesService, Deployer.DeployCall } } - protected Deployer.DeploymentState getDeploymentState(State state) throws Exception { + private Deployer.DeploymentState getDeploymentState(State state) throws Exception { Deployer.DeploymentState dstate = new Deployer.DeploymentState(); // State dstate.state = state; @@ -1181,7 +1181,7 @@ public class FeaturesServiceImpl implements FeaturesService, Deployer.DeployCall - public void doProvision(Map<String, Set<String>> requirements, // all requirements + private void doProvision(Map<String, Set<String>> requirements, // all requirements Map<String, Map<String, FeatureState>> stateChanges, // features state changes State state, // current state EnumSet<Option> options, // installation options