From 6c42c2445d973bd16db525eab2e0bb9ce4d0ca24 Mon Sep 17 00:00:00 2001 From: "minkee.lee" Date: Wed, 23 Dec 2015 13:27:16 +0900 Subject: [PATCH] About: move about-dialog job into main thread Thread for initializing about-dialog content is unnecessary. Change-Id: I5725b1e008c5fd89e2b926e05cdc399762126ec8 Signed-off-by: minkee.lee --- .../tizen/emulator/manager/EmulatorManager.java | 6 +-- .../emulator/manager/console/ConsoleProcessor.java | 4 +- src/org/tizen/emulator/manager/job/CheckAbout.java | 44 ---------------------- .../emulator/manager/ui/dialog/AboutDialog.java | 6 +-- 4 files changed, 7 insertions(+), 53 deletions(-) delete mode 100644 src/org/tizen/emulator/manager/job/CheckAbout.java diff --git a/src/org/tizen/emulator/manager/EmulatorManager.java b/src/org/tizen/emulator/manager/EmulatorManager.java index 0fcba7f..9580503 100755 --- a/src/org/tizen/emulator/manager/EmulatorManager.java +++ b/src/org/tizen/emulator/manager/EmulatorManager.java @@ -41,7 +41,6 @@ import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.Shell; import org.tizen.emulator.manager.console.Action; import org.tizen.emulator.manager.console.CommandLineParser; -import org.tizen.emulator.manager.job.CheckAbout; import org.tizen.emulator.manager.job.CheckGPU; import org.tizen.emulator.manager.job.CheckSDCard; import org.tizen.emulator.manager.job.CheckVT; @@ -50,6 +49,7 @@ import org.tizen.emulator.manager.job.Overseer; import org.tizen.emulator.manager.logging.EMLogger; import org.tizen.emulator.manager.resources.FilePathResources; import org.tizen.emulator.manager.resources.StringResources; +import org.tizen.emulator.manager.tool.About; import org.tizen.emulator.manager.tool.CocoaUtil; import org.tizen.emulator.manager.tool.SettingInfoFile; import org.tizen.emulator.manager.ui.MainDialog; @@ -252,9 +252,7 @@ public class EmulatorManager { try{ checkConsoleMode(args); - Overseer startupPreparations = Overseer.newOverseer("StartupPreparations", //$NON-NLS-1$ - CheckAbout.class); - startupPreparations.startWork(); + About.initAboutContents(); if (isConsoleMode) { EMLogger.getInstance().initLogger(); diff --git a/src/org/tizen/emulator/manager/console/ConsoleProcessor.java b/src/org/tizen/emulator/manager/console/ConsoleProcessor.java index 8fa6b16..1a9de3f 100644 --- a/src/org/tizen/emulator/manager/console/ConsoleProcessor.java +++ b/src/org/tizen/emulator/manager/console/ConsoleProcessor.java @@ -34,13 +34,13 @@ import java.io.IOException; import java.util.ArrayList; import java.util.logging.Level; -import org.tizen.emulator.manager.job.CheckAbout; import org.tizen.emulator.manager.logging.EMLogger; import org.tizen.emulator.manager.platform.BaseImage; import org.tizen.emulator.manager.platform.Profile; import org.tizen.emulator.manager.platform.ProfileList; import org.tizen.emulator.manager.resources.FilePathResources; import org.tizen.emulator.manager.resources.StringResources; +import org.tizen.emulator.manager.tool.About; import org.tizen.emulator.manager.vms.VMProperty; import org.tizen.emulator.manager.vms.helper.HelperClass; import org.tizen.emulator.manager.vms.helper.VMWorkerException; @@ -66,7 +66,7 @@ public class ConsoleProcessor { public String getAboutInfo() { return "Emulator Manager" + StringResources.NEW_LINE + //$NON-NLS-1$ - CheckAbout.getAboutInstance().getContents(); + About.getInstance().getContents(); } public String getDetailInfoOfVM(VMProperty prop) { diff --git a/src/org/tizen/emulator/manager/job/CheckAbout.java b/src/org/tizen/emulator/manager/job/CheckAbout.java deleted file mode 100644 index 77db234..0000000 --- a/src/org/tizen/emulator/manager/job/CheckAbout.java +++ /dev/null @@ -1,44 +0,0 @@ -/* - * Emulator Manager - * - * Copyright (C) 2015 Samsung Electronics Co., Ltd. All rights reserved. - * - * Contact: - * SeokYeon Hwang - * JiHye Kim - * MinKee Lee - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - * - * Contributors: - * - S-Core Co., Ltd - * - */ - -package org.tizen.emulator.manager.job; - -import org.tizen.emulator.manager.tool.About; - -public class CheckAbout extends Job { - - public static About getAboutInstance() { - waitJob(CheckAbout.class); - return About.getInstance(); - } - @Override - public void work() { - About.initAboutContents(); - } -} diff --git a/src/org/tizen/emulator/manager/ui/dialog/AboutDialog.java b/src/org/tizen/emulator/manager/ui/dialog/AboutDialog.java index ed7fceb..b23561b 100644 --- a/src/org/tizen/emulator/manager/ui/dialog/AboutDialog.java +++ b/src/org/tizen/emulator/manager/ui/dialog/AboutDialog.java @@ -41,11 +41,11 @@ import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Link; import org.eclipse.swt.widgets.Shell; import org.tizen.emulator.manager.EmulatorManager; -import org.tizen.emulator.manager.job.CheckAbout; import org.tizen.emulator.manager.logging.EMLogger; import org.tizen.emulator.manager.resources.FilePathResources; import org.tizen.emulator.manager.resources.ImageResources; import org.tizen.emulator.manager.resources.StringResources; +import org.tizen.emulator.manager.tool.About; import org.tizen.emulator.manager.ui.MainDialog; import org.tizen.emulator.manager.ui.Messages; @@ -58,9 +58,9 @@ public class AboutDialog { textContents = StringResources.NEW_LINE + Messages.getString("AboutDialog.0") //$NON-NLS-1$ + StringResources.NEW_LINE + StringResources.NEW_LINE - + Messages.getString("AboutDialog.2") + CheckAbout.getAboutInstance().getAboutVersion() //$NON-NLS-1$ + + Messages.getString("AboutDialog.2") + About.getInstance().getAboutVersion() //$NON-NLS-1$ + StringResources.NEW_LINE - + Messages.getString("AboutDialog.3") + CheckAbout.getAboutInstance().getBuildTime(); //$NON-NLS-1$ + + Messages.getString("AboutDialog.3") + About.getInstance().getBuildTime(); //$NON-NLS-1$ } -- 2.7.4