From: giwoong.kim Date: Fri, 18 Jan 2013 05:01:47 +0000 (+0900) Subject: screenshot: modified variable name X-Git-Tag: Tizen_Studio_1.3_Release_p2.3.1~1154 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=64b2795eff49d640aba8416563ce7d661670d031;p=sdk%2Femulator%2Fqemu.git screenshot: modified variable name modified variable name & indenting & etc Signed-off-by: GiWoong Kim --- diff --git a/tizen/src/skin/client/src/org/tizen/emulator/skin/comm/sock/SocketCommunicator.java b/tizen/src/skin/client/src/org/tizen/emulator/skin/comm/sock/SocketCommunicator.java index 2a35064305..7797d69c84 100644 --- a/tizen/src/skin/client/src/org/tizen/emulator/skin/comm/sock/SocketCommunicator.java +++ b/tizen/src/skin/client/src/org/tizen/emulator/skin/comm/sock/SocketCommunicator.java @@ -48,7 +48,6 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.logging.Level; import java.util.logging.Logger; -import org.eclipse.swt.widgets.Display; import org.tizen.emulator.skin.EmulatorSkin; import org.tizen.emulator.skin.comm.ICommunicator; import org.tizen.emulator.skin.comm.ICommunicator.SendCommand; diff --git a/tizen/src/skin/client/src/org/tizen/emulator/skin/custom/KeyWindow.java b/tizen/src/skin/client/src/org/tizen/emulator/skin/custom/KeyWindow.java index 23f9d93ed6..370830762a 100644 --- a/tizen/src/skin/client/src/org/tizen/emulator/skin/custom/KeyWindow.java +++ b/tizen/src/skin/client/src/org/tizen/emulator/skin/custom/KeyWindow.java @@ -51,15 +51,12 @@ import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Canvas; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Display; -import org.eclipse.swt.widgets.Event; -import org.eclipse.swt.widgets.Listener; import org.eclipse.swt.widgets.Shell; import org.tizen.emulator.skin.EmulatorSkin; import org.tizen.emulator.skin.comm.ICommunicator.KeyEventType; import org.tizen.emulator.skin.comm.ICommunicator.SendCommand; import org.tizen.emulator.skin.comm.sock.SocketCommunicator; import org.tizen.emulator.skin.comm.sock.data.KeyEventData; -import org.tizen.emulator.skin.config.EmulatorConfig.SkinPropertiesConstants; import org.tizen.emulator.skin.dbi.KeyMapType; import org.tizen.emulator.skin.layout.SkinPatches; import org.tizen.emulator.skin.util.SwtUtil; diff --git a/tizen/src/skin/client/src/org/tizen/emulator/skin/screenshot/ScreenShotDialog.java b/tizen/src/skin/client/src/org/tizen/emulator/skin/screenshot/ScreenShotDialog.java index 9eee389d37..88ca5ea657 100644 --- a/tizen/src/skin/client/src/org/tizen/emulator/skin/screenshot/ScreenShotDialog.java +++ b/tizen/src/skin/client/src/org/tizen/emulator/skin/screenshot/ScreenShotDialog.java @@ -110,8 +110,8 @@ public class ScreenShotDialog { private boolean reserveImage; private ToolItem refreshItem; private ToolItem copyItem; - private ToolItem IncreaseScaleItem; - private ToolItem DecreaseScaleItem; + private ToolItem increaseScaleItem; + private ToolItem decreaseScaleItem; private double scaleLevel; /** * @brief constructor @@ -531,9 +531,10 @@ public class ScreenShotDialog { try { clickShutter(); - } catch ( ScreenShotException ex ) { - logger.log( Level.SEVERE, "Fail to create a screen shot.", ex ); - SkinUtil.openMessage( shell, null, "Fail to create a screen shot.", SWT.ERROR, config ); + } catch (ScreenShotException ex) { + logger.log(Level.SEVERE, "Fail to create a screen shot.", ex); + SkinUtil.openMessage(shell, null, + "Fail to create a screen shot.", SWT.ERROR, config); } /* restoration */ @@ -544,12 +545,13 @@ public class ScreenShotDialog { } ); - IncreaseScaleItem = new ToolItem( toolBar, SWT.FLAT ); - IncreaseScaleItem.setImage( ImageRegistry.getInstance().getIcon( IconName.INCREASE_SCALE ) ); - IncreaseScaleItem.setToolTipText( "Increase view size" ); - IncreaseScaleItem.addSelectionListener( new SelectionAdapter() { + increaseScaleItem = new ToolItem(toolBar, SWT.FLAT); + increaseScaleItem.setImage(ImageRegistry.getInstance().getIcon(IconName.INCREASE_SCALE)); + increaseScaleItem.setToolTipText("Increase view size"); + + increaseScaleItem.addSelectionListener(new SelectionAdapter() { @Override - public void widgetSelected( SelectionEvent e ) { + public void widgetSelected(SelectionEvent e) { double level = getScaleLevel(); Point dialogSize = shell.getSize(); @@ -562,11 +564,11 @@ public class ScreenShotDialog { label.update(); if (level >= 400d) { - IncreaseScaleItem.setEnabled(false); - DecreaseScaleItem.setEnabled(true); + increaseScaleItem.setEnabled(false); + decreaseScaleItem.setEnabled(true); } else { - IncreaseScaleItem.setEnabled(true); - DecreaseScaleItem.setEnabled(true); + increaseScaleItem.setEnabled(true); + decreaseScaleItem.setEnabled(true); } /* restoration */ @@ -577,12 +579,13 @@ public class ScreenShotDialog { } ); - DecreaseScaleItem = new ToolItem( toolBar, SWT.FLAT ); - DecreaseScaleItem.setImage( ImageRegistry.getInstance().getIcon( IconName.DECREASE_SCALE ) ); - DecreaseScaleItem.setToolTipText( "Decrease view size" ); - DecreaseScaleItem.addSelectionListener( new SelectionAdapter() { + decreaseScaleItem = new ToolItem(toolBar, SWT.FLAT); + decreaseScaleItem.setImage(ImageRegistry.getInstance().getIcon(IconName.DECREASE_SCALE)); + decreaseScaleItem.setToolTipText("Decrease view size"); + + decreaseScaleItem.addSelectionListener(new SelectionAdapter() { @Override - public void widgetSelected( SelectionEvent e ) { + public void widgetSelected(SelectionEvent e) { double level = getScaleLevel(); Point dialogSize = shell.getSize(); @@ -595,11 +598,11 @@ public class ScreenShotDialog { label.update(); if (level <= 25) { - DecreaseScaleItem.setEnabled(false); - IncreaseScaleItem.setEnabled(true); + decreaseScaleItem.setEnabled(false); + increaseScaleItem.setEnabled(true); } else { - DecreaseScaleItem.setEnabled(true); - IncreaseScaleItem.setEnabled(true); + decreaseScaleItem.setEnabled(true); + increaseScaleItem.setEnabled(true); } /* restoration */ diff --git a/tizen/src/skin/client/src/org/tizen/emulator/skin/screenshot/SdlScreenShotWindow.java b/tizen/src/skin/client/src/org/tizen/emulator/skin/screenshot/SdlScreenShotWindow.java index 6d34eab2ff..d482afce7d 100644 --- a/tizen/src/skin/client/src/org/tizen/emulator/skin/screenshot/SdlScreenShotWindow.java +++ b/tizen/src/skin/client/src/org/tizen/emulator/skin/screenshot/SdlScreenShotWindow.java @@ -59,28 +59,29 @@ public class SdlScreenShotWindow extends ScreenShotDialog { } protected void capture() throws ScreenShotException { - DataTranfer dataTranfer = communicator.sendToQEMU( SendCommand.SCREEN_SHOT, null, true ); - byte[] receivedData = communicator.getReceivedData( dataTranfer ); + DataTranfer dataTranfer = communicator.sendToQEMU( + SendCommand.SCREEN_SHOT, null, true); + byte[] receivedData = communicator.getReceivedData(dataTranfer); - if ( null != receivedData ) { + if (null != receivedData) { + int width = config.getArgInt(ArgsConstants.RESOLUTION_WIDTH); + int height = config.getArgInt(ArgsConstants.RESOLUTION_HEIGHT); + ImageData imageData = new ImageData( + width, height, COLOR_DEPTH, paletteData, 1, receivedData); - if ( null != this.image ) { - this.image.dispose(); - } - - int width = config.getArgInt( ArgsConstants.RESOLUTION_WIDTH ); - int height = config.getArgInt( ArgsConstants.RESOLUTION_HEIGHT ); - ImageData imageData = new ImageData( width , height, COLOR_DEPTH, paletteData, 1, receivedData ); - RotationInfo rotation = getCurrentRotation(); - imageData = rotateImageData( imageData, rotation ); - - this.image = new Image( Display.getDefault(), imageData ); - - imageCanvas.redraw(); + imageData = rotateImageData(imageData, rotation); + Image tempImage = image; + image = new Image(Display.getDefault(), imageData); + + if (tempImage != null) { + tempImage.dispose(); + } + + imageCanvas.redraw(); } else { - throw new ScreenShotException( "Fail to get image data." ); + throw new ScreenShotException("Fail to get image data."); } } } \ No newline at end of file diff --git a/tizen/src/skin/client/src/org/tizen/emulator/skin/screenshot/ShmScreenShotWindow.java b/tizen/src/skin/client/src/org/tizen/emulator/skin/screenshot/ShmScreenShotWindow.java index ce848b2c78..fecbc2e737 100644 --- a/tizen/src/skin/client/src/org/tizen/emulator/skin/screenshot/ShmScreenShotWindow.java +++ b/tizen/src/skin/client/src/org/tizen/emulator/skin/screenshot/ShmScreenShotWindow.java @@ -67,10 +67,13 @@ public class ShmScreenShotWindow extends ScreenShotDialog { RotationInfo rotation = getCurrentRotation(); imageData = rotateImageData(imageData, rotation); - if (image != null) { - image.dispose(); - } + Image tempImage = image; image = new Image(Display.getDefault(), imageData); + + if (tempImage != null) { + tempImage.dispose(); + } + imageCanvas.redraw(); } } \ No newline at end of file diff --git a/tizen/src/skin/maruskin_server.c b/tizen/src/skin/maruskin_server.c index ba07207924..8e3e2d397d 100644 --- a/tizen/src/skin/maruskin_server.c +++ b/tizen/src/skin/maruskin_server.c @@ -238,9 +238,9 @@ void shutdown_skin_server(void) break; } else { #ifdef CONFIG_WIN32 - Sleep(1); // 1ms + Sleep(1); /* 1ms */ #else - usleep(1000); // 1ms + usleep(1000); #endif count++; } @@ -334,6 +334,12 @@ void notify_booting_progress(int progress_value) ERR("fail to send SEND_BOOTING_PROGRESS to skin.\n"); } + +#ifdef CONFIG_WIN32 + Sleep(1); /* 1ms */ +#else + usleep(1000); +#endif } }