commit d8b077a8d6383a96278f1deb16dbdd7d833da9e7
author Toshio Koide <t-koide@onlab.us> Wed Aug 13 10:47:21 2014 -0700
committer Toshio Koide <t-koide@onlab.us> Wed Aug 13 10:47:21 2014 -0700
tree 3133d2cb1af45a84e65d946c7d2b25b3553c6d2d
parent 4373cbef52793ea6aca177aeda4c86fb090df465

Drop "I" prefix from IAction, IMatch, IMatchActionService. (ONOS-1879)

Change-Id: I6b6e0cc98570d5b95a46a9f204cf330f4cf63273

src/main/java/net/onrc/onos/core/matchaction/MatchAction.java

diff --git a/src/main/java/net/onrc/onos/core/matchaction/MatchAction.java b/src/main/java/net/onrc/onos/core/matchaction/MatchAction.java
index d31ced8..2ff3299 100644
--- a/src/main/java/net/onrc/onos/core/matchaction/MatchAction.java
+++ b/src/main/java/net/onrc/onos/core/matchaction/MatchAction.java
@@ -5,9 +5,9 @@
 
 import net.floodlightcontroller.util.MACAddress;
 import net.onrc.onos.api.batchoperation.BatchOperationTarget;
-import net.onrc.onos.core.matchaction.action.IAction;
+import net.onrc.onos.core.matchaction.action.Action;
 import net.onrc.onos.core.matchaction.action.OutputAction;
-import net.onrc.onos.core.matchaction.match.IMatch;
+import net.onrc.onos.core.matchaction.match.Match;
 import net.onrc.onos.core.matchaction.match.PacketMatch;
 import net.onrc.onos.core.util.Dpid;
 import net.onrc.onos.core.util.IPv4;
@@ -20,19 +20,19 @@
 public class MatchAction implements BatchOperationTarget {
     protected final MatchActionId id;
     protected SwitchPort port;
-    protected List<IMatch> matches;
-    protected List<IAction> actions;
+    protected List<Match> matches;
+    protected List<Action> actions;
 
     /**
      * Constructor.
      *
      * @param id ID for this MatchAction object.
      * @param port Switch DPID
-     * @param matches The list of IMatch objects as match condition on the port.
-     * @param actions The list of IAction objects as actions on the switch.
+     * @param matches The list of Match objects as match condition on the port.
+     * @param actions The list of Action objects as actions on the switch.
      */
-    public MatchAction(String id, SwitchPort port, List<IMatch> matches,
-            List<IAction> actions) {
+    public MatchAction(String id, SwitchPort port, List<Match> matches,
+            List<Action> actions) {
         this.id = new MatchActionId(id);
         this.port = port;
         this.matches = matches;
@@ -59,8 +59,8 @@
             IPv4 srcIp, IPv4 dstIp, PortNumber dstPort) {
         // CHECKSTYLE:ON
         this(id, new SwitchPort(dpid, srcPort),
-                Arrays.asList((IMatch) new PacketMatch(srcMac, dstMac, srcIp, dstIp)),
-                Arrays.asList((IAction) new OutputAction(dstPort)));
+                Arrays.asList((Match) new PacketMatch(srcMac, dstMac, srcIp, dstIp)),
+                Arrays.asList((Action) new OutputAction(dstPort)));
     }
 
     public MatchActionId getId() {
@@ -81,7 +81,7 @@
      *
      * @return The traffic filter.
      */
-    public List<IMatch> getMatches() {
+    public List<Match> getMatches() {
         return matches;
     }
 
@@ -90,7 +90,7 @@
      *
      * @return The list of actions.
      */
-    public List<IAction> getActions() {
+    public List<Action> getActions() {
         return actions;
     }
 }