Merge pull request #10 from izumin5210/bugfix

Fix bug
izumin5210 · Nov 23, 2015 · 46c4033 · 46c4033
2 parents 423bc29 + aed7eb0
commit 46c4033
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/...cessor/src/main/java/info/izumin/android/droidux/processor/element/StoreClassElement.java b/...cessor/src/main/java/info/izumin/android/droidux/processor/element/StoreClassElement.java
@@ -112,7 +112,7 @@ private CodeBlock createCodeBlock() {
                 .addStatement(storeModel.getStateName() + " result = null");
 
         for (DispatchableModel dispatchableModel : reducerModel.getDispatchableModels()) {
-            builder = builder.beginControlFlow("if (actionClass.isAssignableFrom($T.class))", dispatchableModel.getAction());
+            builder = builder.beginControlFlow("if ($T.class.isAssignableFrom(actionClass))", dispatchableModel.getAction());
 
             String stateGetter = storeModel.isUndoable() ? "getState().clone()" : "getState()";
 

diff --git a/droidux-processor/src/test/java/info/izumin/android/droidux/processor/fixture/Source.java b/droidux-processor/src/test/java/info/izumin/android/droidux/processor/fixture/Source.java
@@ -47,7 +47,7 @@ public static class Counter {
                 "    protected void dispatchToReducer(Action action) {",
                 "        Class<? extends Action> actionClass = action.getClass();",
                 "        Counter result = null;",
-                "        if (actionClass.isAssignableFrom(IncrementCountAction.class)) {",
+                "        if (IncrementCountAction.class.isAssignableFrom(actionClass)) {",
                 "            result = counterReducer.onIncrement(getState(), (IncrementCountAction) action);",
                 "        }",
                 "        if (result != null) {",
@@ -133,7 +133,7 @@ public static class CounterTakesOnlyStateArgument {
                 "    protected void dispatchToReducer(Action action) {",
                 "        Class<? extends Action> actionClass = action.getClass();",
                 "        Counter result = null;",
-                "        if (actionClass.isAssignableFrom(IncrementCountAction.class)) {",
+                "        if (IncrementCountAction.class.isAssignableFrom(actionClass)) {",
                 "            result = counterReducer.onIncrement(getState());",
                 "        }",
                 "        if (result != null) {",
@@ -225,10 +225,10 @@ public static class TodoList {
                 "    protected void dispatchToReducer(Action action) {",
                 "        Class<? extends Action> actionClass = action.getClass();",
                 "        TodoList result = null;",
-                "        if (actionClass.isAssignableFrom(AddTodoItemAction.class)) {",
+                "        if (AddTodoItemAction.class.isAssignableFrom(actionClass)) {",
                 "            result = todoListReducer.onAddItem(getState(), (AddTodoItemAction) action);",
                 "        }",
-                "        if (actionClass.isAssignableFrom(CompleteTodoItemAction.class)) {",
+                "        if (CompleteTodoItemAction.class.isAssignableFrom(actionClass)) {",
                 "            result = todoListReducer.onCompleteItem(getState(), (CompleteTodoItemAction) action);",
                 "        }",
                 "        if (result != null) {",
@@ -423,11 +423,11 @@ public static class UndoableTodoList {
                 "    protected void dispatchToReducer(Action action) {",
                 "        Class<? extends Action> actionClass = action.getClass();",
                 "        TodoList result = null;",
-                "        if (actionClass.isAssignableFrom(AddTodoItemAction.class)) {",
+                "        if (AddTodoItemAction.class.isAssignableFrom(actionClass)) {",
                 "            result = undoableTodoListReducer.onAddItem(getState().clone(), (AddTodoItemAction) action);",
                 "            history.insert(result);",
                 "        }",
-                "        if (actionClass.isAssignableFrom(CompleteTodoItemAction.class)) {",
+                "        if (CompleteTodoItemAction.class.isAssignableFrom(actionClass)) {",
                 "            result = undoableTodoListReducer.onCompleteItem(getState().clone(), (CompleteTodoItemAction) action);",
                 "            history.insert(result);",
                 "        }",