Removed unused import

diff --git a/org.tizen.common.sdblib/src/org/tizen/sdblib/CrashReportService.java b/org.tizen.common.sdblib/src/org/tizen/sdblib/CrashReportService.java
index c6d2e5e..074843c 100644 (file)
--- a/org.tizen.common.sdblib/src/org/tizen/sdblib/CrashReportService.java
+++ b/org.tizen.common.sdblib/src/org/tizen/sdblib/CrashReportService.java
@@ -34,6 +34,7 @@ import java.nio.channels.SocketChannel;
 import java.nio.charset.Charset;
 import java.util.ArrayList;
 import java.util.Iterator;
+import java.util.List;
 
 import org.tizen.sdblib.SdbHelper.SdbResponse;
 import org.tizen.sdblib.SmartDevelopmentBridge.IDeviceChangeListener;
@@ -46,7 +47,7 @@ import org.tizen.sdblib.SmartDevelopmentBridge.IDeviceChangeListener;
  * 
  */
 public final class CrashReportService implements IDeviceChangeListener {
-    private final static ArrayList<ICrashReportServiceListener> mCSListeners = new ArrayList<ICrashReportServiceListener>();
+    private final static List<ICrashReportServiceListener> mCSListeners = new ArrayList<ICrashReportServiceListener>();
     private static CrashReportService mInstance;
     private Selector mSelector = null;
     private volatile boolean finished = false;
@@ -131,9 +132,9 @@ public final class CrashReportService implements IDeviceChangeListener {
                             Thread.sleep(SdbHelper.WAIT_TIME);
                             continue;
                         }
-                        Iterator it = mSelector.selectedKeys().iterator();
+                        Iterator<SelectionKey> it = mSelector.selectedKeys().iterator();
                         while (it.hasNext()) {
-                            SelectionKey key = (SelectionKey) it.next();
+                            SelectionKey key = it.next();
                             if (key.isConnectable()) {
                                 SocketChannel sc = (SocketChannel) key.channel();
                                 if (sc.isConnectionPending()) {

diff --git a/org.tizen.common.verrari/test/src/org/tizen/common/verrari/template/FileTemplateTest.java b/org.tizen.common.verrari/test/src/org/tizen/common/verrari/template/FileTemplateTest.java
index 6984041..3b9d487 100755 (executable)
--- a/org.tizen.common.verrari/test/src/org/tizen/common/verrari/template/FileTemplateTest.java
+++ b/org.tizen.common.verrari/test/src/org/tizen/common/verrari/template/FileTemplateTest.java
@@ -40,7 +40,6 @@ import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.tizen.common.config.Preference;
-import org.tizen.common.config.provider.EnvironmentProvider;
 import org.tizen.common.config.provider.SystemPropertiesProvider;
 
 /**

diff --git a/org.tizen.common/src/org/tizen/common/core/command/policy/UncaughtExceptionHandlingPolicy.java b/org.tizen.common/src/org/tizen/common/core/command/policy/UncaughtExceptionHandlingPolicy.java
index f16f9c7..25ab62f 100644 (file)
--- a/org.tizen.common/src/org/tizen/common/core/command/policy/UncaughtExceptionHandlingPolicy.java
+++ b/org.tizen.common/src/org/tizen/common/core/command/policy/UncaughtExceptionHandlingPolicy.java
@@ -28,8 +28,9 @@ import java.lang.Thread.UncaughtExceptionHandler;
 import java.util.HashMap;
 import java.util.Map;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.tizen.common.core.command.CommandCancelException;
-import org.tizen.common.util.log.Logger;
 
 /**
  * UncaughtExceptionHandlingPolicy.
@@ -48,6 +49,8 @@ public enum UncaughtExceptionHandlingPolicy
      */
     INSTANCE();
 
+    private final Logger logger = LoggerFactory.getLogger(UncaughtExceptionHandlingPolicy.class);
+
     /**
      * map which stores handler (value) according to the throwable class name (name).
      */
@@ -104,7 +107,7 @@ public enum UncaughtExceptionHandlingPolicy
     private void putHandler(String throwableName, UncaughtExceptionHandler handler) {
         if(repository.containsKey(throwableName)) {
             if(!repository.get(throwableName).equals(handler)) {
-                Logger.error("Handlers are duplicate assigned with one key: " + throwableName);
+                logger.error("Handlers are duplicately assigned with one key: " + throwableName);
             }
             return;
         }

diff --git a/org.tizen.common/src/org/tizen/common/rds/RdsDeltaListFile.java b/org.tizen.common/src/org/tizen/common/rds/RdsDeltaListFile.java
index 2114904..3b6e181 100644 (file)
--- a/org.tizen.common/src/org/tizen/common/rds/RdsDeltaListFile.java
+++ b/org.tizen.common/src/org/tizen/common/rds/RdsDeltaListFile.java
@@ -31,8 +31,9 @@ import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.tizen.common.util.FileUtil;
-import org.tizen.common.util.log.Logger;
 
 
 /**
@@ -42,6 +43,8 @@ import org.tizen.common.util.log.Logger;
  * @author Gun Kim<gune.kim@samsung.com>
  */
 public class RdsDeltaListFile {
+    private final Logger logger = LoggerFactory.getLogger(RdsDeltaListFile.class);
+
     public static final String RDS_DELTA_LIST_FILE_NAME = ".rds_delta";
     public static final String ADD_TITLE = "#add";
     public static final String MODIFY_TITLE = "#modify";
@@ -90,7 +93,7 @@ public class RdsDeltaListFile {
         try {
             FileUtil.writeTextFile(file, strBuilder.toString(), null);
         } catch (IOException e) {
-            Logger.error("Cannot write delta info in " + parentDirectory + "/" + RDS_DELTA_LIST_FILE_NAME , e);
+            logger.error("Cannot write delta info in " + parentDirectory + "/" + RDS_DELTA_LIST_FILE_NAME, e);
             if ( file.exists() ) {
                 file.delete();
             }

diff --git a/org.tizen.common/src/org/tizen/common/rds/RdsDeployer.java b/org.tizen.common/src/org/tizen/common/rds/RdsDeployer.java
index 09bde96..0c8bc17 100644 (file)
--- a/org.tizen.common/src/org/tizen/common/rds/RdsDeployer.java
+++ b/org.tizen.common/src/org/tizen/common/rds/RdsDeployer.java
@@ -37,6 +37,8 @@ import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.osgi.util.NLS;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.tizen.common.CommonPlugin;
 import org.tizen.common.TizenPlatformConstants;
 import org.tizen.common.sdb.command.SdbCommand;
@@ -44,7 +46,6 @@ import org.tizen.common.sdb.command.message.PkgcmdErrorType;
 import org.tizen.common.sdb.command.receiver.PkgCmdReceiver;
 import org.tizen.common.ui.view.console.ITizenConsoleManager;
 import org.tizen.common.util.ISdbCommandHelper;
-import org.tizen.common.util.log.Logger;
 import org.tizen.sdblib.IDevice;
 import org.tizen.sdblib.SyncService;
 import org.tizen.sdblib.SyncService.SyncResult;
@@ -54,7 +55,9 @@ import org.tizen.sdblib.SyncService.SyncResult;
  * 
  * @author Gun Kim<gune.kim@samsung.com>
  */
-public abstract class RdsDeployer implements Closeable{
+public abstract class RdsDeployer implements Closeable {
+    private final Logger logger = LoggerFactory.getLogger(RdsDeployer.class);
+
     protected IProgressMonitor monitor;
     protected ITizenConsoleManager console;
     protected String pkgType;
@@ -318,7 +321,7 @@ public abstract class RdsDeployer implements Closeable{
         try {
             pushFile(strDeltaInfoFile, strRemotePath);
         } catch (Exception e) {
-            Logger.error(RdsDeployer.makeRdsLog(RdsMessages.RDS_RES_INFO_PUSH_ERROR), e);
+            logger.error(RdsDeployer.makeRdsLog(RdsMessages.RDS_RES_INFO_PUSH_ERROR), e);
         }
     }
     

diff --git a/org.tizen.common/src/org/tizen/common/sdb/command/receiver/CommandOutputReceiver.java b/org.tizen.common/src/org/tizen/common/sdb/command/receiver/CommandOutputReceiver.java
index 2a69627..6721faf 100644 (file)
--- a/org.tizen.common/src/org/tizen/common/sdb/command/receiver/CommandOutputReceiver.java
+++ b/org.tizen.common/src/org/tizen/common/sdb/command/receiver/CommandOutputReceiver.java
@@ -1,7 +1,5 @@
 package org.tizen.common.sdb.command.receiver;
 
-import java.io.File;
-
 import org.tizen.common.ui.view.console.ITizenConsoleManager;
 import org.tizen.sdblib.MultiLineReceiver;
 

diff --git a/org.tizen.common/src/org/tizen/common/sdb/command/receiver/PkgCmdReceiver.java b/org.tizen.common/src/org/tizen/common/sdb/command/receiver/PkgCmdReceiver.java
index fdcba01..cd85614 100644 (file)
--- a/org.tizen.common/src/org/tizen/common/sdb/command/receiver/PkgCmdReceiver.java
+++ b/org.tizen.common/src/org/tizen/common/sdb/command/receiver/PkgCmdReceiver.java
@@ -1,7 +1,5 @@
 package org.tizen.common.sdb.command.receiver;
 
-import java.io.File;
-
 import org.tizen.common.ui.view.console.ITizenConsoleManager;
 import org.tizen.common.util.StringUtil;
 
@@ -15,8 +13,6 @@ public class PkgCmdReceiver extends CommandOutputReceiver {
     private static String RETURN_CB_END = "end";
     private static String RETURN_CB_INSTALL_PERCENT = "install_percent";
     private static String RETURN_CB_UNINSTALL_PERCENT = "uninstall_percent";
-    private static String OUTPUT_INSTALL_START = "installing...";
-    private static String OUTPUT_UNINSTALL_START = "uninstalling...";
     private static String OUTPUT_ING = ".";
     
 

diff --git a/org.tizen.common/src/org/tizen/common/util/ImageUtil.java b/org.tizen.common/src/org/tizen/common/util/ImageUtil.java
index 16d0d16..cc7d2fb 100644 (file)
--- a/org.tizen.common/src/org/tizen/common/util/ImageUtil.java
+++ b/org.tizen.common/src/org/tizen/common/util/ImageUtil.java
@@ -39,17 +39,20 @@ import javax.imageio.ImageIO;
 import org.eclipse.core.runtime.Platform;
 import org.eclipse.core.runtime.Plugin;
 import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.swt.SWTException;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.graphics.ImageData;
 import org.eclipse.swt.graphics.PaletteData;
 import org.eclipse.swt.graphics.RGB;
 import org.eclipse.swt.widgets.Display;
 import org.osgi.framework.Bundle;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.tizen.common.SurrogateWithArgument;
-import org.tizen.common.util.log.Logger;
+import org.tizen.common.rds.RdsDeltaDetector;
 
 public class ImageUtil {
+    private static final Logger logger = LoggerFactory.getLogger(RdsDeltaDetector.class);
+
     public static class PlatformSurrogate {
         public Bundle getBundle(String pluginID) {
             return Platform.getBundle(pluginID);
@@ -175,7 +178,7 @@ public class ImageUtil {
                 image = ImageIO.read(new File(path));
             }
         } catch (IOException e) {
-            Logger.log(e);
+            logger.error("Failed to read", e);
         } finally {
             IOUtil.tryClose(is);
         }
@@ -196,9 +199,6 @@ public class ImageUtil {
 
         try {
             Image image = new Image(Display.getDefault(), is);
-            if ( image == null ) {
-                image = new Image(display, 1, 1);
-            }
             return image;
         } finally {
             IOUtil.tryClose(is);

diff --git a/org.tizen.common/src/org/tizen/common/util/ProjectUtil.java b/org.tizen.common/src/org/tizen/common/util/ProjectUtil.java
index 96f8e66..9093bca 100644 (file)
--- a/org.tizen.common/src/org/tizen/common/util/ProjectUtil.java
+++ b/org.tizen.common/src/org/tizen/common/util/ProjectUtil.java
@@ -34,7 +34,8 @@ import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.Platform;
-import org.tizen.common.util.log.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * ProjectUtil.
@@ -44,6 +45,7 @@ import org.tizen.common.util.log.Logger;
  * @author Jihoon Song{@literal <jihoon80.song@samsung.com>} (S-Core)
  */
 public class ProjectUtil {
+    private static final Logger logger = LoggerFactory.getLogger(ProjectUtil.class);
     
     /**
      * Null safety project description getter. If project is null, return null.
@@ -175,7 +177,7 @@ public class ProjectUtil {
             ICommand[] newCommands = addCommand( commands, command );
             setBuildSpec( project, newCommands, monitor );
         } catch (CoreException e) {
-            Logger.log(e);
+            logger.error("Failed to setBuildSpec", e);
         }
     }
     
@@ -193,14 +195,14 @@ public class ProjectUtil {
                 return command.getArguments();
             }
         } catch (CoreException e) {
-            Logger.log(e);
+            logger.error("Failed to getBuildSpec", e);
         }
         
         return null;
     }
     
     /**
-     * Check whether target project is located in default location or not.
+     * Checks whether target project is located in default location or not.
      * @param descriptionLocation .cproject location of target project.
      * @return true if it is located in default location. False if not.
      */