ace-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j...@apache.org
Subject svn commit: r1727499 [5/5] - in /ace/trunk: ./ org.apache.ace.agent.controller.itest/src/org/apache/ace/agent/itest/ org.apache.ace.agent.itest/src/org/apache/ace/agent/itest/ org.apache.ace.agent.launcher/src/org/apache/ace/agent/launcher/ org.apache....
Date Fri, 29 Jan 2016 08:59:34 GMT
Modified: ace/trunk/org.apache.ace.verifier/src/org/apache/felix/framework/resolver/Candidates.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.verifier/src/org/apache/felix/framework/resolver/Candidates.java?rev=1727499&r1=1727498&r2=1727499&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.verifier/src/org/apache/felix/framework/resolver/Candidates.java (original)
+++ ace/trunk/org.apache.ace.verifier/src/org/apache/felix/framework/resolver/Candidates.java Fri Jan 29 08:59:31 2016
@@ -105,14 +105,14 @@ class Candidates
     **/
     public Candidates()
     {
-        m_mandatoryRevisions = new HashSet<BundleRevision>();
-        m_involvedRevisions = new HashSet<BundleRevision>();
-        m_dependentMap = new HashMap<BundleCapability, Set<BundleRequirement>>();
-        m_candidateMap = new HashMap<BundleRequirement, SortedSet<BundleCapability>>();
+        m_mandatoryRevisions = new HashSet<>();
+        m_involvedRevisions = new HashSet<>();
+        m_dependentMap = new HashMap<>();
+        m_candidateMap = new HashMap<>();
         m_hostFragments =
-            new HashMap<BundleCapability, Map<String, Map<Version, List<BundleRequirement>>>>();
-        m_allWrappedHosts = new HashMap<BundleRevision, HostBundleRevision>();
-        m_populateResultCache = new HashMap<BundleRevision, Object>();
+            new HashMap<>();
+        m_allWrappedHosts = new HashMap<>();
+        m_populateResultCache = new HashMap<>();
     }
 
     /**
@@ -305,7 +305,7 @@ class Candidates
                 {
                     if (fragmentCands == null)
                     {
-                        fragmentCands = new HashSet<BundleCapability>();
+                        fragmentCands = new HashSet<>();
                     }
                     fragmentCands.add(candCap);
                 }
@@ -471,7 +471,7 @@ class Candidates
         // Create a local map for populating candidates first, just in case
         // the revision is not resolvable.
         Map<BundleRequirement, SortedSet<BundleCapability>> localCandidateMap =
-            new HashMap<BundleRequirement, SortedSet<BundleCapability>>();
+            new HashMap<>();
         // Add the discovered host candidates to the local candidate map.
         localCandidateMap.put(hostReq, hosts);
         // Add these value to the result cache so we know we are
@@ -624,7 +624,7 @@ class Candidates
             init = true;
         }
 
-        final Map<String, BundleRevision> singletons = new HashMap<String, BundleRevision>();
+        final Map<String, BundleRevision> singletons = new HashMap<>();
 
         for (Iterator<BundleRevision> it = m_involvedRevisions.iterator(); it.hasNext(); )
         {
@@ -723,8 +723,8 @@ class Candidates
         //      with host's attached fragment capabilities.
 
         // Steps 1 and 2
-        List<HostBundleRevision> hostRevisions = new ArrayList<HostBundleRevision>();
-        List<BundleRevision> unselectedFragments = new ArrayList<BundleRevision>();
+        List<HostBundleRevision> hostRevisions = new ArrayList<>();
+        List<BundleRevision> unselectedFragments = new ArrayList<>();
         for (Entry<BundleCapability, Map<String, Map<Version, List<BundleRequirement>>>>
             hostEntry : m_hostFragments.entrySet())
         {
@@ -732,7 +732,7 @@ class Candidates
             BundleCapability hostCap = hostEntry.getKey();
             Map<String, Map<Version, List<BundleRequirement>>> fragments
                 = hostEntry.getValue();
-            List<BundleRevision> selectedFragments = new ArrayList<BundleRevision>();
+            List<BundleRevision> selectedFragments = new ArrayList<>();
             for (Entry<String, Map<Version, List<BundleRequirement>>> fragEntry
                 : fragments.entrySet())
             {
@@ -804,7 +804,7 @@ class Candidates
                     Set<BundleRequirement> dependents = m_dependentMap.get(origCap);
                     if (dependents != null)
                     {
-                        dependents = new HashSet<BundleRequirement>(dependents);
+                        dependents = new HashSet<>(dependents);
                         m_dependentMap.put(c, dependents);
                         for (BundleRequirement r : dependents)
                         {
@@ -824,7 +824,7 @@ class Candidates
                 SortedSet<BundleCapability> cands = m_candidateMap.get(origReq);
                 if (cands != null)
                 {
-                    m_candidateMap.put(r, new TreeSet<BundleCapability>(cands));
+                    m_candidateMap.put(r, new TreeSet<>(cands));
                     for (BundleCapability cand : cands)
                     {
                         Set<BundleRequirement> dependents = m_dependentMap.get(cand);
@@ -860,7 +860,7 @@ class Candidates
                 Set<BundleRequirement> dependents = m_dependentMap.get(cap);
                 if (dependents == null)
                 {
-                    dependents = new HashSet<BundleRequirement>();
+                    dependents = new HashSet<>();
                     m_dependentMap.put(cap, dependents);
                 }
                 dependents.add(req);
@@ -872,7 +872,7 @@ class Candidates
                         fragments = m_hostFragments.get(cap);
                     if (fragments == null)
                     {
-                        fragments = new HashMap<String, Map<Version, List<BundleRequirement>>>();
+                        fragments = new HashMap<>();
                         m_hostFragments.put(cap, fragments);
                     }
                     Map<Version, List<BundleRequirement>> fragmentVersions =
@@ -880,13 +880,13 @@ class Candidates
                     if (fragmentVersions == null)
                     {
                         fragmentVersions =
-                            new TreeMap<Version, List<BundleRequirement>>(Collections.reverseOrder());
+                            new TreeMap<>(Collections.reverseOrder());
                         fragments.put(req.getRevision().getSymbolicName(), fragmentVersions);
                     }
                     List<BundleRequirement> actual = fragmentVersions.get(req.getRevision().getVersion());
                     if (actual == null)
                     {
-                        actual = new ArrayList<BundleRequirement>();
+                        actual = new ArrayList<>();
                         fragmentVersions.put(req.getRevision().getVersion(), actual);
                     }
                     actual.add(req);
@@ -908,7 +908,7 @@ class Candidates
         // Add removal reason to result cache.
         m_populateResultCache.put(revision, ex);
         // Remove from dependents.
-        Set<BundleRevision> unresolvedRevisions = new HashSet<BundleRevision>();
+        Set<BundleRevision> unresolvedRevisions = new HashSet<>();
         remove(revision, unresolvedRevisions);
         // Remove dependents that failed as a result of removing revision.
         while (!unresolvedRevisions.isEmpty())
@@ -1041,20 +1041,20 @@ class Candidates
     public Candidates copy()
     {
         Map<BundleCapability, Set<BundleRequirement>> dependentMap =
-            new HashMap<BundleCapability, Set<BundleRequirement>>();
+            new HashMap<>();
         for (Entry<BundleCapability, Set<BundleRequirement>> entry : m_dependentMap.entrySet())
         {
-            Set<BundleRequirement> dependents = new HashSet<BundleRequirement>(entry.getValue());
+            Set<BundleRequirement> dependents = new HashSet<>(entry.getValue());
             dependentMap.put(entry.getKey(), dependents);
         }
 
         Map<BundleRequirement, SortedSet<BundleCapability>> candidateMap =
-            new HashMap<BundleRequirement, SortedSet<BundleCapability>>();
+            new HashMap<>();
         for (Entry<BundleRequirement, SortedSet<BundleCapability>> entry
             : m_candidateMap.entrySet())
         {
             SortedSet<BundleCapability> candidates =
-                new TreeSet<BundleCapability>(entry.getValue());
+                new TreeSet<>(entry.getValue());
             candidateMap.put(entry.getKey(), candidates);
         }
 
@@ -1067,7 +1067,7 @@ class Candidates
     public void dump()
     {
         // Create set of all revisions from requirements.
-        Set<BundleRevision> revisions = new HashSet<BundleRevision>();
+        Set<BundleRevision> revisions = new HashSet<>();
         for (Entry<BundleRequirement, SortedSet<BundleCapability>> entry
             : m_candidateMap.entrySet())
         {

Modified: ace/trunk/org.apache.ace.verifier/src/org/apache/felix/framework/resolver/HostBundleRevision.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.verifier/src/org/apache/felix/framework/resolver/HostBundleRevision.java?rev=1727499&r1=1727498&r2=1727499&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.verifier/src/org/apache/felix/framework/resolver/HostBundleRevision.java (original)
+++ ace/trunk/org.apache.ace.verifier/src/org/apache/felix/framework/resolver/HostBundleRevision.java Fri Jan 29 08:59:31 2016
@@ -69,7 +69,7 @@ class HostBundleRevision implements Bund
     {
         if (m_cachedCapabilities == null)
         {
-            List<BundleCapability> caps = new ArrayList<BundleCapability>();
+            List<BundleCapability> caps = new ArrayList<>();
 
             // Wrap host capabilities.
             for (BundleCapability cap : m_host.getDeclaredCapabilities(null))
@@ -96,14 +96,14 @@ class HostBundleRevision implements Bund
     }
 
     public List<Capability> getCapabilities(String namespace) {
-        return new ArrayList<Capability>(getCapabilities(namespace));
+        return new ArrayList<>(getCapabilities(namespace));
     }
     
     public List<BundleRequirement> getDeclaredRequirements(String namespace)
     {
         if (m_cachedRequirements == null)
         {
-            List<BundleRequirement> reqs = new ArrayList<BundleRequirement>();
+            List<BundleRequirement> reqs = new ArrayList<>();
 
             // Wrap host requirements.
             for (BundleRequirement req : m_host.getDeclaredRequirements(null))

Modified: ace/trunk/org.apache.ace.verifier/src/org/apache/felix/framework/resolver/ResolverImpl.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.verifier/src/org/apache/felix/framework/resolver/ResolverImpl.java?rev=1727499&r1=1727498&r2=1727499&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.verifier/src/org/apache/felix/framework/resolver/ResolverImpl.java (original)
+++ ace/trunk/org.apache.ace.verifier/src/org/apache/felix/framework/resolver/ResolverImpl.java Fri Jan 29 08:59:31 2016
@@ -53,10 +53,10 @@ public class ResolverImpl implements Res
 
     // Holds candidate permutations based on permutating "uses" chains.
     // These permutations are given higher priority.
-    private final List<Candidates> m_usesPermutations = new ArrayList<Candidates>();
+    private final List<Candidates> m_usesPermutations = new ArrayList<>();
     // Holds candidate permutations based on permutating requirement candidates.
     // These permutations represent backtracking on previous decisions.
-    private final List<Candidates> m_importPermutations = new ArrayList<Candidates>();
+    private final List<Candidates> m_importPermutations = new ArrayList<>();
 
     public ResolverImpl(Logger logger)
     {
@@ -70,9 +70,9 @@ public class ResolverImpl implements Res
         Set<BundleRevision> ondemandFragments)
     {
         Map<BundleRevision, List<ResolverWire>> wireMap =
-            new HashMap<BundleRevision, List<ResolverWire>>();
+            new HashMap<>();
         Map<BundleRevision, Packages> revisionPkgMap =
-            new HashMap<BundleRevision, Packages>();
+            new HashMap<>();
 
         boolean retry;
         do
@@ -130,7 +130,7 @@ public class ResolverImpl implements Res
                 // fragments, since they will only be pulled in if their
                 // host is already present.
                 Set<BundleRevision> allRevisions =
-                    new HashSet<BundleRevision>(mandatoryRevisions);
+                    new HashSet<>(mandatoryRevisions);
                 for (BundleRevision br : optionalRevisions)
                 {
                     if (allCandidates.isPopulated(br))
@@ -148,7 +148,7 @@ public class ResolverImpl implements Res
                 // must ultimately be verified, so store its host requirement
                 // to use for package space calculation.
                 Map<BundleRevision, List<BundleRequirement>> hostReqs =
-                    new HashMap<BundleRevision, List<BundleRequirement>>();
+                    new HashMap<>();
                 for (BundleRevision br : allRevisions)
                 {
                     if (Util.isFragment(br))
@@ -289,8 +289,8 @@ public class ResolverImpl implements Res
             getDynamicImportCandidates(state, revision, pkgName);
         if (allCandidates != null)
         {
-            Map<BundleRevision, List<ResolverWire>> wireMap = new HashMap<BundleRevision, List<ResolverWire>>();
-            Map<BundleRevision, Packages> revisionPkgMap = new HashMap<BundleRevision, Packages>();
+            Map<BundleRevision, List<ResolverWire>> wireMap = new HashMap<>();
+            Map<BundleRevision, Packages> revisionPkgMap = new HashMap<>();
 
             boolean retry;
             do
@@ -407,7 +407,7 @@ public class ResolverImpl implements Res
             Collections.EMPTY_MAP,
             Collections.EMPTY_MAP);
         SortedSet<BundleCapability> caps = state.getCandidates(req, true);
-        List<BundleRevision> singletons = new ArrayList<BundleRevision>();
+        List<BundleRevision> singletons = new ArrayList<>();
         for (BundleCapability cap : caps)
         {
             if (cap.getRevision().getWiring() != null)
@@ -532,8 +532,8 @@ public class ResolverImpl implements Res
 
         // Create parallel arrays for requirement and proposed candidate
         // capability or actual capability if revision is resolved or not.
-        List<BundleRequirement> reqs = new ArrayList<BundleRequirement>();
-        List<BundleCapability> caps = new ArrayList<BundleCapability>();
+        List<BundleRequirement> reqs = new ArrayList<>();
+        List<BundleCapability> caps = new ArrayList<>();
         boolean isDynamicImporting = false;
         if (revision.getWiring() != null)
         {
@@ -659,7 +659,7 @@ public class ResolverImpl implements Res
                 if (!req.getNamespace().equals(BundleRevision.BUNDLE_NAMESPACE)
                     && !req.getNamespace().equals(BundleRevision.PACKAGE_NAMESPACE))
                 {
-                    List<BundleRequirement> blameReqs = new ArrayList<BundleRequirement>();
+                    List<BundleRequirement> blameReqs = new ArrayList<>();
                     blameReqs.add(req);
 
                     mergeUses(
@@ -680,7 +680,7 @@ public class ResolverImpl implements Res
                     // Ignore revisions that import from themselves.
                     if (!blame.m_cap.getRevision().equals(revision))
                     {
-                        List<BundleRequirement> blameReqs = new ArrayList<BundleRequirement>();
+                        List<BundleRequirement> blameReqs = new ArrayList<>();
                         blameReqs.add(blame.m_reqs.get(0));
 
                         mergeUses(
@@ -699,7 +699,7 @@ public class ResolverImpl implements Res
             {
                 for (Blame blame : entry.getValue())
                 {
-                    List<BundleRequirement> blameReqs = new ArrayList<BundleRequirement>();
+                    List<BundleRequirement> blameReqs = new ArrayList<>();
                     blameReqs.add(blame.m_reqs.get(0));
 
                     mergeUses(
@@ -723,7 +723,7 @@ public class ResolverImpl implements Res
         List<BundleCapability> cycleCaps = cycles.get(current);
         if (cycleCaps == null)
         {
-            cycleCaps = new ArrayList<BundleCapability>();
+            cycleCaps = new ArrayList<>();
             cycles.put(current, cycleCaps);
         }
         if (cycleCaps.contains(candCap))
@@ -831,7 +831,7 @@ public class ResolverImpl implements Res
             String pkgName = (String)
                 candCap.getAttributes().get(BundleRevision.PACKAGE_NAMESPACE);
 
-            List<BundleRequirement> blameReqs = new ArrayList<BundleRequirement>();
+            List<BundleRequirement> blameReqs = new ArrayList<>();
             blameReqs.add(currentReq);
 
             Packages currentPkgs = revisionPkgMap.get(current);
@@ -842,7 +842,7 @@ public class ResolverImpl implements Res
             List<Blame> blames = packages.get(pkgName);
             if (blames == null)
             {
-                blames = new ArrayList<Blame>();
+                blames = new ArrayList<>();
                 packages.put(pkgName, blames);
             }
             blames.add(new Blame(candCap, blameReqs));
@@ -887,7 +887,7 @@ public class ResolverImpl implements Res
                 Blame candExportedBlame = candSourcePkgs.m_exportedPkgs.get(usedPkgName);
                 if (candExportedBlame != null)
                 {
-                    candSourceBlames = new ArrayList<Blame>(1);
+                    candSourceBlames = new ArrayList<>(1);
                     candSourceBlames.add(candExportedBlame);
                 }
                 else
@@ -911,14 +911,14 @@ public class ResolverImpl implements Res
                 List<Blame> usedCaps = currentPkgs.m_usedPkgs.get(usedPkgName);
                 if (usedCaps == null)
                 {
-                    usedCaps = new ArrayList<Blame>();
+                    usedCaps = new ArrayList<>();
                     currentPkgs.m_usedPkgs.put(usedPkgName, usedCaps);
                 }
                 for (Blame blame : candSourceBlames)
                 {
                     if (blame.m_reqs != null)
                     {
-                        List<BundleRequirement> blameReqs2 = new ArrayList<BundleRequirement>(blameReqs);
+                        List<BundleRequirement> blameReqs2 = new ArrayList<>(blameReqs);
                         blameReqs2.add(blame.m_reqs.get(blame.m_reqs.size() - 1));
                         usedCaps.add(new Blame(blame.m_cap, blameReqs2));
                         mergeUses(current, currentPkgs, blame.m_cap, blameReqs2,
@@ -1298,7 +1298,7 @@ public class ResolverImpl implements Res
             ? revision.getWiring().getCapabilities(null)
             : revision.getDeclaredCapabilities(null);
         Map<String, BundleCapability> exports =
-            new HashMap<String, BundleCapability>(caps.size());
+            new HashMap<>(caps.size());
         for (BundleCapability cap : caps)
         {
             if (cap.getNamespace().equals(BundleRevision.PACKAGE_NAMESPACE))
@@ -1375,7 +1375,7 @@ public class ResolverImpl implements Res
     }
 
     private Map<BundleCapability, List<BundleCapability>> m_packageSourcesCache
-        = new HashMap<BundleCapability, List<BundleCapability>>();
+        = new HashMap<>();
 
     private List<BundleCapability> getPackageSources(
         BundleCapability cap, Map<BundleRevision, Packages> revisionPkgMap)
@@ -1394,7 +1394,7 @@ public class ResolverImpl implements Res
 
         if (!((BundleCapabilityImpl) cap).getUses().isEmpty())
         {
-            List<BundleCapability> caps = new ArrayList<BundleCapability>(1);
+            List<BundleCapability> caps = new ArrayList<>(1);
             caps.add(cap);
             return caps;
         }
@@ -1485,9 +1485,9 @@ public class ResolverImpl implements Res
         {
             wireMap.put(unwrappedRevision, (List<ResolverWire>) Collections.EMPTY_LIST);
 
-            List<ResolverWire> packageWires = new ArrayList<ResolverWire>();
-            List<ResolverWire> bundleWires = new ArrayList<ResolverWire>();
-            List<ResolverWire> capabilityWires = new ArrayList<ResolverWire>();
+            List<ResolverWire> packageWires = new ArrayList<>();
+            List<ResolverWire> bundleWires = new ArrayList<>();
+            List<ResolverWire> capabilityWires = new ArrayList<>();
 
             for (BundleRequirement req : revision.getDeclaredRequirements(null))
             {
@@ -1540,7 +1540,7 @@ public class ResolverImpl implements Res
                     List<ResolverWire> hostWires = wireMap.get(fragment);
                     if (hostWires == null)
                     {
-                        hostWires = new ArrayList<ResolverWire>();
+                        hostWires = new ArrayList<>();
                         wireMap.put(fragment, hostWires);
                     }
                     hostWires.add(
@@ -1564,7 +1564,7 @@ public class ResolverImpl implements Res
     {
         wireMap.put(revision, (List<ResolverWire>) Collections.EMPTY_LIST);
 
-        List<ResolverWire> packageWires = new ArrayList<ResolverWire>();
+        List<ResolverWire> packageWires = new ArrayList<>();
 
         BundleRequirement dynReq = null;
         BundleCapability dynCand = null;
@@ -1597,7 +1597,7 @@ public class ResolverImpl implements Res
                     allCandidates);
             }
 
-            Map<String, Object> attrs = new HashMap<String, Object>(1);
+            Map<String, Object> attrs = new HashMap<>(1);
             attrs.put(BundleRevision.PACKAGE_NAMESPACE, pkgName);
             packageWires.add(
                 new ResolverWireImpl(
@@ -1750,10 +1750,10 @@ public class ResolverImpl implements Res
     {
         @SuppressWarnings("unused")
         private final BundleRevision m_revision;
-        public final Map<String, Blame> m_exportedPkgs = new HashMap<String, Blame>();
-        public final Map<String, List<Blame>> m_importedPkgs = new HashMap<String, List<Blame>>();
-        public final Map<String, List<Blame>> m_requiredPkgs = new HashMap<String, List<Blame>>();
-        public final Map<String, List<Blame>> m_usedPkgs = new HashMap<String, List<Blame>>();
+        public final Map<String, Blame> m_exportedPkgs = new HashMap<>();
+        public final Map<String, List<Blame>> m_importedPkgs = new HashMap<>();
+        public final Map<String, List<Blame>> m_requiredPkgs = new HashMap<>();
+        public final Map<String, List<Blame>> m_usedPkgs = new HashMap<>();
 
         public Packages(BundleRevision revision)
         {

Modified: ace/trunk/org.apache.ace.verifier/src/org/apache/felix/framework/util/Util.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.verifier/src/org/apache/felix/framework/util/Util.java?rev=1727499&r1=1727498&r2=1727499&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.verifier/src/org/apache/felix/framework/util/Util.java (original)
+++ ace/trunk/org.apache.ace.verifier/src/org/apache/felix/framework/util/Util.java Fri Jan 29 08:59:31 2016
@@ -312,7 +312,7 @@ public class Util
     public static List<BundleCapability> getCapabilityByNamespace(
         BundleRevision br, String namespace)
     {
-        final List<BundleCapability> matching = new ArrayList<BundleCapability>();
+        final List<BundleCapability> matching = new ArrayList<>();
         final List<BundleCapability> caps = (br.getWiring() != null)
             ? br.getWiring().getCapabilities(null)
             : br.getDeclaredCapabilities(null);
@@ -332,7 +332,7 @@ public class Util
     public static List<BundleRequirement> getDynamicRequirements(
         List<BundleRequirement> reqs)
     {
-        List<BundleRequirement> result = new ArrayList<BundleRequirement>();
+        List<BundleRequirement> result = new ArrayList<>();
         if (reqs != null)
         {
             for (BundleRequirement req : reqs)
@@ -515,7 +515,7 @@ public class Util
         // one for detecting cycles for this invocation.
         if (cycleMap == null)
         {
-            cycleMap = new HashMap<String, String>();
+            cycleMap = new HashMap<>();
         }
 
         // Put the current key in the cycle map.
@@ -637,7 +637,7 @@ public class Util
                         // Create array list if needed.
                         if (fragments.isEmpty())
                         {
-                            fragments = new ArrayList<BundleRevision>();
+                            fragments = new ArrayList<>();
                         }
                         fragments.add(w.getRequirerWiring().getRevision());
                     }

Modified: ace/trunk/org.apache.ace.verifier/src/org/apache/felix/framework/util/manifestparser/ManifestParser.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.verifier/src/org/apache/felix/framework/util/manifestparser/ManifestParser.java?rev=1727499&r1=1727498&r2=1727499&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.verifier/src/org/apache/felix/framework/util/manifestparser/ManifestParser.java (original)
+++ ace/trunk/org.apache.ace.verifier/src/org/apache/felix/framework/util/manifestparser/ManifestParser.java Fri Jan 29 08:59:31 2016
@@ -121,7 +121,7 @@ public class ManifestParser
                 if (!attachment.equalsIgnoreCase(Constants.FRAGMENT_ATTACHMENT_NEVER))
                 {
                     Map<String, Object> hostAttrs =
-                        new HashMap<String, Object>(bundleCap.getAttributes());
+                        new HashMap<>(bundleCap.getAttributes());
                     Object value = hostAttrs.remove(BundleRevision.BUNDLE_NAMESPACE);
                     hostAttrs.put(BundleRevision.HOST_NAMESPACE, value);
                     capList.add(new BundleCapabilityImpl(
@@ -142,7 +142,7 @@ public class ManifestParser
             if (isSingleton(bundleCap))
             {
                 Map<String, Object> singletonAttrs =
-                    new HashMap<String, Object>(bundleCap.getAttributes());
+                    new HashMap<>(bundleCap.getAttributes());
                 Object value = singletonAttrs.remove(BundleRevision.BUNDLE_NAMESPACE);
                 singletonAttrs.put(BundleCapabilityImpl.SINGLETON_NAMESPACE, value);
                 capList.add(new BundleCapabilityImpl(
@@ -233,7 +233,7 @@ public class ManifestParser
             importReqs.addAll(convertImports(implicitClauses, owner));
 
             List<ParsedHeaderClause> allImportClauses =
-                new ArrayList<ParsedHeaderClause>(implicitClauses.size() + importClauses.size());
+                new ArrayList<>(implicitClauses.size() + importClauses.size());
             allImportClauses.addAll(importClauses);
             allImportClauses.addAll(implicitClauses);
 
@@ -443,7 +443,7 @@ public class ManifestParser
                 // more efficient.
 // TODO: OSGi R4.3 - This is ordering is kind of hacky.
                 // Prepend the package name to the array of attributes.
-                Map<String, Object> newAttrs = new LinkedHashMap<String, Object>(attrs.size() + 1);
+                Map<String, Object> newAttrs = new LinkedHashMap<>(attrs.size() + 1);
                 // We want this first from an indexing perspective.
                 newAttrs.put(
                     BundleRevision.PACKAGE_NAMESPACE,
@@ -460,7 +460,7 @@ public class ManifestParser
                 // Inject filter directive.
 // TODO: OSGi R4.3 - Can we insert this on demand somehow?
                 Map<String, String> dirs = clause.m_dirs;
-                Map<String, String> newDirs = new HashMap<String, String>(dirs.size() + 1);
+                Map<String, String> newDirs = new HashMap<>(dirs.size() + 1);
                 newDirs.putAll(dirs);
                 newDirs.put(
                     Constants.FILTER_DIRECTIVE,
@@ -662,7 +662,7 @@ public class ManifestParser
 
                         List<String> tokens = parseDelimitedString(
                             clause.m_attrs.get(entry.getKey()).toString(), ",", false);
-                        List<Object> values = new ArrayList<Object>(tokens.size());
+                        List<Object> values = new ArrayList<>(tokens.size());
                         for (String token : tokens)
                         {
                             if (listType.equals("String"))
@@ -864,7 +864,7 @@ public class ManifestParser
             {
                 // Prepend the package name to the array of attributes.
                 Map<String, Object> attrs = clause.m_attrs;
-                Map<String, Object> newAttrs = new HashMap<String, Object>(attrs.size() + 1);
+                Map<String, Object> newAttrs = new HashMap<>(attrs.size() + 1);
                 newAttrs.putAll(attrs);
                 newAttrs.put(
                     BundleRevision.PACKAGE_NAMESPACE,
@@ -975,7 +975,7 @@ public class ManifestParser
             if (clause != null)
             {
                 String[] entries = clause.getLibraryEntries();
-                libs = new ArrayList<R4Library>(entries.length);
+                libs = new ArrayList<>(entries.length);
                 int current = 0;
                 for (int i = 0; i < entries.length; i++)
                 {
@@ -998,7 +998,7 @@ public class ManifestParser
         }
         catch (Exception ex)
         {
-            libs = new ArrayList<R4Library>(0);
+            libs = new ArrayList<>(0);
         }
         return libs;
     }
@@ -1181,7 +1181,7 @@ public class ManifestParser
                 .get(BundleRevision.PACKAGE_NAMESPACE)) == null)
             {
                 // Convert Version to VersionRange.
-                Map<String, Object> attrs = new HashMap<String, Object>();
+                Map<String, Object> attrs = new HashMap<>();
                 Object version = exports.get(i).getAttributes().get(Constants.VERSION_ATTRIBUTE);
                 if (version != null)
                 {
@@ -1223,7 +1223,7 @@ public class ManifestParser
         }
         for (int i = 0; i < exports.size(); i++)
         {
-            Map<String, String> dirs = new HashMap<String, String>(1);
+            Map<String, String> dirs = new HashMap<>(1);
             dirs.put(Constants.USES_DIRECTIVE, usesValue);
             exports.set(i, new BundleCapabilityImpl(
                 exports.get(i).getRevision(),
@@ -1361,7 +1361,7 @@ public class ManifestParser
 // TODO: OSGi R4.3 - This is ordering is kind of hacky.
                 // Prepend the host symbolic name to the map of attributes.
                 Map<String, Object> attrs = clauses.get(0).m_attrs;
-                Map<String, Object> newAttrs = new LinkedHashMap<String, Object>(attrs.size() + 1);
+                Map<String, Object> newAttrs = new LinkedHashMap<>(attrs.size() + 1);
                 // We want this first from an indexing perspective.
                 newAttrs.put(
                     BundleRevision.HOST_NAMESPACE,
@@ -1378,7 +1378,7 @@ public class ManifestParser
                 // Inject filter directive.
 // TODO: OSGi R4.3 - Can we insert this on demand somehow?
                 Map<String, String> dirs = clauses.get(0).m_dirs;
-                Map<String, String> newDirs = new HashMap<String, String>(dirs.size() + 1);
+                Map<String, String> newDirs = new HashMap<>(dirs.size() + 1);
                 newDirs.putAll(dirs);
                 newDirs.put(
                     Constants.FILTER_DIRECTIVE,
@@ -1463,7 +1463,7 @@ public class ManifestParser
                 // more efficient.
 // TODO: OSGi R4.3 - This is ordering is kind of hacky.
                 // Prepend the symbolic name to the array of attributes.
-                Map<String, Object> newAttrs = new LinkedHashMap<String, Object>(attrs.size() + 1);
+                Map<String, Object> newAttrs = new LinkedHashMap<>(attrs.size() + 1);
                 // We want this first from an indexing perspective.
                 newAttrs.put(
                     BundleRevision.BUNDLE_NAMESPACE,
@@ -1480,7 +1480,7 @@ public class ManifestParser
                 // Inject filter directive.
 // TODO: OSGi R4.3 - Can we insert this on demand somehow?
                 Map<String, String> dirs = clause.m_dirs;
-                Map<String, String> newDirs = new HashMap<String, String>(dirs.size() + 1);
+                Map<String, String> newDirs = new HashMap<>(dirs.size() + 1);
                 newDirs.putAll(dirs);
                 newDirs.put(
                     Constants.FILTER_DIRECTIVE,
@@ -1594,7 +1594,7 @@ public class ManifestParser
 
     private static List<ParsedHeaderClause> parseStandardHeader(String header)
     {
-        List<ParsedHeaderClause> clauses = new ArrayList<ParsedHeaderClause>();
+        List<ParsedHeaderClause> clauses = new ArrayList<>();
         if (header != null)
         {
             int[] startIdx = new int[1];
@@ -1961,7 +1961,7 @@ public class ManifestParser
     {
         if (libStrs == null)
         {
-            return new ArrayList<R4LibraryClause>(0);
+            return new ArrayList<>(0);
         }
 
         List<R4LibraryClause> libList = new ArrayList(libStrs.size());

Modified: ace/trunk/org.apache.ace.verifier/src/org/apache/felix/framework/util/manifestparser/R4Library.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.verifier/src/org/apache/felix/framework/util/manifestparser/R4Library.java?rev=1727499&r1=1727498&r2=1727499&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.verifier/src/org/apache/felix/framework/util/manifestparser/R4Library.java (original)
+++ ace/trunk/org.apache.ace.verifier/src/org/apache/felix/framework/util/manifestparser/R4Library.java Fri Jan 29 08:59:31 2016
@@ -99,7 +99,7 @@ public class R4Library
             (String) configMap.get(Constants.FRAMEWORK_LIBRARY_EXTENSIONS), ",");
         if (exts == null)
         {
-            exts = new ArrayList<String>();
+            exts = new ArrayList<>();
         }
         // For Mac OSX, try dylib too.
         if (libname.endsWith(".jnilib") && m_libraryFile.endsWith(".dylib"))

Modified: ace/trunk/org.apache.ace.verifier/src/org/apache/felix/framework/wiring/BundleCapabilityImpl.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.verifier/src/org/apache/felix/framework/wiring/BundleCapabilityImpl.java?rev=1727499&r1=1727498&r2=1727499&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.verifier/src/org/apache/felix/framework/wiring/BundleCapabilityImpl.java (original)
+++ ace/trunk/org.apache.ace.verifier/src/org/apache/felix/framework/wiring/BundleCapabilityImpl.java Fri Jan 29 08:59:31 2016
@@ -77,7 +77,7 @@ public class BundleCapabilityImpl implem
         if (value != null)
         {
             List<String> filters = ManifestParser.parseDelimitedString(value, ",");
-            m_includeFilter = new ArrayList<List<String>>(filters.size());
+            m_includeFilter = new ArrayList<>(filters.size());
             for (int filterIdx = 0; filterIdx < filters.size(); filterIdx++)
             {
                 List<String> substrings = SimpleFilter.parseSubstring(filters.get(filterIdx));
@@ -93,7 +93,7 @@ public class BundleCapabilityImpl implem
         if (value != null)
         {
             List<String> filters = ManifestParser.parseDelimitedString(value, ",");
-            m_excludeFilter = new ArrayList<List<String>>(filters.size());
+            m_excludeFilter = new ArrayList<>(filters.size());
             for (int filterIdx = 0; filterIdx < filters.size(); filterIdx++)
             {
                 List<String> substrings = SimpleFilter.parseSubstring(filters.get(filterIdx));
@@ -110,7 +110,7 @@ public class BundleCapabilityImpl implem
         if (value != null)
         {
             List<String> names = ManifestParser.parseDelimitedString(value, ",");
-            mandatory = new HashSet<String>(names.size());
+            mandatory = new HashSet<>(names.size());
             for (String name : names)
             {
                 // If attribute exists, then record it as mandatory.

Modified: ace/trunk/org.apache.ace.verifier/test/org/apache/ace/deployment/verifier/impl/VerifierTest.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.verifier/test/org/apache/ace/deployment/verifier/impl/VerifierTest.java?rev=1727499&r1=1727498&r2=1727499&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.verifier/test/org/apache/ace/deployment/verifier/impl/VerifierTest.java (original)
+++ ace/trunk/org.apache.ace.verifier/test/org/apache/ace/deployment/verifier/impl/VerifierTest.java Fri Jan 29 08:59:31 2016
@@ -67,7 +67,7 @@ public class VerifierTest {
                 ex.printStackTrace();
             }
         });
-        Set<BundleRevision> bundles = new HashSet<BundleRevision>();
+        Set<BundleRevision> bundles = new HashSet<>();
         bundles.add(env.addBundle(0, new HashMap<String, String>() {
             {
                 put(Constants.BUNDLE_MANIFESTVERSION, "2");
@@ -121,7 +121,7 @@ public class VerifierTest {
                 ex.printStackTrace();
             }
         });
-        Set<BundleRevision> bundles = new HashSet<BundleRevision>();
+        Set<BundleRevision> bundles = new HashSet<>();
         bundles.add(env.addBundle(0, new HashMap<String, String>() {
             {
                 put(Constants.BUNDLE_MANIFESTVERSION, "2");

Modified: ace/trunk/org.apache.ace.webui.vaadin/src/org/apache/ace/webui/vaadin/AddArtifactWindow.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.webui.vaadin/src/org/apache/ace/webui/vaadin/AddArtifactWindow.java?rev=1727499&r1=1727498&r2=1727499&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.webui.vaadin/src/org/apache/ace/webui/vaadin/AddArtifactWindow.java (original)
+++ ace/trunk/org.apache.ace.webui.vaadin/src/org/apache/ace/webui/vaadin/AddArtifactWindow.java Fri Jan 29 08:59:31 2016
@@ -66,7 +66,7 @@ abstract class AddArtifactWindow extends
     private final File m_sessionDir;
     private final URL m_obrUrl;
 
-    private final List<File> m_uploadedArtifacts = new ArrayList<File>();
+    private final List<File> m_uploadedArtifacts = new ArrayList<>();
     private final Button m_searchButton;
     private final Button m_addButton;
     private final Table m_artifactsTable;
@@ -235,7 +235,7 @@ abstract class AddArtifactWindow extends
      * @return the imported artifacts, never <code>null</code>.
      */
     final List<ArtifactObject> importLocalBundles(final Table artifacts) {
-        final List<ArtifactObject> added = new ArrayList<ArtifactObject>();
+        final List<ArtifactObject> added = new ArrayList<>();
 
         Set<?> selectedItems = (Set<?>) artifacts.getValue();
         if (selectedItems != null && !selectedItems.isEmpty()) {
@@ -268,7 +268,7 @@ abstract class AddArtifactWindow extends
      * @return the list of imported bundles.
      */
     final List<ArtifactObject> importRemoteBundles(List<File> uploadedArtifacts) {
-        List<ArtifactObject> added = new ArrayList<ArtifactObject>();
+        List<ArtifactObject> added = new ArrayList<>();
 
         StringBuffer errors = new StringBuffer();
         int failedImports = 0;
@@ -398,7 +398,7 @@ abstract class AddArtifactWindow extends
         // retrieve the repository.xml as a stream
         List<OBREntry> obrList = OBRUtil.getAvailableOBREntries(getConnectionFactory(), getArtifactRepository(), obrBaseUrl, m_repositoryXML);
         if (obrList.isEmpty()) {
-            logError("No new data in OBR.");
+            logDebug("No new data in OBR.");
             return;
         }
 
@@ -412,7 +412,7 @@ abstract class AddArtifactWindow extends
     }
 
     /**
-     * Logs a given message at the error level.
+     * Logs a given message at the debug level.
      * <p>
      * If there's no log service present, this method will silently ignore the log statement.
      * </p>
@@ -420,10 +420,10 @@ abstract class AddArtifactWindow extends
      * @param aMessage
      *            the message to log.
      */
-    private void logError(String aMessage) {
+    private void logDebug(String aMessage) {
         LogService logger = getLogger();
         if (logger != null) {
-            logger.log(LogService.LOG_ERROR, aMessage);
+            logger.log(LogService.LOG_DEBUG, aMessage);
         }
     }
 

Modified: ace/trunk/org.apache.ace.webui.vaadin/src/org/apache/ace/webui/vaadin/EditWindow.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.webui.vaadin/src/org/apache/ace/webui/vaadin/EditWindow.java?rev=1727499&r1=1727498&r2=1727499&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.webui.vaadin/src/org/apache/ace/webui/vaadin/EditWindow.java (original)
+++ ace/trunk/org.apache.ace.webui.vaadin/src/org/apache/ace/webui/vaadin/EditWindow.java Fri Jan 29 08:59:31 2016
@@ -100,7 +100,7 @@ public abstract class EditWindow extends
         tabs.setWidth("100%");
         tabs.setVisible(!factories.isEmpty());
 
-        Map<String, Object> context = new HashMap<String, Object>();
+        Map<String, Object> context = new HashMap<>();
         context.put("object", object);
         populateContext(context);
 

Modified: ace/trunk/org.apache.ace.webui.vaadin/src/org/apache/ace/webui/vaadin/OBRUtil.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.webui.vaadin/src/org/apache/ace/webui/vaadin/OBRUtil.java?rev=1727499&r1=1727498&r2=1727499&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.webui.vaadin/src/org/apache/ace/webui/vaadin/OBRUtil.java (original)
+++ ace/trunk/org.apache.ace.webui.vaadin/src/org/apache/ace/webui/vaadin/OBRUtil.java Fri Jan 29 08:59:31 2016
@@ -146,7 +146,7 @@ public final class OBRUtil {
     private static List<OBREntry> getUsedOBRArtifacts(ArtifactRepository artifactRepository, URL obrBaseUrl) throws IOException {
         final String baseURL = obrBaseUrl.toExternalForm();
 
-        List<OBREntry> fromRepository = new ArrayList<OBREntry>();
+        List<OBREntry> fromRepository = new ArrayList<>();
 
         List<ArtifactObject> artifactObjects = artifactRepository.get();
         artifactObjects.addAll(artifactRepository.getResourceProcessors());
@@ -200,7 +200,7 @@ public final class OBRUtil {
             }
         }
 
-        List<OBREntry> obrList = new ArrayList<OBREntry>();
+        List<OBREntry> obrList = new ArrayList<>();
         for (int nResource = 0; nResource < resources.getLength(); nResource++) {
             Node resource = resources.item(nResource);
             NamedNodeMap attr = resource.getAttributes();

Modified: ace/trunk/org.apache.ace.webui.vaadin/src/org/apache/ace/webui/vaadin/UploadHelper.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.webui.vaadin/src/org/apache/ace/webui/vaadin/UploadHelper.java?rev=1727499&r1=1727498&r2=1727499&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.webui.vaadin/src/org/apache/ace/webui/vaadin/UploadHelper.java (original)
+++ ace/trunk/org.apache.ace.webui.vaadin/src/org/apache/ace/webui/vaadin/UploadHelper.java Fri Jan 29 08:59:31 2016
@@ -102,8 +102,8 @@ public class UploadHelper {
      */
     static abstract class GenericUploadHandler implements Upload.SucceededListener,
         Upload.FailedListener, Upload.Receiver, Upload.FinishedListener, Upload.ProgressListener {
-        private final Map<String, UploadHandleImpl> m_uploads = new ConcurrentHashMap<String, UploadHandleImpl>();
-        private final List<UploadHandle> m_completed = new CopyOnWriteArrayList<UploadHandle>();
+        private final Map<String, UploadHandleImpl> m_uploads = new ConcurrentHashMap<>();
+        private final List<UploadHandle> m_completed = new CopyOnWriteArrayList<>();
         private final File m_sessionDir;
 
         /**

Modified: ace/trunk/org.apache.ace.webui.vaadin/src/org/apache/ace/webui/vaadin/VaadinClient.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.webui.vaadin/src/org/apache/ace/webui/vaadin/VaadinClient.java?rev=1727499&r1=1727498&r2=1727499&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.webui.vaadin/src/org/apache/ace/webui/vaadin/VaadinClient.java (original)
+++ ace/trunk/org.apache.ace.webui.vaadin/src/org/apache/ace/webui/vaadin/VaadinClient.java Fri Jan 29 08:59:31 2016
@@ -196,7 +196,7 @@ public class VaadinClient extends com.va
 
     private Component m_component;
 
-    private final List<Component> m_eventHandlers = new ArrayList<Component>();
+    private final List<Component> m_eventHandlers = new ArrayList<>();
 
     private GridLayout m_mainToolbar;
 
@@ -477,10 +477,10 @@ public class VaadinClient extends com.va
      *            the description of the new distribution.
      */
     protected DistributionObject createDistribution(String name, String description) {
-        Map<String, String> attributes = new HashMap<String, String>();
+        Map<String, String> attributes = new HashMap<>();
         attributes.put(DistributionObject.KEY_NAME, name);
         attributes.put(DistributionObject.KEY_DESCRIPTION, description);
-        Map<String, String> tags = new HashMap<String, String>();
+        Map<String, String> tags = new HashMap<>();
         return m_distributionRepository.create(attributes, tags);
     }
 
@@ -493,10 +493,10 @@ public class VaadinClient extends com.va
      *            the description of the new feature.
      */
     protected FeatureObject createFeature(String name, String description) {
-        Map<String, String> attributes = new HashMap<String, String>();
+        Map<String, String> attributes = new HashMap<>();
         attributes.put(FeatureObject.KEY_NAME, name);
         attributes.put(FeatureObject.KEY_DESCRIPTION, description);
-        Map<String, String> tags = new HashMap<String, String>();
+        Map<String, String> tags = new HashMap<>();
         return m_featureRepository.create(attributes, tags);
     }
 
@@ -507,10 +507,10 @@ public class VaadinClient extends com.va
      *            the name of the new target;
      */
     protected StatefulTargetObject createTarget(String name) {
-        Map<String, String> attributes = new HashMap<String, String>();
+        Map<String, String> attributes = new HashMap<>();
         attributes.put(StatefulTargetObject.KEY_ID, name);
         attributes.put(TargetObject.KEY_AUTO_APPROVE, "true");
-        Map<String, String> tags = new HashMap<String, String>();
+        Map<String, String> tags = new HashMap<>();
         return m_statefulTargetRepository.preregister(attributes, tags);
     }
 
@@ -1054,7 +1054,7 @@ public class VaadinClient extends com.va
             protected void artifactsUploaded(List<UploadHandle> uploadedArtifacts) {
                 StringBuilder failedMsg = new StringBuilder();
                 StringBuilder successMsg = new StringBuilder();
-                Set<String> selection = new HashSet<String>();
+                Set<String> selection = new HashSet<>();
 
                 for (UploadHandle handle : uploadedArtifacts) {
                     if (!handle.isSuccessful()) {

Modified: ace/trunk/org.apache.ace.webui.vaadin/src/org/apache/ace/webui/vaadin/component/AssociationHelper.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.webui.vaadin/src/org/apache/ace/webui/vaadin/component/AssociationHelper.java?rev=1727499&r1=1727498&r2=1727499&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.webui.vaadin/src/org/apache/ace/webui/vaadin/component/AssociationHelper.java (original)
+++ ace/trunk/org.apache.ace.webui.vaadin/src/org/apache/ace/webui/vaadin/component/AssociationHelper.java Fri Jan 29 08:59:31 2016
@@ -26,8 +26,8 @@ import java.util.Set;
 import com.vaadin.ui.Table;
 
 public class AssociationHelper {
-    private Set<String> m_associatedItems = new HashSet<String>();
-    private Set<String> m_relatedItems = new HashSet<String>();
+    private Set<String> m_associatedItems = new HashSet<>();
+    private Set<String> m_relatedItems = new HashSet<>();
     private Table m_activeTable;
 
     public void addAssociated(Collection<String> associated) {

Modified: ace/trunk/org.apache.ace.webui.vaadin/src/org/apache/ace/webui/vaadin/component/BaseObjectPanel.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.webui.vaadin/src/org/apache/ace/webui/vaadin/component/BaseObjectPanel.java?rev=1727499&r1=1727498&r2=1727499&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.webui.vaadin/src/org/apache/ace/webui/vaadin/component/BaseObjectPanel.java (original)
+++ ace/trunk/org.apache.ace.webui.vaadin/src/org/apache/ace/webui/vaadin/component/BaseObjectPanel.java Fri Jan 29 08:59:31 2016
@@ -134,7 +134,7 @@ abstract class BaseObjectPanel<REPO_OBJ
 
         public UIExtensionFactoryHolder(ServiceReference serviceRef, UIExtensionFactory extensionFactory) {
             m_serviceRef = serviceRef;
-            m_extensionFactory = new WeakReference<UIExtensionFactory>(extensionFactory);
+            m_extensionFactory = new WeakReference<>(extensionFactory);
         }
 
         /**
@@ -222,7 +222,7 @@ abstract class BaseObjectPanel<REPO_OBJ
 
         m_associations = associations;
         m_associationManager = associationRemover;
-        m_extensionFactories = new ArrayList<UIExtensionFactoryHolder>();
+        m_extensionFactories = new ArrayList<>();
         m_extensionPoint = extensionPoint;
         m_entityType = entityType;
 
@@ -442,8 +442,8 @@ abstract class BaseObjectPanel<REPO_OBJ
      * Recalculates all relations.
      */
     final void recalculateRelations(Direction direction) {
-        Set<String> associated = new HashSet<String>();
-        Set<String> related = new HashSet<String>();
+        Set<String> associated = new HashSet<>();
+        Set<String> related = new HashSet<>();
         collectRelations(direction, associated, related);
 
         m_associations.updateRelations(associated, related);
@@ -545,7 +545,7 @@ abstract class BaseObjectPanel<REPO_OBJ
      */
     protected final void collectRelations(Direction direction, Collection<String> associated, Collection<String> related) {
         Set<?> value = (Set<?>) getValue();
-        List<REPO_OBJ> selection = new ArrayList<REPO_OBJ>();
+        List<REPO_OBJ> selection = new ArrayList<>();
         for (Object itemID : value) {
             REPO_OBJ obj = getFromId(itemID);
             if (obj != null) {
@@ -1050,7 +1050,7 @@ abstract class BaseObjectPanel<REPO_OBJ
             Collections.sort(m_extensionFactories);
 
             // Walk through the holders and fetch the extension factories one by one...
-            extensions = new ArrayList<UIExtensionFactory>(m_extensionFactories.size());
+            extensions = new ArrayList<>(m_extensionFactories.size());
             for (UIExtensionFactoryHolder holder : m_extensionFactories) {
                 UIExtensionFactory extensionFactory = holder.getUIExtensionFactory();
                 // Make sure only to use non-GCd factories...

Modified: ace/trunk/org.apache.ace.webui.vaadin/src/org/apache/ace/webui/vaadin/component/MainActionToolbar.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.webui.vaadin/src/org/apache/ace/webui/vaadin/component/MainActionToolbar.java?rev=1727499&r1=1727498&r2=1727499&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.webui.vaadin/src/org/apache/ace/webui/vaadin/component/MainActionToolbar.java (original)
+++ ace/trunk/org.apache.ace.webui.vaadin/src/org/apache/ace/webui/vaadin/component/MainActionToolbar.java Fri Jan 29 08:59:31 2016
@@ -265,7 +265,7 @@ public abstract class MainActionToolbar
     public MainActionToolbar(boolean showLogoutButton) {
         super(6, 1);
 
-        m_extensions = new ConcurrentHashMap<ServiceReference, UIExtensionFactory>();
+        m_extensions = new ConcurrentHashMap<>();
         m_showLogoutButton = showLogoutButton;
 
         setWidth("100%");
@@ -345,15 +345,15 @@ public abstract class MainActionToolbar
     @SuppressWarnings("unchecked")
     protected final List<Component> getExtraComponents() {
         // create a shapshot of the current extensions...
-        Map<ServiceReference, UIExtensionFactory> extensions = new HashMap<ServiceReference, UIExtensionFactory>(m_extensions);
+        Map<ServiceReference, UIExtensionFactory> extensions = new HashMap<>(m_extensions);
 
         // Make sure we've got a predictable order of the components...
-        List<ServiceReference> refs = new ArrayList<ServiceReference>(extensions.keySet());
+        List<ServiceReference> refs = new ArrayList<>(extensions.keySet());
         Collections.sort(refs);
 
-        Map<String, Object> context = new HashMap<String, Object>();
+        Map<String, Object> context = new HashMap<>();
 
-        List<Component> result = new ArrayList<Component>();
+        List<Component> result = new ArrayList<>();
         for (ServiceReference ref : refs) {
             UIExtensionFactory factory = extensions.get(ref);
 

Modified: ace/trunk/run-server-allinone/scripts/setup.gogo
URL: http://svn.apache.org/viewvc/ace/trunk/run-server-allinone/scripts/setup.gogo?rev=1727499&r1=1727498&r2=1727499&view=diff
==============================================================================
--- ace/trunk/run-server-allinone/scripts/setup.gogo (original)
+++ ace/trunk/run-server-allinone/scripts/setup.gogo Fri Jan 29 08:59:31 2016
@@ -11,7 +11,7 @@ start 'file:'$pwd'/../org.apache.ace.tes
 w = (cw)
 
 # upload resource processor
-$w ca 'file:'$pwd'/../cnf/localrepo/org.apache.felix.deployment.rp.autoconf/org.apache.felix.deployment.rp.autoconf-0.1.5.jar' true
+$w ca 'file:'$pwd'/../cnf/localrepo/org.apache.felix.deployment.rp.autoconf/org.apache.felix.deployment.rp.autoconf-0.1.8.jar' true
 
 # create 10 features, distributions and targets...
 each [0 1 2 3 4 5 6 7 8 9] {



Mime
View raw message