some clean code.

Author: pmfg

.idea/workspace.xml

@@ -89,6 +89,7 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/apk_list" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/build-info" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/builds" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundle_manifest" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/check_manifest_result" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/compatible_screen_manifest" />

app/app.iml

@@ -54,10 +54,10 @@
         <activity
             android:name=".AlviiMain"
             android:label="ALVIi"
+            android:theme="@style/DialogPopUp"
             android:screenOrientation="portrait">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
-
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>

app/src/main/AndroidManifest.xml

@@ -280,10 +280,8 @@ public static boolean sendMessageToAllUUVs(IMCMessage msg){
 	 * @see pt.lsts.imc.IMCMessage
 	 */
 	public static boolean isMsgFromMain(IMCMessage imcMessage){
-		if (imcMessage.getSrc()==mainSys.getID())
-			return true;
-		return false;
-	}
+        return imcMessage.getSrc() == mainSys.getID();
+    }
 
 	/**
 	 *

app/src/main/java/pt/lsts/accl/bus/AcclBus.java

@@ -199,49 +199,38 @@ public void setLastMsgReceived(IMCMessage lastMsgReceived) {
      * @return true if same system, false otherwise
      */
     public boolean equals(Sys sys){
-        if (sys.getID()==this.getID())
-            return true;
-        return false;
+        return sys.getID() == this.getID();
     }
 
     /**
      * Check if the system is a vehicle.
      * @return true if SYS_TYPE = UUV, USV, UAV or UGV, false otherwise
     **/
     public boolean isVehicle(){
-        if (getSysType()==
+        return getSysType() ==
                 SystemType.UUV
-            || getSysType()==
+                || getSysType() ==
                 SystemType.USV
-            || getSysType()==
+                || getSysType() ==
                 SystemType.UAV
-            || getSysType()==
-                SystemType.UGV)
-                return true;
-            else
-                return false;
+                || getSysType() ==
+                SystemType.UGV;
     }
 
     /**
      * Check if the system is a Unmanned Aerial Vehicle (UAV).
      * @return true if SYS_TYPE = UAV, false otherwise
      **/
     public boolean isUAV(){
-        if (getSysType()== SystemType.UAV){
-            return true;
-        }
-        return false;
+        return getSysType() == SystemType.UAV;
     }
 
     /**
      * Check if the system is a Unmanned Underwater Vehicle (UUV), also refered to as Autonomous Underwater Vehicle (AUV) or Light AUV (LAUV).
      * @return true if SYS_TYPE = UUV, false otherwise
      **/
     public boolean isUUV(){
-        if (getSysType()== SystemType.UUV){
-            return true;
-        }
-        return false;
+        return getSysType() == SystemType.UUV;
     }
 
     /**
@@ -250,10 +239,7 @@ public boolean isUUV(){
      * @return true if SYS_TYPE = CCU, false otherwise
      **/
     public boolean isCCU(){
-        if (getSysType()== SystemType.CCU){
-            return true;
-        }
-        return false;
+        return getSysType() == SystemType.CCU;
     }
 
     /**
@@ -262,9 +248,7 @@ public boolean isCCU(){
      * @return false if more than 10 seconds since last Message, true otherwise.
      */
     public boolean isConnected(){
-        if (getLastMsgReceivedAgeInSeconds()>10)
-            return false;
-        return true;
+        return !(getLastMsgReceivedAgeInSeconds() > 10);
     }
 
 }

app/src/main/java/pt/lsts/accl/sys/Sys.java

@@ -30,9 +30,9 @@ public static ArrayList<String> getAnnounceService(IMCMessage msg,
 			String service) {
 		String str = msg.getString("services");
 		ArrayList<String> list = new ArrayList<String>();
-		String services[] = str.split(";");
+        String[] services = str.split(";");
 		for (String s : services) {
-			String foo[] = s.split("://");
+            String[] foo = s.split("://");
 			if (foo[0].equals(service))
 				list.add(foo[1]);
 		}
@@ -47,9 +47,9 @@ public static ArrayList<String> getAnnounceService(IMCMessage msg,
 	 * @return The node address for IMC communications.
 	 */
 	public static String[] getAnnounceIMCAddressPort(IMCMessage msg) {
-		String res[]=null;
+        String[] res = null;
 		for (String s : getAnnounceService(msg, "imc+udp")) {
-                String foo[] = s.split(":");
+            String[] foo = s.split(":");
                 res = new String[2];
                 res[0] = foo[0];
                 res[1] = foo[1].substring(0, foo[1].length() - 1);

app/src/main/java/pt/lsts/accl/util/IMCUtils.java

@@ -502,10 +502,7 @@ public boolean isRunnigPlan(String sysName, String planName){
         for (int i = 0; i < number_system; i++) {
             if (m_system_Info.system_names[i].equals(sysName)) {
                 if(m_system_Info.planInfoRun[i][0].equals(planName)){
-                    if(m_system_Info.planInfoRun[i][1].equals("EXECUTING"))
-                        return true;
-                    else
-                        return false;
+                    return m_system_Info.planInfoRun[i][1].equals("EXECUTING");
                 }
             }
         }