incubator-flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From p...@apache.org
Subject svn commit: r1417142 - in /incubator/flex/sdk/branches/develop/mustella/java/src: mustella/MobileConfigWriter.java utils/MobileUtil.java
Date Tue, 04 Dec 2012 20:03:14 GMT
Author: pent
Date: Tue Dec  4 20:03:12 2012
New Revision: 1417142

URL: http://svn.apache.org/viewvc?rev=1417142&view=rev
Log:
Adjusted values for running tests on Windows using the device emulator.

Modified:
    incubator/flex/sdk/branches/develop/mustella/java/src/mustella/MobileConfigWriter.java
    incubator/flex/sdk/branches/develop/mustella/java/src/utils/MobileUtil.java

Modified: incubator/flex/sdk/branches/develop/mustella/java/src/mustella/MobileConfigWriter.java
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/java/src/mustella/MobileConfigWriter.java?rev=1417142&r1=1417141&r2=1417142&view=diff
==============================================================================
--- incubator/flex/sdk/branches/develop/mustella/java/src/mustella/MobileConfigWriter.java
(original)
+++ incubator/flex/sdk/branches/develop/mustella/java/src/mustella/MobileConfigWriter.java
Tue Dec  4 20:03:12 2012
@@ -173,7 +173,7 @@ public class MobileConfigWriter {
 				// if the target OS is android or iOS, the device_name might not be a real device but
mac or win, indicating a desktop
 				// emulator. If that's the case, treat this the same as above. 
 				else if((target_os.compareToIgnoreCase(MobileUtil.ANDROID) == 0) || (target_os.compareToIgnoreCase(MobileUtil.IOS)
== 0)) {
-					if( (device_name.compareToIgnoreCase(MobileUtil.MAC) == 0 ) || (device_name.compareToIgnoreCase(MobileUtil.WIN2)
== 0) ) {
+					if( (device_name.compareToIgnoreCase(MobileUtil.MAC) == 0 ) || (device_name.compareToIgnoreCase(MobileUtil.WIN)
== 0) ) {
 						if( adl_extras_XscreenDPI == -1 ){
 							ret += "		UnitTester.cv.deviceDensity = flash.system.Capabilities.screenDPI;\n";
 						}else{

Modified: incubator/flex/sdk/branches/develop/mustella/java/src/utils/MobileUtil.java
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/java/src/utils/MobileUtil.java?rev=1417142&r1=1417141&r2=1417142&view=diff
==============================================================================
--- incubator/flex/sdk/branches/develop/mustella/java/src/utils/MobileUtil.java (original)
+++ incubator/flex/sdk/branches/develop/mustella/java/src/utils/MobileUtil.java Tue Dec  4
20:03:12 2012
@@ -34,8 +34,8 @@ public class MobileUtil {
 	public static final String IOS = "ios";	// "iPhone OS" is what the iPod Touch 4G returns,
anyway.
 	public static final String QNX = "qnx";
 	public static final String MAC = "mac";
-	public static final String WIN = "windows";
-	public static final String WIN2 = "win";
+	public static final String WIN = "win";
+	public static final String WINDOWS = "windows";
 
 	// devices
 	// Get rid of these two when we do device types (soon).
@@ -67,9 +67,9 @@ public class MobileUtil {
 	public static final String[] DEVICES_USING_IOS = {IPAD, IPAD2, IPOD_TOUCH_3GS, IPOD_TOUCH_4G,
IPOD_TOUCH_5G};
 	public static final String[] DEVICES_USING_QNX = {PLAYBOOK};
     public static final String[] DEVICES_USING_SDCARD = {ANDROID, ANDROID2, DESIRE, DROID,
DROID_2, DROID_X, DROID_PRO, NEXUS_ONE, EVO, INCREDIBLE, ANDROID_TABLET, XOOM};
-    public static final String[] DEVICES_AROUND_160PPI = {DROID_PRO, ANDROID_TABLET, XOOM,
IPOD_TOUCH_3GS, IPAD, IPAD2, PLAYBOOK};
+    public static final String[] DEVICES_AROUND_160PPI = {WIN, DROID_PRO, ANDROID_TABLET,
XOOM, IPOD_TOUCH_3GS, IPAD, IPAD2, PLAYBOOK};
 	public static final String[] DEVICES_AROUND_240PPI = {ANDROID, ANDROID2, DESIRE, DROID,
DROID_2, DROID_X, NEXUS_ONE, EVO, INCREDIBLE};
-	public static final String[] DEVICES_AROUND_320PPI = {IPOD_TOUCH_4G, IPOD_TOUCH_5G, IPAD3,
IPAD4};
+	public static final String[] DEVICES_AROUND_320PPI = {WIN, IPOD_TOUCH_4G, IPOD_TOUCH_5G,
IPAD3, IPAD4};
 
 	// Other
 	public static final String MOBILE_FRAMEWORK_DIR = "MobileConfig";
@@ -114,7 +114,7 @@ public class MobileUtil {
 				return MobileUtil.MAC;
 			else if( device_name.compareToIgnoreCase( MobileUtil.WIN ) == 0 )
 				return MobileUtil.WIN;
-			else if( device_name.compareToIgnoreCase( MobileUtil.WIN2 ) == 0 )
+			else if( device_name.compareToIgnoreCase( MobileUtil.WINDOWS ) == 0 )
 				return MobileUtil.WIN;
 		}
 



Mime
View raw message