From: kh5325.kim Date: Sat, 5 Oct 2013 04:39:00 +0000 (+0900) Subject: Fixed some Prevent issues X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0ea2214328df63121a6a71ce0a47034edd598e07;p=sdk%2Fide%2Fcommon-eplugin.git Fixed some Prevent issues Change-Id: I0cc9f1ccdf6b8306851c58aa12813cb2680d3f28 Signed-off-by: kh5325.kim --- diff --git a/org.tizen.common.connection/src/org/tizen/common/connection/ui/SyncProgressMonitor.java b/org.tizen.common.connection/src/org/tizen/common/connection/ui/SyncProgressMonitor.java index c8c11aa..8faa4ef 100644 --- a/org.tizen.common.connection/src/org/tizen/common/connection/ui/SyncProgressMonitor.java +++ b/org.tizen.common.connection/src/org/tizen/common/connection/ui/SyncProgressMonitor.java @@ -53,7 +53,7 @@ public class SyncProgressMonitor implements ISyncProgressMonitor protected long worked; - protected int estimated; + //protected int estimated; protected int rate; @@ -82,7 +82,7 @@ public class SyncProgressMonitor implements ISyncProgressMonitor { this.totalWork = totalWork; this.rate = 1; - this.estimated = 0; + //this.estimated = 0; while (totalWork > Integer.MAX_VALUE) { @@ -131,18 +131,25 @@ public class SyncProgressMonitor implements ISyncProgressMonitor final String toStr; final String sizeStr; - String[] subTasks = name.split("\t"); - if (name == null || subTasks.length != 2) + if (name == null) { - fromStr = subTasks[0]; - toStr = ""; - sizeStr = ""; + fromStr = toStr = sizeStr = ""; } else { - fromStr = labelFrom + subTasks[0]; - toStr = labelTo + subTasks[1]; - sizeStr = labelSize + String.format("( %s / %s )", getSizeAndUnit(getWorked()), getSizeAndUnit(getTotal())); + String[] subTasks = name.split("\t"); + if (subTasks.length != 2) + { + fromStr = subTasks[0]; + toStr = ""; + sizeStr = ""; + } + else + { + fromStr = labelFrom + subTasks[0]; + toStr = labelTo + subTasks[1]; + sizeStr = labelSize + String.format("( %s / %s )", getSizeAndUnit(getWorked()), getSizeAndUnit(getTotal())); + } } SWTUtil.asyncExec(new Runnable() diff --git a/org.tizen.common.connection/src/org/tizen/common/connection/ui/TizenRemoteFileImageLoader.java b/org.tizen.common.connection/src/org/tizen/common/connection/ui/TizenRemoteFileImageLoader.java index 20e8ed8..3263de9 100644 --- a/org.tizen.common.connection/src/org/tizen/common/connection/ui/TizenRemoteFileImageLoader.java +++ b/org.tizen.common.connection/src/org/tizen/common/connection/ui/TizenRemoteFileImageLoader.java @@ -35,6 +35,7 @@ import org.eclipse.swt.graphics.Color; import org.eclipse.swt.graphics.GC; import org.eclipse.swt.graphics.Image; import org.eclipse.swt.widgets.Display; +import org.tizen.common.util.IOUtil; public class TizenRemoteFileImageLoader { @@ -129,11 +130,14 @@ public class TizenRemoteFileImageLoader { if (img == null) { String tmp = PATH + filename; InputStream imageStream = mClass.getResourceAsStream(tmp); - - if (imageStream != null) { - img = new Image(display, imageStream); - mLoadedImages.put(filename, img); - return img; + try { + if (imageStream != null) { + img = new Image(display, imageStream); + mLoadedImages.put(filename, img); + return img; + } + } finally { + IOUtil.tryClose(imageStream); } } return img; diff --git a/org.tizen.common.gom/src/org/tizen/common/gom/smartlaunch/handler/GomSmartLaunchCycleHandler.java b/org.tizen.common.gom/src/org/tizen/common/gom/smartlaunch/handler/GomSmartLaunchCycleHandler.java index f6e6f7d..84469e3 100644 --- a/org.tizen.common.gom/src/org/tizen/common/gom/smartlaunch/handler/GomSmartLaunchCycleHandler.java +++ b/org.tizen.common.gom/src/org/tizen/common/gom/smartlaunch/handler/GomSmartLaunchCycleHandler.java @@ -63,8 +63,8 @@ public class GomSmartLaunchCycleHandler extends CycleBaseHandler { GomMessages.SMARTLAUNCH_CYCLE_COLUMNS_4}; private String[] sampleColumns = {"Profile", "ProjectProject", "LaunchConfigurationLaunchConfiguration", "emulator-xxxxx"}; - private final String TIZEN_SMART_LAUNCH_UP_ID="org.tizen.common.gom.smartlaunch.ui.tizensmartlauncher.up"; - private final String TIZEN_SMART_LAUNCH_DOWN_ID="org.tizen.common.gom.smartlaunch.ui.tizensmartlauncher.down"; + private final static String TIZEN_SMART_LAUNCH_UP_ID="org.tizen.common.gom.smartlaunch.ui.tizensmartlauncher.up"; + private final static String TIZEN_SMART_LAUNCH_DOWN_ID="org.tizen.common.gom.smartlaunch.ui.tizensmartlauncher.down"; @Override protected void addItems(Table table, WorkbenchPage page) { diff --git a/org.tizen.common.gom/src/org/tizen/common/gom/smartlaunch/ui/GomDialog.java b/org.tizen.common.gom/src/org/tizen/common/gom/smartlaunch/ui/GomDialog.java index ffd1310..78bc227 100644 --- a/org.tizen.common.gom/src/org/tizen/common/gom/smartlaunch/ui/GomDialog.java +++ b/org.tizen.common.gom/src/org/tizen/common/gom/smartlaunch/ui/GomDialog.java @@ -49,15 +49,7 @@ import org.eclipse.swt.events.SelectionListener; import org.eclipse.swt.graphics.Rectangle; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; -import org.eclipse.swt.widgets.Button; -import org.eclipse.swt.widgets.Combo; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Control; -import org.eclipse.swt.widgets.Group; -import org.eclipse.swt.widgets.Label; -import org.eclipse.swt.widgets.Shell; -import org.eclipse.swt.widgets.Text; -import org.eclipse.swt.widgets.Tree; +import org.eclipse.swt.widgets.*; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.activities.WorkbenchActivityHelper; import org.tizen.common.ITizenNativeProject; @@ -70,8 +62,8 @@ import org.tizen.common.util.StringUtil; public class GomDialog extends TitleAreaDialog{ - private final int WIDTH = 500; - private final int HEIGHT = 500; + private final static int WIDTH = 500; + private final static int HEIGHT = 500; private Label lbBuild; private Button[] btnMode; @@ -315,7 +307,7 @@ public class GomDialog extends TitleAreaDialog{ { String config = configList.get(i); comboBuildConfiguration.add(configList.get(i)); - if(defaultConfig.equals(config)) + if(defaultConfig != null && defaultConfig.equals(config)) { setSelectionBuildConfiguration(i); } diff --git a/org.tizen.common.sdblib/src/org/tizen/sdblib/receiver/DlogReceiver.java b/org.tizen.common.sdblib/src/org/tizen/sdblib/receiver/DlogReceiver.java index 7d5c5ee..d734452 100644 --- a/org.tizen.common.sdblib/src/org/tizen/sdblib/receiver/DlogReceiver.java +++ b/org.tizen.common.sdblib/src/org/tizen/sdblib/receiver/DlogReceiver.java @@ -19,9 +19,10 @@ public class DlogReceiver extends MultiLineReceiver { @Override public void processNewLines(String[] lines) { DlogInfo[] infos = DlogUtil.getDlogInfos(dlogFormat, lines); - - for (DlogInfo info : infos) { - dlogUtilLogs.add(info); + if (infos != null) { + for (DlogInfo info : infos) { + dlogUtilLogs.add(info); + } } } 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 684d647..bd66149 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 @@ -68,12 +68,13 @@ public class SignCommand extends FileHandlingCommand { if ( !handler.is( this.path, Attribute.EXISTS ) ) { final Policy policy = context.getPolicy( Policy.NONEXIST_IN_PROJECT ); - final MessagePolicy messagePolicy = policy.adapt( MessagePolicy.class ); - - if ( messagePolicy != null ) { - messagePolicy.print( context.getPrompter(), "{0} doesn't exist", this.path ); + if ( policy != null ) { + final MessagePolicy messagePolicy = policy.adapt( MessagePolicy.class ); + + if ( messagePolicy != null ) { + messagePolicy.print( context.getPrompter(), "{0} doesn't exist", this.path ); + } } - return ; } 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 a9cbaf8..826d52e 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 @@ -109,7 +109,6 @@ public class SigningPreferencePage extends PreferencePage implements IWorkbenchP protected List