Merge branch 'develop' of git.netxms.org:public/netxms into develop
authorMarco Incalcaterra <marco.incalcaterra@thinksoft.it>
Sun, 5 Oct 2014 15:45:00 +0000 (17:45 +0200)
committerMarco Incalcaterra <marco.incalcaterra@thinksoft.it>
Sun, 5 Oct 2014 15:45:00 +0000 (17:45 +0200)
android/src/console/res/values/strings.xml
android/src/console/src/org/netxms/ui/android/main/adapters/OverviewAdapter.java

index 5995dfe..1812289 100644 (file)
        <string name="overview_system_description">System Description</string>
        <string name="overview_netxms_agent_version">NetXMS Agent Version</string>
        <string name="overview_platform_name">Platform Name</string>
+       <string name="overview_boot_time">Boot Time</string>
        <string name="overview_snmp_sysname">SNMP sysName</string>
        <string name="overview_snmp_oid">SNMP OID</string>
        <string name="overview_bridge_base_address">Bridge Base Address</string>
index 32ffd8d..e78043e 100644 (file)
@@ -70,6 +70,7 @@ public class OverviewAdapter extends BaseAdapter
                                                addPair(r.getString(R.string.overview_netxms_agent_version), ((Node)obj).getAgentVersion());
                                        addPair(r.getString(R.string.overview_system_description), ((Node)obj).getSystemDescription(), false);
                                        addPair(r.getString(R.string.overview_platform_name), ((Node)obj).getPlatformName(), false);
+                                       addPair(r.getString(R.string.overview_boot_time), ((Node)obj).getBootTime().toString(), false);
                                        addPair(r.getString(R.string.overview_snmp_sysname), ((Node)obj).getSnmpSysName(), false);
                                        addPair(r.getString(R.string.overview_snmp_oid), ((Node)obj).getSnmpOID(), false);
                                        if ((((Node)obj).getFlags() & Node.NF_IS_BRIDGE) != 0)