Merge branch 'release' into develop
authorsyeon.hwang <syeon.hwang@samsung.com>
Fri, 7 Sep 2012 08:23:10 +0000 (17:23 +0900)
committersyeon.hwang <syeon.hwang@samsung.com>
Fri, 7 Sep 2012 08:23:10 +0000 (17:23 +0900)
Conflicts:
package/pkginfo.manifest
tizen/src/Makefile
tizen/src/skin/client/src/org/tizen/emulator/skin/dialog/DetailInfoDialog.java
vl.c

1  2 
tizen/src/skin/client/src/org/tizen/emulator/skin/dialog/DetailInfoDialog.java

@@@ -166,27 -166,25 +166,50 @@@ public class DetailInfoDialog extends S
                                        return;
                                }
  
+                               ProcessBuilder procBrowser = new ProcessBuilder();
+                               if (SwtUtil.isLinuxPlatform()) {
+                                       procBrowser.command("nautilus", "--browser", openPath);
+                               } else if (SwtUtil.isWindowsPlatform()) {
+                                       procBrowser.command("explorer", "\"" + openPath + "\"");
+                               } else if (SwtUtil.isMacPlatform()) {
+                                       //TODO:
+                                       logger.warning( "not supported yet" );
+                               }
+                               if (procBrowser.command().isEmpty() == false) {
+                                       try {
+                                               procBrowser.start();
+                                       } catch (Exception e) {
+                                               logger.log( Level.SEVERE, e.getMessage(), e);
+                                       }
+                               }
++                              if (openPath.compareTo(VALUE_NONE) == 0 || openPath.compareTo("") == 0) {
++                                      return;
++                              }
++
 +                              Program.launch(openPath);
 +
 +                              /*ProcessBuilder procBrowser = new ProcessBuilder();
 +
 +                              if (SwtUtil.isLinuxPlatform()) {
 +                                      procBrowser.command("nautilus", "--browser", openPath);
 +                              } else if (SwtUtil.isWindowsPlatform()) {
 +                                      procBrowser.command("explorer", "\"" + openPath + "\"");
 +                              } else if (SwtUtil.isMacPlatform()) {
 +                                      //TODO:
 +                                      logger.warning( "not supported yet" );
 +                              }
 +
 +                              if (procBrowser.command().isEmpty() == false) {
 +                                      try {
 +                                              procBrowser.start();
 +                                      } catch (Exception e) {
 +                                              logger.log( Level.SEVERE, e.getMessage(), e);
 +                                      }
 +                              }*/
 +
                        }
                });