Merge branch 'master' of https://github.com/mzule/ActivityRouter

mzule · Jun 2, 2016 · 1e4d231 · 1e4d231
2 parents 26ccfa0 + af9a984
commit 1e4d231
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/activityrouter/src/main/java/com/github/mzule/activityrouter/router/ExtraTypes.java b/activityrouter/src/main/java/com/github/mzule/activityrouter/router/ExtraTypes.java
@@ -125,7 +125,7 @@ public int getType(String name) {
         return STRING;
     }
 
-    private boolean arrayContain(String[] array, String value) {
+    private static boolean arrayContain(String[] array, String value) {
         if (array == null) {
             return false;
         }

diff --git a/activityrouter/src/main/java/com/github/mzule/activityrouter/router/Mapping.java b/activityrouter/src/main/java/com/github/mzule/activityrouter/router/Mapping.java
@@ -10,9 +10,9 @@
  * Created by CaoDongping on 4/6/16.
  */
 public class Mapping {
-    private String format;
-    private Class<? extends Activity> activity;
-    private ExtraTypes extraTypes;
+    private final String format;
+    private final Class<? extends Activity> activity;
+    private final ExtraTypes extraTypes;
     private Path formatPath;
 
     public Mapping(String format, Class<? extends Activity> activity, ExtraTypes extraTypes) {

diff --git a/activityrouter/src/main/java/com/github/mzule/activityrouter/router/Path.java b/activityrouter/src/main/java/com/github/mzule/activityrouter/router/Path.java
@@ -6,7 +6,7 @@
  * Created by CaoDongping on 4/7/16.
  */
 public class Path {
-    private String value;
+    private final String value;
     private Path next;
 
     private Path(String value) {

diff --git a/compiler/src/main/java/com/github/mzule/activityrouter/compiler/RouterProcessor.java b/compiler/src/main/java/com/github/mzule/activityrouter/compiler/RouterProcessor.java
@@ -132,7 +132,7 @@ public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment
         return true;
     }
 
-    private String join(String[] args) {
+    private static String join(String[] args) {
         if (args == null || args.length == 0) {
             return "";
         }