Merge branch 'master' into PlplupLearnedBulletSeed

Fork: 0

nitta-lab-2018 / Cactus

Browse code Merge branch 'master' into PlplupLearnedBulletSeed # Conflicts: # .idea/caches/build_file_checksums.ser # app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/OwnPlayer.java # app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/PlayerFragment.java # app/src/main/res/layout/ui_fragment.xml 8080はだめです。っていう変更 CleanArchitecture ForEasySignUp correct_design master
1 parent 137ceb7 commit 3a4647ac0cb5c8821dc18c30d6e6c963415f7784 a-matsumoto authored on 13 Nov 2018

Browse code

# Conflicts:
#	.idea/caches/build_file_checksums.ser
#	app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/OwnPlayer.java
#	app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/PlayerFragment.java
#	app/src/main/res/layout/ui_fragment.xml

8080はだめです。っていう変更

CleanArchitecture ForEasySignUp correct_design master

1 parent 137ceb7 commit 3a4647ac0cb5c8821dc18c30d6e6c963415f7784

a-matsumoto authored on 13 Nov 2018

Patch

Unified Split

Showing 11 changed files

                Ignore Space
               Show notes
              View
            
          
          2 ■■■■■
          app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/connections/BulletCreateConnection.java
 import org.ntlab.radishforandroidstudio.framework.network.HttpAsyncConnection;
 
public class BulletCreateConnection extends HttpAsyncConnection {
    public BulletCreateConnection(String instanceId, String playerId) {
        super("http://nitta-lab-www.is.konan-u.ac.jp:8080/CactusServer/rest/instances/" + instanceId + "/bullets/" + playerId);
        super("http://nitta-lab-www.is.konan-u.ac.jp/CactusServer/rest/instances/" + instanceId + "/bullets/" + playerId);
    }
}
 import org.ntlab.radishforandroidstudio.framework.network.HttpAsyncConnection;
 public class BulletCreateConnection extends HttpAsyncConnection {
     public BulletCreateConnection(String instanceId, String playerId) {
+        super("http://nitta-lab-www.is.konan-u.ac.jp:8080/CactusServer/rest/instances/" + instanceId + "/bullets/" + playerId);
+        super("http://nitta-lab-www.is.konan-u.ac.jp/CactusServer/rest/instances/" + instanceId + "/bullets/" + playerId);
     }
 }

                Ignore Space
               Show notes
              View
            
          
          2 ■■■■■
          app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/connections/BulletGetConnection.java
 import org.ntlab.radishforandroidstudio.framework.network.HttpAsyncConnection;
 
public class BulletGetConnection extends HttpAsyncConnection {
    public BulletGetConnection(String instanceId) {
        super("http://nitta-lab-www.is.konan-u.ac.jp:8080/CactusServer/rest/instances/" + instanceId + "/bullets");
        super("http://nitta-lab-www.is.konan-u.ac.jp/CactusServer/rest/instances/" + instanceId + "/bullets");
    }
}
 import org.ntlab.radishforandroidstudio.framework.network.HttpAsyncConnection;
 public class BulletGetConnection extends HttpAsyncConnection {
     public BulletGetConnection(String instanceId) {
+        super("http://nitta-lab-www.is.konan-u.ac.jp:8080/CactusServer/rest/instances/" + instanceId + "/bullets");
+        super("http://nitta-lab-www.is.konan-u.ac.jp/CactusServer/rest/instances/" + instanceId + "/bullets");
     }
 }

                Ignore Space
               Show notes
              View
            
          
          2 ■■■■■
          app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/connections/BulletUpdateConnection.java
 import org.ntlab.radishforandroidstudio.framework.network.HttpAsyncConnection;
 
public class BulletUpdateConnection extends HttpAsyncConnection {
    public BulletUpdateConnection(String instanceId, String playerId, String bulletId) {
        super("http://nitta-lab-www.is.konan-u.ac.jp:8080/CactusServer/rest/instances/" + instanceId + "/bullets/" + playerId + "/" + bulletId);
        super("http://nitta-lab-www.is.konan-u.ac.jp/CactusServer/rest/instances/" + instanceId + "/bullets/" + playerId + "/" + bulletId);
    }
}
 import org.ntlab.radishforandroidstudio.framework.network.HttpAsyncConnection;
 public class BulletUpdateConnection extends HttpAsyncConnection {
     public BulletUpdateConnection(String instanceId, String playerId, String bulletId) {
+        super("http://nitta-lab-www.is.konan-u.ac.jp:8080/CactusServer/rest/instances/" + instanceId + "/bullets/" + playerId + "/" + bulletId);
+        super("http://nitta-lab-www.is.konan-u.ac.jp/CactusServer/rest/instances/" + instanceId + "/bullets/" + playerId + "/" + bulletId);
     }
 }

                Ignore Space
               Show notes
              View
            
          
          2 ■■■■■
          app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/connections/CharacterConnection.java
 import org.ntlab.radishforandroidstudio.framework.network.HttpAsyncConnection;
 
