From 6d5b88966aaa4e23194faec6de4b4822a034f9de Mon Sep 17 00:00:00 2001 From: "kh5325.kim" Date: Fri, 10 May 2013 18:48:43 +0900 Subject: [PATCH] Removed unused import --- .../src/org/tizen/common/connection/ConnectionPlugin.java | 6 ++++-- .../src/org/tizen/common/sign/command/SignCommand.java | 1 - .../src/org/tizen/common/sign/model/DeltaListResource.java | 1 - .../common/sign/preferences/SigningPreferencePage.java | 14 +------------- .../common/sign/preferences/SigningProfileItemFactory.java | 8 +++++--- org.tizen.common/src/org/tizen/common/CommonPlugin.java | 8 +++++--- .../src/org/tizen/common/rds/RdsDeltaDetector.java | 7 +++++-- .../src/org/tizen/common/ui/dialog/NewIconDialog.java | 8 +++++--- .../org/tizen/common/ui/view/console/ConsoleManager.java | 12 +----------- org.tizen.common/src/org/tizen/common/util/StringUtil.java | 11 +++++++---- 10 files changed, 33 insertions(+), 43 deletions(-) diff --git a/org.tizen.common.connection/src/org/tizen/common/connection/ConnectionPlugin.java b/org.tizen.common.connection/src/org/tizen/common/connection/ConnectionPlugin.java index 071219e..314aaa8 100755 --- a/org.tizen.common.connection/src/org/tizen/common/connection/ConnectionPlugin.java +++ b/org.tizen.common.connection/src/org/tizen/common/connection/ConnectionPlugin.java @@ -33,10 +33,11 @@ import org.eclipse.jface.preference.IPreferenceStore; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.ui.plugin.AbstractUIPlugin; import org.osgi.framework.BundleContext; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.tizen.common.connection.preference.TizenConnectionExplorerPreferencePage; import org.tizen.common.connection.preference.TizenLogPreferencePage; import org.tizen.common.util.OSChecker; -import org.tizen.common.util.log.Logger; import org.tizen.sdblib.FileListingService.FileEntry; import org.tizen.sdblib.IDevice; import org.tizen.sdblib.SmartDevelopmentBridge; @@ -45,6 +46,7 @@ import org.tizen.sdblib.SmartDevelopmentBridge; * The activator class controls the plug-in life cycle */ public class ConnectionPlugin extends AbstractUIPlugin { + private static final Logger logger = LoggerFactory.getLogger(ConnectionPlugin.class); // The plug-in ID public static final String PLUGIN_ID = "org.tizen.common.connection"; //$NON-NLS-1$ @@ -158,7 +160,7 @@ public class ConnectionPlugin extends AbstractUIPlugin { try { listener.selectionChanged(file); } catch (Exception e) { - Logger.error("ConnectionPlugin", e); + logger.error("Failed to invoke selectionChanged", e); } } } diff --git a/org.tizen.common.sign/src/org/tizen/common/sign/command/SignCommand.java b/org.tizen.common.sign/src/org/tizen/common/sign/command/SignCommand.java index 86c598c..773d9a2 100755 --- a/org.tizen.common.sign/src/org/tizen/common/sign/command/SignCommand.java +++ b/org.tizen.common.sign/src/org/tizen/common/sign/command/SignCommand.java @@ -41,7 +41,6 @@ import org.tizen.common.sign.preferences.SigningProfileItem; import org.tizen.common.sign.signer.TizenSigner; import org.tizen.common.sign.util.SignatureUtility; import org.tizen.common.util.Assert; -import org.tizen.common.util.FileUtil; import org.tizen.common.util.StringUtil; diff --git a/org.tizen.common.sign/src/org/tizen/common/sign/model/DeltaListResource.java b/org.tizen.common.sign/src/org/tizen/common/sign/model/DeltaListResource.java index 987fb34..0156945 100644 --- a/org.tizen.common.sign/src/org/tizen/common/sign/model/DeltaListResource.java +++ b/org.tizen.common.sign/src/org/tizen/common/sign/model/DeltaListResource.java @@ -32,7 +32,6 @@ import java.io.FileOutputStream; import java.io.IOException; import java.io.OutputStream; import java.util.List; -import java.util.Map; import org.eclipse.core.resources.IContainer; import org.eclipse.core.resources.IProject; diff --git a/org.tizen.common.sign/src/org/tizen/common/sign/preferences/SigningPreferencePage.java b/org.tizen.common.sign/src/org/tizen/common/sign/preferences/SigningPreferencePage.java index 29c0048..d2cc85d 100755 --- a/org.tizen.common.sign/src/org/tizen/common/sign/preferences/SigningPreferencePage.java +++ b/org.tizen.common.sign/src/org/tizen/common/sign/preferences/SigningPreferencePage.java @@ -40,23 +40,11 @@ import org.eclipse.jface.dialogs.InputDialog; import org.eclipse.jface.preference.IPreferenceStore; import org.eclipse.jface.preference.PreferencePage; import org.eclipse.jface.resource.JFaceResources; -import org.eclipse.jface.viewers.CellEditor; -import org.eclipse.jface.viewers.IFontProvider; -import org.eclipse.jface.viewers.ISelection; -import org.eclipse.jface.viewers.ISelectionChangedListener; -import org.eclipse.jface.viewers.IStructuredContentProvider; -import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.jface.viewers.LabelProvider; -import org.eclipse.jface.viewers.SelectionChangedEvent; -import org.eclipse.jface.viewers.StructuredSelection; -import org.eclipse.jface.viewers.TableViewer; -import org.eclipse.jface.viewers.TextCellEditor; -import org.eclipse.jface.viewers.Viewer; +import org.eclipse.jface.viewers.*; import org.eclipse.swt.SWT; import org.eclipse.swt.events.ControlAdapter; import org.eclipse.swt.events.ControlEvent; import org.eclipse.swt.events.ControlListener; -import org.eclipse.swt.events.SelectionAdapter; import org.eclipse.swt.events.SelectionEvent; import org.eclipse.swt.events.SelectionListener; import org.eclipse.swt.graphics.Font; diff --git a/org.tizen.common.sign/src/org/tizen/common/sign/preferences/SigningProfileItemFactory.java b/org.tizen.common.sign/src/org/tizen/common/sign/preferences/SigningProfileItemFactory.java index 01da031..42283c9 100644 --- a/org.tizen.common.sign/src/org/tizen/common/sign/preferences/SigningProfileItemFactory.java +++ b/org.tizen.common.sign/src/org/tizen/common/sign/preferences/SigningProfileItemFactory.java @@ -28,15 +28,17 @@ import java.io.IOException; import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.Path; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.tizen.common.Factory; import org.tizen.common.core.application.InstallPathConfig; import org.tizen.common.sign.Activator; import org.tizen.common.util.StringUtil; -import org.tizen.common.util.log.Logger; public class SigningProfileItemFactory -implements Factory{ +implements Factory { + private static final Logger logger = LoggerFactory.getLogger(SigningProfileItemFactory.class); protected static final String DEVELOPER_KEY_PASSWORD = "tizenpkcs12passfordsigner"; //$NON-NLS-1$ @@ -70,7 +72,7 @@ implements Factory{ profileItem.setKeyLocation( getDeveloperKeyPath() ); profileItem.setPassword( DEVELOPER_KEY_PASSWORD.toCharArray() ); } catch (IOException e) { - Logger.log(e); + logger.error("Failed to set profileItem", e); } profileItem.setIdentifier(StringUtil.EMPTY_STRING); //$NON-NLS-1$ profileItem.setAuthor(false); diff --git a/org.tizen.common/src/org/tizen/common/CommonPlugin.java b/org.tizen.common/src/org/tizen/common/CommonPlugin.java index c078315..3ffec2b 100755 --- a/org.tizen.common/src/org/tizen/common/CommonPlugin.java +++ b/org.tizen.common/src/org/tizen/common/CommonPlugin.java @@ -33,6 +33,8 @@ import org.eclipse.core.runtime.RegistryFactory; import org.eclipse.jface.preference.IPreferenceStore; import org.eclipse.ui.plugin.AbstractUIPlugin; import org.osgi.framework.BundleContext; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.tizen.common.core.application.InstallPathConfig; import org.tizen.common.core.command.EclipseExecutor; import org.tizen.common.core.command.Executor; @@ -44,7 +46,6 @@ import org.tizen.common.ui.page.preference.TizenBasePreferencePage; import org.tizen.common.util.DialogUtil; import org.tizen.common.util.HostUtil; import org.tizen.common.util.OSChecker; -import org.tizen.common.util.log.Logger; import org.tizen.common.util.log.TizenLog4jConfigurator; import org.tizen.sdblib.CrashReportService; import org.tizen.sdblib.ICrashReportServiceListener; @@ -55,6 +56,7 @@ import org.tizen.sdblib.SmartDevelopmentBridge; * @author Changhyun Lee {@literal } (S-Core) */ public class CommonPlugin extends AbstractUIPlugin { + private static final Logger logger = LoggerFactory.getLogger(CommonPlugin.class); // The plug-in ID public static final String PLUGIN_ID = "org.tizen.common"; //$NON-NLS-1$ @@ -95,7 +97,7 @@ public class CommonPlugin extends AbstractUIPlugin { SmartDevelopmentBridge.init(); SmartDevelopmentBridge.createBridge(sdbPath, true); } catch (Throwable t) { - Logger.error("Problem occurred while initializing sdb", t.getMessage(), t); + logger.error("Problem occurred while initializing sdb", t.getMessage(), t); DialogUtil.openErrorDialog("Failed to start sdb"); } } @@ -211,7 +213,7 @@ public class CommonPlugin extends AbstractUIPlugin { CrashReportService.addCrashReportServiceListener((ICrashReportServiceListener)obj); } } catch (CoreException e) { - Logger.warning("Error occurred while adding cs create listener" , e); + logger.warn("Error occurred while adding CrashReportServiceListener", e); } } } diff --git a/org.tizen.common/src/org/tizen/common/rds/RdsDeltaDetector.java b/org.tizen.common/src/org/tizen/common/rds/RdsDeltaDetector.java index 272afc1..fcb07ce 100755 --- a/org.tizen.common/src/org/tizen/common/rds/RdsDeltaDetector.java +++ b/org.tizen.common/src/org/tizen/common/rds/RdsDeltaDetector.java @@ -47,8 +47,9 @@ import org.eclipse.core.internal.watson.ElementTreeReader; import org.eclipse.core.internal.watson.ElementTreeWriter; import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.IPath; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.tizen.common.util.IOUtil; -import org.tizen.common.util.log.Logger; import org.tizen.sdblib.IDevice; import org.tizen.sdblib.SyncService; import org.tizen.sdblib.SyncService.SyncResult; @@ -60,6 +61,8 @@ import org.tizen.sdblib.SyncService.SyncResult; */ @SuppressWarnings("restriction") public class RdsDeltaDetector { + private static final Logger logger = LoggerFactory.getLogger(RdsDeltaDetector.class); + ElementTree oldTree; IDevice device; IProject project; @@ -92,7 +95,7 @@ public class RdsDeltaDetector { input = new DataInputStream(new SafeFileInputStream(strLocalFile, strLocalFile + ".temp", TREE_BUFFER_SIZE)); oldTree = treeReader.readTree(input); } catch (IOException e) { - Logger.log(e); + logger.error("Failed to read", e); } finally { IOUtil.tryClose(input); } diff --git a/org.tizen.common/src/org/tizen/common/ui/dialog/NewIconDialog.java b/org.tizen.common/src/org/tizen/common/ui/dialog/NewIconDialog.java index e230fc1..af0a2e7 100644 --- a/org.tizen.common/src/org/tizen/common/ui/dialog/NewIconDialog.java +++ b/org.tizen.common/src/org/tizen/common/ui/dialog/NewIconDialog.java @@ -59,16 +59,18 @@ import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Shell; import org.eclipse.swt.widgets.Text; import org.eclipse.ui.dialogs.SelectionStatusDialog; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.tizen.common.CommonPlugin; import org.tizen.common.ScreenDensity; import org.tizen.common.util.ImageUtil; import org.tizen.common.util.StringUtil; -import org.tizen.common.util.log.Logger; /** * The original source is org.tizen.nativecpp.misc.editor.UiNewIconDialog */ public class NewIconDialog extends SelectionStatusDialog { + private static final Logger logger = LoggerFactory.getLogger(NewIconDialog.class); public static final String ICON_FILE_NAME = "icon.png"; public static final String[] ICON_FILTER_EXTENSIONS = { "*.png;*.gif;*.jpg" }; @@ -227,7 +229,7 @@ public class NewIconDialog extends SelectionStatusDialog { destFile.delete(true, null); } } catch (CoreException e) { - Logger.log(e); + logger.error("Failed to delete", e); } } } @@ -239,7 +241,7 @@ public class NewIconDialog extends SelectionStatusDialog { loader.save(destFilePath, SWT.IMAGE_PNG); destFile.getParent().refreshLocal(1, null); } catch (CoreException e1) { - Logger.log(e1); + logger.error("Failed to save", e1); } super.okPressed(); // widget will be disposed diff --git a/org.tizen.common/src/org/tizen/common/ui/view/console/ConsoleManager.java b/org.tizen.common/src/org/tizen/common/ui/view/console/ConsoleManager.java index a9b0429..aea2625 100755 --- a/org.tizen.common/src/org/tizen/common/ui/view/console/ConsoleManager.java +++ b/org.tizen.common/src/org/tizen/common/ui/view/console/ConsoleManager.java @@ -72,17 +72,7 @@ implements ITizenConsoleManager } /** - * Change Console Name. - * - * @deprecated This method has been deprecated by {@link #changeConsoleName(String)} - */ - @Deprecated - public void changeConsolName(String newName) throws NoSuchFieldException, IllegalAccessException { - changeConsoleName(newName); - } - - /** - * Change Console Name. + * Changes console name. * * @param newName - console Title. It shown console's tab bar. * @author Gyeongseok.seo@samsung.com diff --git a/org.tizen.common/src/org/tizen/common/util/StringUtil.java b/org.tizen.common/src/org/tizen/common/util/StringUtil.java index cc9f01a..012379b 100755 --- a/org.tizen.common/src/org/tizen/common/util/StringUtil.java +++ b/org.tizen.common/src/org/tizen/common/util/StringUtil.java @@ -34,7 +34,8 @@ import java.util.ArrayList; import java.util.List; import java.util.StringTokenizer; -import org.tizen.common.util.log.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * @author Changhyun Lee {@literal } (S-Core) @@ -50,6 +51,8 @@ import org.tizen.common.util.log.Logger; */ public class StringUtil { + private static final Logger logger = LoggerFactory.getLogger(StringUtil.class); + /** * Empty String */ @@ -1075,7 +1078,7 @@ public class StringUtil if ( index < 0 || doc.length() < index ) { - Logger.debug( "Index[{0}] is out of bound :[0:{1}]", index, doc.length() ); + logger.debug( "Index[{0}] is out of bound :[0:{1}]", index, doc.length() ); return ""; } @@ -1086,7 +1089,7 @@ public class StringUtil ch = doc.charAt( index ); bNeedWord = Character.isWhitespace( ch ); } - Logger.debug( "Character at index :'{0}'", (char ) ch ); + logger.debug( "Character at index :'{0}'", (char ) ch ); for ( int i = index - 1 ; 0 <= i ; --i ) { ch = doc.charAt( i ); @@ -1097,7 +1100,7 @@ public class StringUtil { continue; } - Logger.debug( "Meet space at column {0}", i ); + logger.debug( "Meet space at column {0}", i ); break; } bNeedWord = false; -- 2.7.4