From 673d301a91e22bbdb7ecf6caef76e2a2d9b34d15 Mon Sep 17 00:00:00 2001
From: Anton Keks <anton@codeborne.com>
Date: Sat, 26 Apr 2014 22:39:18 +0300
Subject: [PATCH] convert some MessageBoxes to sheets on mac

---
 src/net/azib/ipscan/Main.java                   |  2 +-
 src/net/azib/ipscan/gui/MainWindow.java         |  7 -------
 .../ipscan/gui/actions/ScanMenuActions.java     |  2 +-
 .../gui/actions/StartStopScanningAction.java    | 17 ++++++-----------
 4 files changed, 8 insertions(+), 20 deletions(-)

diff --git a/src/net/azib/ipscan/Main.java b/src/net/azib/ipscan/Main.java
index 86bd1f15..81e9f697 100644
--- a/src/net/azib/ipscan/Main.java
+++ b/src/net/azib/ipscan/Main.java
@@ -101,7 +101,7 @@ public class Main {
 	}
 
 	private static void showMessage(Shell parent, int flags, String title, String localizedMessage) {
-		MessageBox messageBox = new MessageBox(parent, SWT.OK | flags);
+		MessageBox messageBox = new MessageBox(parent, SWT.OK | SWT.SHEET | flags);
 		messageBox.setText(title);
 		messageBox.setMessage(localizedMessage);
 		messageBox.open();
diff --git a/src/net/azib/ipscan/gui/MainWindow.java b/src/net/azib/ipscan/gui/MainWindow.java
index d0201e58..4853f1fb 100644
--- a/src/net/azib/ipscan/gui/MainWindow.java
+++ b/src/net/azib/ipscan/gui/MainWindow.java
@@ -100,13 +100,6 @@ public class MainWindow {
 			}
 		});
 	}
-	
-	private int showMessage(String text, int buttons) {
-		MessageBox box = new MessageBox(MainWindow.this.shell, SWT.ICON_WARNING | buttons);
-		box.setText(Version.NAME);
-		box.setMessage(text);
-		return box.open();
-	}
 
 	/**
 	 * This method initializes shell
diff --git a/src/net/azib/ipscan/gui/actions/ScanMenuActions.java b/src/net/azib/ipscan/gui/actions/ScanMenuActions.java
index d4964b2e..1f2119ea 100644
--- a/src/net/azib/ipscan/gui/actions/ScanMenuActions.java
+++ b/src/net/azib/ipscan/gui/actions/ScanMenuActions.java
@@ -63,7 +63,7 @@ public class ScanMenuActions {
 			
 			if (!stateMachine.inState(ScanningState.IDLE)) {
 				// ask the user whether to save incomplete results
-				MessageBox box = new MessageBox(resultTable.getShell(), SWT.YES | SWT.NO | SWT.ICON_WARNING);
+				MessageBox box = new MessageBox(resultTable.getShell(), SWT.YES | SWT.NO | SWT.ICON_WARNING | SWT.SHEET);
 				box.setText(Version.NAME);
 				box.setMessage(Labels.getLabel("exception.ExporterException.scanningInProgress"));
 				if (box.open() != SWT.YES)
diff --git a/src/net/azib/ipscan/gui/actions/StartStopScanningAction.java b/src/net/azib/ipscan/gui/actions/StartStopScanningAction.java
index da77ca56..699a857c 100644
--- a/src/net/azib/ipscan/gui/actions/StartStopScanningAction.java
+++ b/src/net/azib/ipscan/gui/actions/StartStopScanningAction.java
@@ -5,26 +5,19 @@
  */
 package net.azib.ipscan.gui.actions;
 
-import java.net.InetAddress;
-
 import net.azib.ipscan.config.GUIConfig;
-import net.azib.ipscan.config.Labels;
 import net.azib.ipscan.config.GUIConfig.DisplayMethod;
-import net.azib.ipscan.core.ScannerDispatcherThread;
-import net.azib.ipscan.core.ScannerDispatcherThreadFactory;
-import net.azib.ipscan.core.ScanningProgressCallback;
-import net.azib.ipscan.core.ScanningResult;
-import net.azib.ipscan.core.ScanningResultCallback;
+import net.azib.ipscan.config.Labels;
+import net.azib.ipscan.core.*;
 import net.azib.ipscan.core.ScanningResult.ResultType;
 import net.azib.ipscan.core.net.PingerRegistry;
 import net.azib.ipscan.core.state.ScanningState;
 import net.azib.ipscan.core.state.StateMachine;
-import net.azib.ipscan.core.state.StateTransitionListener;
 import net.azib.ipscan.core.state.StateMachine.Transition;
+import net.azib.ipscan.core.state.StateTransitionListener;
 import net.azib.ipscan.gui.ResultTable;
 import net.azib.ipscan.gui.StatusBar;
 import net.azib.ipscan.gui.feeders.FeederGUIRegistry;
-
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.events.SelectionListener;
@@ -33,6 +26,8 @@ import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.MessageBox;
 
+import java.net.InetAddress;
+
 /**
  * Start/Stop button action class.
  * It listens to presses on the buttons as well as updates gui statuses
@@ -128,7 +123,7 @@ public class StartStopScanningAction implements SelectionListener, ScanningProgr
 		
 		// ask user for confirmation if needed
 		if (guiConfig.askScanConfirmation && resultTable.getItemCount() > 0) {
-			MessageBox box = new MessageBox(resultTable.getShell(), SWT.ICON_QUESTION | SWT.YES | SWT.NO);
+			MessageBox box = new MessageBox(resultTable.getShell(), SWT.ICON_QUESTION | SWT.YES | SWT.NO | SWT.SHEET);
 			box.setText(Labels.getLabel("text.scan.new"));
 			box.setMessage(Labels.getLabel("text.scan.confirmation"));
 			if (box.open() != SWT.YES) {