commit f33b8930037e1b70ade1eb303c9705e0d2dcddd8
author Sho SHIMIZU <sshimizu@us.fujitsu.com> Mon Jan 25 18:43:32 2016 -0800
committer Sho Shimizu <sho.shimizu@gmail.com> Tue Jan 26 18:59:11 2016 +0000
tree 92813154ea8ac698beba25d5a39d8b01487ef327
parent 2d31022034ced11d6e4d67fe30037f772878b9bb

Move inner classes to upper level

Rename as follows.
- ResourceId.Discrete -> DiscreteResourceId
- ResourceId.Continuous -> ContinuousResourceId
- Resource.Discrete -> DiscreteResource
- Resource.Continuous -> ContinuousResource

Change-Id: I80e59d1eec07128743bacc582a8725bd4d5489b4

cli/src/main/java/org/onosproject/cli/net/ResourcesCommand.java

diff --git a/cli/src/main/java/org/onosproject/cli/net/ResourcesCommand.java b/cli/src/main/java/org/onosproject/cli/net/ResourcesCommand.java
index 1cc0463..0a6e6a4 100644
--- a/cli/src/main/java/org/onosproject/cli/net/ResourcesCommand.java
+++ b/cli/src/main/java/org/onosproject/cli/net/ResourcesCommand.java
@@ -34,6 +34,7 @@
 import org.onosproject.net.DeviceId;
 import org.onosproject.net.PortNumber;
 import org.onosproject.net.TributarySlot;
+import org.onosproject.net.newresource.ContinuousResource;
 import org.onosproject.net.newresource.Resource;
 import org.onosproject.net.newresource.ResourceService;
 
@@ -112,10 +113,10 @@
                 return;
             }
 
-            if (resource instanceof Resource.Continuous) {
+            if (resource instanceof ContinuousResource) {
                 print("%s%s: %f", Strings.repeat(" ", level),
                                   resource.last(),
-                                  ((Resource.Continuous) resource).value());
+                                  ((ContinuousResource) resource).value());
                 // Continuous resource is terminal node, stop here
                 return;
             } else {
@@ -144,7 +145,7 @@
         List<Resource> nonAggregatable = new ArrayList<>();
 
         for (Resource r : children) {
-            if (r instanceof Resource.Continuous) {
+            if (r instanceof ContinuousResource) {
                 // non-aggregatable terminal node
                 nonAggregatable.add(r);
             } else if (aggregatableTypes.contains(r.last().getClass())) {