From a5b64eee5dec78ee2e2f775ffc2e5e2d296b4e46 Mon Sep 17 00:00:00 2001 From: jeonghwan kim Date: Fri, 21 Mar 2014 10:54:57 +0900 Subject: [PATCH] UIB : throw Illegal ArgumentException -> Using Assert & Initialize class member Change-Id: I2dae9b8d78ae5789ce449c5d0c2889ee9fbcad0e Signed-off-by: jeonghwan kim --- .../pagetemplate/action/CreateAction.java | 4 +-- .../pagetemplate/action/DeleteAction.java | 3 +- .../pagetemplate/action/ExportAction.java | 1 - .../pagetemplate/action/ImportAction.java | 1 - .../pagetemplate/action/RenameAction.java | 2 +- .../pagetemplate/loader/TemplateGroupLoader.java | 2 +- .../pagetemplate/loader/TemplateLoader.java | 2 +- .../pagetemplate/manager/TemplateManager.java | 2 +- .../webuibuilder/pagetemplate/model/Template.java | 2 +- .../pagetemplate/model/TemplateGroup.java | 4 +-- .../ui/wizard/policy/CreatePolicy.java | 8 ++--- .../ui/wizard/policy/EditorOpenPolicy.java | 2 +- .../ui/wizard/policy/ExportPolicy.java | 4 +-- .../ui/wizard/policy/ImportPolicy.java | 4 +-- .../ui/wizard/policy/NewPagePolicy.java | 6 ++-- .../ui/editor/PageDesignerContextMenu.java | 5 ++- .../ui/views/resources/PageDesignerDnDHooker.java | 2 +- .../ui/views/resources/ResourcesPage.java | 38 +++++----------------- .../resources/ResourcesViewDropTargetAdapter.java | 2 +- .../org/tizen/webuibuilder/utility/ImageUtils.java | 14 +++----- .../webuibuilder/utility/ResourceManager.java | 5 ++- .../tizen/webuibuilder/utility/ResourceUtil.java | 5 ++- 22 files changed, 44 insertions(+), 74 deletions(-) diff --git a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/pagetemplate/action/CreateAction.java b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/pagetemplate/action/CreateAction.java index e332ad8..6b9176c 100644 --- a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/pagetemplate/action/CreateAction.java +++ b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/pagetemplate/action/CreateAction.java @@ -39,8 +39,8 @@ import org.tizen.webuibuilder.pagetemplate.ui.wizards.CreateWizard; public class CreateAction extends SelectionAction { - private EditPart rootEditPart; - private DescriptorManager descriptorManager; + private EditPart rootEditPart = null; + private DescriptorManager descriptorManager = null; public CreateAction(IWorkbenchPart part, EditPart rootEditPart, DescriptorManager descriptorManager) { diff --git a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/pagetemplate/action/DeleteAction.java b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/pagetemplate/action/DeleteAction.java index f9413b5..cbe6e1d 100644 --- a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/pagetemplate/action/DeleteAction.java +++ b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/pagetemplate/action/DeleteAction.java @@ -30,8 +30,7 @@ import org.tizen.webuibuilder.snippet.ui.wizards.policy.PaletteRefreshPolicy; public class DeleteAction extends SelectionAction { - - private ISnippet snippet; + private ISnippet snippet = null; public DeleteAction(ISnippet snippet) { super(null); diff --git a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/pagetemplate/action/ExportAction.java b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/pagetemplate/action/ExportAction.java index 6741064..1bfbb94 100644 --- a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/pagetemplate/action/ExportAction.java +++ b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/pagetemplate/action/ExportAction.java @@ -32,7 +32,6 @@ import org.tizen.webuibuilder.snippet.ui.wizards.ExportWizard; public class ExportAction extends SelectionAction { - public ExportAction() { super(null); setText("Export"); diff --git a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/pagetemplate/action/ImportAction.java b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/pagetemplate/action/ImportAction.java index e2a816b..84e5e69 100644 --- a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/pagetemplate/action/ImportAction.java +++ b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/pagetemplate/action/ImportAction.java @@ -32,7 +32,6 @@ import org.tizen.webuibuilder.snippet.ui.wizards.ImportWizard; public class ImportAction extends SelectionAction { - public ImportAction() { super(null); setText("Import"); diff --git a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/pagetemplate/action/RenameAction.java b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/pagetemplate/action/RenameAction.java index 040324b..d32bbb7 100644 --- a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/pagetemplate/action/RenameAction.java +++ b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/pagetemplate/action/RenameAction.java @@ -34,7 +34,7 @@ import org.tizen.webuibuilder.snippet.validator.SnippetNameInputValidator; public class RenameAction extends SelectionAction { - private ISnippet snippet; + private ISnippet snippet = null; public RenameAction(ISnippet snippet) { super(null); diff --git a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/pagetemplate/loader/TemplateGroupLoader.java b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/pagetemplate/loader/TemplateGroupLoader.java index afb559d..9deab3c 100644 --- a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/pagetemplate/loader/TemplateGroupLoader.java +++ b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/pagetemplate/loader/TemplateGroupLoader.java @@ -35,7 +35,7 @@ import org.tizen.webuibuilder.snippet.model.jaxb.Metadata; public class TemplateGroupLoader implements ITemplateGroupLoader { private static final String VERSION = "1.0"; - public ITemplateGroup templateGroup; + public ITemplateGroup templateGroup = null; public TemplateGroupLoader() { super(); diff --git a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/pagetemplate/loader/TemplateLoader.java b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/pagetemplate/loader/TemplateLoader.java index 3e6f491..0fb07ee 100644 --- a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/pagetemplate/loader/TemplateLoader.java +++ b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/pagetemplate/loader/TemplateLoader.java @@ -42,7 +42,7 @@ import org.tizen.webuibuilder.utility.ResourceUtil; public class TemplateLoader implements ITemplateLoader { private static final String VERSION = "1.0"; - public ITemplate template; + public ITemplate template = null; public TemplateLoader() { super(); diff --git a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/pagetemplate/manager/TemplateManager.java b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/pagetemplate/manager/TemplateManager.java index 291e407..f9c33ba 100644 --- a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/pagetemplate/manager/TemplateManager.java +++ b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/pagetemplate/manager/TemplateManager.java @@ -38,7 +38,7 @@ import org.tizen.webuibuilder.utility.ResourceUtil; public class TemplateManager implements ITemplateManager { - private List templateGroups; + private List templateGroups = null; public TemplateManager() { super(); diff --git a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/pagetemplate/model/Template.java b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/pagetemplate/model/Template.java index 5bace5f..62a3262 100644 --- a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/pagetemplate/model/Template.java +++ b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/pagetemplate/model/Template.java @@ -27,7 +27,7 @@ import org.tizen.webuibuilder.snippet.model.Snippet; public class Template extends Snippet implements ITemplate { - private String previewPath; + private String previewPath = null; public Template() { super(); diff --git a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/pagetemplate/model/TemplateGroup.java b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/pagetemplate/model/TemplateGroup.java index 7741736..b764ce8 100644 --- a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/pagetemplate/model/TemplateGroup.java +++ b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/pagetemplate/model/TemplateGroup.java @@ -28,8 +28,8 @@ import java.util.List; public class TemplateGroup implements ITemplateGroup { - private List templates; - private String name; + private List templates = null; + private String name = null; public TemplateGroup() { templates = new ArrayList(); diff --git a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/pagetemplate/ui/wizard/policy/CreatePolicy.java b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/pagetemplate/ui/wizard/policy/CreatePolicy.java index e585614..297c96e 100644 --- a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/pagetemplate/ui/wizard/policy/CreatePolicy.java +++ b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/pagetemplate/ui/wizard/policy/CreatePolicy.java @@ -43,10 +43,10 @@ import org.tizen.webuibuilder.utility.ResourceManager; public class CreatePolicy implements IWizardPolicy { - private List parts; - private ITemplateGroup group; - private String name; - private DescriptorManager descriptorManager; + private List parts = null; + private ITemplateGroup group = null; + private String name = null; + private DescriptorManager descriptorManager = null; private CreatePolicy() { super(); diff --git a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/pagetemplate/ui/wizard/policy/EditorOpenPolicy.java b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/pagetemplate/ui/wizard/policy/EditorOpenPolicy.java index eb44462..10bcfac 100644 --- a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/pagetemplate/ui/wizard/policy/EditorOpenPolicy.java +++ b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/pagetemplate/ui/wizard/policy/EditorOpenPolicy.java @@ -35,7 +35,7 @@ import org.tizen.webuibuilder.ui.wizards.IWizardPolicy; public class EditorOpenPolicy implements IWizardPolicy { - private IFile fFile; + private IFile fFile = null; private EditorOpenPolicy() { super(); diff --git a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/pagetemplate/ui/wizard/policy/ExportPolicy.java b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/pagetemplate/ui/wizard/policy/ExportPolicy.java index 83a0e7b..a7dee45 100644 --- a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/pagetemplate/ui/wizard/policy/ExportPolicy.java +++ b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/pagetemplate/ui/wizard/policy/ExportPolicy.java @@ -30,8 +30,8 @@ import org.tizen.webuibuilder.ui.wizards.IWizardPolicy; public class ExportPolicy implements IWizardPolicy { - private ITemplate template; - private String path; + private ITemplate template = null; + private String path = null; private ExportPolicy() { super(); diff --git a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/pagetemplate/ui/wizard/policy/ImportPolicy.java b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/pagetemplate/ui/wizard/policy/ImportPolicy.java index efc4119..3b465ef 100644 --- a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/pagetemplate/ui/wizard/policy/ImportPolicy.java +++ b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/pagetemplate/ui/wizard/policy/ImportPolicy.java @@ -31,8 +31,8 @@ import org.tizen.webuibuilder.ui.wizards.IWizardPolicy; public class ImportPolicy implements IWizardPolicy { - private ITemplate template; - private ITemplateGroup templateGroup; + private ITemplate template = null; + private ITemplateGroup templateGroup = null; private ImportPolicy() { super(); diff --git a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/pagetemplate/ui/wizard/policy/NewPagePolicy.java b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/pagetemplate/ui/wizard/policy/NewPagePolicy.java index c1c5f0f..5f59171 100644 --- a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/pagetemplate/ui/wizard/policy/NewPagePolicy.java +++ b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/pagetemplate/ui/wizard/policy/NewPagePolicy.java @@ -30,9 +30,9 @@ import org.tizen.webuibuilder.ui.wizards.IWizardPolicy; public class NewPagePolicy implements IWizardPolicy { - private Object model; - private String name; - private ITemplate template; + private Object model = null; + private String name = null; + private ITemplate template = null; private NewPagePolicy() { super(); diff --git a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/editor/PageDesignerContextMenu.java b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/editor/PageDesignerContextMenu.java index c5373d3..b25e623 100644 --- a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/editor/PageDesignerContextMenu.java +++ b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/editor/PageDesignerContextMenu.java @@ -30,6 +30,7 @@ import org.eclipse.ui.IWorkbenchWindow; import org.eclipse.ui.actions.ActionFactory; import org.eclipse.ui.actions.LabelRetargetAction; import org.eclipse.ui.internal.WorkbenchMessages; +import org.tizen.common.util.Assert; import org.tizen.webuibuilder.contextmenu.ContextMenu; @@ -46,9 +47,7 @@ public class PageDesignerContextMenu extends ContextMenu { */ @Override public IWorkbenchAction create(IWorkbenchWindow window) { - if (window == null) { - throw new IllegalArgumentException(); - } + Assert.notNull(window); LabelRetargetAction action = new LabelRetargetAction(getId(), WorkbenchMessages.Workbench_redo); action.setToolTipText(WorkbenchMessages.Workbench_redoToolTip); diff --git a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/resources/PageDesignerDnDHooker.java b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/resources/PageDesignerDnDHooker.java index 520c9a5..93c55f2 100644 --- a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/resources/PageDesignerDnDHooker.java +++ b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/resources/PageDesignerDnDHooker.java @@ -34,7 +34,7 @@ import org.tizen.webuibuilder.ui.views.resources.model.Resource; public class PageDesignerDnDHooker implements TemplateTransferDropTargetListener2 { - private ResourcesPage page; + private ResourcesPage page = null; public PageDesignerDnDHooker(ResourcesPage page) { this.page = page; diff --git a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/resources/ResourcesPage.java b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/resources/ResourcesPage.java index cdb7297..a220c4d 100644 --- a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/resources/ResourcesPage.java +++ b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/resources/ResourcesPage.java @@ -81,6 +81,7 @@ import org.eclipse.ui.ISharedImages; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.actions.ActionFactory; import org.eclipse.ui.part.Page; +import org.tizen.common.util.Assert; import org.tizen.common.util.EFSUtil; import org.tizen.webuibuilder.gef.dnd.model.ResourceTemplate; import org.tizen.webuibuilder.ui.SelectionProvider; @@ -385,10 +386,7 @@ public class ResourcesPage extends Page implements PalettePage, ModifyListener, } public void setInput(IProject project) { - if (project == null) { - throw new IllegalArgumentException(); - } - + Assert.notNull(project); IResource resource = project.findMember(ResourcesViewMessages.RESOURCES_FOLDER); if (resource == null) { // TODO : @@ -406,10 +404,7 @@ public class ResourcesPage extends Page implements PalettePage, ModifyListener, } private void setInput(IFolder folder) { - if (folder == null) { - throw new IllegalArgumentException(); - } - + Assert.notNull(folder); project = folder.getProject(); currentFolder = folder; resources = getResources(currentFolder); @@ -454,13 +449,8 @@ public class ResourcesPage extends Page implements PalettePage, ModifyListener, * @return {@link PaletteRoot} */ private PaletteRoot getPaletteRoot(IFolder folder, List resources) { - if (folder == null) { - throw new IllegalArgumentException(); - } - - if (resources == null) { - throw new IllegalArgumentException(); - } + Assert.notNull(folder); + Assert.notNull(resources); // initialize PaletteRoot PaletteRoot root = new PaletteRoot(); @@ -748,13 +738,8 @@ public class ResourcesPage extends Page implements PalettePage, ModifyListener, } private List getRegExpFilteredResources(List resources, String exp) { - if (resources == null) { - throw new IllegalArgumentException(); - } - - if (exp == null) { - throw new IllegalArgumentException(); - } + Assert.notNull(resources); + Assert.notNull(exp); if (exp.equals("")) { return resources; @@ -771,13 +756,8 @@ public class ResourcesPage extends Page implements PalettePage, ModifyListener, } private List getExtensionFilteredResources(List resources, String exp) { - if (resources == null) { - throw new IllegalArgumentException(); - } - - if (exp == null) { - throw new IllegalArgumentException(); - } + Assert.notNull(resources); + Assert.notNull(exp); if (exp.equals("*.*")) { return resources; diff --git a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/resources/ResourcesViewDropTargetAdapter.java b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/resources/ResourcesViewDropTargetAdapter.java index 5d0c56f..b9b9099 100644 --- a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/resources/ResourcesViewDropTargetAdapter.java +++ b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/resources/ResourcesViewDropTargetAdapter.java @@ -30,7 +30,7 @@ import org.eclipse.swt.dnd.DropTargetEvent; public class ResourcesViewDropTargetAdapter extends DropTargetAdapter { - private ResourcesPage page; + private ResourcesPage page = null; public ResourcesViewDropTargetAdapter(ResourcesPage page) { this.page = page; diff --git a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/utility/ImageUtils.java b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/utility/ImageUtils.java index 38bdf04..547d66d 100644 --- a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/utility/ImageUtils.java +++ b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/utility/ImageUtils.java @@ -33,6 +33,7 @@ import org.eclipse.swt.graphics.ImageLoader; import org.eclipse.swt.graphics.Point; import org.eclipse.swt.graphics.Rectangle; import org.eclipse.swt.widgets.Display; +import org.tizen.common.util.Assert; public class ImageUtils { @@ -70,9 +71,7 @@ public class ImageUtils { * @return */ public static Image resizeBestSize(Image image, int maxWidth, int maxHeight) { - // Check for null - if (image == null) - throw new IllegalArgumentException(); + Assert.notNull(image); // Calculate best size Point newSize = @@ -83,8 +82,7 @@ public class ImageUtils { } public static ImageData resize(ImageData imageData, int width, int height, boolean antiAliasing) { - if (imageData == null) - throw new IllegalArgumentException(); + Assert.notNull(imageData); if (imageData.width == width && imageData.height == height) return imageData; @@ -117,8 +115,7 @@ public class ImageUtils { * @return */ public static Image resize(Image image, int width, int height) { - if (image == null) - throw new IllegalArgumentException(); + Assert.notNull(image); final Image scaled = new Image(Display.getDefault(), width, height); GC gc = new GC(scaled); @@ -139,8 +136,7 @@ public class ImageUtils { } public static byte[] saveImage(Image image, int format) { - if (image == null) - throw new IllegalArgumentException(); + Assert.notNull(image); ImageLoader il = new ImageLoader(); il.data = new ImageData[] { image.getImageData() }; diff --git a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/utility/ResourceManager.java b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/utility/ResourceManager.java index 75b4ca6..1d0ff90 100644 --- a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/utility/ResourceManager.java +++ b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/utility/ResourceManager.java @@ -35,6 +35,7 @@ import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jface.resource.ImageRegistry; import org.eclipse.swt.graphics.Image; import org.eclipse.ui.plugin.AbstractUIPlugin; +import org.tizen.common.util.Assert; import org.tizen.webuibuilder.BuilderConstants; import org.tizen.webuibuilder.BuilderPlugin; @@ -109,9 +110,7 @@ public class ResourceManager { * @return URL of resource file */ public static URL getResource(String name) { - if (name == null) { - throw new IllegalArgumentException(); - } + Assert.notNull(name); return BuilderPlugin.getDefault().getBundle().getResource(name); } diff --git a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/utility/ResourceUtil.java b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/utility/ResourceUtil.java index 5c40745..ed79a0e 100644 --- a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/utility/ResourceUtil.java +++ b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/utility/ResourceUtil.java @@ -27,6 +27,7 @@ import java.io.IOException; import java.net.URL; import org.eclipse.core.runtime.FileLocator; +import org.tizen.common.util.Assert; import org.tizen.webuibuilder.BuilderPlugin; @@ -57,9 +58,7 @@ public class ResourceUtil { * @return String of absolute path */ public static String getAbsolutePath(String bundleRelativePath) { - if (bundleRelativePath == null) { - throw new IllegalArgumentException(); - } + Assert.notNull(bundleRelativePath); URL url = BuilderPlugin.getDefault().getBundle().getEntry(""); String bundleAbsPath = getAbsolutePath(url); -- 2.7.4