public class CharacterConnection extends HttpAsyncConnection {
    public CharacterConnection(String playerId) {
        super("http://nitta-lab-www.is.konan-u.ac.jp:8080/CactusServer/rest/instances/players/" + playerId);
        super("http://nitta-lab-www.is.konan-u.ac.jp/CactusServer/rest/instances/players/" + playerId);
    }
}
 import org.ntlab.radishforandroidstudio.framework.network.HttpAsyncConnection;
 public class CharacterConnection extends HttpAsyncConnection {
     public CharacterConnection(String playerId) {
+        super("http://nitta-lab-www.is.konan-u.ac.jp:8080/CactusServer/rest/instances/players/" + playerId);
+        super("http://nitta-lab-www.is.konan-u.ac.jp/CactusServer/rest/instances/players/" + playerId);
     }
 }

                Ignore Space
               Show notes
              View
            
          
          2 ■■■■■
          app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/connections/CharactersConnection.java
 import org.ntlab.radishforandroidstudio.framework.network.HttpAsyncConnection;
 
public class CharactersConnection extends HttpAsyncConnection {
    public CharactersConnection(String instanceId) {
        super("http://nitta-lab-www.is.konan-u.ac.jp:8080/CactusServer/rest/instances/" + instanceId + "/characters");
        super("http://nitta-lab-www.is.konan-u.ac.jp/CactusServer/rest/instances/" + instanceId + "/characters");
    }
 
}
 import org.ntlab.radishforandroidstudio.framework.network.HttpAsyncConnection;
 public class CharactersConnection extends HttpAsyncConnection {
     public CharactersConnection(String instanceId) {
+        super("http://nitta-lab-www.is.konan-u.ac.jp:8080/CactusServer/rest/instances/" + instanceId + "/characters");
+        super("http://nitta-lab-www.is.konan-u.ac.jp/CactusServer/rest/instances/" + instanceId + "/characters");
     }
 }

                Ignore Space
               Show notes
              View
            
          
          2 ■■■■■
          app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/connections/CharactersFragmentConnection.java
 public class CharactersFragmentConnection extends HttpAsyncConnection {
 
    public CharactersFragmentConnection(String instanceId) {
        super("http://nitta-lab-www.is.konan-u.ac.jp:8080/CactusServer/rest/instances/"+ instanceId +"/characters");
        super("http://nitta-lab-www.is.konan-u.ac.jp/CactusServer/rest/instances/"+ instanceId +"/characters");
    }
 
}
 public class CharactersFragmentConnection extends HttpAsyncConnection {
     public CharactersFragmentConnection(String instanceId) {
+        super("http://nitta-lab-www.is.konan-u.ac.jp:8080/CactusServer/rest/instances/"+ instanceId +"/characters");
+        super("http://nitta-lab-www.is.konan-u.ac.jp/CactusServer/rest/instances/"+ instanceId +"/characters");
     }
 }

                Ignore Space
               Show notes
              View
            
          
          2 ■■■■■
          app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/connections/InstancesFragmentConnection.java
 public class InstancesFragmentConnection extends HttpAsyncConnection {
 
    public InstancesFragmentConnection() {
        super("http://nitta-lab-www.is.konan-u.ac.jp:8080/CactusServer/rest/instances");
        super("http://nitta-lab-www.is.konan-u.ac.jp/CactusServer/rest/instances");
    }
 
}
 public class InstancesFragmentConnection extends HttpAsyncConnection {
     public InstancesFragmentConnection() {
+        super("http://nitta-lab-www.is.konan-u.ac.jp:8080/CactusServer/rest/instances");
+        super("http://nitta-lab-www.is.konan-u.ac.jp/CactusServer/rest/instances");
     }
 }

                Ignore Space
               Show notes
              View
            
          
          2 ■■■■■
          app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/connections/LoginFragmentConnection.java
 public class LoginFragmentConnection extends HttpAsyncConnection {
 
    public LoginFragmentConnection() {
        super("http://nitta-lab-www.is.konan-u.ac.jp:8080/CactusServer/rest/accounts");
        super("http://nitta-lab-www.is.konan-u.ac.jp/CactusServer/rest/accounts");
 
    }
}
 public class LoginFragmentConnection extends HttpAsyncConnection {
     public LoginFragmentConnection() {
+        super("http://nitta-lab-www.is.konan-u.ac.jp:8080/CactusServer/rest/accounts");
+        super("http://nitta-lab-www.is.konan-u.ac.jp/CactusServer/rest/accounts");
     }
 }

                Ignore Space
               Show notes
              View
            
          
          2 ■■■■■
          app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/connections/ObjectsConnection.java
 import org.ntlab.radishforandroidstudio.framework.network.HttpAsyncConnection;
 
public class ObjectsConnection extends HttpAsyncConnection {
    public ObjectsConnection(String instanceId) {
        super("http://nitta-lab-www.is.konan-u.ac.jp:8080/CactusServer/rest/instances/" + instanceId + "/objects");
        super("http://nitta-lab-www.is.konan-u.ac.jp/CactusServer/rest/instances/" + instanceId + "/objects");
    }
}
 import org.ntlab.radishforandroidstudio.framework.network.HttpAsyncConnection;
 public class ObjectsConnection extends HttpAsyncConnection {
     public ObjectsConnection(String instanceId) {
+        super("http://nitta-lab-www.is.konan-u.ac.jp:8080/CactusServer/rest/instances/" + instanceId + "/objects");
+        super("http://nitta-lab-www.is.konan-u.ac.jp/CactusServer/rest/instances/" + instanceId + "/objects");
     }
 }

Ignore Space Show notes View app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/connections/PlayersConnection.java

Ignore Space Show notes View app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/connections/SignUpFragmentConnection.java

Show line notes below