From: SeokYeon Hwang Date: Wed, 3 Feb 2016 05:48:25 +0000 (+0900) Subject: resources: correct some class names X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a2cf2fde9342ed8495239ea50729f759b44921c6;p=sdk%2Femulator%2Femulator-manager.git resources: correct some class names Change-Id: Ie15552216e428eaf157431242f048d22cdbe227f Signed-off-by: SeokYeon Hwang --- diff --git a/src/org/tizen/emulator/manager/renewal/resources/ColorResources.java b/src/org/tizen/emulator/manager/renewal/resources/ColorResource.java similarity index 92% rename from src/org/tizen/emulator/manager/renewal/resources/ColorResources.java rename to src/org/tizen/emulator/manager/renewal/resources/ColorResource.java index f50ecef..0a9cb40 100644 --- a/src/org/tizen/emulator/manager/renewal/resources/ColorResources.java +++ b/src/org/tizen/emulator/manager/renewal/resources/ColorResource.java @@ -33,7 +33,7 @@ import org.eclipse.swt.graphics.Color; import org.eclipse.swt.graphics.RGB; import org.eclipse.swt.widgets.Display; -public enum ColorResources { +public enum ColorResource { WHITE(255, 255, 255), BLACK(0, 0, 0), RED(255, 0, 0), @@ -91,14 +91,14 @@ public enum ColorResources { // TODO I guess .. little brighter than MESSAGE_BOX_CONTENTS_FONT DISABLED_TEXT(160, 160, 160); - public static ColorResources GRAY_BTN_FONT = WHITE; - public static ColorResources CONTENT_FONT = MESSAGE_BOX_CONTENTS_FONT; + public static ColorResource GRAY_BTN_FONT = WHITE; + public static ColorResource CONTENT_FONT = MESSAGE_BOX_CONTENTS_FONT; Color color; int r,g,b; - ColorResources(int r, int g, int b) { + ColorResource(int r, int g, int b) { this.r = r; this.g = g; this.b = b; @@ -124,7 +124,7 @@ public enum ColorResources { } public static void dispose() { - for (ColorResources c : ColorResources.values()) { + for (ColorResource c : ColorResource.values()) { if (c.color != null) { c.color.dispose(); c.color = null; diff --git a/src/org/tizen/emulator/manager/renewal/resources/FontResources.java b/src/org/tizen/emulator/manager/renewal/resources/FontResource.java similarity index 94% rename from src/org/tizen/emulator/manager/renewal/resources/FontResources.java rename to src/org/tizen/emulator/manager/renewal/resources/FontResource.java index d6dd062..4fbc539 100644 --- a/src/org/tizen/emulator/manager/renewal/resources/FontResources.java +++ b/src/org/tizen/emulator/manager/renewal/resources/FontResource.java @@ -36,7 +36,7 @@ import org.eclipse.swt.graphics.FontData; import org.eclipse.swt.widgets.Display; import org.tizen.emulator.manager.EmulatorManager; -public enum FontResources { +public enum FontResource { GRAY_BTN_FONT("btn_font", resizeDefaultFont(10)), // * Nomal button @@ -54,13 +54,13 @@ public enum FontResources { DEFAULT_BOLD_FONT_9("default_font_9", setDefaultFontStyleAndSize(SWT.BOLD, 9)), DEFAULT_BOLD_FONT_8("default_font_8", setDefaultFontStyleAndSize(SWT.BOLD, 8)); - public static FontResources MODIFY_ITEM_TITLE = DEFAULT_FONT_9; - public static FontResources CONTENT = DEFAULT_FONT_9; + public static FontResource MODIFY_ITEM_TITLE = DEFAULT_FONT_9; + public static FontResource CONTENT = DEFAULT_FONT_9; String name; Font font; FontData[] data; - FontResources(String name, FontData[] data) { + FontResource(String name, FontData[] data) { this.name = name; this.data = data; } @@ -151,7 +151,7 @@ public enum FontResources { if (defaultFont != null) { defaultFont.dispose(); } - for (FontResources res : FontResources.values()) { + for (FontResource res : FontResource.values()) { if (res.font != null) { res.font.dispose(); res.font = null; diff --git a/src/org/tizen/emulator/manager/renewal/resources/ImageResources.java b/src/org/tizen/emulator/manager/renewal/resources/ImageResource.java similarity index 94% rename from src/org/tizen/emulator/manager/renewal/resources/ImageResources.java rename to src/org/tizen/emulator/manager/renewal/resources/ImageResource.java index df762ab..994ba0a 100644 --- a/src/org/tizen/emulator/manager/renewal/resources/ImageResources.java +++ b/src/org/tizen/emulator/manager/renewal/resources/ImageResource.java @@ -39,7 +39,7 @@ import org.eclipse.swt.graphics.ImageData; import org.eclipse.swt.widgets.Display; import org.tizen.emulator.manager.logging.EMLogger; -public enum ImageResources { +public enum ImageResource { // 9p button disable BTN_DISABLE_B("9p_btn_disable_b"), BTN_DISABLE_L("9p_btn_disable_l"), @@ -388,57 +388,37 @@ public enum ImageResources { BTN_BACK_HOVER("btn_back_hover"), BTN_BACK_DISABLE("btn_back_disable"); + String name; Image image; ImageData imageData; ImageType type; - ImageResources(String name) { - this.name = name; - this.type = ImageType.PNG; + + ImageResource(String name) { + this(name, ImageType.PNG); } - ImageResources(String name, ImageType type) { + ImageResource(String name, ImageType type) { this.name = name; this.type = type; - } - - public Image getImageObject() { - return image; - } - - public Image getImage() { - if (this.image == null) { - switch(this.type) { - case GIF: - this.image = ImageRegistry.getGifImage(name); - break; - case PNG: - this.image = ImageRegistry.getPngImage(name); - } - } + image = ImageRegistry.getImage(this, type); if (image == null) { - return Display.getCurrent().getSystemImage(SWT.ICON_WARNING); + image = Display.getCurrent().getSystemImage(SWT.ICON_WARNING); } + } + public Image getImage() { return image; } public ImageData getImageData() { - if (this.image == null) { - this.image = getImage(); - } - - if (this.image == null) { - return null; - } - - if (this.imageData == null) { - this.imageData = this.image.getImageData(); + if (imageData == null) { + imageData = image.getImageData(); } - return this.imageData; + return imageData; } @Override @@ -447,7 +427,7 @@ public enum ImageResources { } public static void dispose() { - for (ImageResources r : ImageResources.values()) { + for (ImageResource r : ImageResource.values()) { if (r.image != null) { r.image.dispose(); r.image = null; @@ -457,12 +437,12 @@ public enum ImageResources { } class ImageRegistry { - public static Image getImage(String name, String extension) { + static Image getImage(ImageResource res, ImageType type) { Image i = null; if (i == null) { ClassLoader loader = ImageRegistry.class.getClassLoader(); if (loader != null) { - InputStream is = loader.getResourceAsStream("renewal/res/" + name + "." + extension); //$NON-NLS-1$ //$NON-NLS-2$ + InputStream is = loader.getResourceAsStream("renewal/res/" + res + "." + type); //$NON-NLS-1$ //$NON-NLS-2$ if (is != null) { i = new Image(Display.getCurrent(), is); try { @@ -475,12 +455,4 @@ class ImageRegistry { } return i; } - - public static Image getPngImage(String name) { - return getImage(name, "png"); //$NON-NLS-1$ - } - - public static Image getGifImage(String name) { - return getImage(name, "gif"); //$NON-NLS-1$ - } } diff --git a/src/org/tizen/emulator/manager/renewal/resources/ImageType.java b/src/org/tizen/emulator/manager/renewal/resources/ImageType.java index 02371e9..c5799b7 100644 --- a/src/org/tizen/emulator/manager/renewal/resources/ImageType.java +++ b/src/org/tizen/emulator/manager/renewal/resources/ImageType.java @@ -34,11 +34,13 @@ public enum ImageType { PNG("png"),GIF("gif"); //$NON-NLS-1$ //$NON-NLS-2$ private String type; + ImageType(String type){ this.type = type; } - public String getType() { + @Override + public String toString() { return type; } } diff --git a/src/org/tizen/emulator/manager/renewal/resources/PatchImageResources.java b/src/org/tizen/emulator/manager/renewal/resources/PatchImageHelper.java similarity index 97% rename from src/org/tizen/emulator/manager/renewal/resources/PatchImageResources.java rename to src/org/tizen/emulator/manager/renewal/resources/PatchImageHelper.java index c8e6826..ffbf209 100644 --- a/src/org/tizen/emulator/manager/renewal/resources/PatchImageResources.java +++ b/src/org/tizen/emulator/manager/renewal/resources/PatchImageHelper.java @@ -39,7 +39,7 @@ import org.eclipse.swt.graphics.Rectangle; import org.eclipse.swt.widgets.Display; import org.tizen.emulator.manager.ui.renewal.widgets.NinePatchResourceInfo; -public class PatchImageResources { +public class PatchImageHelper { public static Image getThreePatchButtonImage(int width, NinePatchResourceInfo ninePatchImagesInfo) { Image leftImage = ninePatchImagesInfo.getLeftImage().getImage(); @@ -102,7 +102,7 @@ public class PatchImageResources { /** Image should be disposed by caller */ public static Image getNinePatchButtonImage(int width, int height, NinePatchResourceInfo ninePatchImagesInfo - , ColorResources parentBackground) { + , ColorResource parentBackground) { if (ninePatchImagesInfo == null) { return null; @@ -127,7 +127,7 @@ public class PatchImageResources { /** Image should be disposed by caller */ public static Image getBlueButtonImage(Image icon, int width, int height, NinePatchResourceInfo ninePatchImagesInfo) { - return PatchImageResources.getBlueButtonImage(icon, width, height, SWT.CENTER, ninePatchImagesInfo); + return PatchImageHelper.getBlueButtonImage(icon, width, height, SWT.CENTER, ninePatchImagesInfo); } public static Image getBlueButtonImage(Image icon, int width, int height, int style, @@ -187,7 +187,7 @@ public class PatchImageResources { gc.setInterpolation(SWT.NONE); // Draw background - gc.setBackground(ColorResources.WHITE.getColor()); + gc.setBackground(ColorResource.WHITE.getColor()); gc.fillRectangle(0, 0, width, height); drawNinePatchImage(gc, width, height, ninePatchImagesInfo); diff --git a/src/org/tizen/emulator/manager/ui/renewal/MainDialog.java b/src/org/tizen/emulator/manager/ui/renewal/MainDialog.java index 18f2add..449aec0 100644 --- a/src/org/tizen/emulator/manager/ui/renewal/MainDialog.java +++ b/src/org/tizen/emulator/manager/ui/renewal/MainDialog.java @@ -42,7 +42,7 @@ import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.Shell; import org.tizen.emulator.manager.Messages; import org.tizen.emulator.manager.logging.EMLogger; -import org.tizen.emulator.manager.renewal.resources.ImageResources; +import org.tizen.emulator.manager.renewal.resources.ImageResource; import org.tizen.emulator.manager.resources.StringResources; import org.tizen.emulator.manager.tool.About; import org.tizen.emulator.manager.ui.renewal.tableviewer.AbstractTableViewer; @@ -137,9 +137,9 @@ public class MainDialog { viewer.destroyTableViewer(); } - ImageResources.dispose(); - org.tizen.emulator.manager.renewal.resources.ColorResources.dispose(); - org.tizen.emulator.manager.renewal.resources.FontResources.dispose(); + ImageResource.dispose(); + org.tizen.emulator.manager.renewal.resources.ColorResource.dispose(); + org.tizen.emulator.manager.renewal.resources.FontResource.dispose(); if(icon != null) { icon.dispose(); diff --git a/src/org/tizen/emulator/manager/ui/renewal/dialog/DeleteMessageBox.java b/src/org/tizen/emulator/manager/ui/renewal/dialog/DeleteMessageBox.java index ec75af2..61efb60 100644 --- a/src/org/tizen/emulator/manager/ui/renewal/dialog/DeleteMessageBox.java +++ b/src/org/tizen/emulator/manager/ui/renewal/dialog/DeleteMessageBox.java @@ -37,8 +37,8 @@ import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Listener; import org.tizen.emulator.manager.platform.BaseImage; import org.tizen.emulator.manager.platform.baseimage.CustomBaseImageLoader; -import org.tizen.emulator.manager.renewal.resources.ColorResources; -import org.tizen.emulator.manager.renewal.resources.FontResources; +import org.tizen.emulator.manager.renewal.resources.ColorResource; +import org.tizen.emulator.manager.renewal.resources.FontResource; import org.tizen.emulator.manager.resources.StringResources; import org.tizen.emulator.manager.ui.renewal.widgets.CheckBoxButton; import org.tizen.emulator.manager.ui.renewal.widgets.CustomScrolledComposite; @@ -62,8 +62,8 @@ public class DeleteMessageBox extends MessageBox { scrolledList = new CustomScrolledComposite(dialog, SWT.V_SCROLL | SWT.H_SCROLL); Composite contentsBox = new Composite(scrolledList, SWT.NONE); scrolledList.setContent(contentsBox); - scrolledList.setBackground(ColorResources.MESSAGE_BOX_CONTENTS_BG.getColor()); - contentsBox.setBackground(ColorResources.MESSAGE_BOX_CONTENTS_BG.getColor()); + scrolledList.setBackground(ColorResource.MESSAGE_BOX_CONTENTS_BG.getColor()); + contentsBox.setBackground(ColorResource.MESSAGE_BOX_CONTENTS_BG.getColor()); int top = SPACING; int textHeight = 20; @@ -90,14 +90,14 @@ public class DeleteMessageBox extends MessageBox { label = makeLabel(contentsBox, "Delete base image file on disk(cannot be undone)"); - label.setFont(FontResources.MESSAGE_BOX_CONTENTS_BOLD.getFont()); + label.setFont(FontResource.MESSAGE_BOX_CONTENTS_BOLD.getFont()); label.setBounds(SPACING + checkBoxWidth + 5, top, CONTENTS_WIDTH, textHeight); top = top + SPACING + textHeight; } } else { label = makeLabel(contentsBox, "Base image file has already been deleted."); - label.setFont(FontResources.MESSAGE_BOX_CONTENTS_BOLD.getFont()); + label.setFont(FontResource.MESSAGE_BOX_CONTENTS_BOLD.getFont()); label.setBounds(SPACING, top, CONTENTS_WIDTH, textHeight); top = top + SPACING + textHeight; @@ -120,9 +120,9 @@ public class DeleteMessageBox extends MessageBox { private Label makeLabel(Composite comp, String msg) { Label label = new Label(comp, SWT.WRAP); label.setText(msg); - label.setBackground(ColorResources.MESSAGE_BOX_CONTENTS_BG.getColor()); - label.setForeground(ColorResources.MESSAGE_BOX_CONTENTS_FONT.getColor()); - label.setFont(FontResources.MESSAGE_BOX_CONTENTS.getFont()); + label.setBackground(ColorResource.MESSAGE_BOX_CONTENTS_BG.getColor()); + label.setForeground(ColorResource.MESSAGE_BOX_CONTENTS_FONT.getColor()); + label.setFont(FontResource.MESSAGE_BOX_CONTENTS.getFont()); return label; } diff --git a/src/org/tizen/emulator/manager/ui/renewal/dialog/Dialog.java b/src/org/tizen/emulator/manager/ui/renewal/dialog/Dialog.java index ad2a969..3aa3de0 100644 --- a/src/org/tizen/emulator/manager/ui/renewal/dialog/Dialog.java +++ b/src/org/tizen/emulator/manager/ui/renewal/dialog/Dialog.java @@ -43,7 +43,7 @@ import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.Shell; -import org.tizen.emulator.manager.renewal.resources.ColorResources; +import org.tizen.emulator.manager.renewal.resources.ColorResource; import org.tizen.emulator.manager.ui.renewal.widgets.NinePatchButton; public class Dialog { @@ -170,7 +170,7 @@ public class Dialog { @Override public void paintControl(PaintEvent e) { - e.gc.setForeground(ColorResources.MESSABE_BOX_BORDER.getColor()); + e.gc.setForeground(ColorResource.MESSABE_BOX_BORDER.getColor()); e.gc.setLineWidth(BORDER_WIDTH); Rectangle rect = ((Shell)e.widget).getBounds(); @@ -203,7 +203,7 @@ public class Dialog { layout.marginHeight = marginHeight; layout.marginWidth = marginWidth; getBodyComposite().setLayout(layout); - getBodyComposite().setBackground(ColorResources.WHITE.getColor()); + getBodyComposite().setBackground(ColorResource.WHITE.getColor()); } diff --git a/src/org/tizen/emulator/manager/ui/renewal/dialog/DialogButtons.java b/src/org/tizen/emulator/manager/ui/renewal/dialog/DialogButtons.java index 480a15e..9358734 100644 --- a/src/org/tizen/emulator/manager/ui/renewal/dialog/DialogButtons.java +++ b/src/org/tizen/emulator/manager/ui/renewal/dialog/DialogButtons.java @@ -36,7 +36,7 @@ import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Event; import org.eclipse.swt.widgets.Listener; -import org.tizen.emulator.manager.renewal.resources.ColorResources; +import org.tizen.emulator.manager.renewal.resources.ColorResource; import org.tizen.emulator.manager.ui.renewal.widgets.GrayButton; import org.tizen.emulator.manager.ui.renewal.widgets.HighLightButton; import org.tizen.emulator.manager.ui.renewal.widgets.NinePatchButton; @@ -69,7 +69,7 @@ public class DialogButtons { gridData.horizontalAlignment = GridData.FILL; gridData.heightHint = BUTTON_COMP_HEIGHT; - buttonComp.setBackground(ColorResources.MESSAGE_BOX_BG.getColor()); + buttonComp.setBackground(ColorResource.MESSAGE_BOX_BG.getColor()); buttonComp.setLayoutData(gridData); // for the transparency of corners of buttons. diff --git a/src/org/tizen/emulator/manager/ui/renewal/dialog/DialogTitle.java b/src/org/tizen/emulator/manager/ui/renewal/dialog/DialogTitle.java index 2bbe841..611f73d 100644 --- a/src/org/tizen/emulator/manager/ui/renewal/dialog/DialogTitle.java +++ b/src/org/tizen/emulator/manager/ui/renewal/dialog/DialogTitle.java @@ -41,8 +41,8 @@ import org.eclipse.swt.layout.GridData; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Shell; -import org.tizen.emulator.manager.renewal.resources.ColorResources; -import org.tizen.emulator.manager.renewal.resources.FontResources; +import org.tizen.emulator.manager.renewal.resources.ColorResource; +import org.tizen.emulator.manager.renewal.resources.FontResource; public class DialogTitle { @@ -65,7 +65,7 @@ public class DialogTitle { gridData.horizontalAlignment = GridData.FILL; gridData.heightHint = TITLE_COMP_HEIGHT; - titleComp.setBackground(ColorResources.MESSAGE_BOX_TITLE_BG.getColor()); + titleComp.setBackground(ColorResource.MESSAGE_BOX_TITLE_BG.getColor()); titleComp.setLayoutData(gridData); titleComp.setLayout(new FormLayout()); @@ -80,9 +80,9 @@ public class DialogTitle { data.left = new FormAttachment(0, TITLE_MARGIN_LEFT); Label titleLabel = new Label(titleComp, SWT.NONE); - titleLabel.setBackground(ColorResources.MESSAGE_BOX_TITLE_BG.getColor()); - titleLabel.setForeground(ColorResources.MESSAGE_BOX_TITLE_FONT.getColor()); - titleLabel.setFont(FontResources.MESSAGE_BOX_TITLE.getFont()); + titleLabel.setBackground(ColorResource.MESSAGE_BOX_TITLE_BG.getColor()); + titleLabel.setForeground(ColorResource.MESSAGE_BOX_TITLE_FONT.getColor()); + titleLabel.setFont(FontResource.MESSAGE_BOX_TITLE.getFont()); titleLabel.setText(title); titleLabel.setLayoutData(data); diff --git a/src/org/tizen/emulator/manager/ui/renewal/dialog/ItemListComp.java b/src/org/tizen/emulator/manager/ui/renewal/dialog/ItemListComp.java index bf1c02b..d466d37 100644 --- a/src/org/tizen/emulator/manager/ui/renewal/dialog/ItemListComp.java +++ b/src/org/tizen/emulator/manager/ui/renewal/dialog/ItemListComp.java @@ -42,7 +42,7 @@ import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Shell; import org.tizen.emulator.manager.platform.Profile; import org.tizen.emulator.manager.platform.ProfileList; -import org.tizen.emulator.manager.renewal.resources.ColorResources; +import org.tizen.emulator.manager.renewal.resources.ColorResource; import org.tizen.emulator.manager.ui.renewal.dialoghandler.DeviceTemplateDialogHandler; import org.tizen.emulator.manager.ui.renewal.item.ItemName; import org.tizen.emulator.manager.ui.renewal.item.modify.common.ModifyDialogItem; @@ -185,7 +185,7 @@ public class ItemListComp { // add content sc.setContent(scrolledContent); - scrolledContent.setBackground(ColorResources.BLACK.getColor()); + scrolledContent.setBackground(ColorResource.BLACK.getColor()); GridLayout layout = new GridLayout(); layout.numColumns = 1; diff --git a/src/org/tizen/emulator/manager/ui/renewal/dialog/MessageBox.java b/src/org/tizen/emulator/manager/ui/renewal/dialog/MessageBox.java index 1f4d9c7..8980ed8 100644 --- a/src/org/tizen/emulator/manager/ui/renewal/dialog/MessageBox.java +++ b/src/org/tizen/emulator/manager/ui/renewal/dialog/MessageBox.java @@ -45,8 +45,8 @@ import org.eclipse.swt.widgets.Event; import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Listener; import org.eclipse.swt.widgets.Shell; -import org.tizen.emulator.manager.renewal.resources.ColorResources; -import org.tizen.emulator.manager.renewal.resources.FontResources; +import org.tizen.emulator.manager.renewal.resources.ColorResource; +import org.tizen.emulator.manager.renewal.resources.FontResource; import org.tizen.emulator.manager.ui.renewal.MainDialog; import org.tizen.emulator.manager.ui.renewal.widgets.CustomScrolledComposite; import org.tizen.emulator.manager.ui.renewal.widgets.GrayButton; @@ -182,7 +182,7 @@ public class MessageBox { makeContentsBox(); // need contentsBox size - dialog.setBackground(ColorResources.MESSAGE_BOX_BG.getColor()); + dialog.setBackground(ColorResource.MESSAGE_BOX_BG.getColor()); dialog.setBounds(computeDialogBounds()); dialog.setBackgroundMode(SWT.INHERIT_FORCE); @@ -258,14 +258,14 @@ public class MessageBox { private void makeTitleLabel() { titleComp = new Composite(dialog, SWT.NONE); - titleComp.setBackground(ColorResources.MESSAGE_BOX_TITLE_BG.getColor()); + titleComp.setBackground(ColorResource.MESSAGE_BOX_TITLE_BG.getColor()); titleComp.setLayout(new FormLayout()); titleLabel = new Label(titleComp, SWT.NONE); titleLabel.setText(this.title); - titleLabel.setBackground(ColorResources.MESSAGE_BOX_TITLE_BG.getColor()); - titleLabel.setForeground(ColorResources.MESSAGE_BOX_TITLE_FONT.getColor()); - titleLabel.setFont(FontResources.MESSAGE_BOX_TITLE.getFont()); + titleLabel.setBackground(ColorResource.MESSAGE_BOX_TITLE_BG.getColor()); + titleLabel.setForeground(ColorResource.MESSAGE_BOX_TITLE_FONT.getColor()); + titleLabel.setFont(FontResource.MESSAGE_BOX_TITLE.getFont()); FormData data = new FormData(); data.top = new FormAttachment(0, TITLE_MARGIN_TOP); @@ -281,12 +281,12 @@ public class MessageBox { contentsBox = new StyledText(scrolledList, SWT.NONE); scrolledList.setContent(contentsBox); - scrolledList.setBackground(ColorResources.MESSAGE_BOX_CONTENTS_BG.getColor()); + scrolledList.setBackground(ColorResource.MESSAGE_BOX_CONTENTS_BG.getColor()); contentsBox.setText(message); - contentsBox.setBackground(ColorResources.MESSAGE_BOX_CONTENTS_BG.getColor()); - contentsBox.setForeground(ColorResources.MESSAGE_BOX_CONTENTS_FONT.getColor()); - contentsBox.setFont(FontResources.MESSAGE_BOX_CONTENTS.getFont()); + contentsBox.setBackground(ColorResource.MESSAGE_BOX_CONTENTS_BG.getColor()); + contentsBox.setForeground(ColorResource.MESSAGE_BOX_CONTENTS_FONT.getColor()); + contentsBox.setFont(FontResource.MESSAGE_BOX_CONTENTS.getFont()); contentsBox.setLeftMargin(SPACING); contentsBox.setTopMargin(SPACING); contentsBox.setRightMargin(SPACING); @@ -300,7 +300,7 @@ public class MessageBox { private void makeButton(String text, final int buttonType) { if ((style & buttonType) == buttonType) { GrayButton button = new GrayButton(dialog, SWT.PUSH); - button.setFont(FontResources.GRAY_BTN_FONT.getFont()); + button.setFont(FontResource.GRAY_BTN_FONT.getFont()); button.setText(text); button.setBackground(null); button.addListener(SWT.Selection, new Listener(){ diff --git a/src/org/tizen/emulator/manager/ui/renewal/dialog/network/AddressPortItem.java b/src/org/tizen/emulator/manager/ui/renewal/dialog/network/AddressPortItem.java index 5952a0d..5a8e48e 100644 --- a/src/org/tizen/emulator/manager/ui/renewal/dialog/network/AddressPortItem.java +++ b/src/org/tizen/emulator/manager/ui/renewal/dialog/network/AddressPortItem.java @@ -47,8 +47,8 @@ import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Canvas; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Text; -import org.tizen.emulator.manager.renewal.resources.ColorResources; -import org.tizen.emulator.manager.renewal.resources.FontResources; +import org.tizen.emulator.manager.renewal.resources.ColorResource; +import org.tizen.emulator.manager.renewal.resources.FontResource; import org.tizen.emulator.manager.ui.renewal.item.modify.comp.ModifyItem; import org.tizen.emulator.manager.ui.renewal.widgets.TextInputBox; import org.tizen.emulator.manager.ui.renewal.widgets.WidgetHelper; @@ -112,7 +112,7 @@ class AddressPortItem { comp = new Composite(parent, SWT.NONE); comp.setLayoutData(layoutData); - comp.setBackground(ColorResources.WHITE.getColor()); + comp.setBackground(ColorResource.WHITE.getColor()); setCompLayout(); createWidget(); @@ -231,7 +231,7 @@ class AddressPortItem { Composite widgetComp = createWidgetComp(index); Canvas canvas = new Canvas(widgetComp, SWT.NONE); - canvas.setBackground(ColorResources.WHITE.getColor()); + canvas.setBackground(ColorResource.WHITE.getColor()); canvas.setLayoutData(getLabelLayout()); drawTitle(canvas, title + LABEL_COLON); return canvas; @@ -247,7 +247,7 @@ class AddressPortItem { private Composite createWidgetComp(int index) { Composite widgetComp = new Composite(comp, SWT.NONE); - widgetComp.setBackground(ColorResources.WHITE.getColor()); + widgetComp.setBackground(ColorResource.WHITE.getColor()); widgetComp.setLayoutData(getWidgetLayout(index)); widgetComp.setLayout(new FormLayout()); return widgetComp; @@ -261,12 +261,12 @@ class AddressPortItem { public void paintControl(PaintEvent e) { GC gc = e.gc; if (isEnabled) { - gc.setForeground(ColorResources.CONTENT_FONT.getColor()); + gc.setForeground(ColorResource.CONTENT_FONT.getColor()); } else { - gc.setForeground(ColorResources.DISABLED_TEXT.getColor()); + gc.setForeground(ColorResource.DISABLED_TEXT.getColor()); } - gc.setFont(FontResources.CONTENT.getFont()); + gc.setFont(FontResource.CONTENT.getFont()); int itemHeight = ((Composite)e.widget).getBounds().height; Point textExt = gc.textExtent(text); diff --git a/src/org/tizen/emulator/manager/ui/renewal/dialog/network/HTTPCheckBoxItem.java b/src/org/tizen/emulator/manager/ui/renewal/dialog/network/HTTPCheckBoxItem.java index fb6b926..bbdfecf 100644 --- a/src/org/tizen/emulator/manager/ui/renewal/dialog/network/HTTPCheckBoxItem.java +++ b/src/org/tizen/emulator/manager/ui/renewal/dialog/network/HTTPCheckBoxItem.java @@ -40,7 +40,7 @@ import org.eclipse.swt.widgets.Canvas; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Event; import org.eclipse.swt.widgets.Listener; -import org.tizen.emulator.manager.renewal.resources.ColorResources; +import org.tizen.emulator.manager.renewal.resources.ColorResource; import org.tizen.emulator.manager.ui.Messages; import org.tizen.emulator.manager.ui.renewal.item.modify.common.CheckBoxSubItem; import org.tizen.emulator.manager.ui.renewal.widgets.CheckBoxButton; @@ -63,7 +63,7 @@ class HTTPCheckBoxItem { comp = new Composite(parent, SWT.NONE); comp.setLayoutData(layoutData); comp.setLayout(new FormLayout()); - comp.setBackground(ColorResources.WHITE.getColor()); + comp.setBackground(ColorResource.WHITE.getColor()); createCheckBox(); createTextLabel(); @@ -80,7 +80,7 @@ class HTTPCheckBoxItem { CheckBoxSubItem.CHECK_BOX_HEIGHT); data.top = new FormAttachment(0, (compHeight - CheckBoxSubItem.CHECK_BOX_HEIGHT) / 2); data.left = new FormAttachment(0, AddressPortItem.getWidth(0) + 5); - checkBox.setBackground(ColorResources.WHITE.getColor()); + checkBox.setBackground(ColorResource.WHITE.getColor()); checkBox.setLayoutData(data); } @@ -93,7 +93,7 @@ class HTTPCheckBoxItem { data.top = new FormAttachment(0,0); data.bottom = new FormAttachment(100,0); textCanvas.setLayoutData(data); - textCanvas.setBackground(ColorResources.WHITE.getColor()); + textCanvas.setBackground(ColorResource.WHITE.getColor()); WidgetHelper.drawText(textCanvas, TITLE, SWT.NONE); } diff --git a/src/org/tizen/emulator/manager/ui/renewal/dialog/network/TapDeviceDialogForWin.java b/src/org/tizen/emulator/manager/ui/renewal/dialog/network/TapDeviceDialogForWin.java index 6df2bf4..146acca 100644 --- a/src/org/tizen/emulator/manager/ui/renewal/dialog/network/TapDeviceDialogForWin.java +++ b/src/org/tizen/emulator/manager/ui/renewal/dialog/network/TapDeviceDialogForWin.java @@ -50,7 +50,7 @@ import org.eclipse.swt.widgets.Listener; import org.eclipse.swt.widgets.Shell; import org.tizen.emulator.manager.EmulatorManager; import org.tizen.emulator.manager.logging.EMLogger; -import org.tizen.emulator.manager.renewal.resources.ColorResources; +import org.tizen.emulator.manager.renewal.resources.ColorResource; import org.tizen.emulator.manager.resources.FilePathResources; import org.tizen.emulator.manager.resources.StringResources; import org.tizen.emulator.manager.tool.TapUtil; @@ -185,7 +185,7 @@ public class TapDeviceDialogForWin extends Dialog { private Composite createItemComp() { Composite comp = new Composite(getBodyComposite(), SWT.NONE); comp.setLayoutData(makeLayoutData(ROW_NUM)); - comp.setBackground(ColorResources.WHITE.getColor()); + comp.setBackground(ColorResource.WHITE.getColor()); GridLayout layout = new GridLayout(); layout.numColumns = 2; @@ -198,7 +198,7 @@ public class TapDeviceDialogForWin extends Dialog { private ComboBox addComboBox(Composite parent) { Composite comp = createWidgetComp(parent, 1); - comp.setBackground(ColorResources.WHITE.getColor()); + comp.setBackground(ColorResource.WHITE.getColor()); ComboBox combo = new ComboBox(getShell(), comp, SWT.NONE); combo.setLayoutData(getWidgetLayoutData( ((GridData)parent.getLayoutData()).heightHint)); @@ -207,7 +207,7 @@ public class TapDeviceDialogForWin extends Dialog { private TextInputBox addTextBox(Composite parent) { Composite comp = createWidgetComp(parent, 1); - comp.setBackground(ColorResources.WHITE.getColor()); + comp.setBackground(ColorResource.WHITE.getColor()); TextInputBox textBox = new TextInputBox(comp, SWT.NONE); textBox.setLayoutData(getWidgetLayoutData( ((GridData)parent.getLayoutData()).heightHint)); @@ -226,7 +226,7 @@ public class TapDeviceDialogForWin extends Dialog { private void addTitle(Composite parent, String title) { Composite comp = createWidgetComp(parent, 0); Canvas canvas = new Canvas(comp, SWT.NONE); - canvas.setBackground(ColorResources.WHITE.getColor()); + canvas.setBackground(ColorResource.WHITE.getColor()); canvas.setLayoutData(getTitleLayout()); WidgetHelper.drawText(canvas, title, SWT.NONE); } @@ -243,7 +243,7 @@ public class TapDeviceDialogForWin extends Dialog { private Composite createWidgetComp(Composite parent, int index) { Composite widgetComp = new Composite(parent, SWT.NONE); - widgetComp.setBackground(ColorResources.WHITE.getColor()); + widgetComp.setBackground(ColorResource.WHITE.getColor()); widgetComp.setLayoutData(getWidgetLayout(index)); widgetComp.setLayout(new FormLayout()); return widgetComp; diff --git a/src/org/tizen/emulator/manager/ui/renewal/dialog/network/TapGuideDialogForMac.java b/src/org/tizen/emulator/manager/ui/renewal/dialog/network/TapGuideDialogForMac.java index 453e1f0..1083133 100644 --- a/src/org/tizen/emulator/manager/ui/renewal/dialog/network/TapGuideDialogForMac.java +++ b/src/org/tizen/emulator/manager/ui/renewal/dialog/network/TapGuideDialogForMac.java @@ -50,8 +50,8 @@ import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Shell; import org.tizen.emulator.manager.logging.EMLogger; -import org.tizen.emulator.manager.renewal.resources.ColorResources; -import org.tizen.emulator.manager.renewal.resources.FontResources; +import org.tizen.emulator.manager.renewal.resources.ColorResource; +import org.tizen.emulator.manager.renewal.resources.FontResource; import org.tizen.emulator.manager.resources.StringResources; import org.tizen.emulator.manager.ui.Messages; import org.tizen.emulator.manager.ui.renewal.MainDialog; @@ -106,7 +106,7 @@ public class TapGuideDialogForMac { String newLine = StringResources.NEW_LINE; Label objective = new Label(comp, SWT.NONE); - objective.setFont(FontResources.CONTENT.getFont()); + objective.setFont(FontResource.CONTENT.getFont()); objective.setText(Messages.getString("TapGuideDialogForMac.Objective.0") + newLine + Messages.getString("TapGuideDialogForMac.Objective.1")); @@ -117,8 +117,8 @@ public class TapGuideDialogForMac { objective.setLayoutData(data); Label title1 = new Label(comp, SWT.NONE); - title1.setFont(FontResources.DEFAULT_BOLD_FONT_10.getFont()); - title1.setForeground(ColorResources.TEAL.getColor()); + title1.setFont(FontResource.DEFAULT_BOLD_FONT_10.getFont()); + title1.setForeground(ColorResource.TEAL.getColor()); title1.setText(Messages.getString("TapGuideDialogForMac.Title1")); data = new FormData(); data.left = new FormAttachment(0, TITLE_INDENT); @@ -137,7 +137,7 @@ public class TapGuideDialogForMac { + newLine + Messages.getString("TapGuideDialogForMac.Content1.4"); - content1.setFont(FontResources.DEFAULT_FONT_9.getFont()); + content1.setFont(FontResource.DEFAULT_FONT_9.getFont()); content1.setText(msg); data = new FormData(); data.left = new FormAttachment(0, CONTENT_INDENT); @@ -146,8 +146,8 @@ public class TapGuideDialogForMac { content1.setLayoutData(data); Label title2 = new Label(comp, SWT.NONE); - title2.setFont(FontResources.DEFAULT_BOLD_FONT_10.getFont()); - title2.setForeground(ColorResources.TEAL.getColor()); + title2.setFont(FontResource.DEFAULT_BOLD_FONT_10.getFont()); + title2.setForeground(ColorResource.TEAL.getColor()); title2.setText(Messages.getString("TapGuideDialogForMac.Title2")); data = new FormData(); data.left = new FormAttachment(0, TITLE_INDENT); @@ -158,7 +158,7 @@ public class TapGuideDialogForMac { Label content2 = new Label(comp, SWT.NONE); String msg2 = Messages.getString("TapGuideDialogForMac.Content2"); - content2.setFont(FontResources.DEFAULT_FONT_9.getFont()); + content2.setFont(FontResource.DEFAULT_FONT_9.getFont()); content2.setText(msg2); data = new FormData(); data.left = new FormAttachment(0, CONTENT_INDENT); @@ -175,7 +175,7 @@ public class TapGuideDialogForMac { + newLine + Messages.getString("TapGuideDialogForMac.End.2") + newLine + newLine; - end.setFont(FontResources.DEFAULT_BOLD_FONT_9.getFont()); + end.setFont(FontResource.DEFAULT_BOLD_FONT_9.getFont()); end.setText(endMsg); data = new FormData(); data.left = new FormAttachment(0, TITLE_INDENT); diff --git a/src/org/tizen/emulator/manager/ui/renewal/dialog/network/TapGuideDialogForWin.java b/src/org/tizen/emulator/manager/ui/renewal/dialog/network/TapGuideDialogForWin.java index 0f42c8b..e7da16d 100644 --- a/src/org/tizen/emulator/manager/ui/renewal/dialog/network/TapGuideDialogForWin.java +++ b/src/org/tizen/emulator/manager/ui/renewal/dialog/network/TapGuideDialogForWin.java @@ -42,8 +42,8 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Shell; -import org.tizen.emulator.manager.renewal.resources.ColorResources; -import org.tizen.emulator.manager.renewal.resources.FontResources; +import org.tizen.emulator.manager.renewal.resources.ColorResource; +import org.tizen.emulator.manager.renewal.resources.FontResource; import org.tizen.emulator.manager.resources.StringResources; import org.tizen.emulator.manager.ui.Messages; import org.tizen.emulator.manager.ui.renewal.MainDialog; @@ -95,7 +95,7 @@ public class TapGuideDialogForWin { comp.setLayout(new FormLayout()); Label objective = new Label(comp, SWT.NONE); - objective.setFont(FontResources.DEFAULT_FONT_9.getFont()); + objective.setFont(FontResource.DEFAULT_FONT_9.getFont()); objective .setText(Messages.getString("TapGuideDialogForWin.UseBridgeDialog.1") //$NON-NLS-1$ + Messages.getString("TapGuideDialogForWin.UseBridgeDialog.2")); //$NON-NLS-1$ @@ -106,8 +106,8 @@ public class TapGuideDialogForWin { objective.setLayoutData(data); Label title1 = new Label(comp, SWT.NONE); - title1.setFont(FontResources.DEFAULT_BOLD_FONT_10.getFont()); - title1.setForeground(ColorResources.TEAL.getColor()); + title1.setFont(FontResource.DEFAULT_BOLD_FONT_10.getFont()); + title1.setForeground(ColorResource.TEAL.getColor()); title1.setText(Messages.getString("TapGuideDialogForWin.CreateBridgeDialog.0")); //$NON-NLS-1$ data = new FormData(); data.left = new FormAttachment(0, TITLE_INDENT); @@ -128,7 +128,7 @@ public class TapGuideDialogForWin { + Messages.getString("TapGuideDialogForWin.CreateBridgeDialog.7") //$NON-NLS-1$ + Messages.getString("TapGuideDialogForWin.CreateBridgeDialog.8"); //$NON-NLS-1$ - content1.setFont(FontResources.DEFAULT_FONT_9.getFont()); + content1.setFont(FontResource.DEFAULT_FONT_9.getFont()); content1.setText(msg); data = new FormData(); data.left = new FormAttachment(0, CONTENT_INDENT); @@ -137,8 +137,8 @@ public class TapGuideDialogForWin { content1.setLayoutData(data); Label title2 = new Label(comp, SWT.NONE); - title2.setFont(FontResources.DEFAULT_BOLD_FONT_10.getFont()); - title2.setForeground(ColorResources.TEAL.getColor()); + title2.setFont(FontResource.DEFAULT_BOLD_FONT_10.getFont()); + title2.setForeground(ColorResource.TEAL.getColor()); title2.setText(Messages.getString("TapGuideDialogForWin.TCPSetting.0")); //$NON-NLS-1$ data = new FormData(); data.left = new FormAttachment(0, TITLE_INDENT); @@ -160,7 +160,7 @@ public class TapGuideDialogForWin { + Messages.getString("TapGuideDialogForWin.TCPSetting.8") //$NON-NLS-1$ + Messages.getString("TapGuideDialogForWin.TCPSetting.9"); //$NON-NLS-1$ - content2.setFont(FontResources.DEFAULT_FONT_9.getFont()); + content2.setFont(FontResource.DEFAULT_FONT_9.getFont()); content2.setText(msg2); data = new FormData(); data.left = new FormAttachment(0, CONTENT_INDENT); @@ -175,7 +175,7 @@ public class TapGuideDialogForWin { + Messages.getString("TapGuideDialogForWin.NetworkWarning.2") //$NON-NLS-1$ + StringResources.NEW_LINE + StringResources.NEW_LINE; - end.setFont(FontResources.DEFAULT_BOLD_FONT_9.getFont()); + end.setFont(FontResource.DEFAULT_BOLD_FONT_9.getFont()); end.setText(endMsg); data = new FormData(); data.left = new FormAttachment(0, TITLE_INDENT); diff --git a/src/org/tizen/emulator/manager/ui/renewal/item/modify/baseimage/BaseImageFileItem.java b/src/org/tizen/emulator/manager/ui/renewal/item/modify/baseimage/BaseImageFileItem.java index 587be84..4096b42 100644 --- a/src/org/tizen/emulator/manager/ui/renewal/item/modify/baseimage/BaseImageFileItem.java +++ b/src/org/tizen/emulator/manager/ui/renewal/item/modify/baseimage/BaseImageFileItem.java @@ -40,7 +40,7 @@ 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.platform.baseimage.CustomBaseImageLoader; -import org.tizen.emulator.manager.renewal.resources.ImageResources; +import org.tizen.emulator.manager.renewal.resources.ImageResource; import org.tizen.emulator.manager.resources.FilePathResources; import org.tizen.emulator.manager.resources.StringResources; import org.tizen.emulator.manager.ui.renewal.MainDialog; @@ -68,7 +68,7 @@ public class BaseImageFileItem extends FileDialogItem { @Override public void create(Composite parent) { - create(parent, getTitle(), ImageResources.ICON_TITLE_IMAGE_FILE, TEXT_BOX_WIDTH); + create(parent, getTitle(), ImageResource.ICON_TITLE_IMAGE_FILE, TEXT_BOX_WIDTH); if (getItemListComp().isDetailMode()) { setTextBox(imageFilePath); } else { diff --git a/src/org/tizen/emulator/manager/ui/renewal/item/modify/baseimage/BaseImageNameItem.java b/src/org/tizen/emulator/manager/ui/renewal/item/modify/baseimage/BaseImageNameItem.java index 840f41c..cd2d553 100644 --- a/src/org/tizen/emulator/manager/ui/renewal/item/modify/baseimage/BaseImageNameItem.java +++ b/src/org/tizen/emulator/manager/ui/renewal/item/modify/baseimage/BaseImageNameItem.java @@ -34,7 +34,7 @@ import java.io.File; import org.eclipse.swt.widgets.Composite; import org.tizen.emulator.manager.platform.BaseImage; -import org.tizen.emulator.manager.renewal.resources.ImageResources; +import org.tizen.emulator.manager.renewal.resources.ImageResource; import org.tizen.emulator.manager.resources.StringResources; import org.tizen.emulator.manager.ui.renewal.item.ItemState; import org.tizen.emulator.manager.ui.renewal.item.modify.common.ModifyDialogItem; @@ -73,7 +73,7 @@ public class BaseImageNameItem extends TextInputBoxItem { @Override public void create(Composite parent) { // modify dialog item: setItemListComp() -> setInitialValue() -> create() -> setVisible() - create(parent, ImageResources.ICON_TITLE_VMNAME, INPUT_BOX_WIDTH, true); + create(parent, ImageResource.ICON_TITLE_VMNAME, INPUT_BOX_WIDTH, true); // call 'makeBody' function } diff --git a/src/org/tizen/emulator/manager/ui/renewal/item/modify/baseimage/DescriptionItem.java b/src/org/tizen/emulator/manager/ui/renewal/item/modify/baseimage/DescriptionItem.java index 5d8dbd4..d1caf0f 100644 --- a/src/org/tizen/emulator/manager/ui/renewal/item/modify/baseimage/DescriptionItem.java +++ b/src/org/tizen/emulator/manager/ui/renewal/item/modify/baseimage/DescriptionItem.java @@ -5,14 +5,14 @@ import org.eclipse.swt.layout.FormAttachment; import org.eclipse.swt.layout.FormData; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.widgets.Composite; -import org.tizen.emulator.manager.renewal.resources.ImageResources; +import org.tizen.emulator.manager.renewal.resources.ImageResource; import org.tizen.emulator.manager.ui.renewal.item.modify.common.ModifyDialogItem; import org.tizen.emulator.manager.ui.renewal.item.modify.common.TextInputBoxItem; import org.tizen.emulator.manager.ui.renewal.item.modify.comp.ModifyItem; import org.tizen.emulator.manager.ui.renewal.widgets.TextInputBox; public class DescriptionItem extends TextInputBoxItem { - private final ImageResources TITILE_ICON = ImageResources.ICON_TITILE_DESCRIPTION; + private final ImageResource TITILE_ICON = ImageResource.ICON_TITILE_DESCRIPTION; private final int ITEM_HEIGHT = 95; private final int INPUT_BOX_HEIGHT = 87; private final int INPUT_BOX_WIDTH = 290; diff --git a/src/org/tizen/emulator/manager/ui/renewal/item/modify/baseimage/PlatformItem.java b/src/org/tizen/emulator/manager/ui/renewal/item/modify/baseimage/PlatformItem.java index 271131c..05de431 100644 --- a/src/org/tizen/emulator/manager/ui/renewal/item/modify/baseimage/PlatformItem.java +++ b/src/org/tizen/emulator/manager/ui/renewal/item/modify/baseimage/PlatformItem.java @@ -40,8 +40,8 @@ import org.eclipse.swt.widgets.Listener; import org.tizen.emulator.manager.platform.Platform; import org.tizen.emulator.manager.platform.Profile; import org.tizen.emulator.manager.platform.ProfileList; -import org.tizen.emulator.manager.renewal.resources.ColorResources; -import org.tizen.emulator.manager.renewal.resources.ImageResources; +import org.tizen.emulator.manager.renewal.resources.ColorResource; +import org.tizen.emulator.manager.renewal.resources.ImageResource; import org.tizen.emulator.manager.ui.renewal.item.modify.common.ComboItem; import org.tizen.emulator.manager.ui.renewal.item.modify.common.ModifyDialogItem; import org.tizen.emulator.manager.ui.renewal.item.modify.comp.ModifyItem; @@ -78,7 +78,7 @@ public class PlatformItem extends ComboItem { @Override public void create(Composite parent) { item.init(parent); - item.setItemTitle(createIconTitle(item, ImageResources.ICON_TITLE_VERSION)); + item.setItemTitle(createIconTitle(item, ImageResource.ICON_TITLE_VERSION)); item.create(); button32 = new ImageButton(item.getBody(), SWT.RADIO); @@ -108,10 +108,10 @@ public class PlatformItem extends ComboItem { private void settingRadioButton() { button32.setText("32 bit"); - button32.setFontColor(ColorResources.CONTENT_FONT.getColor()); + button32.setFontColor(ColorResource.CONTENT_FONT.getColor()); button64.setText("64 bit"); - button64.setFontColor(ColorResources.CONTENT_FONT.getColor()); + button64.setFontColor(ColorResource.CONTENT_FONT.getColor()); // set layout int top = (item.getItemHeight() - 15) / 2; diff --git a/src/org/tizen/emulator/manager/ui/renewal/item/modify/common/CheckBoxSubItem.java b/src/org/tizen/emulator/manager/ui/renewal/item/modify/common/CheckBoxSubItem.java index c831c92..b09e095 100644 --- a/src/org/tizen/emulator/manager/ui/renewal/item/modify/common/CheckBoxSubItem.java +++ b/src/org/tizen/emulator/manager/ui/renewal/item/modify/common/CheckBoxSubItem.java @@ -42,8 +42,8 @@ import org.eclipse.swt.layout.FormLayout; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Event; import org.eclipse.swt.widgets.Listener; -import org.tizen.emulator.manager.renewal.resources.ColorResources; -import org.tizen.emulator.manager.renewal.resources.FontResources; +import org.tizen.emulator.manager.renewal.resources.ColorResource; +import org.tizen.emulator.manager.renewal.resources.FontResource; import org.tizen.emulator.manager.ui.renewal.dialog.DIALOG_MODE; import org.tizen.emulator.manager.ui.renewal.item.modify.comp.ModifyItem; import org.tizen.emulator.manager.ui.renewal.widgets.CheckBoxButton; @@ -166,12 +166,12 @@ public class CheckBoxSubItem { GC gc = e.gc; if (checkBox.isEnabled() || (parentItem.getItemListComp().isDetailMode() && isChecked)) { - gc.setForeground(ColorResources.CONTENT_FONT.getColor()); + gc.setForeground(ColorResource.CONTENT_FONT.getColor()); } else { - gc.setForeground(ColorResources.DISABLED_TEXT.getColor()); + gc.setForeground(ColorResource.DISABLED_TEXT.getColor()); } - gc.setFont(FontResources.CONTENT.getFont()); + gc.setFont(FontResource.CONTENT.getFont()); int itemHeight = ((Composite)e.widget).getBounds().height; Point textExt = gc.textExtent(title); diff --git a/src/org/tizen/emulator/manager/ui/renewal/item/modify/common/ComboItem.java b/src/org/tizen/emulator/manager/ui/renewal/item/modify/common/ComboItem.java index 5b66570..2ad814a 100644 --- a/src/org/tizen/emulator/manager/ui/renewal/item/modify/common/ComboItem.java +++ b/src/org/tizen/emulator/manager/ui/renewal/item/modify/common/ComboItem.java @@ -35,7 +35,7 @@ import java.util.List; import org.eclipse.swt.SWT; import org.eclipse.swt.widgets.Event; import org.eclipse.swt.widgets.Listener; -import org.tizen.emulator.manager.renewal.resources.ColorResources; +import org.tizen.emulator.manager.renewal.resources.ColorResource; import org.tizen.emulator.manager.ui.renewal.item.modify.comp.ModifyItem; import org.tizen.emulator.manager.ui.renewal.widgets.ComboBox; import org.tizen.emulator.manager.ui.renewal.widgets.WSTATE; @@ -123,10 +123,10 @@ public abstract class ComboItem extends ModifyDialogItem { protected void createCombo(ModifyItem item, int width) { - createCombo(item, width, ColorResources.WHITE); + createCombo(item, width, ColorResource.WHITE); } - protected void createCombo(ModifyItem item, int width, ColorResources parentBackground) { + protected void createCombo(ModifyItem item, int width, ColorResource parentBackground) { item.setBodyLayoutForm(); comboBox = new ComboBox(getItemListComp().getShell(), item.getBody(), SWT.NONE); comboBox.setParentBackground(parentBackground); diff --git a/src/org/tizen/emulator/manager/ui/renewal/item/modify/common/ConnectivityItem.java b/src/org/tizen/emulator/manager/ui/renewal/item/modify/common/ConnectivityItem.java index 4ea2507..8e5c2eb 100644 --- a/src/org/tizen/emulator/manager/ui/renewal/item/modify/common/ConnectivityItem.java +++ b/src/org/tizen/emulator/manager/ui/renewal/item/modify/common/ConnectivityItem.java @@ -34,7 +34,7 @@ import java.util.ArrayList; import java.util.List; import org.eclipse.swt.widgets.Composite; -import org.tizen.emulator.manager.renewal.resources.ImageResources; +import org.tizen.emulator.manager.renewal.resources.ImageResource; import org.tizen.emulator.manager.ui.renewal.item.modify.comp.TreeModifyItem; public class ConnectivityItem extends CheckBoxItem { @@ -60,7 +60,7 @@ public class ConnectivityItem extends CheckBoxItem { @Override public void create(Composite parent) { item.init(parent); - item.setItemTitle(createIconTitle(item, ImageResources.ICON_TITLE_CONNECTIVITY)); + item.setItemTitle(createIconTitle(item, ImageResource.ICON_TITLE_CONNECTIVITY)); item.create(); createCheckBoxItems(item); diff --git a/src/org/tizen/emulator/manager/ui/renewal/item/modify/common/DisplayItem.java b/src/org/tizen/emulator/manager/ui/renewal/item/modify/common/DisplayItem.java index c61670f..4c2e09c 100644 --- a/src/org/tizen/emulator/manager/ui/renewal/item/modify/common/DisplayItem.java +++ b/src/org/tizen/emulator/manager/ui/renewal/item/modify/common/DisplayItem.java @@ -45,8 +45,8 @@ import org.eclipse.swt.widgets.Canvas; import org.eclipse.swt.widgets.Composite; import org.tizen.emulator.manager.logging.EMLogger; import org.tizen.emulator.manager.platform.Skin; -import org.tizen.emulator.manager.renewal.resources.ColorResources; -import org.tizen.emulator.manager.renewal.resources.ImageResources; +import org.tizen.emulator.manager.renewal.resources.ColorResource; +import org.tizen.emulator.manager.renewal.resources.ImageResource; import org.tizen.emulator.manager.template.renewal.VMItem; import org.tizen.emulator.manager.template.renewal.VMTemplateUtil; import org.tizen.emulator.manager.ui.renewal.dialog.DIALOG_MODE; @@ -64,7 +64,7 @@ public class DisplayItem extends ModifyDialogItem { private static final String TITLE = "Display"; private static final String NAME = "display"; - private final ImageResources TITLE_ICON_RESOURCE = ImageResources.ICON_TITLE_DISPLAY; + private final ImageResource TITLE_ICON_RESOURCE = ImageResource.ICON_TITLE_DISPLAY; private static final int ROW_HEIGHT = ModifyItem.ITEM_HEIGHT; public static final int BODY_MARGIN_LEFT = 77; @@ -322,7 +322,7 @@ public class DisplayItem extends ModifyDialogItem { comp.setLayoutData(data); comp.setLayout(new FormLayout()); - WidgetHelper.drawText(comp, title, SWT.LEFT, ColorResources.CONTENT_FONT); + WidgetHelper.drawText(comp, title, SWT.LEFT, ColorResource.CONTENT_FONT); return comp; } diff --git a/src/org/tizen/emulator/manager/ui/renewal/item/modify/common/FileDialogItem.java b/src/org/tizen/emulator/manager/ui/renewal/item/modify/common/FileDialogItem.java index 0e75ece..5c40668 100644 --- a/src/org/tizen/emulator/manager/ui/renewal/item/modify/common/FileDialogItem.java +++ b/src/org/tizen/emulator/manager/ui/renewal/item/modify/common/FileDialogItem.java @@ -40,7 +40,7 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.DirectoryDialog; import org.eclipse.swt.widgets.Event; import org.eclipse.swt.widgets.Listener; -import org.tizen.emulator.manager.renewal.resources.ImageResources; +import org.tizen.emulator.manager.renewal.resources.ImageResource; import org.tizen.emulator.manager.resources.FilePathResources; import org.tizen.emulator.manager.ui.renewal.MainDialog; import org.tizen.emulator.manager.ui.renewal.item.modify.comp.IconItemTitle; @@ -88,7 +88,7 @@ public abstract class FileDialogItem extends ModifyDialogItem { } protected void create(Composite parent, String title, - ImageResources iconResource, int textBoxWidth) { + ImageResource iconResource, int textBoxWidth) { item = new ModifyItem(this); item.init(parent); item.setItemTitle(new IconItemTitle(item.getItemComp(), title, iconResource)); @@ -154,7 +154,7 @@ public abstract class FileDialogItem extends ModifyDialogItem { data.width = BUTTON_WIDTH; data.height = BUTTON_HEIGHT; fileDialogButton = new BlueButton(item.getBody(), SWT.PUSH); - fileDialogButton.setIcon(ImageResources.ICON_BLUE_BUTTON_OPEN); + fileDialogButton.setIcon(ImageResource.ICON_BLUE_BUTTON_OPEN); fileDialogButton.setLayoutData(data); if (getItemListComp().isDetailMode()) { diff --git a/src/org/tizen/emulator/manager/ui/renewal/item/modify/common/ImageItem.java b/src/org/tizen/emulator/manager/ui/renewal/item/modify/common/ImageItem.java index d034ec8..b36f222 100644 --- a/src/org/tizen/emulator/manager/ui/renewal/item/modify/common/ImageItem.java +++ b/src/org/tizen/emulator/manager/ui/renewal/item/modify/common/ImageItem.java @@ -31,13 +31,13 @@ package org.tizen.emulator.manager.ui.renewal.item.modify.common; import org.eclipse.swt.widgets.Composite; -import org.tizen.emulator.manager.renewal.resources.ImageResources; +import org.tizen.emulator.manager.renewal.resources.ImageResource; public class ImageItem extends TextLabelItem { private final static String TITLE = "Image"; private static final String NAME = "image"; - private final ImageResources TITLE_ICON_RESOURCE = ImageResources.ICON_TITLE_IMAGE; + private final ImageResource TITLE_ICON_RESOURCE = ImageResource.ICON_TITLE_IMAGE; public ImageItem() { super(NAME, TITLE); diff --git a/src/org/tizen/emulator/manager/ui/renewal/item/modify/common/ModifyDialogItem.java b/src/org/tizen/emulator/manager/ui/renewal/item/modify/common/ModifyDialogItem.java index 4890601..740444c 100644 --- a/src/org/tizen/emulator/manager/ui/renewal/item/modify/common/ModifyDialogItem.java +++ b/src/org/tizen/emulator/manager/ui/renewal/item/modify/common/ModifyDialogItem.java @@ -39,7 +39,7 @@ import org.eclipse.swt.layout.FormAttachment; import org.eclipse.swt.layout.FormData; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.widgets.Canvas; -import org.tizen.emulator.manager.renewal.resources.ImageResources; +import org.tizen.emulator.manager.renewal.resources.ImageResource; import org.tizen.emulator.manager.ui.renewal.dialog.ItemListComp; import org.tizen.emulator.manager.ui.renewal.item.ItemState; import org.tizen.emulator.manager.ui.renewal.item.modify.comp.IconItemTitle; @@ -181,7 +181,7 @@ public abstract class ModifyDialogItem implements IModifyDialogItem { } - protected ItemTitle createIconTitle(ModifyItem item, ImageResources icon) { + protected ItemTitle createIconTitle(ModifyItem item, ImageResource icon) { if (item instanceof SubTreeModifyItem) { return new SubTreeItemTitle(item.getItemComp(), title, icon); } @@ -303,10 +303,10 @@ public abstract class ModifyDialogItem implements IModifyDialogItem { public void paintControl(PaintEvent e) { GC gc = e.gc; if (isErrorState()) { - gc.drawImage(ImageResources.ICON_STATE_ERROR.getImage(), 0, 0); + gc.drawImage(ImageResource.ICON_STATE_ERROR.getImage(), 0, 0); } else if (isWarningState()) { - gc.drawImage(ImageResources.ICON_STATE_WARNING.getImage(), 0, 0); + gc.drawImage(ImageResource.ICON_STATE_WARNING.getImage(), 0, 0); } } }); diff --git a/src/org/tizen/emulator/manager/ui/renewal/item/modify/common/NameItem.java b/src/org/tizen/emulator/manager/ui/renewal/item/modify/common/NameItem.java index fcb5392..8e3a373 100644 --- a/src/org/tizen/emulator/manager/ui/renewal/item/modify/common/NameItem.java +++ b/src/org/tizen/emulator/manager/ui/renewal/item/modify/common/NameItem.java @@ -32,7 +32,7 @@ package org.tizen.emulator.manager.ui.renewal.item.modify.common; import org.eclipse.swt.widgets.Composite; import org.tizen.emulator.manager.logging.EMLogger; -import org.tizen.emulator.manager.renewal.resources.ImageResources; +import org.tizen.emulator.manager.renewal.resources.ImageResource; import org.tizen.emulator.manager.resources.StringResources; import org.tizen.emulator.manager.ui.Messages; import org.tizen.emulator.manager.ui.renewal.dialog.DIALOG_MODE; @@ -42,7 +42,7 @@ import org.tizen.emulator.manager.vms.helper.HelperClass; public class NameItem extends TextInputBoxItem { - private final ImageResources TITLE_ICON_RESOURCE = ImageResources.ICON_TITLE_VMNAME; + private final ImageResource TITLE_ICON_RESOURCE = ImageResource.ICON_TITLE_VMNAME; private final int INPUT_BOX_WIDTH = 236; public NameItem(String name, String title) { diff --git a/src/org/tizen/emulator/manager/ui/renewal/item/modify/common/OnOffItem.java b/src/org/tizen/emulator/manager/ui/renewal/item/modify/common/OnOffItem.java index e4f7143..c8062f2 100644 --- a/src/org/tizen/emulator/manager/ui/renewal/item/modify/common/OnOffItem.java +++ b/src/org/tizen/emulator/manager/ui/renewal/item/modify/common/OnOffItem.java @@ -41,9 +41,9 @@ import org.eclipse.swt.widgets.Canvas; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Event; import org.eclipse.swt.widgets.Listener; -import org.tizen.emulator.manager.renewal.resources.ColorResources; -import org.tizen.emulator.manager.renewal.resources.FontResources; -import org.tizen.emulator.manager.renewal.resources.ImageResources; +import org.tizen.emulator.manager.renewal.resources.ColorResource; +import org.tizen.emulator.manager.renewal.resources.FontResource; +import org.tizen.emulator.manager.renewal.resources.ImageResource; import org.tizen.emulator.manager.ui.renewal.item.modify.comp.ModifyItem; import org.tizen.emulator.manager.ui.renewal.widgets.ImageButton; import org.tizen.emulator.manager.ui.renewal.widgets.WSTATE; @@ -81,14 +81,14 @@ public abstract class OnOffItem extends ModifyDialogItem { item.setBodyLayoutForm(); button = new ImageButton(item.getBody(), SWT.PUSH); - button.setImage(WSTATE.NORMAL, ImageResources.BTN_OFF_NML); - button.setImage(WSTATE.HOVER, ImageResources.BTN_OFF_HOVER); - button.setImage(WSTATE.PUSH, ImageResources.BTN_OFF_HOVER); - button.setImage(WSTATE.DISABLE_OFF, ImageResources.BTN_OFF_NML); - button.setImage(WSTATE.SELECTED, ImageResources.BTN_ON_NML); - button.setImage(WSTATE.SELECTED_HOVER, ImageResources.BTN_ON_HOVER); - button.setImage(WSTATE.SELECTED_PUSH, ImageResources.BTN_ON_HOVER); - button.setImage(WSTATE.DISABLE_ON, ImageResources.BTN_OFF_NML); + button.setImage(WSTATE.NORMAL, ImageResource.BTN_OFF_NML); + button.setImage(WSTATE.HOVER, ImageResource.BTN_OFF_HOVER); + button.setImage(WSTATE.PUSH, ImageResource.BTN_OFF_HOVER); + button.setImage(WSTATE.DISABLE_OFF, ImageResource.BTN_OFF_NML); + button.setImage(WSTATE.SELECTED, ImageResource.BTN_ON_NML); + button.setImage(WSTATE.SELECTED_HOVER, ImageResource.BTN_ON_HOVER); + button.setImage(WSTATE.SELECTED_PUSH, ImageResource.BTN_ON_HOVER); + button.setImage(WSTATE.DISABLE_ON, ImageResource.BTN_OFF_NML); FormData formData = new FormData(); formData.left = new FormAttachment(0, ModifyItem.BODY_MARGIN_LEFT); formData.top = new FormAttachment(0, (ModifyItem.ITEM_HEIGHT - BUTTON_HEIGHT) / 2); @@ -110,8 +110,8 @@ public abstract class OnOffItem extends ModifyDialogItem { public void paintControl(PaintEvent e) { // draw text GC gc = e.gc; - gc.setForeground(ColorResources.CONTENT_FONT.getColor()); - gc.setFont(FontResources.CONTENT.getFont()); + gc.setForeground(ColorResource.CONTENT_FONT.getColor()); + gc.setFont(FontResource.CONTENT.getFont()); int itemHeight = ((Composite)e.widget).getBounds().height; Point textExt = gc.textExtent(labelText); diff --git a/src/org/tizen/emulator/manager/ui/renewal/item/modify/common/ProcessorItem.java b/src/org/tizen/emulator/manager/ui/renewal/item/modify/common/ProcessorItem.java index abcc18d..33adb01 100644 --- a/src/org/tizen/emulator/manager/ui/renewal/item/modify/common/ProcessorItem.java +++ b/src/org/tizen/emulator/manager/ui/renewal/item/modify/common/ProcessorItem.java @@ -34,7 +34,7 @@ package org.tizen.emulator.manager.ui.renewal.item.modify.common; import org.eclipse.swt.widgets.Composite; import org.tizen.emulator.manager.job.CheckVT; import org.tizen.emulator.manager.logging.EMLogger; -import org.tizen.emulator.manager.renewal.resources.ImageResources; +import org.tizen.emulator.manager.renewal.resources.ImageResource; import org.tizen.emulator.manager.resources.StringResources; import org.tizen.emulator.manager.ui.Messages; import org.tizen.emulator.manager.ui.renewal.dialog.DIALOG_MODE; @@ -49,7 +49,7 @@ public class ProcessorItem extends ComboItem { private static final String TITLE = "Processor"; private static final String NAME = "processor"; - private final ImageResources TITLE_ICON_RESOURCE = ImageResources.ICON_TITLE_PROCESSOR; + private final ImageResource TITLE_ICON_RESOURCE = ImageResource.ICON_TITLE_PROCESSOR; private final int COMBO_WIDTH = 124; private int cpuNum; diff --git a/src/org/tizen/emulator/manager/ui/renewal/item/modify/common/ProfileItem.java b/src/org/tizen/emulator/manager/ui/renewal/item/modify/common/ProfileItem.java index 4a54574..707dc51 100644 --- a/src/org/tizen/emulator/manager/ui/renewal/item/modify/common/ProfileItem.java +++ b/src/org/tizen/emulator/manager/ui/renewal/item/modify/common/ProfileItem.java @@ -49,7 +49,7 @@ import org.eclipse.swt.widgets.Event; import org.eclipse.swt.widgets.Listener; import org.tizen.emulator.manager.platform.Profile; import org.tizen.emulator.manager.platform.ProfileList; -import org.tizen.emulator.manager.renewal.resources.ImageResources; +import org.tizen.emulator.manager.renewal.resources.ImageResource; import org.tizen.emulator.manager.ui.renewal.item.modify.comp.ModifyItem; import org.tizen.emulator.manager.ui.renewal.widgets.ImageRadioButton; import org.tizen.emulator.manager.ui.renewal.widgets.WSTATE; @@ -61,7 +61,7 @@ public class ProfileItem extends ModifyDialogItem { private final static String TITLE = "Profile"; private static final String NAME = "profile"; - private final ImageResources TITLE_ICON_RESOURCE = ImageResources.ICON_TITLE_PROFILE; + private final ImageResource TITLE_ICON_RESOURCE = ImageResource.ICON_TITLE_PROFILE; private final String MOBILE = "mobile"; private final String WEARABLE = "wearable"; private final String TV = "tv"; @@ -133,13 +133,13 @@ public class ProfileItem extends ModifyDialogItem { public void paintControl(PaintEvent e) { Image image = null; if (currentProfile.equals(MOBILE)) { - image = ImageResources.BTN_PROFILE_MOBILE_SELECTED.getImage(); + image = ImageResource.BTN_PROFILE_MOBILE_SELECTED.getImage(); } else if (currentProfile.equals(WEARABLE)) { - image = ImageResources.BTN_PROFILE_WEARABLE_SELECTED.getImage(); + image = ImageResource.BTN_PROFILE_WEARABLE_SELECTED.getImage(); } else if (currentProfile.equals(TV)) { - image = ImageResources.BTN_PROFILE_TV_SELECTED.getImage(); + image = ImageResource.BTN_PROFILE_TV_SELECTED.getImage(); } if (image != null) { @@ -199,27 +199,27 @@ public class ProfileItem extends ModifyDialogItem { private void createMobileButton() { ImageRadioButton mobileButton = new ImageRadioButton(item.getBody()); - mobileButton.setImage(WSTATE.NORMAL, ImageResources.BTN_PROFILE_MOBILE_UNSELECTED_NML); - mobileButton.setImage(WSTATE.HOVER, ImageResources.BTN_PROFILE_MOBILE_UNSELECTED_HOVER); - mobileButton.setImage(WSTATE.SELECTED, ImageResources.BTN_PROFILE_MOBILE_SELECTED); + mobileButton.setImage(WSTATE.NORMAL, ImageResource.BTN_PROFILE_MOBILE_UNSELECTED_NML); + mobileButton.setImage(WSTATE.HOVER, ImageResource.BTN_PROFILE_MOBILE_UNSELECTED_HOVER); + mobileButton.setImage(WSTATE.SELECTED, ImageResource.BTN_PROFILE_MOBILE_SELECTED); mobileButton.setToolTipText(MOBILE); buttonMap.put(MOBILE, mobileButton); } private void createWearableButton() { ImageRadioButton wearableButton = new ImageRadioButton(item.getBody()); - wearableButton.setImage(WSTATE.NORMAL, ImageResources.BTN_PROFILE_WEARABLE_UNSELECTED_NML); - wearableButton.setImage(WSTATE.HOVER, ImageResources.BTN_PROFILE_WEARABLE_UNSELECTED_HOVER); - wearableButton.setImage(WSTATE.SELECTED, ImageResources.BTN_PROFILE_WEARABLE_SELECTED); + wearableButton.setImage(WSTATE.NORMAL, ImageResource.BTN_PROFILE_WEARABLE_UNSELECTED_NML); + wearableButton.setImage(WSTATE.HOVER, ImageResource.BTN_PROFILE_WEARABLE_UNSELECTED_HOVER); + wearableButton.setImage(WSTATE.SELECTED, ImageResource.BTN_PROFILE_WEARABLE_SELECTED); wearableButton.setToolTipText(WEARABLE); buttonMap.put(WEARABLE, wearableButton); } private void createTVButton() { ImageRadioButton tvButton = new ImageRadioButton(item.getBody()); - tvButton.setImage(WSTATE.NORMAL, ImageResources.BTN_PROFILE_TV_UNSELECTED_NML); - tvButton.setImage(WSTATE.HOVER, ImageResources.BTN_PROFILE_TV_UNSELECTED_HOVER); - tvButton.setImage(WSTATE.SELECTED, ImageResources.BTN_PROFILE_TV_SELECTED); + tvButton.setImage(WSTATE.NORMAL, ImageResource.BTN_PROFILE_TV_UNSELECTED_NML); + tvButton.setImage(WSTATE.HOVER, ImageResource.BTN_PROFILE_TV_UNSELECTED_HOVER); + tvButton.setImage(WSTATE.SELECTED, ImageResource.BTN_PROFILE_TV_SELECTED); tvButton.setToolTipText(TV); buttonMap.put(TV, tvButton); } diff --git a/src/org/tizen/emulator/manager/ui/renewal/item/modify/common/RamSizeItem.java b/src/org/tizen/emulator/manager/ui/renewal/item/modify/common/RamSizeItem.java index d599da3..3aa8c93 100644 --- a/src/org/tizen/emulator/manager/ui/renewal/item/modify/common/RamSizeItem.java +++ b/src/org/tizen/emulator/manager/ui/renewal/item/modify/common/RamSizeItem.java @@ -36,7 +36,7 @@ import org.eclipse.swt.layout.FormData; import org.eclipse.swt.widgets.Canvas; import org.eclipse.swt.widgets.Composite; import org.tizen.emulator.manager.logging.EMLogger; -import org.tizen.emulator.manager.renewal.resources.ImageResources; +import org.tizen.emulator.manager.renewal.resources.ImageResource; import org.tizen.emulator.manager.ui.renewal.dialog.DIALOG_MODE; import org.tizen.emulator.manager.ui.renewal.item.modify.comp.ModifyItem; import org.tizen.emulator.manager.ui.renewal.item.modify.comp.SubTreeModifyItem; @@ -50,7 +50,7 @@ public class RamSizeItem extends ComboItem { private static final String TITLE = "Ram"; private static final String NAME = "ram"; - private final ImageResources TITLE_ICON_RESOURCE = ImageResources.ICON_TITLE_RAM; + private final ImageResource TITLE_ICON_RESOURCE = ImageResource.ICON_TITLE_RAM; private final int COMBO_WIDTH = 124; private int ramSize = 512; diff --git a/src/org/tizen/emulator/manager/ui/renewal/item/modify/common/ResolutionSubItem.java b/src/org/tizen/emulator/manager/ui/renewal/item/modify/common/ResolutionSubItem.java index 47b4c1a..5479fce 100644 --- a/src/org/tizen/emulator/manager/ui/renewal/item/modify/common/ResolutionSubItem.java +++ b/src/org/tizen/emulator/manager/ui/renewal/item/modify/common/ResolutionSubItem.java @@ -44,7 +44,7 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Event; import org.eclipse.swt.widgets.Listener; import org.tizen.emulator.manager.logging.EMLogger; -import org.tizen.emulator.manager.renewal.resources.ColorResources; +import org.tizen.emulator.manager.renewal.resources.ColorResource; import org.tizen.emulator.manager.ui.renewal.item.modify.comp.ModifyItem; import org.tizen.emulator.manager.ui.renewal.item.modify.comp.PropertyValue; import org.tizen.emulator.manager.ui.renewal.widgets.ComboBox; @@ -99,7 +99,7 @@ public class ResolutionSubItem { data.width = DisplayItem.COMBO_WIDTH; data.height = ModifyItem.WIDGET_HEIGHT; resolutionCombo = new ComboBox(displayItem.getItemListComp().getShell(), comp, SWT.NONE); - resolutionCombo.setParentBackground(ColorResources.MODIFY_ITEM_TITLE_SUB_BACKGROUND); + resolutionCombo.setParentBackground(ColorResource.MODIFY_ITEM_TITLE_SUB_BACKGROUND); resolutionCombo.setLayoutData(data); addResolutionComboListener(); diff --git a/src/org/tizen/emulator/manager/ui/renewal/item/modify/common/SensorItem.java b/src/org/tizen/emulator/manager/ui/renewal/item/modify/common/SensorItem.java index 557bde6..8ce7e77 100644 --- a/src/org/tizen/emulator/manager/ui/renewal/item/modify/common/SensorItem.java +++ b/src/org/tizen/emulator/manager/ui/renewal/item/modify/common/SensorItem.java @@ -35,14 +35,14 @@ import java.util.ArrayList; import java.util.List; import org.eclipse.swt.widgets.Composite; -import org.tizen.emulator.manager.renewal.resources.ImageResources; +import org.tizen.emulator.manager.renewal.resources.ImageResource; import org.tizen.emulator.manager.ui.renewal.item.modify.comp.TreeModifyItem; public class SensorItem extends CheckBoxItem { private static final String TITLE = "Sensor"; private static final String NAME = "sensor"; - private final ImageResources TITLE_ICON_RESOURCE = ImageResources.ICON_TITLE_SENSOR; + private final ImageResource TITLE_ICON_RESOURCE = ImageResource.ICON_TITLE_SENSOR; private static final int NUM_COLUMN = 2; diff --git a/src/org/tizen/emulator/manager/ui/renewal/item/modify/common/SkinShapeItem.java b/src/org/tizen/emulator/manager/ui/renewal/item/modify/common/SkinShapeItem.java index 359aba5..3077380 100644 --- a/src/org/tizen/emulator/manager/ui/renewal/item/modify/common/SkinShapeItem.java +++ b/src/org/tizen/emulator/manager/ui/renewal/item/modify/common/SkinShapeItem.java @@ -47,8 +47,8 @@ import org.eclipse.swt.widgets.Canvas; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Event; import org.eclipse.swt.widgets.Listener; -import org.tizen.emulator.manager.renewal.resources.ColorResources; -import org.tizen.emulator.manager.renewal.resources.FontResources; +import org.tizen.emulator.manager.renewal.resources.ColorResource; +import org.tizen.emulator.manager.renewal.resources.FontResource; import org.tizen.emulator.manager.ui.renewal.item.ItemName; import org.tizen.emulator.manager.ui.renewal.item.modify.comp.ModifyItem; import org.tizen.emulator.manager.ui.renewal.widgets.ComboBox; @@ -262,13 +262,13 @@ public class SkinShapeItem extends ComboItem { GC gc = e.gc; if (isDetailMode() || comboBox.isEnabled()) { - gc.setForeground(ColorResources.CONTENT_FONT.getColor()); + gc.setForeground(ColorResource.CONTENT_FONT.getColor()); } else { - gc.setForeground(ColorResources.DISABLED_TEXT.getColor()); + gc.setForeground(ColorResource.DISABLED_TEXT.getColor()); } - gc.setFont(FontResources.CONTENT.getFont()); + gc.setFont(FontResource.CONTENT.getFont()); int itemHeight = ((Composite)e.widget).getBounds().height; Point textExt = gc.textExtent(getTitle()); diff --git a/src/org/tizen/emulator/manager/ui/renewal/item/modify/common/TextInputBoxItem.java b/src/org/tizen/emulator/manager/ui/renewal/item/modify/common/TextInputBoxItem.java index 378f505..f1345b1 100644 --- a/src/org/tizen/emulator/manager/ui/renewal/item/modify/common/TextInputBoxItem.java +++ b/src/org/tizen/emulator/manager/ui/renewal/item/modify/common/TextInputBoxItem.java @@ -39,7 +39,7 @@ import org.eclipse.swt.layout.FormData; import org.eclipse.swt.widgets.Canvas; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Text; -import org.tizen.emulator.manager.renewal.resources.ImageResources; +import org.tizen.emulator.manager.renewal.resources.ImageResource; import org.tizen.emulator.manager.ui.renewal.item.modify.comp.IconItemTitle; import org.tizen.emulator.manager.ui.renewal.item.modify.comp.ModifyItem; import org.tizen.emulator.manager.ui.renewal.widgets.TextInputBox; @@ -105,7 +105,7 @@ public abstract class TextInputBoxItem extends ModifyDialogItem { return false; } - protected void create(Composite parent,ImageResources iconResource, + protected void create(Composite parent,ImageResource iconResource, int textBoxWidth, boolean needClearButton) { item = new ModifyItem(this); item.init(parent); diff --git a/src/org/tizen/emulator/manager/ui/renewal/item/modify/common/TextLabelItem.java b/src/org/tizen/emulator/manager/ui/renewal/item/modify/common/TextLabelItem.java index 6cef3a6..cd70e65 100644 --- a/src/org/tizen/emulator/manager/ui/renewal/item/modify/common/TextLabelItem.java +++ b/src/org/tizen/emulator/manager/ui/renewal/item/modify/common/TextLabelItem.java @@ -39,9 +39,9 @@ import org.eclipse.swt.graphics.Point; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.widgets.Canvas; import org.eclipse.swt.widgets.Composite; -import org.tizen.emulator.manager.renewal.resources.ColorResources; -import org.tizen.emulator.manager.renewal.resources.FontResources; -import org.tizen.emulator.manager.renewal.resources.ImageResources; +import org.tizen.emulator.manager.renewal.resources.ColorResource; +import org.tizen.emulator.manager.renewal.resources.FontResource; +import org.tizen.emulator.manager.renewal.resources.ImageResource; import org.tizen.emulator.manager.ui.renewal.item.modify.comp.IconItemTitle; import org.tizen.emulator.manager.ui.renewal.item.modify.comp.ModifyItem; @@ -62,7 +62,7 @@ public abstract class TextLabelItem extends ModifyDialogItem { return item.getHeight(); } - protected void create(Composite parent, String title, ImageResources iconResource) { + protected void create(Composite parent, String title, ImageResource iconResource) { item = new ModifyItem(this); item.init(parent); item.setItemTitle(new IconItemTitle(item.getItemComp(), title, iconResource)); @@ -91,8 +91,8 @@ public abstract class TextLabelItem extends ModifyDialogItem { @Override public void paintControl(PaintEvent e) { GC gc = e.gc; - gc.setForeground(ColorResources.CONTENT_FONT.getColor()); - gc.setFont(FontResources.CONTENT.getFont()); + gc.setForeground(ColorResource.CONTENT_FONT.getColor()); + gc.setFont(FontResource.CONTENT.getFont()); Point textExt = gc.textExtent(value); int poxY = (getHeight() - textExt.y) / 2; gc.drawText(value, 0, poxY); diff --git a/src/org/tizen/emulator/manager/ui/renewal/item/modify/comp/AdvancedPropertyViewer.java b/src/org/tizen/emulator/manager/ui/renewal/item/modify/comp/AdvancedPropertyViewer.java index f12d317..812f717 100644 --- a/src/org/tizen/emulator/manager/ui/renewal/item/modify/comp/AdvancedPropertyViewer.java +++ b/src/org/tizen/emulator/manager/ui/renewal/item/modify/comp/AdvancedPropertyViewer.java @@ -48,7 +48,7 @@ import org.eclipse.swt.widgets.Composite; 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.renewal.resources.ColorResources; +import org.tizen.emulator.manager.renewal.resources.ColorResource; import org.tizen.emulator.manager.ui.renewal.MainDialog; import org.tizen.emulator.manager.ui.renewal.dialog.DIALOG_MODE; import org.tizen.emulator.manager.ui.renewal.dialog.ItemListComp; @@ -82,7 +82,7 @@ public class AdvancedPropertyViewer { parentComp.addPaintListener(new PaintListener() { @Override public void paintControl(PaintEvent e) { - e.gc.setForeground(ColorResources.ADVANCED_OPTION_BORDER.getColor()); + e.gc.setForeground(ColorResource.ADVANCED_OPTION_BORDER.getColor()); e.gc.setLineWidth(1); Rectangle rect = ((Composite)e.widget).getBounds(); diff --git a/src/org/tizen/emulator/manager/ui/renewal/item/modify/comp/IconItemTitle.java b/src/org/tizen/emulator/manager/ui/renewal/item/modify/comp/IconItemTitle.java index ecd8a4f..bc78988 100644 --- a/src/org/tizen/emulator/manager/ui/renewal/item/modify/comp/IconItemTitle.java +++ b/src/org/tizen/emulator/manager/ui/renewal/item/modify/comp/IconItemTitle.java @@ -38,26 +38,26 @@ import org.eclipse.swt.layout.FormAttachment; import org.eclipse.swt.layout.FormData; import org.eclipse.swt.widgets.Canvas; import org.eclipse.swt.widgets.Composite; -import org.tizen.emulator.manager.renewal.resources.ColorResources; -import org.tizen.emulator.manager.renewal.resources.ImageResources; +import org.tizen.emulator.manager.renewal.resources.ColorResource; +import org.tizen.emulator.manager.renewal.resources.ImageResource; public class IconItemTitle extends ItemTitle { private Canvas iconCanvas; - private final ImageResources iconResource; + private final ImageResource iconResource; public static final int ICON_WIDTH = 18; public static final int ICON_HEIGHT = 18; private static final int TITLE_SPACING = 8; private static int TITLE_MARGIN_LEFT = 15; - private static ColorResources background = ColorResources.MODIFY_ITEM_TITLE_BACKGROUND; + private static ColorResource background = ColorResource.MODIFY_ITEM_TITLE_BACKGROUND; - public IconItemTitle(Composite parent, String title, ImageResources iconResource) { + public IconItemTitle(Composite parent, String title, ImageResource iconResource) { this(parent, title, TITLE_MARGIN_LEFT, iconResource, background); } public IconItemTitle(Composite parent, String title, int marginLeft, - ImageResources iconResource, ColorResources background) { + ImageResource iconResource, ColorResource background) { super(parent, title, marginLeft, marginLeft + ICON_WIDTH + TITLE_SPACING, background); this.iconResource = iconResource; diff --git a/src/org/tizen/emulator/manager/ui/renewal/item/modify/comp/ItemTitle.java b/src/org/tizen/emulator/manager/ui/renewal/item/modify/comp/ItemTitle.java index bbcc6f6..2f97f52 100644 --- a/src/org/tizen/emulator/manager/ui/renewal/item/modify/comp/ItemTitle.java +++ b/src/org/tizen/emulator/manager/ui/renewal/item/modify/comp/ItemTitle.java @@ -41,8 +41,8 @@ import org.eclipse.swt.layout.FormLayout; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.widgets.Canvas; import org.eclipse.swt.widgets.Composite; -import org.tizen.emulator.manager.renewal.resources.ColorResources; -import org.tizen.emulator.manager.renewal.resources.FontResources; +import org.tizen.emulator.manager.renewal.resources.ColorResource; +import org.tizen.emulator.manager.renewal.resources.FontResource; import org.tizen.emulator.manager.ui.renewal.widgets.WidgetHelper; public class ItemTitle extends Canvas{ @@ -51,13 +51,13 @@ public class ItemTitle extends Canvas{ // public static final int TITLE_CANVAS_WIDTH = 130; private final int LINE_INDENT = 5; public static int TITLE_MARGIN_LEFT = 15; - public static ColorResources TITLE_BACKGROUND = - ColorResources.MODIFY_ITEM_TITLE_BACKGROUND; + public static ColorResource TITLE_BACKGROUND = + ColorResource.MODIFY_ITEM_TITLE_BACKGROUND; protected final String title; protected int marginLeft = 0; private int titleIndent = 0; - protected final ColorResources background; + protected final ColorResource background; boolean isDrawBottomLine = true; @@ -69,7 +69,7 @@ public class ItemTitle extends Canvas{ protected boolean isTitleEnable = true; - public ItemTitle(Composite parent, String title, int marginLeft, int titleIndent, ColorResources background) { + public ItemTitle(Composite parent, String title, int marginLeft, int titleIndent, ColorResource background) { super(parent, SWT.NONE); this.title = title; this.marginLeft = marginLeft; @@ -100,8 +100,8 @@ public class ItemTitle extends Canvas{ if (drawMark) { text = ESSENTIAL_MARK; } - gc.setFont(FontResources.MODIFY_ITEM_TITLE.getFont()); - gc.setForeground(ColorResources.ESSENTIAL_MARK.getColor()); + gc.setFont(FontResource.MODIFY_ITEM_TITLE.getFont()); + gc.setForeground(ColorResource.ESSENTIAL_MARK.getColor()); Point textExt = gc.textExtent(text); int titleY = (itemHeight - textExt.y) / 2 + 1; gc.drawText(text, 0, titleY); @@ -115,7 +115,7 @@ public class ItemTitle extends Canvas{ data.top = new FormAttachment(0, 0); data.bottom = new FormAttachment(100, -1); data.width = WidgetHelper.calcTextWidth(markCanvas, ESSENTIAL_MARK, - FontResources.MODIFY_ITEM_TITLE.getFont()); + FontResource.MODIFY_ITEM_TITLE.getFont()); } else { data.left = new FormAttachment(0,-1); @@ -179,7 +179,7 @@ public class ItemTitle extends Canvas{ data.top = new FormAttachment(0, 0); data.bottom = new FormAttachment(100, -1); data.width = WidgetHelper.calcTextWidth(titleCanvas, title, - FontResources.MODIFY_ITEM_TITLE.getFont()); + FontResource.MODIFY_ITEM_TITLE.getFont()); titleCanvas.setLayoutData(data); // draw title @@ -192,11 +192,11 @@ public class ItemTitle extends Canvas{ // draw text if (isTitleEnable) { - gc.setForeground(ColorResources.MODIFY_ITEM_TITLE.getColor()); + gc.setForeground(ColorResource.MODIFY_ITEM_TITLE.getColor()); } else { - gc.setForeground(ColorResources.DISABLED_TEXT.getColor()); + gc.setForeground(ColorResource.DISABLED_TEXT.getColor()); } - gc.setFont(FontResources.MODIFY_ITEM_TITLE.getFont()); + gc.setFont(FontResource.MODIFY_ITEM_TITLE.getFont()); Point textExt = gc.textExtent(title); int titleY = (itemHeight - textExt.y) / 2; @@ -217,7 +217,7 @@ public class ItemTitle extends Canvas{ // draw under line if (isDrawBottomLine) { int lineWidth = ModifyItem.LINE_WIDTH; - gc.setForeground(ColorResources.MODIFY_ITEM_LINE.getColor()); + gc.setForeground(ColorResource.MODIFY_ITEM_LINE.getColor()); gc.setLineWidth(lineWidth); gc.drawLine(LINE_INDENT, itemHeight, TITLE_CANVAS_WIDTH, itemHeight); diff --git a/src/org/tizen/emulator/manager/ui/renewal/item/modify/comp/ModifyItem.java b/src/org/tizen/emulator/manager/ui/renewal/item/modify/comp/ModifyItem.java index b562e9b..16f04f4 100644 --- a/src/org/tizen/emulator/manager/ui/renewal/item/modify/comp/ModifyItem.java +++ b/src/org/tizen/emulator/manager/ui/renewal/item/modify/comp/ModifyItem.java @@ -42,7 +42,7 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Event; import org.eclipse.swt.widgets.Layout; import org.eclipse.swt.widgets.Listener; -import org.tizen.emulator.manager.renewal.resources.ColorResources; +import org.tizen.emulator.manager.renewal.resources.ColorResource; import org.tizen.emulator.manager.ui.renewal.dialog.VMModifyDialog; import org.tizen.emulator.manager.ui.renewal.item.modify.common.ModifyDialogItem; @@ -67,12 +67,12 @@ public class ModifyItem { private int itemHeight = ITEM_HEIGHT; - protected ColorResources background; + protected ColorResource background; // Constructor public ModifyItem(ModifyDialogItem dialogItem){ this.dialogItem = dialogItem; - background = ColorResources.WHITE; + background = ColorResource.WHITE; } public void setFocus() { @@ -157,7 +157,7 @@ public class ModifyItem { } GC gc = e.gc; Rectangle rect = ((Composite)e.widget).getBounds(); - gc.setForeground(ColorResources.MODIFY_ITEM_LINE.getColor()); + gc.setForeground(ColorResource.MODIFY_ITEM_LINE.getColor()); gc.setLineWidth(ModifyItem.LINE_WIDTH); gc.drawLine(-1, getItemHeight(), rect.width, getItemHeight()); diff --git a/src/org/tizen/emulator/manager/ui/renewal/item/modify/comp/SubItemTitle.java b/src/org/tizen/emulator/manager/ui/renewal/item/modify/comp/SubItemTitle.java index e158b3d..ea396de 100644 --- a/src/org/tizen/emulator/manager/ui/renewal/item/modify/comp/SubItemTitle.java +++ b/src/org/tizen/emulator/manager/ui/renewal/item/modify/comp/SubItemTitle.java @@ -42,8 +42,8 @@ import org.eclipse.swt.layout.FormLayout; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.widgets.Canvas; import org.eclipse.swt.widgets.Composite; -import org.tizen.emulator.manager.renewal.resources.ColorResources; -import org.tizen.emulator.manager.renewal.resources.FontResources; +import org.tizen.emulator.manager.renewal.resources.ColorResource; +import org.tizen.emulator.manager.renewal.resources.FontResource; import org.tizen.emulator.manager.ui.renewal.widgets.WidgetHelper; public class SubItemTitle extends ItemTitle{ @@ -55,14 +55,14 @@ public class SubItemTitle extends ItemTitle{ boolean drawVerticalLine = true; public SubItemTitle(Composite parent, String title, - ColorResources background, boolean drawVerticalLine, int titleWidth ) { + ColorResource background, boolean drawVerticalLine, int titleWidth ) { super(parent, title, MARGIN_LEFT, MARGIN_LEFT, background); this.drawVerticalLine = drawVerticalLine; this.titleWidth = titleWidth; } public SubItemTitle(Composite parent, String title, - ColorResources background) { + ColorResource background) { this(parent, title, background, true, TITLE_WIDTH); } @@ -105,7 +105,7 @@ public class SubItemTitle extends ItemTitle{ data.top = new FormAttachment(0, 0); data.bottom = new FormAttachment(100, -1); data.width = WidgetHelper.calcTextWidth(titleCanvas, title, - FontResources.MODIFY_ITEM_TITLE.getFont()); + FontResource.MODIFY_ITEM_TITLE.getFont()); titleCanvas.setLayoutData(data); // draw title @@ -119,12 +119,12 @@ public class SubItemTitle extends ItemTitle{ // draw text if (isTitleEnable) { - gc.setForeground(ColorResources.CONTENT_FONT.getColor()); + gc.setForeground(ColorResource.CONTENT_FONT.getColor()); } else { - gc.setForeground(ColorResources.DISABLED_TEXT.getColor()); + gc.setForeground(ColorResource.DISABLED_TEXT.getColor()); } - gc.setFont(FontResources.MODIFY_ITEM_TITLE.getFont()); + gc.setFont(FontResource.MODIFY_ITEM_TITLE.getFont()); Point textExt = gc.textExtent(title); int titleY = (itemHeight - textExt.y) / 2; gc.drawText(title, 0, titleY); @@ -141,7 +141,7 @@ public class SubItemTitle extends ItemTitle{ // draw right vertical line if (drawVerticalLine) { - gc.setForeground(ColorResources.MODIFY_ITEM_LINE.getColor()); + gc.setForeground(ColorResource.MODIFY_ITEM_LINE.getColor()); gc.setLineWidth(ModifyItem.LINE_WIDTH); gc.drawLine(titleWidth -1, -1, titleWidth -1, itemHeight + 1); @@ -150,7 +150,7 @@ public class SubItemTitle extends ItemTitle{ // draw bottom line if (drawLine) { int lineWidth = ModifyItem.LINE_WIDTH; - gc.setForeground(ColorResources.MODIFY_ITEM_LINE.getColor()); + gc.setForeground(ColorResource.MODIFY_ITEM_LINE.getColor()); gc.setLineWidth(lineWidth); gc.drawLine(-1, itemHeight, titleWidth, itemHeight); diff --git a/src/org/tizen/emulator/manager/ui/renewal/item/modify/comp/SubTreeItemTitle.java b/src/org/tizen/emulator/manager/ui/renewal/item/modify/comp/SubTreeItemTitle.java index 5fc42c3..3e6f5ce 100644 --- a/src/org/tizen/emulator/manager/ui/renewal/item/modify/comp/SubTreeItemTitle.java +++ b/src/org/tizen/emulator/manager/ui/renewal/item/modify/comp/SubTreeItemTitle.java @@ -31,15 +31,15 @@ package org.tizen.emulator.manager.ui.renewal.item.modify.comp; import org.eclipse.swt.widgets.Composite; -import org.tizen.emulator.manager.renewal.resources.ColorResources; -import org.tizen.emulator.manager.renewal.resources.ImageResources; +import org.tizen.emulator.manager.renewal.resources.ColorResource; +import org.tizen.emulator.manager.renewal.resources.ImageResource; public class SubTreeItemTitle extends IconItemTitle { private static int TITLE_MARGIN_LEFT = 23; - private static ColorResources background = ColorResources.MODIFY_ITEM_TITLE_SUB_BACKGROUND; + private static ColorResource background = ColorResource.MODIFY_ITEM_TITLE_SUB_BACKGROUND; - public SubTreeItemTitle(Composite parent, String title, ImageResources iconResource) { + public SubTreeItemTitle(Composite parent, String title, ImageResource iconResource) { super(parent, title, TITLE_MARGIN_LEFT, iconResource, background); } } diff --git a/src/org/tizen/emulator/manager/ui/renewal/item/modify/comp/SubTreeModifyItem.java b/src/org/tizen/emulator/manager/ui/renewal/item/modify/comp/SubTreeModifyItem.java index bb15f00..2d67915 100644 --- a/src/org/tizen/emulator/manager/ui/renewal/item/modify/comp/SubTreeModifyItem.java +++ b/src/org/tizen/emulator/manager/ui/renewal/item/modify/comp/SubTreeModifyItem.java @@ -31,7 +31,7 @@ package org.tizen.emulator.manager.ui.renewal.item.modify.comp; import org.eclipse.swt.layout.GridData; -import org.tizen.emulator.manager.renewal.resources.ColorResources; +import org.tizen.emulator.manager.renewal.resources.ColorResource; import org.tizen.emulator.manager.ui.renewal.item.modify.common.ModifyDialogItem; @@ -42,7 +42,7 @@ public class SubTreeModifyItem extends ModifyItem{ public SubTreeModifyItem(ModifyDialogItem dialogItem, TreeModifyItem treeRoot) { super(dialogItem); this.treeRoot = treeRoot; - background = ColorResources.MODIFY_SUB_TREE_CONTENT; + background = ColorResource.MODIFY_SUB_TREE_CONTENT; } public TreeModifyItem getTreeRoot() { diff --git a/src/org/tizen/emulator/manager/ui/renewal/item/modify/comp/TreeItemTitle.java b/src/org/tizen/emulator/manager/ui/renewal/item/modify/comp/TreeItemTitle.java index dd69c82..24db953 100644 --- a/src/org/tizen/emulator/manager/ui/renewal/item/modify/comp/TreeItemTitle.java +++ b/src/org/tizen/emulator/manager/ui/renewal/item/modify/comp/TreeItemTitle.java @@ -41,8 +41,8 @@ import org.eclipse.swt.layout.FormData; import org.eclipse.swt.widgets.Canvas; import org.eclipse.swt.widgets.Event; import org.eclipse.swt.widgets.Listener; -import org.tizen.emulator.manager.renewal.resources.ColorResources; -import org.tizen.emulator.manager.renewal.resources.ImageResources; +import org.tizen.emulator.manager.renewal.resources.ColorResource; +import org.tizen.emulator.manager.renewal.resources.ImageResource; public class TreeItemTitle extends IconItemTitle { @@ -51,9 +51,9 @@ public class TreeItemTitle extends IconItemTitle { private final TreeModifyItem treeRoot; - private static ColorResources background = ColorResources.MODIFY_ITEM_TITLE_BACKGROUND; - private static ImageResources ARROW_EXPANDED = ImageResources.ICON_TITLE_TREE_EXPANDED; - private static ImageResources ARROW_CLOSED = ImageResources.ICON_TITLE_TREE_CLOSED; + private static ColorResource background = ColorResource.MODIFY_ITEM_TITLE_BACKGROUND; + private static ImageResource ARROW_EXPANDED = ImageResource.ICON_TITLE_TREE_EXPANDED; + private static ImageResource ARROW_CLOSED = ImageResource.ICON_TITLE_TREE_CLOSED; public TreeItemTitle(TreeModifyItem treeRoot, String title) { diff --git a/src/org/tizen/emulator/manager/ui/renewal/item/modify/template/CameraItem.java b/src/org/tizen/emulator/manager/ui/renewal/item/modify/template/CameraItem.java index 274aefc..3b44bf9 100644 --- a/src/org/tizen/emulator/manager/ui/renewal/item/modify/template/CameraItem.java +++ b/src/org/tizen/emulator/manager/ui/renewal/item/modify/template/CameraItem.java @@ -34,7 +34,7 @@ import java.util.ArrayList; import java.util.List; import org.eclipse.swt.widgets.Composite; -import org.tizen.emulator.manager.renewal.resources.ImageResources; +import org.tizen.emulator.manager.renewal.resources.ImageResource; import org.tizen.emulator.manager.ui.renewal.item.modify.common.CheckBoxItem; import org.tizen.emulator.manager.ui.renewal.item.modify.common.CheckItemData; import org.tizen.emulator.manager.ui.renewal.item.modify.common.ModifyDialogItem; @@ -62,7 +62,7 @@ public class CameraItem extends CheckBoxItem { @Override public void create(Composite parent) { item.init(parent); - item.setItemTitle(createIconTitle(item, ImageResources.ICON_TITLE_CAMERA)); + item.setItemTitle(createIconTitle(item, ImageResource.ICON_TITLE_CAMERA)); item.create(); createCheckBoxItems(item); diff --git a/src/org/tizen/emulator/manager/ui/renewal/item/modify/template/TemplateSkinSubItem.java b/src/org/tizen/emulator/manager/ui/renewal/item/modify/template/TemplateSkinSubItem.java index 83b6871..3a1bc54 100644 --- a/src/org/tizen/emulator/manager/ui/renewal/item/modify/template/TemplateSkinSubItem.java +++ b/src/org/tizen/emulator/manager/ui/renewal/item/modify/template/TemplateSkinSubItem.java @@ -42,7 +42,7 @@ import org.eclipse.swt.widgets.Event; import org.eclipse.swt.widgets.Listener; import org.tizen.emulator.manager.logging.EMLogger; import org.tizen.emulator.manager.platform.Skin; -import org.tizen.emulator.manager.renewal.resources.ImageResources; +import org.tizen.emulator.manager.renewal.resources.ImageResource; import org.tizen.emulator.manager.resources.StringResources; import org.tizen.emulator.manager.ui.renewal.MainDialog; import org.tizen.emulator.manager.ui.renewal.dialog.MessageBox; @@ -69,7 +69,7 @@ public class TemplateSkinSubItem extends SkinSubItem { textBox = new TextBox(comp, SWT.NONE, SWT.CENTER); dirDialogButton = new BlueButton(comp, SWT.PUSH); - dirDialogButton.setIcon(ImageResources.ICON_BLUE_BUTTON_OPEN); + dirDialogButton.setIcon(ImageResource.ICON_BLUE_BUTTON_OPEN); // set layout data FormData data = new FormData(); diff --git a/src/org/tizen/emulator/manager/ui/renewal/item/modify/vm/CPUSupportItem.java b/src/org/tizen/emulator/manager/ui/renewal/item/modify/vm/CPUSupportItem.java index 342f2d4..12942e5 100644 --- a/src/org/tizen/emulator/manager/ui/renewal/item/modify/vm/CPUSupportItem.java +++ b/src/org/tizen/emulator/manager/ui/renewal/item/modify/vm/CPUSupportItem.java @@ -32,7 +32,7 @@ package org.tizen.emulator.manager.ui.renewal.item.modify.vm; import org.eclipse.swt.widgets.Composite; import org.tizen.emulator.manager.job.CheckVT; -import org.tizen.emulator.manager.renewal.resources.ColorResources; +import org.tizen.emulator.manager.renewal.resources.ColorResource; import org.tizen.emulator.manager.resources.StringResources; import org.tizen.emulator.manager.ui.Messages; import org.tizen.emulator.manager.ui.renewal.item.ItemName; @@ -72,7 +72,7 @@ public class CPUSupportItem extends OnOffItem { item.setItemHeight(SubModifyItem.ITEM_HEIGHT); item.init(parent); item.setItemTitle(new SubItemTitle(item.getItemComp(), getTitle(), - ColorResources.WHITE)); + ColorResource.WHITE)); item.create(); makeBody(); diff --git a/src/org/tizen/emulator/manager/ui/renewal/item/modify/vm/CameraImageItem.java b/src/org/tizen/emulator/manager/ui/renewal/item/modify/vm/CameraImageItem.java index 5f33876..bae275e 100644 --- a/src/org/tizen/emulator/manager/ui/renewal/item/modify/vm/CameraImageItem.java +++ b/src/org/tizen/emulator/manager/ui/renewal/item/modify/vm/CameraImageItem.java @@ -33,7 +33,7 @@ package org.tizen.emulator.manager.ui.renewal.item.modify.vm; import java.io.File; import org.eclipse.swt.widgets.Composite; -import org.tizen.emulator.manager.renewal.resources.ColorResources; +import org.tizen.emulator.manager.renewal.resources.ColorResource; import org.tizen.emulator.manager.resources.FilePathResources; import org.tizen.emulator.manager.ui.Messages; import org.tizen.emulator.manager.ui.renewal.item.ItemName; @@ -62,7 +62,7 @@ public class CameraImageItem extends FileDialogItem { item.setItemHeight(SubModifyItem.ITEM_HEIGHT); item.init(parent); item.setItemTitle(new SubItemTitle(item.getItemComp(), getTitle(), - ColorResources.WHITE)); + ColorResource.WHITE)); item.create(); makeBody(SubModifyItem.BOX_WIDTH); diff --git a/src/org/tizen/emulator/manager/ui/renewal/item/modify/vm/CameraItem.java b/src/org/tizen/emulator/manager/ui/renewal/item/modify/vm/CameraItem.java index e1dacd9..ad94193 100644 --- a/src/org/tizen/emulator/manager/ui/renewal/item/modify/vm/CameraItem.java +++ b/src/org/tizen/emulator/manager/ui/renewal/item/modify/vm/CameraItem.java @@ -32,7 +32,7 @@ package org.tizen.emulator.manager.ui.renewal.item.modify.vm; import org.eclipse.swt.widgets.Composite; import org.tizen.emulator.manager.job.CheckWebcam; -import org.tizen.emulator.manager.renewal.resources.ImageResources; +import org.tizen.emulator.manager.renewal.resources.ImageResource; import org.tizen.emulator.manager.ui.renewal.item.ItemName; import org.tizen.emulator.manager.ui.renewal.item.modify.common.ModifyDialogItem; import org.tizen.emulator.manager.ui.renewal.item.modify.comp.ModifyItem; @@ -79,7 +79,7 @@ public class CameraItem extends CategoryItem { item.init(parent); // TODO set camera icon - item.setItemTitle(createIconTitle(item, ImageResources.ICON_TITLE_CAMERA)); + item.setItemTitle(createIconTitle(item, ImageResource.ICON_TITLE_CAMERA)); item.create(); makeBody(); diff --git a/src/org/tizen/emulator/manager/ui/renewal/item/modify/vm/CameraLegacyItem.java b/src/org/tizen/emulator/manager/ui/renewal/item/modify/vm/CameraLegacyItem.java index 964caa1..41104ad 100644 --- a/src/org/tizen/emulator/manager/ui/renewal/item/modify/vm/CameraLegacyItem.java +++ b/src/org/tizen/emulator/manager/ui/renewal/item/modify/vm/CameraLegacyItem.java @@ -34,7 +34,7 @@ import java.util.List; import java.util.Map; import org.eclipse.swt.widgets.Composite; -import org.tizen.emulator.manager.renewal.resources.ImageResources; +import org.tizen.emulator.manager.renewal.resources.ImageResource; import org.tizen.emulator.manager.ui.renewal.item.modify.common.CheckBoxItem; import org.tizen.emulator.manager.ui.renewal.item.modify.common.CheckBoxSubItem; import org.tizen.emulator.manager.ui.renewal.item.modify.common.CheckItemData; @@ -50,7 +50,7 @@ public class CameraLegacyItem extends CheckBoxItem { @Override public void create(Composite parent) { item.init(parent); - item.setItemTitle(createIconTitle(item, ImageResources.ICON_TITLE_CAMERA)); + item.setItemTitle(createIconTitle(item, ImageResource.ICON_TITLE_CAMERA)); item.create(); createCheckBoxItems(item); diff --git a/src/org/tizen/emulator/manager/ui/renewal/item/modify/vm/CameraTypeItem.java b/src/org/tizen/emulator/manager/ui/renewal/item/modify/vm/CameraTypeItem.java index e6ab8b6..7ec5343 100644 --- a/src/org/tizen/emulator/manager/ui/renewal/item/modify/vm/CameraTypeItem.java +++ b/src/org/tizen/emulator/manager/ui/renewal/item/modify/vm/CameraTypeItem.java @@ -33,7 +33,7 @@ package org.tizen.emulator.manager.ui.renewal.item.modify.vm; import org.eclipse.swt.SWT; import org.eclipse.swt.widgets.Canvas; import org.eclipse.swt.widgets.Composite; -import org.tizen.emulator.manager.renewal.resources.ColorResources; +import org.tizen.emulator.manager.renewal.resources.ColorResource; import org.tizen.emulator.manager.ui.detail.item.property.CameraViewItem; import org.tizen.emulator.manager.ui.renewal.item.ItemName; import org.tizen.emulator.manager.ui.renewal.item.modify.common.ComboItem; @@ -59,7 +59,7 @@ public class CameraTypeItem extends ComboItem { item.setItemHeight(SubModifyItem.ITEM_HEIGHT); item.init(parent); item.setItemTitle(new SubItemTitle(item.getItemComp(), getTitle(), - ColorResources.WHITE)); + ColorResource.WHITE)); item.create(); makeBody(); diff --git a/src/org/tizen/emulator/manager/ui/renewal/item/modify/vm/FileSharingItem.java b/src/org/tizen/emulator/manager/ui/renewal/item/modify/vm/FileSharingItem.java index e01f433..783d2ec 100644 --- a/src/org/tizen/emulator/manager/ui/renewal/item/modify/vm/FileSharingItem.java +++ b/src/org/tizen/emulator/manager/ui/renewal/item/modify/vm/FileSharingItem.java @@ -31,13 +31,13 @@ package org.tizen.emulator.manager.ui.renewal.item.modify.vm; import org.eclipse.swt.widgets.Composite; -import org.tizen.emulator.manager.renewal.resources.ImageResources; +import org.tizen.emulator.manager.renewal.resources.ImageResource; import org.tizen.emulator.manager.ui.renewal.item.modify.common.FileDialogItem; import org.tizen.emulator.manager.ui.renewal.item.modify.common.ModifyDialogItem; public class FileSharingItem extends FileDialogItem { - private final ImageResources TITLE_ICON_RESOURCE = ImageResources.ICON_TITLE_FILESHARING; + private final ImageResource TITLE_ICON_RESOURCE = ImageResource.ICON_TITLE_FILESHARING; private static final String NAME="fileSharing"; private static final String TITLE="File Sharing"; private final int TEXT_BOX_WIDTH = 232; diff --git a/src/org/tizen/emulator/manager/ui/renewal/item/modify/vm/GPUSupportItem.java b/src/org/tizen/emulator/manager/ui/renewal/item/modify/vm/GPUSupportItem.java index b00834d..a19b3af 100644 --- a/src/org/tizen/emulator/manager/ui/renewal/item/modify/vm/GPUSupportItem.java +++ b/src/org/tizen/emulator/manager/ui/renewal/item/modify/vm/GPUSupportItem.java @@ -32,7 +32,7 @@ package org.tizen.emulator.manager.ui.renewal.item.modify.vm; import org.eclipse.swt.widgets.Composite; import org.tizen.emulator.manager.job.CheckGPU; -import org.tizen.emulator.manager.renewal.resources.ColorResources; +import org.tizen.emulator.manager.renewal.resources.ColorResource; import org.tizen.emulator.manager.resources.StringResources; import org.tizen.emulator.manager.ui.Messages; import org.tizen.emulator.manager.ui.renewal.item.ItemName; @@ -82,7 +82,7 @@ public class GPUSupportItem extends OnOffItem { item.setItemHeight(SubModifyItem.ITEM_HEIGHT); item.init(parent); item.setItemTitle(new SubItemTitle(item.getItemComp(), getTitle(), - ColorResources.WHITE)); + ColorResource.WHITE)); item.create(); makeBody(); diff --git a/src/org/tizen/emulator/manager/ui/renewal/item/modify/vm/HWSupportItem.java b/src/org/tizen/emulator/manager/ui/renewal/item/modify/vm/HWSupportItem.java index 19bd957..09201bb 100644 --- a/src/org/tizen/emulator/manager/ui/renewal/item/modify/vm/HWSupportItem.java +++ b/src/org/tizen/emulator/manager/ui/renewal/item/modify/vm/HWSupportItem.java @@ -32,7 +32,7 @@ package org.tizen.emulator.manager.ui.renewal.item.modify.vm; import org.eclipse.swt.widgets.Composite; -import org.tizen.emulator.manager.renewal.resources.ImageResources; +import org.tizen.emulator.manager.renewal.resources.ImageResource; import org.tizen.emulator.manager.ui.renewal.item.modify.common.ModifyDialogItem; import org.tizen.emulator.manager.ui.renewal.item.modify.comp.ModifyItem; @@ -61,7 +61,7 @@ public class HWSupportItem extends CategoryItem { item = new ModifyItem(this); item.setItemHeight(itemHeight); item.init(parent); - item.setItemTitle(createIconTitle(item, ImageResources.ICON_TITLE_HWSUPPORT)); + item.setItemTitle(createIconTitle(item, ImageResource.ICON_TITLE_HWSUPPORT)); item.create(); makeBody(); diff --git a/src/org/tizen/emulator/manager/ui/renewal/item/modify/vm/NetConnectTypeItem.java b/src/org/tizen/emulator/manager/ui/renewal/item/modify/vm/NetConnectTypeItem.java index 3957714..af6e44a 100644 --- a/src/org/tizen/emulator/manager/ui/renewal/item/modify/vm/NetConnectTypeItem.java +++ b/src/org/tizen/emulator/manager/ui/renewal/item/modify/vm/NetConnectTypeItem.java @@ -37,7 +37,7 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.Shell; import org.tizen.emulator.manager.EmulatorManager; -import org.tizen.emulator.manager.renewal.resources.ColorResources; +import org.tizen.emulator.manager.renewal.resources.ColorResource; import org.tizen.emulator.manager.resources.StringResources; import org.tizen.emulator.manager.tool.TapUtil; import org.tizen.emulator.manager.ui.Messages; @@ -72,7 +72,7 @@ public class NetConnectTypeItem extends ComboItem{ item.setItemHeight(SubModifyItem.ITEM_HEIGHT); item.init(parent); item.setItemTitle(new SubItemTitle(item.getItemComp(), getTitle(), - ColorResources.WHITE)); + ColorResource.WHITE)); item.create(); makeBody(); diff --git a/src/org/tizen/emulator/manager/ui/renewal/item/modify/vm/NetDnsItem.java b/src/org/tizen/emulator/manager/ui/renewal/item/modify/vm/NetDnsItem.java index 0e64e7a..315bdfd 100644 --- a/src/org/tizen/emulator/manager/ui/renewal/item/modify/vm/NetDnsItem.java +++ b/src/org/tizen/emulator/manager/ui/renewal/item/modify/vm/NetDnsItem.java @@ -32,7 +32,7 @@ package org.tizen.emulator.manager.ui.renewal.item.modify.vm; import org.eclipse.swt.widgets.Composite; -import org.tizen.emulator.manager.renewal.resources.ColorResources; +import org.tizen.emulator.manager.renewal.resources.ColorResource; import org.tizen.emulator.manager.tool.TapUtil; import org.tizen.emulator.manager.ui.renewal.item.ItemName; import org.tizen.emulator.manager.ui.renewal.item.ItemState; @@ -56,7 +56,7 @@ public class NetDnsItem extends TextInputBoxItem { item.setItemHeight(SubModifyItem.ITEM_HEIGHT); item.init(parent); item.setItemTitle(new SubItemTitle(item.getItemComp(), getTitle(), - ColorResources.WHITE)); + ColorResource.WHITE)); item.create(); makeBody(); diff --git a/src/org/tizen/emulator/manager/ui/renewal/item/modify/vm/NetIPInfoItem.java b/src/org/tizen/emulator/manager/ui/renewal/item/modify/vm/NetIPInfoItem.java index 7647517..1c497b7 100644 --- a/src/org/tizen/emulator/manager/ui/renewal/item/modify/vm/NetIPInfoItem.java +++ b/src/org/tizen/emulator/manager/ui/renewal/item/modify/vm/NetIPInfoItem.java @@ -38,7 +38,7 @@ import org.eclipse.swt.layout.GridData; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Event; import org.eclipse.swt.widgets.Listener; -import org.tizen.emulator.manager.renewal.resources.ColorResources; +import org.tizen.emulator.manager.renewal.resources.ColorResource; import org.tizen.emulator.manager.ui.renewal.item.ItemName; import org.tizen.emulator.manager.ui.renewal.item.modify.common.CheckBoxSubItem; import org.tizen.emulator.manager.ui.renewal.item.modify.common.ModifyDialogItem; @@ -81,7 +81,7 @@ public class NetIPInfoItem extends ModifyDialogItem { item.setItemHeight(SubModifyItem.ITEM_HEIGHT * ROW_NUM); item.init(parent); item.setItemTitle(new SubItemTitle(item.getItemComp(), getTitle(), - ColorResources.WHITE)); + ColorResource.WHITE)); item.create(); makeBody(); diff --git a/src/org/tizen/emulator/manager/ui/renewal/item/modify/vm/NetIPSubItem.java b/src/org/tizen/emulator/manager/ui/renewal/item/modify/vm/NetIPSubItem.java index ffcac3a..ba894dd 100644 --- a/src/org/tizen/emulator/manager/ui/renewal/item/modify/vm/NetIPSubItem.java +++ b/src/org/tizen/emulator/manager/ui/renewal/item/modify/vm/NetIPSubItem.java @@ -34,7 +34,7 @@ package org.tizen.emulator.manager.ui.renewal.item.modify.vm; import org.eclipse.swt.events.FocusEvent; import org.eclipse.swt.events.FocusListener; import org.eclipse.swt.widgets.Composite; -import org.tizen.emulator.manager.renewal.resources.ColorResources; +import org.tizen.emulator.manager.renewal.resources.ColorResource; import org.tizen.emulator.manager.tool.TapUtil; import org.tizen.emulator.manager.ui.renewal.item.ItemName; import org.tizen.emulator.manager.ui.renewal.item.ItemState; @@ -59,7 +59,7 @@ public class NetIPSubItem extends TextInputBoxItem { item.setItemHeight(SubModifyItem.ITEM_HEIGHT - 1); item.init(parent); item.setItemTitle(new SubItemTitle(item.getItemComp(), getTitle(), - ColorResources.WHITE, false, TITLE_WIDTH)); + ColorResource.WHITE, false, TITLE_WIDTH)); setDrawBottomLine(false); // for item body item.create(); diff --git a/src/org/tizen/emulator/manager/ui/renewal/item/modify/vm/NetMacItem.java b/src/org/tizen/emulator/manager/ui/renewal/item/modify/vm/NetMacItem.java index ed18996..823c86b 100644 --- a/src/org/tizen/emulator/manager/ui/renewal/item/modify/vm/NetMacItem.java +++ b/src/org/tizen/emulator/manager/ui/renewal/item/modify/vm/NetMacItem.java @@ -35,7 +35,7 @@ import java.util.Random; import org.eclipse.swt.widgets.Composite; import org.tizen.emulator.manager.EmulatorManager; -import org.tizen.emulator.manager.renewal.resources.ColorResources; +import org.tizen.emulator.manager.renewal.resources.ColorResource; import org.tizen.emulator.manager.ui.detail.item.CommonItemListFactory; import org.tizen.emulator.manager.ui.renewal.item.ItemName; import org.tizen.emulator.manager.ui.renewal.item.modify.common.ModifyDialogItem; @@ -60,7 +60,7 @@ public class NetMacItem extends TextBoxItem { item.setItemHeight(SubModifyItem.ITEM_HEIGHT); item.init(parent); item.setItemTitle(new SubItemTitle(item.getItemComp(), getTitle(), - ColorResources.WHITE)); + ColorResource.WHITE)); item.create(); makeBody(); diff --git a/src/org/tizen/emulator/manager/ui/renewal/item/modify/vm/NetProxyItem.java b/src/org/tizen/emulator/manager/ui/renewal/item/modify/vm/NetProxyItem.java index c4e1cf0..c01a2a3 100644 --- a/src/org/tizen/emulator/manager/ui/renewal/item/modify/vm/NetProxyItem.java +++ b/src/org/tizen/emulator/manager/ui/renewal/item/modify/vm/NetProxyItem.java @@ -40,8 +40,8 @@ import org.eclipse.swt.widgets.Canvas; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Event; import org.eclipse.swt.widgets.Listener; -import org.tizen.emulator.manager.renewal.resources.ColorResources; -import org.tizen.emulator.manager.renewal.resources.ImageResources; +import org.tizen.emulator.manager.renewal.resources.ColorResource; +import org.tizen.emulator.manager.renewal.resources.ImageResource; import org.tizen.emulator.manager.resources.StringResources; import org.tizen.emulator.manager.ui.Messages; import org.tizen.emulator.manager.ui.renewal.dialog.network.ProxyDialog; @@ -89,7 +89,7 @@ public class NetProxyItem extends ComboItem{ item.setItemHeight(SubModifyItem.ITEM_HEIGHT); item.init(parent); item.setItemTitle(new SubItemTitle(item.getItemComp(), TITLE, - ColorResources.WHITE)); + ColorResource.WHITE)); item.create(); makeBody(); @@ -130,14 +130,14 @@ public class NetProxyItem extends ComboItem{ private void makeSettingButton() { // create setting button button = new ImageButton(item.getBody(), SWT.PUSH); - button.setImage(WSTATE.NORMAL, ImageResources.BTN_SETTING_NML); - button.setImage(WSTATE.HOVER, ImageResources.BTN_SETTING_HOVER); - button.setImage(WSTATE.PUSH, ImageResources.BTN_SETTING_HOVER); - button.setImage(WSTATE.DISABLE_OFF, ImageResources.BTN_SETTING_NML); - button.setImage(WSTATE.SELECTED, ImageResources.BTN_SETTING_HOVER); - button.setImage(WSTATE.SELECTED_HOVER, ImageResources.BTN_SETTING_HOVER); - button.setImage(WSTATE.SELECTED_PUSH, ImageResources.BTN_SETTING_HOVER); - button.setImage(WSTATE.DISABLE_ON, ImageResources.BTN_SETTING_NML); + button.setImage(WSTATE.NORMAL, ImageResource.BTN_SETTING_NML); + button.setImage(WSTATE.HOVER, ImageResource.BTN_SETTING_HOVER); + button.setImage(WSTATE.PUSH, ImageResource.BTN_SETTING_HOVER); + button.setImage(WSTATE.DISABLE_OFF, ImageResource.BTN_SETTING_NML); + button.setImage(WSTATE.SELECTED, ImageResource.BTN_SETTING_HOVER); + button.setImage(WSTATE.SELECTED_HOVER, ImageResource.BTN_SETTING_HOVER); + button.setImage(WSTATE.SELECTED_PUSH, ImageResource.BTN_SETTING_HOVER); + button.setImage(WSTATE.DISABLE_ON, ImageResource.BTN_SETTING_NML); FormData formData = new FormData(); formData.left = new FormAttachment(comboBox, SubModifyItem.BUTTON_SPACE); formData.top = new FormAttachment(0, (SubModifyItem.ITEM_HEIGHT - SubModifyItem.BUTTON_HEIGHT) / 2); diff --git a/src/org/tizen/emulator/manager/ui/renewal/item/modify/vm/NetTapDeviceItem.java b/src/org/tizen/emulator/manager/ui/renewal/item/modify/vm/NetTapDeviceItem.java index 320db5d..2cf199f 100644 --- a/src/org/tizen/emulator/manager/ui/renewal/item/modify/vm/NetTapDeviceItem.java +++ b/src/org/tizen/emulator/manager/ui/renewal/item/modify/vm/NetTapDeviceItem.java @@ -35,7 +35,7 @@ import java.util.List; import org.eclipse.swt.widgets.Composite; import org.tizen.emulator.manager.EmulatorManager; -import org.tizen.emulator.manager.renewal.resources.ColorResources; +import org.tizen.emulator.manager.renewal.resources.ColorResource; import org.tizen.emulator.manager.tool.TapUtil; import org.tizen.emulator.manager.ui.dialog.TapDeviceDialogForLinux; import org.tizen.emulator.manager.ui.dialog.TapDeviceDialogForMac; @@ -61,7 +61,7 @@ public class NetTapDeviceItem extends ComboItem{ item.setItemHeight(SubModifyItem.ITEM_HEIGHT); item.init(parent); item.setItemTitle(new SubItemTitle(item.getItemComp(), getTitle(), - ColorResources.WHITE)); + ColorResource.WHITE)); item.create(); makeBody(); diff --git a/src/org/tizen/emulator/manager/ui/renewal/item/modify/vm/NetTapDeviceItemForWin.java b/src/org/tizen/emulator/manager/ui/renewal/item/modify/vm/NetTapDeviceItemForWin.java index 6ee322e..56962ad 100644 --- a/src/org/tizen/emulator/manager/ui/renewal/item/modify/vm/NetTapDeviceItemForWin.java +++ b/src/org/tizen/emulator/manager/ui/renewal/item/modify/vm/NetTapDeviceItemForWin.java @@ -36,7 +36,7 @@ import org.eclipse.swt.layout.FormAttachment; import org.eclipse.swt.layout.FormData; import org.eclipse.swt.widgets.Event; import org.eclipse.swt.widgets.Listener; -import org.tizen.emulator.manager.renewal.resources.ImageResources; +import org.tizen.emulator.manager.renewal.resources.ImageResource; import org.tizen.emulator.manager.tool.TapUtil; import org.tizen.emulator.manager.ui.renewal.dialog.network.TapDeviceDialogForWin; import org.tizen.emulator.manager.ui.renewal.item.ItemName; @@ -68,14 +68,14 @@ public class NetTapDeviceItemForWin extends NetTapDeviceItem { // create setting button button = new ImageButton(item.getBody(), SWT.PUSH); - button.setImage(WSTATE.NORMAL, ImageResources.BTN_NEW_FILE_NML); - button.setImage(WSTATE.HOVER, ImageResources.BTN_NEW_FILE_HOVER); - button.setImage(WSTATE.PUSH, ImageResources.BTN_NEW_FILE_HOVER); - button.setImage(WSTATE.DISABLE_OFF, ImageResources.BTN_NEW_FILE_NML); - button.setImage(WSTATE.SELECTED, ImageResources.BTN_NEW_FILE_HOVER); - button.setImage(WSTATE.SELECTED_HOVER, ImageResources.BTN_NEW_FILE_HOVER); - button.setImage(WSTATE.SELECTED_PUSH, ImageResources.BTN_NEW_FILE_HOVER); - button.setImage(WSTATE.DISABLE_ON, ImageResources.BTN_NEW_FILE_NML); + button.setImage(WSTATE.NORMAL, ImageResource.BTN_NEW_FILE_NML); + button.setImage(WSTATE.HOVER, ImageResource.BTN_NEW_FILE_HOVER); + button.setImage(WSTATE.PUSH, ImageResource.BTN_NEW_FILE_HOVER); + button.setImage(WSTATE.DISABLE_OFF, ImageResource.BTN_NEW_FILE_NML); + button.setImage(WSTATE.SELECTED, ImageResource.BTN_NEW_FILE_HOVER); + button.setImage(WSTATE.SELECTED_HOVER, ImageResource.BTN_NEW_FILE_HOVER); + button.setImage(WSTATE.SELECTED_PUSH, ImageResource.BTN_NEW_FILE_HOVER); + button.setImage(WSTATE.DISABLE_ON, ImageResource.BTN_NEW_FILE_NML); FormData formData = new FormData(); formData.left = new FormAttachment(comboBox, SubModifyItem.BUTTON_SPACE); formData.top = new FormAttachment(0, (SubModifyItem.ITEM_HEIGHT - SubModifyItem.BUTTON_HEIGHT) / 2); diff --git a/src/org/tizen/emulator/manager/ui/renewal/item/modify/vm/NetworkItem.java b/src/org/tizen/emulator/manager/ui/renewal/item/modify/vm/NetworkItem.java index 640d8e6..6b6d030 100644 --- a/src/org/tizen/emulator/manager/ui/renewal/item/modify/vm/NetworkItem.java +++ b/src/org/tizen/emulator/manager/ui/renewal/item/modify/vm/NetworkItem.java @@ -32,7 +32,7 @@ package org.tizen.emulator.manager.ui.renewal.item.modify.vm; import org.eclipse.swt.widgets.Composite; import org.tizen.emulator.manager.EmulatorManager; -import org.tizen.emulator.manager.renewal.resources.ImageResources; +import org.tizen.emulator.manager.renewal.resources.ImageResource; import org.tizen.emulator.manager.ui.renewal.item.ItemName; import org.tizen.emulator.manager.ui.renewal.item.modify.common.ModifyDialogItem; import org.tizen.emulator.manager.ui.renewal.item.modify.comp.ModifyItem; @@ -61,7 +61,7 @@ public class NetworkItem extends CategoryItem { // item.setItemHeight(ModifyItem.ITEM_HEIGHT * subItems.size()); item.setItemHeight(itemHeight); item.init(parent); - item.setItemTitle(createIconTitle(item, ImageResources.ICON_TITLE_NETWORK)); + item.setItemTitle(createIconTitle(item, ImageResource.ICON_TITLE_NETWORK)); item.create(); makeBody(); diff --git a/src/org/tizen/emulator/manager/ui/renewal/item/modify/vm/OCIDeviceItem.java b/src/org/tizen/emulator/manager/ui/renewal/item/modify/vm/OCIDeviceItem.java index 67b6c5f..5861546 100644 --- a/src/org/tizen/emulator/manager/ui/renewal/item/modify/vm/OCIDeviceItem.java +++ b/src/org/tizen/emulator/manager/ui/renewal/item/modify/vm/OCIDeviceItem.java @@ -37,7 +37,7 @@ import java.util.StringTokenizer; import org.eclipse.swt.widgets.Composite; import org.tizen.emulator.manager.EmulatorManager; import org.tizen.emulator.manager.logging.EMLogger; -import org.tizen.emulator.manager.renewal.resources.ImageResources; +import org.tizen.emulator.manager.renewal.resources.ImageResource; import org.tizen.emulator.manager.resources.StringResources; import org.tizen.emulator.manager.ui.renewal.item.ItemName; import org.tizen.emulator.manager.ui.renewal.item.modify.common.ComboItem; @@ -66,7 +66,7 @@ public class OCIDeviceItem extends ComboItem { public void create(Composite parent) { item = new ModifyItem(this); item.init(parent); - item.setItemTitle(createIconTitle(item, ImageResources.ICON_TITLE_OCI_DEVICE1)); + item.setItemTitle(createIconTitle(item, ImageResource.ICON_TITLE_OCI_DEVICE1)); item.create(); makeBody(); diff --git a/src/org/tizen/emulator/manager/ui/renewal/item/modify/vm/TunerCountryItem.java b/src/org/tizen/emulator/manager/ui/renewal/item/modify/vm/TunerCountryItem.java index ad74f77..debd286 100644 --- a/src/org/tizen/emulator/manager/ui/renewal/item/modify/vm/TunerCountryItem.java +++ b/src/org/tizen/emulator/manager/ui/renewal/item/modify/vm/TunerCountryItem.java @@ -34,7 +34,7 @@ package org.tizen.emulator.manager.ui.renewal.item.modify.vm; import java.util.List; import org.eclipse.swt.widgets.Composite; -import org.tizen.emulator.manager.renewal.resources.ColorResources; +import org.tizen.emulator.manager.renewal.resources.ColorResource; import org.tizen.emulator.manager.ui.renewal.item.ItemName; import org.tizen.emulator.manager.ui.renewal.item.modify.common.ComboItem; import org.tizen.emulator.manager.ui.renewal.item.modify.common.ModifyDialogItem; @@ -59,7 +59,7 @@ public class TunerCountryItem extends ComboItem { item.setItemHeight(SubModifyItem.ITEM_HEIGHT); item.init(parent); item.setItemTitle(new SubItemTitle(item.getItemComp(), getTitle(), - ColorResources.WHITE)); + ColorResource.WHITE)); item.create(); makeBody(); diff --git a/src/org/tizen/emulator/manager/ui/renewal/item/modify/vm/TunerItem.java b/src/org/tizen/emulator/manager/ui/renewal/item/modify/vm/TunerItem.java index 3dacafc..c9091f4 100644 --- a/src/org/tizen/emulator/manager/ui/renewal/item/modify/vm/TunerItem.java +++ b/src/org/tizen/emulator/manager/ui/renewal/item/modify/vm/TunerItem.java @@ -32,7 +32,7 @@ package org.tizen.emulator.manager.ui.renewal.item.modify.vm; import org.eclipse.swt.widgets.Composite; -import org.tizen.emulator.manager.renewal.resources.ImageResources; +import org.tizen.emulator.manager.renewal.resources.ImageResource; import org.tizen.emulator.manager.ui.renewal.item.ItemName; import org.tizen.emulator.manager.ui.renewal.item.modify.common.ModifyDialogItem; import org.tizen.emulator.manager.ui.renewal.item.modify.comp.ModifyItem; @@ -63,7 +63,7 @@ public class TunerItem extends CategoryItem { // item.setItemHeight(ModifyItem.ITEM_HEIGHT * subItems.size()); item.setItemHeight(itemHeight); item.init(parent); - item.setItemTitle(createIconTitle(item, ImageResources.ICON_TITLE_TUNER)); + item.setItemTitle(createIconTitle(item, ImageResource.ICON_TITLE_TUNER)); item.create(); makeBody(); diff --git a/src/org/tizen/emulator/manager/ui/renewal/item/modify/vm/TunerSystemItem.java b/src/org/tizen/emulator/manager/ui/renewal/item/modify/vm/TunerSystemItem.java index 3752738..28ba4aa 100644 --- a/src/org/tizen/emulator/manager/ui/renewal/item/modify/vm/TunerSystemItem.java +++ b/src/org/tizen/emulator/manager/ui/renewal/item/modify/vm/TunerSystemItem.java @@ -35,7 +35,7 @@ package org.tizen.emulator.manager.ui.renewal.item.modify.vm; import java.util.List; import org.eclipse.swt.widgets.Composite; -import org.tizen.emulator.manager.renewal.resources.ColorResources; +import org.tizen.emulator.manager.renewal.resources.ColorResource; import org.tizen.emulator.manager.ui.renewal.item.ItemName; import org.tizen.emulator.manager.ui.renewal.item.modify.common.ComboItem; import org.tizen.emulator.manager.ui.renewal.item.modify.common.ModifyDialogItem; @@ -59,7 +59,7 @@ public class TunerSystemItem extends ComboItem { item.setItemHeight(SubModifyItem.ITEM_HEIGHT); item.init(parent); item.setItemTitle(new SubItemTitle(item.getItemComp(), getTitle(), - ColorResources.WHITE)); + ColorResource.WHITE)); item.create(); makeBody(); diff --git a/src/org/tizen/emulator/manager/ui/renewal/item/modify/vm/TunerTableItem.java b/src/org/tizen/emulator/manager/ui/renewal/item/modify/vm/TunerTableItem.java index 8d0ed22..790c473 100644 --- a/src/org/tizen/emulator/manager/ui/renewal/item/modify/vm/TunerTableItem.java +++ b/src/org/tizen/emulator/manager/ui/renewal/item/modify/vm/TunerTableItem.java @@ -36,7 +36,7 @@ import java.io.File; import org.eclipse.swt.SWT; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.FileDialog; -import org.tizen.emulator.manager.renewal.resources.ColorResources; +import org.tizen.emulator.manager.renewal.resources.ColorResource; import org.tizen.emulator.manager.ui.renewal.MainDialog; import org.tizen.emulator.manager.ui.renewal.item.ItemName; import org.tizen.emulator.manager.ui.renewal.item.ItemState; @@ -65,7 +65,7 @@ public class TunerTableItem extends FileDialogItem { item.setItemHeight(SubModifyItem.ITEM_HEIGHT); item.init(parent); item.setItemTitle(new SubItemTitle(item.getItemComp(), getTitle(), - ColorResources.WHITE)); + ColorResource.WHITE)); item.create(); makeBody(BOX_WIDTH); diff --git a/src/org/tizen/emulator/manager/ui/renewal/tableviewer/AbstractTableViewer.java b/src/org/tizen/emulator/manager/ui/renewal/tableviewer/AbstractTableViewer.java index a5c48eb..42f0e77 100644 --- a/src/org/tizen/emulator/manager/ui/renewal/tableviewer/AbstractTableViewer.java +++ b/src/org/tizen/emulator/manager/ui/renewal/tableviewer/AbstractTableViewer.java @@ -42,9 +42,9 @@ import org.eclipse.swt.layout.FormData; import org.eclipse.swt.layout.FormLayout; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Shell; -import org.tizen.emulator.manager.renewal.resources.ColorResources; -import org.tizen.emulator.manager.renewal.resources.FontResources; -import org.tizen.emulator.manager.renewal.resources.ImageResources; +import org.tizen.emulator.manager.renewal.resources.ColorResource; +import org.tizen.emulator.manager.renewal.resources.FontResource; +import org.tizen.emulator.manager.renewal.resources.ImageResource; import org.tizen.emulator.manager.ui.dialog.AboutDialog; import org.tizen.emulator.manager.ui.renewal.widgets.ImageButton; @@ -125,7 +125,7 @@ public abstract class AbstractTableViewer { } topComp = new Composite(mainComp, SWT.NONE); - topComp.setBackgroundImage(ImageResources.TITLE_IMAGE.getImage()); + topComp.setBackgroundImage(ImageResource.TITLE_IMAGE.getImage()); topComp.setLayout(new FormLayout()); tableComp = new Composite(mainComp, SWT.None); @@ -134,7 +134,7 @@ public abstract class AbstractTableViewer { makeTopComposite(); makeTableComposite(); - tableComp.setBackground(ColorResources.TABLE_VIEWER_BG.getColor()); + tableComp.setBackground(ColorResource.TABLE_VIEWER_BG.getColor()); settingLayout(); @@ -167,10 +167,10 @@ public abstract class AbstractTableViewer { private void makeTopComposite() { infoButton = new ImageButton(topComp, SWT.PUSH); - infoButton.setImages(ImageResources.BUTTON_INFO_NML.getImage(), - ImageResources.BUTTON_INFO_HOVER.getImage(), - ImageResources.BUTTON_INFO_HOVER.getImage(), - ImageResources.BUTTON_INFO_NML.getImage()); + infoButton.setImages(ImageResource.BUTTON_INFO_NML.getImage(), + ImageResource.BUTTON_INFO_HOVER.getImage(), + ImageResource.BUTTON_INFO_HOVER.getImage(), + ImageResource.BUTTON_INFO_NML.getImage()); infoButton.setBackground(null); infoButton.addSelectionListener(new SelectionListener() { @Override @@ -235,10 +235,10 @@ public abstract class AbstractTableViewer { data.height = 22; ImageButton menu = linkMenuList.get(i); menu.setLayoutData(data); - menu.setImages(ImageResources.BTN_NAV_NORMAL.getImage(), ImageResources.BTN_NAV_HOVER.getImage(), - ImageResources.BTN_NAV_PUSH.getImage(), ImageResources.BTN_NAV_NORMAL.getImage()); - menu.setForeground(ColorResources.LINK_MENU_FONT.getColor()); - menu.setFont(FontResources.TABLE_VIEWER_LINK_MENU.getFont()); + menu.setImages(ImageResource.BTN_NAV_NORMAL.getImage(), ImageResource.BTN_NAV_HOVER.getImage(), + ImageResource.BTN_NAV_PUSH.getImage(), ImageResource.BTN_NAV_NORMAL.getImage()); + menu.setForeground(ColorResource.LINK_MENU_FONT.getColor()); + menu.setFont(FontResource.TABLE_VIEWER_LINK_MENU.getFont()); } } } diff --git a/src/org/tizen/emulator/manager/ui/renewal/tableviewer/BaseImageTableViewer.java b/src/org/tizen/emulator/manager/ui/renewal/tableviewer/BaseImageTableViewer.java index bfecb05..5f2aac5 100644 --- a/src/org/tizen/emulator/manager/ui/renewal/tableviewer/BaseImageTableViewer.java +++ b/src/org/tizen/emulator/manager/ui/renewal/tableviewer/BaseImageTableViewer.java @@ -56,8 +56,8 @@ import org.tizen.emulator.manager.platform.Profile; import org.tizen.emulator.manager.platform.ProfileList; import org.tizen.emulator.manager.platform.baseimage.CustomBaseImageValue; import org.tizen.emulator.manager.platform.baseimage.CustomBaseImageWorker; -import org.tizen.emulator.manager.renewal.resources.ColorResources; -import org.tizen.emulator.manager.renewal.resources.ImageResources; +import org.tizen.emulator.manager.renewal.resources.ColorResource; +import org.tizen.emulator.manager.renewal.resources.ImageResource; import org.tizen.emulator.manager.resources.StringResources; import org.tizen.emulator.manager.ui.renewal.MainDialog; import org.tizen.emulator.manager.ui.renewal.dialog.DeleteMessageBox; @@ -103,7 +103,7 @@ public class BaseImageTableViewer extends AbstractTableViewer { @Override void setTitleImage() { - setTtileBackgroundImage(ImageResources.BASEIMAGE_LIST_TITLE_IMAGE.getImage()); + setTtileBackgroundImage(ImageResource.BASEIMAGE_LIST_TITLE_IMAGE.getImage()); } @Override @@ -115,10 +115,10 @@ public class BaseImageTableViewer extends AbstractTableViewer { void setIconMenu() { refreshButton = new ImageButton(getTopComp(), SWT.PUSH); refreshButton.setToolTipText("reloading base image list"); - refreshButton.setImages(ImageResources.BUTTON_REFRESH_NML.getImage(), - ImageResources.BUTTON_REFRESH_HOVER.getImage(), - ImageResources.BUTTON_REFRESH_HOVER.getImage(), - ImageResources.BUTTON_REFRESH_HOVER.getImage()); + refreshButton.setImages(ImageResource.BUTTON_REFRESH_NML.getImage(), + ImageResource.BUTTON_REFRESH_HOVER.getImage(), + ImageResource.BUTTON_REFRESH_HOVER.getImage(), + ImageResource.BUTTON_REFRESH_HOVER.getImage()); refreshButton.addSelectionListener(new SelectionListener() { @Override @@ -337,9 +337,9 @@ public class BaseImageTableViewer extends AbstractTableViewer { if (backupTableItemSelectedForeground == null) { backupTableItemSelectedForeground = item.getSelectedForground(); } - item.setImage(0, ImageResources.ICON_STATE_ERROR.getImage()); - item.setForeground(ColorResources.ERROR_TABLE_ITEM_FONT.getColor()); - item.setSelectedForeground(ColorResources.ERROR_SELECTED_TABLE_ITEM_FONT.getColor()); + item.setImage(0, ImageResource.ICON_STATE_ERROR.getImage()); + item.setForeground(ColorResource.ERROR_TABLE_ITEM_FONT.getColor()); + item.setSelectedForeground(ColorResource.ERROR_SELECTED_TABLE_ITEM_FONT.getColor()); // setRedrawVMList(); // @@ -482,10 +482,10 @@ public class BaseImageTableViewer extends AbstractTableViewer { createButton = new ImageButton(comp, SWT.PUSH); createButton.setToolTipText("create custom base image"); createButton.setBackground(null); - createButton.setImages(ImageResources.BUTTON_CREATE_NORMAL.getImage(), - ImageResources.BUTTON_CREATE_HOVER.getImage(), - ImageResources.BUTTON_CREATE_HOVER.getImage(), - ImageResources.BUTTON_CREATE_DISABLE.getImage()); + createButton.setImages(ImageResource.BUTTON_CREATE_NORMAL.getImage(), + ImageResource.BUTTON_CREATE_HOVER.getImage(), + ImageResource.BUTTON_CREATE_HOVER.getImage(), + ImageResource.BUTTON_CREATE_DISABLE.getImage()); createButton.addListener(SWT.Selection, new Listener() { @Override public void handleEvent(Event event) { @@ -498,10 +498,10 @@ public class BaseImageTableViewer extends AbstractTableViewer { modifyButton = new ImageButton(comp, SWT.PUSH); modifyButton.setToolTipText("modify custom base image"); modifyButton.setBackground(null); - modifyButton.setImages(ImageResources.BUTTON_MODIFY_NORMAL.getImage(), - ImageResources.BUTTON_MODIFY_HOVER.getImage(), - ImageResources.BUTTON_MODIFY_HOVER.getImage(), - ImageResources.BUTTON_MODIFY_DISABLE.getImage()); + modifyButton.setImages(ImageResource.BUTTON_MODIFY_NORMAL.getImage(), + ImageResource.BUTTON_MODIFY_HOVER.getImage(), + ImageResource.BUTTON_MODIFY_HOVER.getImage(), + ImageResource.BUTTON_MODIFY_DISABLE.getImage()); modifyButton.addListener(SWT.Selection, new Listener() { @Override public void handleEvent(Event event) { @@ -518,10 +518,10 @@ public class BaseImageTableViewer extends AbstractTableViewer { deleteButton = new ImageButton(comp, SWT.PUSH); deleteButton.setToolTipText("delete base image"); deleteButton.setBackground(null); - deleteButton.setImages(ImageResources.BUTTON_DELETE_NORMAL.getImage(), - ImageResources.BUTTON_DELETE_HOVER.getImage(), - ImageResources.BUTTON_DELETE_HOVER.getImage(), - ImageResources.BUTTON_DELETE_DISABLE.getImage()); + deleteButton.setImages(ImageResource.BUTTON_DELETE_NORMAL.getImage(), + ImageResource.BUTTON_DELETE_HOVER.getImage(), + ImageResource.BUTTON_DELETE_HOVER.getImage(), + ImageResource.BUTTON_DELETE_DISABLE.getImage()); deleteButton.addListener(SWT.Selection, new Listener() { @Override public void handleEvent(Event event) { diff --git a/src/org/tizen/emulator/manager/ui/renewal/tableviewer/CreateVMTableViewer.java b/src/org/tizen/emulator/manager/ui/renewal/tableviewer/CreateVMTableViewer.java index 4120727..d55a7d6 100644 --- a/src/org/tizen/emulator/manager/ui/renewal/tableviewer/CreateVMTableViewer.java +++ b/src/org/tizen/emulator/manager/ui/renewal/tableviewer/CreateVMTableViewer.java @@ -46,10 +46,10 @@ 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.Skin; -import org.tizen.emulator.manager.renewal.resources.ColorResources; -import org.tizen.emulator.manager.renewal.resources.FontResources; -import org.tizen.emulator.manager.renewal.resources.ImageResources; -import org.tizen.emulator.manager.renewal.resources.PatchImageResources; +import org.tizen.emulator.manager.renewal.resources.ColorResource; +import org.tizen.emulator.manager.renewal.resources.FontResource; +import org.tizen.emulator.manager.renewal.resources.ImageResource; +import org.tizen.emulator.manager.renewal.resources.PatchImageHelper; import org.tizen.emulator.manager.resources.StringResources; import org.tizen.emulator.manager.ui.Messages; import org.tizen.emulator.manager.ui.renewal.MainDialog; @@ -99,7 +99,7 @@ public class CreateVMTableViewer extends AbstractTableViewer { @Override void setTitleImage() { - setTtileBackgroundImage(ImageResources.CREATE_VIEW_TITLE_IMAGE.getImage()); + setTtileBackgroundImage(ImageResource.CREATE_VIEW_TITLE_IMAGE.getImage()); } @Override @@ -126,11 +126,11 @@ public class CreateVMTableViewer extends AbstractTableViewer { advanceBtn = new ImageButton(comp, SWT.TOGGLE); setAdvanceButtonImage(); advanceBtn.setText("Advance"); - advanceBtn.setFont(FontResources.DEFAULT_BOLD_FONT_9.getFont()); + advanceBtn.setFont(FontResource.DEFAULT_BOLD_FONT_9.getFont()); advanceBtn.addListener(SWT.Selection, advanceBtnSelectionListener); profileLabel = new Label(comp, SWT.NONE); - profileLabel.setFont(FontResources.DEFAULT_BOLD_FONT_9.getFont()); + profileLabel.setFont(FontResource.DEFAULT_BOLD_FONT_9.getFont()); form = new SashForm(comp, SWT.NONE); form.SASH_WIDTH = 0; @@ -348,7 +348,7 @@ public class CreateVMTableViewer extends AbstractTableViewer { confirmBtn = new HighLightButton(comp, SWT.PUSH); confirmBtn.setText("Confirm"); - confirmBtn.setFont(FontResources.DEFAULT_BOLD_FONT_9.getFont()); + confirmBtn.setFont(FontResource.DEFAULT_BOLD_FONT_9.getFont()); confirmBtn.addListener(SWT.Selection, new Listener(){ @Override public void handleEvent(Event event) { @@ -535,26 +535,26 @@ public class CreateVMTableViewer extends AbstractTableViewer { private Image ADVANCE_BUTTON_UNSELECTED_NORMAL; private Image ADVANCE_BUTTON_UNSELECTED_HOVER; private void setAdvanceButtonImage() { - ADVANCE_BUTTON_SELECTED_NORMAL = PatchImageResources.getBlueButtonImage( - ImageResources.ICON_BLUE_BUTTON_CLOSE.getImage(), + ADVANCE_BUTTON_SELECTED_NORMAL = PatchImageHelper.getBlueButtonImage( + ImageResource.ICON_BLUE_BUTTON_CLOSE.getImage(), 90, BUTTON_HEIGHT, SWT.LEFT, advanceBtnNormalInfo); - ADVANCE_BUTTON_SELECTED_HOVER = PatchImageResources.getBlueButtonImage( - ImageResources.ICON_BLUE_BUTTON_CLOSE.getImage(), + ADVANCE_BUTTON_SELECTED_HOVER = PatchImageHelper.getBlueButtonImage( + ImageResource.ICON_BLUE_BUTTON_CLOSE.getImage(), 90, BUTTON_HEIGHT, SWT.LEFT, advanceBtnHoverInfo); - ADVANCE_BUTTON_UNSELECTED_NORMAL = PatchImageResources.getBlueButtonImage( - ImageResources.ICON_BLUE_BUTTON_EXPAND.getImage(), + ADVANCE_BUTTON_UNSELECTED_NORMAL = PatchImageHelper.getBlueButtonImage( + ImageResource.ICON_BLUE_BUTTON_EXPAND.getImage(), 90, BUTTON_HEIGHT, SWT.RIGHT, advanceBtnNormalInfo); - ADVANCE_BUTTON_UNSELECTED_HOVER = PatchImageResources.getBlueButtonImage( - ImageResources.ICON_BLUE_BUTTON_EXPAND.getImage(), + ADVANCE_BUTTON_UNSELECTED_HOVER = PatchImageHelper.getBlueButtonImage( + ImageResource.ICON_BLUE_BUTTON_EXPAND.getImage(), 90, BUTTON_HEIGHT, SWT.RIGHT, @@ -569,26 +569,26 @@ public class CreateVMTableViewer extends AbstractTableViewer { } private final NinePatchResourceInfo advanceBtnNormalInfo = new NinePatchResourceInfo( - ColorResources.BLUE_BTN, - ColorResources.RED, - ImageResources.BLUE_BTN_NORMAL_LT, - ImageResources.BLUE_BTN_NORMAL_T, - ImageResources.BLUE_BTN_NORMAL_RT, - ImageResources.BLUE_BTN_NORMAL_R, - ImageResources.BLUE_BTN_NORMAL_RB, - ImageResources.BLUE_BTN_NORMAL_B, - ImageResources.BLUE_BTN_NORMAL_LB, - ImageResources.BLUE_BTN_NORMAL_L); + ColorResource.BLUE_BTN, + ColorResource.RED, + ImageResource.BLUE_BTN_NORMAL_LT, + ImageResource.BLUE_BTN_NORMAL_T, + ImageResource.BLUE_BTN_NORMAL_RT, + ImageResource.BLUE_BTN_NORMAL_R, + ImageResource.BLUE_BTN_NORMAL_RB, + ImageResource.BLUE_BTN_NORMAL_B, + ImageResource.BLUE_BTN_NORMAL_LB, + ImageResource.BLUE_BTN_NORMAL_L); private final NinePatchResourceInfo advanceBtnHoverInfo = new NinePatchResourceInfo( - ColorResources.BLUE_BTN, - ColorResources.RED, - ImageResources.BLUE_BTN_HOVER_LT, - ImageResources.BLUE_BTN_HOVER_T, - ImageResources.BLUE_BTN_HOVER_RT, - ImageResources.BLUE_BTN_HOVER_R, - ImageResources.BLUE_BTN_HOVER_RB, - ImageResources.BLUE_BTN_HOVER_B, - ImageResources.BLUE_BTN_HOVER_LB, - ImageResources.BLUE_BTN_HOVER_L); + ColorResource.BLUE_BTN, + ColorResource.RED, + ImageResource.BLUE_BTN_HOVER_LT, + ImageResource.BLUE_BTN_HOVER_T, + ImageResource.BLUE_BTN_HOVER_RT, + ImageResource.BLUE_BTN_HOVER_R, + ImageResource.BLUE_BTN_HOVER_RB, + ImageResource.BLUE_BTN_HOVER_B, + ImageResource.BLUE_BTN_HOVER_LB, + ImageResource.BLUE_BTN_HOVER_L); } diff --git a/src/org/tizen/emulator/manager/ui/renewal/tableviewer/CreateVMTopComposite.java b/src/org/tizen/emulator/manager/ui/renewal/tableviewer/CreateVMTopComposite.java index dc97162..758a3c0 100644 --- a/src/org/tizen/emulator/manager/ui/renewal/tableviewer/CreateVMTopComposite.java +++ b/src/org/tizen/emulator/manager/ui/renewal/tableviewer/CreateVMTopComposite.java @@ -47,9 +47,9 @@ import org.tizen.emulator.manager.platform.BaseImage; import org.tizen.emulator.manager.platform.Profile; import org.tizen.emulator.manager.platform.baseimage.CustomBaseImageValue; import org.tizen.emulator.manager.platform.baseimage.CustomBaseImageWorker; -import org.tizen.emulator.manager.renewal.resources.ColorResources; -import org.tizen.emulator.manager.renewal.resources.FontResources; -import org.tizen.emulator.manager.renewal.resources.ImageResources; +import org.tizen.emulator.manager.renewal.resources.ColorResource; +import org.tizen.emulator.manager.renewal.resources.FontResource; +import org.tizen.emulator.manager.renewal.resources.ImageResource; import org.tizen.emulator.manager.resources.StringResources; import org.tizen.emulator.manager.ui.renewal.dialog.MessageBox; import org.tizen.emulator.manager.ui.renewal.dialoghandler.BaseImageDialogHandler; @@ -99,25 +99,25 @@ public class CreateVMTopComposite extends Composite { vmNameText.getTextWidget().setTextLimit(20); baseImageCombo = new ComboBox(this.getShell(), this, SWT.NONE); - baseImageCombo.setParentBackground(ColorResources.TABLE_VIEWER_BG); + baseImageCombo.setParentBackground(ColorResource.TABLE_VIEWER_BG); baseImageCombo.addListener(SWT.Selection, imageComboListener); addCustomImageBtn = new BlueButton(this, SWT.PUSH); - addCustomImageBtn.setIcon(ImageResources.ICON_BLUE_BUTTON_PLUS); + addCustomImageBtn.setIcon(ImageResource.ICON_BLUE_BUTTON_PLUS); addCustomImageBtn.addListener(SWT.Selection, customImageListener); addCustomImageBtn.setToolTipText("add new custom base image"); errorMsgLabel = new Label(this, SWT.NONE); errorImageLabel = new Label(this, SWT.NONE); - errorMsgLabel.setFont(FontResources.DEFAULT_FONT_10.getFont()); + errorMsgLabel.setFont(FontResource.DEFAULT_FONT_10.getFont()); // for print base image information imageVersionLabel = new Label(this, SWT.NONE); - imageVersionLabel.setFont(FontResources.DEFAULT_FONT_10.getFont()); + imageVersionLabel.setFont(FontResource.DEFAULT_FONT_10.getFont()); imageArchLabel = new Label(this, SWT.NONE); - imageArchLabel.setFont(FontResources.DEFAULT_FONT_10.getFont()); + imageArchLabel.setFont(FontResource.DEFAULT_FONT_10.getFont()); imageSkinShapeLabel = new Label(this, SWT.NONE); - imageSkinShapeLabel.setFont(FontResources.DEFAULT_FONT_10.getFont()); + imageSkinShapeLabel.setFont(FontResource.DEFAULT_FONT_10.getFont()); setLayout(); } @@ -239,7 +239,7 @@ public class CreateVMTopComposite extends Composite { private void setErrorMessageLabel(String err) { if (!err.isEmpty()) { - errorImageLabel.setImage(ImageResources.ICON_STATE_ERROR.getImage()); + errorImageLabel.setImage(ImageResource.ICON_STATE_ERROR.getImage()); errorMsgLabel.setText("Error: " + err); isNameValid = false; } else { @@ -286,7 +286,7 @@ public class CreateVMTopComposite extends Composite { // VM Name label = new Label(this, SWT.NONE); label.setText("VM Name"); - label.setFont(FontResources.DEFAULT_BOLD_FONT_9.getFont()); + label.setFont(FontResource.DEFAULT_BOLD_FONT_9.getFont()); data = new FormData(); data.top = new FormAttachment(0, 16); data.left = new FormAttachment(0, 18); @@ -317,7 +317,7 @@ public class CreateVMTopComposite extends Composite { // Base Image label = new Label(this, SWT.NONE); label.setText("Base Image"); - label.setFont(FontResources.DEFAULT_BOLD_FONT_9.getFont()); + label.setFont(FontResource.DEFAULT_BOLD_FONT_9.getFont()); data = new FormData(); data.top = new FormAttachment(vmNameText, 14); data.left = new FormAttachment(0, 18); diff --git a/src/org/tizen/emulator/manager/ui/renewal/tableviewer/DeviceTemplateTableViewer.java b/src/org/tizen/emulator/manager/ui/renewal/tableviewer/DeviceTemplateTableViewer.java index e91c90c..575fdb1 100644 --- a/src/org/tizen/emulator/manager/ui/renewal/tableviewer/DeviceTemplateTableViewer.java +++ b/src/org/tizen/emulator/manager/ui/renewal/tableviewer/DeviceTemplateTableViewer.java @@ -56,8 +56,8 @@ import org.tizen.emulator.manager.devices.DeviceWorkerException; import org.tizen.emulator.manager.logging.EMLogger; import org.tizen.emulator.manager.platform.Profile; import org.tizen.emulator.manager.platform.ProfileList; -import org.tizen.emulator.manager.renewal.resources.ColorResources; -import org.tizen.emulator.manager.renewal.resources.ImageResources; +import org.tizen.emulator.manager.renewal.resources.ColorResource; +import org.tizen.emulator.manager.renewal.resources.ImageResource; import org.tizen.emulator.manager.resources.StringResources; import org.tizen.emulator.manager.ui.renewal.MainDialog; import org.tizen.emulator.manager.ui.renewal.dialog.MessageBox; @@ -94,7 +94,7 @@ public class DeviceTemplateTableViewer extends AbstractTableViewer { @Override void setTitleImage() { - setTtileBackgroundImage(ImageResources.TEMPLATE_LIST_TITLE_IMAGE.getImage()); + setTtileBackgroundImage(ImageResource.TEMPLATE_LIST_TITLE_IMAGE.getImage()); } @Override @@ -106,10 +106,10 @@ public class DeviceTemplateTableViewer extends AbstractTableViewer { void setIconMenu() { refreshButton = new ImageButton(getTopComp(), SWT.PUSH); refreshButton.setToolTipText("reloading device template list"); - refreshButton.setImages(ImageResources.BUTTON_REFRESH_NML.getImage(), - ImageResources.BUTTON_REFRESH_HOVER.getImage(), - ImageResources.BUTTON_REFRESH_HOVER.getImage(), - ImageResources.BUTTON_REFRESH_HOVER.getImage()); + refreshButton.setImages(ImageResource.BUTTON_REFRESH_NML.getImage(), + ImageResource.BUTTON_REFRESH_HOVER.getImage(), + ImageResource.BUTTON_REFRESH_HOVER.getImage(), + ImageResource.BUTTON_REFRESH_HOVER.getImage()); refreshButton.addSelectionListener(new SelectionListener() { @Override @@ -410,9 +410,9 @@ public class DeviceTemplateTableViewer extends AbstractTableViewer { if (backupTableItemSelectedForeground == null) { backupTableItemSelectedForeground = item.getSelectedForground(); } - item.setImage(0, ImageResources.ICON_STATE_ERROR.getImage()); - item.setForeground(ColorResources.ERROR_TABLE_ITEM_FONT.getColor()); - item.setSelectedForeground(ColorResources.ERROR_SELECTED_TABLE_ITEM_FONT.getColor()); + item.setImage(0, ImageResource.ICON_STATE_ERROR.getImage()); + item.setForeground(ColorResource.ERROR_TABLE_ITEM_FONT.getColor()); + item.setSelectedForeground(ColorResource.ERROR_SELECTED_TABLE_ITEM_FONT.getColor()); // setRedrawVMList(); // @@ -584,10 +584,10 @@ public class DeviceTemplateTableViewer extends AbstractTableViewer { createButton = new ImageButton(comp, SWT.PUSH); createButton.setToolTipText("create device template"); createButton.setBackground(null); - createButton.setImages(ImageResources.BUTTON_CREATE_NORMAL.getImage(), - ImageResources.BUTTON_CREATE_HOVER.getImage(), - ImageResources.BUTTON_CREATE_HOVER.getImage(), - ImageResources.BUTTON_CREATE_DISABLE.getImage()); + createButton.setImages(ImageResource.BUTTON_CREATE_NORMAL.getImage(), + ImageResource.BUTTON_CREATE_HOVER.getImage(), + ImageResource.BUTTON_CREATE_HOVER.getImage(), + ImageResource.BUTTON_CREATE_DISABLE.getImage()); createButton.addListener(SWT.Selection, new Listener() { @Override public void handleEvent(Event event) { @@ -600,10 +600,10 @@ public class DeviceTemplateTableViewer extends AbstractTableViewer { cloneButton = new ImageButton(comp, SWT.PUSH); cloneButton.setToolTipText("clone device template"); cloneButton.setBackground(null); - cloneButton.setImages(ImageResources.BUTTON_CLONE_NORMAL.getImage(), - ImageResources.BUTTON_CLONE_HOVER.getImage(), - ImageResources.BUTTON_CLONE_HOVER.getImage(), - ImageResources.BUTTON_CLONE_DISABLE.getImage()); + cloneButton.setImages(ImageResource.BUTTON_CLONE_NORMAL.getImage(), + ImageResource.BUTTON_CLONE_HOVER.getImage(), + ImageResource.BUTTON_CLONE_HOVER.getImage(), + ImageResource.BUTTON_CLONE_DISABLE.getImage()); cloneButton.addListener(SWT.Selection, new Listener() { @Override public void handleEvent(Event event) { @@ -619,10 +619,10 @@ public class DeviceTemplateTableViewer extends AbstractTableViewer { modifyButton = new ImageButton(comp, SWT.PUSH); modifyButton.setToolTipText("modify device template"); modifyButton.setBackground(null); - modifyButton.setImages(ImageResources.BUTTON_MODIFY_NORMAL.getImage(), - ImageResources.BUTTON_MODIFY_HOVER.getImage(), - ImageResources.BUTTON_MODIFY_HOVER.getImage(), - ImageResources.BUTTON_MODIFY_DISABLE.getImage()); + modifyButton.setImages(ImageResource.BUTTON_MODIFY_NORMAL.getImage(), + ImageResource.BUTTON_MODIFY_HOVER.getImage(), + ImageResource.BUTTON_MODIFY_HOVER.getImage(), + ImageResource.BUTTON_MODIFY_DISABLE.getImage()); modifyButton.addListener(SWT.Selection, new Listener() { @Override public void handleEvent(Event event) { @@ -639,10 +639,10 @@ public class DeviceTemplateTableViewer extends AbstractTableViewer { deleteButton = new ImageButton(comp, SWT.PUSH); deleteButton.setToolTipText("delete device template"); deleteButton.setBackground(null); - deleteButton.setImages(ImageResources.BUTTON_DELETE_NORMAL.getImage(), - ImageResources.BUTTON_DELETE_HOVER.getImage(), - ImageResources.BUTTON_DELETE_HOVER.getImage(), - ImageResources.BUTTON_DELETE_DISABLE.getImage()); + deleteButton.setImages(ImageResource.BUTTON_DELETE_NORMAL.getImage(), + ImageResource.BUTTON_DELETE_HOVER.getImage(), + ImageResource.BUTTON_DELETE_HOVER.getImage(), + ImageResource.BUTTON_DELETE_DISABLE.getImage()); deleteButton.addListener(SWT.Selection, new Listener() { @Override public void handleEvent(Event event) { diff --git a/src/org/tizen/emulator/manager/ui/renewal/tableviewer/ProfileButtonMaker.java b/src/org/tizen/emulator/manager/ui/renewal/tableviewer/ProfileButtonMaker.java index 87b4cb7..336b57f 100644 --- a/src/org/tizen/emulator/manager/ui/renewal/tableviewer/ProfileButtonMaker.java +++ b/src/org/tizen/emulator/manager/ui/renewal/tableviewer/ProfileButtonMaker.java @@ -36,7 +36,7 @@ import org.tizen.emulator.manager.platform.Platform; import org.tizen.emulator.manager.platform.Profile; import org.tizen.emulator.manager.platform.ProfileList; import org.tizen.emulator.manager.plugin.PluginImageResources; -import org.tizen.emulator.manager.renewal.resources.ImageResources; +import org.tizen.emulator.manager.renewal.resources.ImageResource; import org.tizen.emulator.manager.ui.renewal.widgets.ImageButton; public class ProfileButtonMaker { @@ -50,28 +50,28 @@ public class ProfileButtonMaker { button = makeMobileButton(comp); if (button != null) { profileButton = new ProfileButton(name, button); - profileButton.setIcon(ImageResources.ICON_TYPE_MOBILE.getImage()); - profileButton.setSelectedIcon(ImageResources.ICON_SELECTED_MOBILE.getImage()); - profileButton.setCreateIcon(ImageResources.ICON_CREATE_MOBILE.getImage()); - profileButton.setCustomIcon(ImageResources.ICON_TYPE_MOBILE_CUSTOM.getImage()); + profileButton.setIcon(ImageResource.ICON_TYPE_MOBILE.getImage()); + profileButton.setSelectedIcon(ImageResource.ICON_SELECTED_MOBILE.getImage()); + profileButton.setCreateIcon(ImageResource.ICON_CREATE_MOBILE.getImage()); + profileButton.setCustomIcon(ImageResource.ICON_TYPE_MOBILE_CUSTOM.getImage()); } } else if (name.equals("tv")){ button = makeTVButton(comp); if (button != null) { profileButton = new ProfileButton(name, button); - profileButton.setIcon(ImageResources.ICON_TYPE_TV.getImage()); - profileButton.setSelectedIcon(ImageResources.ICON_SELECTED_TV.getImage()); - profileButton.setCreateIcon(ImageResources.ICON_CREATE_TV.getImage()); - profileButton.setCustomIcon(ImageResources.ICON_TYPE_TV_CUSTOM.getImage()); + profileButton.setIcon(ImageResource.ICON_TYPE_TV.getImage()); + profileButton.setSelectedIcon(ImageResource.ICON_SELECTED_TV.getImage()); + profileButton.setCreateIcon(ImageResource.ICON_CREATE_TV.getImage()); + profileButton.setCustomIcon(ImageResource.ICON_TYPE_TV_CUSTOM.getImage()); } } else if (name.equals("wearable")) { button = makeWearableButton(comp); if (button != null) { profileButton = new ProfileButton(name, button); - profileButton.setIcon(ImageResources.ICON_TYPE_WEARABLE.getImage()); - profileButton.setSelectedIcon(ImageResources.ICON_SELECTED_WEARABLE_SQUARE.getImage()); - profileButton.setCreateIcon(ImageResources.ICON_CREATE_WEARABLE.getImage()); - profileButton.setCustomIcon(ImageResources.ICON_TYPE_WEARABLE_CUSTOM.getImage()); + profileButton.setIcon(ImageResource.ICON_TYPE_WEARABLE.getImage()); + profileButton.setSelectedIcon(ImageResource.ICON_SELECTED_WEARABLE_SQUARE.getImage()); + profileButton.setCreateIcon(ImageResource.ICON_CREATE_WEARABLE.getImage()); + profileButton.setCustomIcon(ImageResource.ICON_TYPE_WEARABLE_CUSTOM.getImage()); } } else { Profile profile = ProfileList.getProfile(name); @@ -102,39 +102,39 @@ public class ProfileButtonMaker { private static ImageButton makeMobileButton(Composite comp) { ImageButton button = new ImageButton(comp, SWT.TOGGLE); - button.setImages(ImageResources.BUTTON_FILTER_MOBILE_SELECTED_NORMAL.getImage(), - ImageResources.BUTTON_FILTER_MOBILE_SELECTED_HOVER.getImage(), - ImageResources.BUTTON_FILTER_MOBILE_SELECTED_HOVER.getImage(), - ImageResources.BUTTON_FILTER_MOBILE_UNSELECTED_NORMAL.getImage(), - ImageResources.BUTTON_FILTER_MOBILE_UNSELECTED_HOVER.getImage(), - ImageResources.BUTTON_FILTER_MOBILE_UNSELECTED_HOVER.getImage(), - ImageResources.BUTTON_FILTER_MOBILE_UNSELECTED_NORMAL.getImage()); // disable + button.setImages(ImageResource.BUTTON_FILTER_MOBILE_SELECTED_NORMAL.getImage(), + ImageResource.BUTTON_FILTER_MOBILE_SELECTED_HOVER.getImage(), + ImageResource.BUTTON_FILTER_MOBILE_SELECTED_HOVER.getImage(), + ImageResource.BUTTON_FILTER_MOBILE_UNSELECTED_NORMAL.getImage(), + ImageResource.BUTTON_FILTER_MOBILE_UNSELECTED_HOVER.getImage(), + ImageResource.BUTTON_FILTER_MOBILE_UNSELECTED_HOVER.getImage(), + ImageResource.BUTTON_FILTER_MOBILE_UNSELECTED_NORMAL.getImage()); // disable return button; } private static ImageButton makeTVButton(Composite comp) { ImageButton button = new ImageButton(comp, SWT.TOGGLE); - button.setImages(ImageResources.BUTTON_FILTER_TV_SELECTED_NORMAL.getImage(), - ImageResources.BUTTON_FILTER_TV_SELECTED_HOVER.getImage(), - ImageResources.BUTTON_FILTER_TV_SELECTED_HOVER.getImage(), - ImageResources.BUTTON_FILTER_TV_UNSELECTED_NORMAL.getImage(), - ImageResources.BUTTON_FILTER_TV_UNSELECTED_HOVER.getImage(), - ImageResources.BUTTON_FILTER_TV_UNSELECTED_HOVER.getImage(), - ImageResources.BUTTON_FILTER_TV_UNSELECTED_NORMAL.getImage()); + button.setImages(ImageResource.BUTTON_FILTER_TV_SELECTED_NORMAL.getImage(), + ImageResource.BUTTON_FILTER_TV_SELECTED_HOVER.getImage(), + ImageResource.BUTTON_FILTER_TV_SELECTED_HOVER.getImage(), + ImageResource.BUTTON_FILTER_TV_UNSELECTED_NORMAL.getImage(), + ImageResource.BUTTON_FILTER_TV_UNSELECTED_HOVER.getImage(), + ImageResource.BUTTON_FILTER_TV_UNSELECTED_HOVER.getImage(), + ImageResource.BUTTON_FILTER_TV_UNSELECTED_NORMAL.getImage()); return button; } private static ImageButton makeWearableButton(Composite comp) { ImageButton button = new ImageButton(comp, SWT.TOGGLE); - button.setImages(ImageResources.BUTTON_FILTER_WEARABLE_SELECTED_NORMAL.getImage(), - ImageResources.BUTTON_FILTER_WEARABLE_SELECTED_HOVER.getImage(), - ImageResources.BUTTON_FILTER_WEARABLE_SELECTED_HOVER.getImage(), - ImageResources.BUTTON_FILTER_WEARABLE_UNSELECTED_NORMAL.getImage(), - ImageResources.BUTTON_FILTER_WEARABLE_UNSELECTED_HOVER.getImage(), - ImageResources.BUTTON_FILTER_WEARABLE_UNSELECTED_HOVER.getImage(), - ImageResources.BUTTON_FILTER_WEARABLE_UNSELECTED_NORMAL.getImage()); + button.setImages(ImageResource.BUTTON_FILTER_WEARABLE_SELECTED_NORMAL.getImage(), + ImageResource.BUTTON_FILTER_WEARABLE_SELECTED_HOVER.getImage(), + ImageResource.BUTTON_FILTER_WEARABLE_SELECTED_HOVER.getImage(), + ImageResource.BUTTON_FILTER_WEARABLE_UNSELECTED_NORMAL.getImage(), + ImageResource.BUTTON_FILTER_WEARABLE_UNSELECTED_HOVER.getImage(), + ImageResource.BUTTON_FILTER_WEARABLE_UNSELECTED_HOVER.getImage(), + ImageResource.BUTTON_FILTER_WEARABLE_UNSELECTED_NORMAL.getImage()); return button; } diff --git a/src/org/tizen/emulator/manager/ui/renewal/tableviewer/TableViewerHelper.java b/src/org/tizen/emulator/manager/ui/renewal/tableviewer/TableViewerHelper.java index 50fb647..4c07821 100644 --- a/src/org/tizen/emulator/manager/ui/renewal/tableviewer/TableViewerHelper.java +++ b/src/org/tizen/emulator/manager/ui/renewal/tableviewer/TableViewerHelper.java @@ -32,9 +32,9 @@ package org.tizen.emulator.manager.ui.renewal.tableviewer; import org.eclipse.swt.SWT; import org.eclipse.swt.widgets.Composite; -import org.tizen.emulator.manager.renewal.resources.ColorResources; -import org.tizen.emulator.manager.renewal.resources.FontResources; -import org.tizen.emulator.manager.renewal.resources.ImageResources; +import org.tizen.emulator.manager.renewal.resources.ColorResource; +import org.tizen.emulator.manager.renewal.resources.FontResource; +import org.tizen.emulator.manager.renewal.resources.ImageResource; import org.tizen.emulator.manager.ui.renewal.widgets.ImageButton; public class TableViewerHelper { @@ -45,12 +45,12 @@ public class TableViewerHelper { ImageButton backVMListBtn = new ImageButton(comp, SWT.PUSH); backVMListBtn.setText("Back"); - backVMListBtn.setFont(FontResources.DEFAULT_FONT_9.getFont()); - backVMListBtn.setFontColor(ColorResources.WHITE.getColor()); - backVMListBtn.setImages(ImageResources.BTN_BACK_NORMAL.getImage(), - ImageResources.BTN_BACK_HOVER.getImage(), - ImageResources.BTN_BACK_HOVER.getImage(), - ImageResources.BTN_BACK_DISABLE.getImage()); + backVMListBtn.setFont(FontResource.DEFAULT_FONT_9.getFont()); + backVMListBtn.setFontColor(ColorResource.WHITE.getColor()); + backVMListBtn.setImages(ImageResource.BTN_BACK_NORMAL.getImage(), + ImageResource.BTN_BACK_HOVER.getImage(), + ImageResource.BTN_BACK_HOVER.getImage(), + ImageResource.BTN_BACK_DISABLE.getImage()); backVMListBtn.setSize(BACK_BUTTON_WIDTH, BACK_BUTTON_HEIGHT); return backVMListBtn; diff --git a/src/org/tizen/emulator/manager/ui/renewal/tableviewer/VMListTable.java b/src/org/tizen/emulator/manager/ui/renewal/tableviewer/VMListTable.java index 7046839..89beac9 100644 --- a/src/org/tizen/emulator/manager/ui/renewal/tableviewer/VMListTable.java +++ b/src/org/tizen/emulator/manager/ui/renewal/tableviewer/VMListTable.java @@ -49,8 +49,8 @@ import org.eclipse.swt.widgets.MenuItem; import org.tizen.emulator.manager.EmulatorManager; import org.tizen.emulator.manager.devices.DeviceTemplateValue; import org.tizen.emulator.manager.platform.Profile; -import org.tizen.emulator.manager.renewal.resources.ColorResources; -import org.tizen.emulator.manager.renewal.resources.ImageResources; +import org.tizen.emulator.manager.renewal.resources.ColorResource; +import org.tizen.emulator.manager.renewal.resources.ImageResource; import org.tizen.emulator.manager.resources.StringResources; import org.tizen.emulator.manager.ui.renewal.dialoghandler.VMModifyHandler; import org.tizen.emulator.manager.ui.table.Table; @@ -275,9 +275,9 @@ public class VMListTable { private void setTableItemProperty(ProfileButton pButton, TableItem item, VMProperty property) { VMPropertyValue value = property.getPropertyValue(); if (property.isRunning()) { - item.setImage(0, ImageResources.ICON_RUNNING.getImage()); + item.setImage(0, ImageResource.ICON_RUNNING.getImage()); } else { - item.setImage(0, ImageResources.ICON_NOT_RUNNING.getImage()); + item.setImage(0, ImageResource.ICON_NOT_RUNNING.getImage()); } if (pButton != null) { @@ -290,7 +290,7 @@ public class VMListTable { item.setSelectedImage(1, pButton.getSelectedIcon()); if (pButton.getProfileName().equals("wearable")) { if (value.baseImage.getSkinShape().equals(SKIN_SHAPE.CIRCLE)) { - item.setSelectedImage(1, ImageResources.ICON_SELECTED_WEARABLE_ROUND.getImage()); + item.setSelectedImage(1, ImageResource.ICON_SELECTED_WEARABLE_ROUND.getImage()); } } } @@ -325,9 +325,9 @@ public class VMListTable { } } else { if (value.fileSharePath == null || value.fileSharePath.isEmpty()) { - item.setImage(6, ImageResources.ICON_FILE_SHARE_OFF.getImage());; + item.setImage(6, ImageResource.ICON_FILE_SHARE_OFF.getImage());; } else { - item.setImage(6, ImageResources.ICON_FILE_SHARE_ON.getImage()); + item.setImage(6, ImageResource.ICON_FILE_SHARE_ON.getImage()); } } @@ -347,7 +347,7 @@ public class VMListTable { if (value.device != null) { if (value.deivceVersion != value.device.getValue().getVersion()) { // modified original device template - item.setImage(3, ImageResources.ICON_STATE_WARNING.getImage()); + item.setImage(3, ImageResource.ICON_STATE_WARNING.getImage()); DeviceTemplateValue deviceValue = value.device.getValue(); deviceTip = "Device: " + deviceValue.getName() + StringResources.NEW_LINE @@ -375,7 +375,7 @@ public class VMListTable { } else { if (value.devicePath != null) { // erasure original device template - item.setImage(3, ImageResources.ICON_STATE_WARNING.getImage()); + item.setImage(3, ImageResource.ICON_STATE_WARNING.getImage()); deviceTip = "Original device template had been deleted." + StringResources.NEW_LINE + "Need to select new device template."; @@ -397,9 +397,9 @@ public class VMListTable { backupTableItemSelectedForeground = item.getSelectedForground(); } - item.setForeground(ColorResources.ERROR_TABLE_ITEM_FONT.getColor()); - item.setSelectedForeground(ColorResources.ERROR_SELECTED_TABLE_ITEM_FONT.getColor()); - item.setImage(4, ImageResources.ICON_STATE_ERROR.getImage()); + item.setForeground(ColorResource.ERROR_TABLE_ITEM_FONT.getColor()); + item.setSelectedForeground(ColorResource.ERROR_SELECTED_TABLE_ITEM_FONT.getColor()); + item.setImage(4, ImageResource.ICON_STATE_ERROR.getImage()); imageTip = ""; if (!value.baseImage.isFilePathExist()) { imageTip = "Platform image had been deleted"; @@ -472,10 +472,10 @@ public class VMListTable { private ImageButton makeFileSharingButton(TableItem item) { ImageButton button = new ImageButton(item.getItemCell(6), SWT.PUSH); button.setSize(18, 18); - button.setImages(ImageResources.ICON_FILE_SHARE_ON.getImage(), - ImageResources.ICON_FILE_SHARE_ON.getImage(), - ImageResources.ICON_FILE_SHARE_ON.getImage(), - ImageResources.ICON_FILE_SHARE_OFF.getImage()); + button.setImages(ImageResource.ICON_FILE_SHARE_ON.getImage(), + ImageResource.ICON_FILE_SHARE_ON.getImage(), + ImageResource.ICON_FILE_SHARE_ON.getImage(), + ImageResource.ICON_FILE_SHARE_OFF.getImage()); button.addListener(SWT.Selection, new Listener(){ @Override public void handleEvent(Event event) { diff --git a/src/org/tizen/emulator/manager/ui/renewal/tableviewer/VMListTableViewer.java b/src/org/tizen/emulator/manager/ui/renewal/tableviewer/VMListTableViewer.java index 32c5703..4aeeb2b 100644 --- a/src/org/tizen/emulator/manager/ui/renewal/tableviewer/VMListTableViewer.java +++ b/src/org/tizen/emulator/manager/ui/renewal/tableviewer/VMListTableViewer.java @@ -46,7 +46,7 @@ import org.tizen.emulator.manager.EmulatorManager; import org.tizen.emulator.manager.logging.EMLogger; import org.tizen.emulator.manager.platform.Profile; import org.tizen.emulator.manager.platform.ProfileList; -import org.tizen.emulator.manager.renewal.resources.ImageResources; +import org.tizen.emulator.manager.renewal.resources.ImageResource; import org.tizen.emulator.manager.resources.StringResources; import org.tizen.emulator.manager.ui.renewal.MainDialog; import org.tizen.emulator.manager.ui.renewal.dialog.MessageBox; @@ -136,7 +136,7 @@ public class VMListTableViewer extends AbstractTableViewer { @Override void setTitleImage() { - setTtileBackgroundImage(ImageResources.VMLIST_TITLE_IMAGE.getImage()); + setTtileBackgroundImage(ImageResource.VMLIST_TITLE_IMAGE.getImage()); } @Override @@ -185,10 +185,10 @@ public class VMListTableViewer extends AbstractTableViewer { @Override void setIconMenu() { refreshButton = new ImageButton(getTopComp(), SWT.PUSH); - refreshButton.setImages(ImageResources.BUTTON_REFRESH_NML.getImage(), - ImageResources.BUTTON_REFRESH_HOVER.getImage(), - ImageResources.BUTTON_REFRESH_HOVER.getImage(), - ImageResources.BUTTON_REFRESH_HOVER.getImage()); + refreshButton.setImages(ImageResource.BUTTON_REFRESH_NML.getImage(), + ImageResource.BUTTON_REFRESH_HOVER.getImage(), + ImageResource.BUTTON_REFRESH_HOVER.getImage(), + ImageResource.BUTTON_REFRESH_HOVER.getImage()); refreshButton.addSelectionListener(new SelectionListener() { @Override @@ -314,10 +314,10 @@ public class VMListTableViewer extends AbstractTableViewer { private void makeVMButton() { deleteButton = new ImageButton(comp, SWT.PUSH); deleteButton.setBackground(null); - deleteButton.setImages(ImageResources.BUTTON_DELETE_NORMAL.getImage(), - ImageResources.BUTTON_DELETE_HOVER.getImage(), - ImageResources.BUTTON_DELETE_HOVER.getImage(), - ImageResources.BUTTON_DELETE_DISABLE.getImage()); + deleteButton.setImages(ImageResource.BUTTON_DELETE_NORMAL.getImage(), + ImageResource.BUTTON_DELETE_HOVER.getImage(), + ImageResource.BUTTON_DELETE_HOVER.getImage(), + ImageResource.BUTTON_DELETE_DISABLE.getImage()); deleteButton.addListener(SWT.Selection, new Listener() { @Override public void handleEvent(Event event) { @@ -331,10 +331,10 @@ public class VMListTableViewer extends AbstractTableViewer { modifyButton = new ImageButton(comp, SWT.PUSH); modifyButton.setBackground(null); - modifyButton.setImages(ImageResources.BUTTON_MODIFY_NORMAL.getImage(), - ImageResources.BUTTON_MODIFY_HOVER.getImage(), - ImageResources.BUTTON_MODIFY_HOVER.getImage(), - ImageResources.BUTTON_MODIFY_DISABLE.getImage()); + modifyButton.setImages(ImageResource.BUTTON_MODIFY_NORMAL.getImage(), + ImageResource.BUTTON_MODIFY_HOVER.getImage(), + ImageResource.BUTTON_MODIFY_HOVER.getImage(), + ImageResource.BUTTON_MODIFY_DISABLE.getImage()); modifyButton.addListener(SWT.Selection, new Listener() { @Override public void handleEvent(Event event) { @@ -347,10 +347,10 @@ public class VMListTableViewer extends AbstractTableViewer { launchButton = new ImageButton(comp, SWT.PUSH); launchButton.setBackground(null); - launchButton.setImages(ImageResources.BUTTON_RUN_NORMAL.getImage(), - ImageResources.BUTTON_RUN_HOVER.getImage(), - ImageResources.BUTTON_RUN_HOVER.getImage(), - ImageResources.BUTTON_RUN_DISABLE.getImage()); + launchButton.setImages(ImageResource.BUTTON_RUN_NORMAL.getImage(), + ImageResource.BUTTON_RUN_HOVER.getImage(), + ImageResource.BUTTON_RUN_HOVER.getImage(), + ImageResource.BUTTON_RUN_DISABLE.getImage()); launchButton.addListener(SWT.Selection, new Listener() { @Override public void handleEvent(Event event) { diff --git a/src/org/tizen/emulator/manager/ui/renewal/widgets/BlueButton.java b/src/org/tizen/emulator/manager/ui/renewal/widgets/BlueButton.java index b8b6c67..aeef803 100644 --- a/src/org/tizen/emulator/manager/ui/renewal/widgets/BlueButton.java +++ b/src/org/tizen/emulator/manager/ui/renewal/widgets/BlueButton.java @@ -34,14 +34,14 @@ import org.eclipse.swt.graphics.GC; import org.eclipse.swt.graphics.Image; import org.eclipse.swt.graphics.Rectangle; import org.eclipse.swt.widgets.Composite; -import org.tizen.emulator.manager.renewal.resources.ColorResources; -import org.tizen.emulator.manager.renewal.resources.ImageResources; -import org.tizen.emulator.manager.renewal.resources.PatchImageResources; +import org.tizen.emulator.manager.renewal.resources.ColorResource; +import org.tizen.emulator.manager.renewal.resources.ImageResource; +import org.tizen.emulator.manager.renewal.resources.PatchImageHelper; public class BlueButton extends NinePatchButton { private static NinePatchResourceMap ninePatchResourceMap; - private ImageResources icon; + private ImageResource icon; private Image iconImage = null; public BlueButton(Composite parent, int style) { @@ -49,7 +49,7 @@ public class BlueButton extends NinePatchButton { initNinePatchResourceMap(); } - public void setIcon(ImageResources imageResource) { + public void setIcon(ImageResource imageResource) { icon = imageResource; } @@ -64,28 +64,28 @@ public class BlueButton extends NinePatchButton { switch(state) { case HOVER: if (hoverImage == null) { - hoverImage = PatchImageResources.getBlueButtonImage(iconImage, width, height, + hoverImage = PatchImageHelper.getBlueButtonImage(iconImage, width, height, getNinePatchResourceMap().get(state)); } image = hoverImage; break; case PUSH: if (pushImage == null) { - pushImage = PatchImageResources.getBlueButtonImage(iconImage, width, height, + pushImage = PatchImageHelper.getBlueButtonImage(iconImage, width, height, getNinePatchResourceMap().get(state)); } image = pushImage; break; case DISABLE_ON: if (disableImage == null) { - disableImage = PatchImageResources.getBlueButtonImage(iconImage, width, height, + disableImage = PatchImageHelper.getBlueButtonImage(iconImage, width, height, getNinePatchResourceMap().get(state)); } image = disableImage; break; default: if (normalImage == null) { - normalImage = PatchImageResources.getBlueButtonImage(iconImage, width, height, + normalImage = PatchImageHelper.getBlueButtonImage(iconImage, width, height, getNinePatchResourceMap().get(WSTATE.NORMAL)); } image = normalImage; @@ -104,38 +104,38 @@ public class BlueButton extends NinePatchButton { private static void initNinePatchResourceMap() { ninePatchResourceMap = new NinePatchResourceMap(); - ninePatchResourceMap.setImages(WSTATE.NORMAL, ColorResources.BLUE_BTN, - ColorResources.RED, - ImageResources.BLUE_BTN_NORMAL_LT, - ImageResources.BLUE_BTN_NORMAL_T, - ImageResources.BLUE_BTN_NORMAL_RT, - ImageResources.BLUE_BTN_NORMAL_R, - ImageResources.BLUE_BTN_NORMAL_RB, - ImageResources.BLUE_BTN_NORMAL_B, - ImageResources.BLUE_BTN_NORMAL_LB, - ImageResources.BLUE_BTN_NORMAL_L); - - ninePatchResourceMap.setImages(WSTATE.HOVER, ColorResources.BLUE_BTN, - ColorResources.RED, - ImageResources.BLUE_BTN_HOVER_LT, - ImageResources.BLUE_BTN_HOVER_T, - ImageResources.BLUE_BTN_HOVER_RT, - ImageResources.BLUE_BTN_HOVER_R, - ImageResources.BLUE_BTN_HOVER_RB, - ImageResources.BLUE_BTN_HOVER_B, - ImageResources.BLUE_BTN_HOVER_LB, - ImageResources.BLUE_BTN_HOVER_L); - - ninePatchResourceMap.setImages(WSTATE.PUSH, ColorResources.BLUE_BTN, - ColorResources.RED, - ImageResources.BLUE_BTN_HOVER_LT, - ImageResources.BLUE_BTN_HOVER_T, - ImageResources.BLUE_BTN_HOVER_RT, - ImageResources.BLUE_BTN_HOVER_R, - ImageResources.BLUE_BTN_HOVER_RB, - ImageResources.BLUE_BTN_HOVER_B, - ImageResources.BLUE_BTN_HOVER_LB, - ImageResources.BLUE_BTN_HOVER_L); + ninePatchResourceMap.setImages(WSTATE.NORMAL, ColorResource.BLUE_BTN, + ColorResource.RED, + ImageResource.BLUE_BTN_NORMAL_LT, + ImageResource.BLUE_BTN_NORMAL_T, + ImageResource.BLUE_BTN_NORMAL_RT, + ImageResource.BLUE_BTN_NORMAL_R, + ImageResource.BLUE_BTN_NORMAL_RB, + ImageResource.BLUE_BTN_NORMAL_B, + ImageResource.BLUE_BTN_NORMAL_LB, + ImageResource.BLUE_BTN_NORMAL_L); + + ninePatchResourceMap.setImages(WSTATE.HOVER, ColorResource.BLUE_BTN, + ColorResource.RED, + ImageResource.BLUE_BTN_HOVER_LT, + ImageResource.BLUE_BTN_HOVER_T, + ImageResource.BLUE_BTN_HOVER_RT, + ImageResource.BLUE_BTN_HOVER_R, + ImageResource.BLUE_BTN_HOVER_RB, + ImageResource.BLUE_BTN_HOVER_B, + ImageResource.BLUE_BTN_HOVER_LB, + ImageResource.BLUE_BTN_HOVER_L); + + ninePatchResourceMap.setImages(WSTATE.PUSH, ColorResource.BLUE_BTN, + ColorResource.RED, + ImageResource.BLUE_BTN_HOVER_LT, + ImageResource.BLUE_BTN_HOVER_T, + ImageResource.BLUE_BTN_HOVER_RT, + ImageResource.BLUE_BTN_HOVER_R, + ImageResource.BLUE_BTN_HOVER_RB, + ImageResource.BLUE_BTN_HOVER_B, + ImageResource.BLUE_BTN_HOVER_LB, + ImageResource.BLUE_BTN_HOVER_L); } @Override diff --git a/src/org/tizen/emulator/manager/ui/renewal/widgets/CheckBoxButton.java b/src/org/tizen/emulator/manager/ui/renewal/widgets/CheckBoxButton.java index 2dcb841..5260a3f 100644 --- a/src/org/tizen/emulator/manager/ui/renewal/widgets/CheckBoxButton.java +++ b/src/org/tizen/emulator/manager/ui/renewal/widgets/CheckBoxButton.java @@ -45,7 +45,7 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Event; import org.eclipse.swt.widgets.Listener; import org.eclipse.swt.widgets.TypedListener; -import org.tizen.emulator.manager.renewal.resources.ImageResources; +import org.tizen.emulator.manager.renewal.resources.ImageResource; import org.tizen.emulator.manager.ui.table.Helper; public class CheckBoxButton extends Canvas { @@ -68,12 +68,12 @@ public class CheckBoxButton extends Canvas { } protected void initButton() { - image = ImageResources.CHECKBOX_UNCHECKED_NML.getImage(); - imageHover = ImageResources.CHECKBOX_UNCHECKED_HOVER.getImage(); - imageDisable = ImageResources.CHECKBOX_UNCHECKED_DISABLE.getImage(); - checkedImage = ImageResources.CHECKBOX_CHECKED_NML.getImage(); - checkedImageHover = ImageResources.CHECKBOX_CHECKED_HOVER.getImage(); - checkedImageDisable = ImageResources.CHECKBOX_CHECKED_DISABLE.getImage(); + image = ImageResource.CHECKBOX_UNCHECKED_NML.getImage(); + imageHover = ImageResource.CHECKBOX_UNCHECKED_HOVER.getImage(); + imageDisable = ImageResource.CHECKBOX_UNCHECKED_DISABLE.getImage(); + checkedImage = ImageResource.CHECKBOX_CHECKED_NML.getImage(); + checkedImageHover = ImageResource.CHECKBOX_CHECKED_HOVER.getImage(); + checkedImageDisable = ImageResource.CHECKBOX_CHECKED_DISABLE.getImage(); } private void addListeners() { diff --git a/src/org/tizen/emulator/manager/ui/renewal/widgets/ComboBox.java b/src/org/tizen/emulator/manager/ui/renewal/widgets/ComboBox.java index 8948665..c559571 100644 --- a/src/org/tizen/emulator/manager/ui/renewal/widgets/ComboBox.java +++ b/src/org/tizen/emulator/manager/ui/renewal/widgets/ComboBox.java @@ -49,10 +49,10 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Event; import org.eclipse.swt.widgets.Listener; import org.eclipse.swt.widgets.Shell; -import org.tizen.emulator.manager.renewal.resources.ColorResources; -import org.tizen.emulator.manager.renewal.resources.FontResources; -import org.tizen.emulator.manager.renewal.resources.ImageResources; -import org.tizen.emulator.manager.renewal.resources.PatchImageResources; +import org.tizen.emulator.manager.renewal.resources.ColorResource; +import org.tizen.emulator.manager.renewal.resources.FontResource; +import org.tizen.emulator.manager.renewal.resources.ImageResource; +import org.tizen.emulator.manager.renewal.resources.PatchImageHelper; public class ComboBox extends NinePatchBox { @@ -74,7 +74,7 @@ public class ComboBox extends NinePatchBox { private String selectedItem = ""; private Object selectedData; - private ColorResources parentBackground = ColorResources.WHITE; + private ColorResource parentBackground = ColorResource.WHITE; // This decide whether widget is modifiable or not. // This is distinguished from disabled. @@ -92,7 +92,7 @@ public class ComboBox extends NinePatchBox { addMouseListener(); } - public void setParentBackground(ColorResources parentBackground) { + public void setParentBackground(ColorResource parentBackground) { this.parentBackground = parentBackground; } @@ -222,7 +222,7 @@ public class ComboBox extends NinePatchBox { textCanvas = new Canvas(this, SWT.NONE); textCanvas.setLayoutData(data); - textCanvas.setBackground(ColorResources.WHITE.getColor()); + textCanvas.setBackground(ColorResource.WHITE.getColor()); drawText(); } @@ -244,12 +244,12 @@ public class ComboBox extends NinePatchBox { Rectangle rect = ((Canvas) e.widget).getBounds(); if (isDisabled() || isFixed) { - gc.setForeground(ColorResources.DISABLED_TEXT.getColor()); + gc.setForeground(ColorResource.DISABLED_TEXT.getColor()); } else { - gc.setForeground(ColorResources.CONTENT_FONT.getColor()); + gc.setForeground(ColorResource.CONTENT_FONT.getColor()); } - gc.setFont(FontResources.CONTENT.getFont()); + gc.setFont(FontResource.CONTENT.getFont()); Point textExt = gc.textExtent(selectedItem); int poxY = (rect.height - textExt.y) / 2; gc.drawText(selectedItem, TEXT_MARGIN_LEFT, poxY); @@ -284,7 +284,7 @@ public class ComboBox extends NinePatchBox { return; } Rectangle rect = ((Canvas) e.widget).getClientArea(); - image = PatchImageResources.getNinePatchButtonImage( + image = PatchImageHelper.getNinePatchButtonImage( rect.width, rect.height, map.get(state), parentBackground); imageMap.put(state, image); } @@ -332,14 +332,14 @@ public class ComboBox extends NinePatchBox { private Image getArrowImage() { if (getState() == WSTATE.HOVER || getState() == WSTATE.SELECTED) { if (arrowImageHover == null) { - arrowImageHover = ImageResources.DROP_DOWN_ARROW_HOVER + arrowImageHover = ImageResource.DROP_DOWN_ARROW_HOVER .getImage(); } return arrowImageHover; } if (arrowImageNormal == null) { - arrowImageNormal = ImageResources.DROP_DOWN_ARROW_NORMAL.getImage(); + arrowImageNormal = ImageResource.DROP_DOWN_ARROW_NORMAL.getImage(); } return arrowImageNormal; @@ -403,70 +403,70 @@ public class ComboBox extends NinePatchBox { private static void initNinePatchResourceMap() { ninePatchResourceMap = new NinePatchResourceMap(); - ninePatchResourceMap.setImages(WSTATE.NORMAL, ColorResources.WHITE, - ColorResources.BLACK, - ImageResources.DROP_DOWN_BOX_NORMAL_LT, - ImageResources.DROP_DOWN_BOX_NORMAL_T, - ImageResources.DROP_DOWN_BOX_NORMAL_RT, - ImageResources.DROP_DOWN_BOX_NORMAL_R, - ImageResources.DROP_DOWN_BOX_NORMAL_RB, - ImageResources.DROP_DOWN_BOX_NORMAL_B, - ImageResources.DROP_DOWN_BOX_NORMAL_LB, - ImageResources.DROP_DOWN_BOX_NORMAL_L); - - ninePatchResourceMap.setImages(WSTATE.HOVER, ColorResources.WHITE, - ColorResources.BLACK, - ImageResources.DROP_DOWN_BOX_HOVER_LT, - ImageResources.DROP_DOWN_BOX_HOVER_T, - ImageResources.DROP_DOWN_BOX_HOVER_RT, - ImageResources.DROP_DOWN_BOX_HOVER_R, - ImageResources.DROP_DOWN_BOX_HOVER_RB, - ImageResources.DROP_DOWN_BOX_HOVER_B, - ImageResources.DROP_DOWN_BOX_HOVER_LB, - ImageResources.DROP_DOWN_BOX_HOVER_L); - - ninePatchResourceMap.setImages(WSTATE.SELECTED, ColorResources.WHITE, - ColorResources.BLACK, - ImageResources.DROP_DOWN_BOX_SELECTED_LT, - ImageResources.DROP_DOWN_BOX_SELECTED_T, - ImageResources.DROP_DOWN_BOX_SELECTED_RT, - ImageResources.DROP_DOWN_BOX_SELECTED_R, - ImageResources.DROP_DOWN_BOX_SELECTED_RB, - ImageResources.DROP_DOWN_BOX_SELECTED_B, - ImageResources.DROP_DOWN_BOX_SELECTED_LB, - ImageResources.DROP_DOWN_BOX_SELECTED_L); - - ninePatchResourceMap.setImages(WSTATE.DISABLE_ON, ColorResources.WHITE, - ColorResources.BLACK, - ImageResources.DROP_DOWN_BOX_DISABLE_LT, - ImageResources.DROP_DOWN_BOX_DISABLE_T, - ImageResources.DROP_DOWN_BOX_DISABLE_RT, - ImageResources.DROP_DOWN_BOX_DISABLE_R, - ImageResources.DROP_DOWN_BOX_DISABLE_RB, - ImageResources.DROP_DOWN_BOX_DISABLE_B, - ImageResources.DROP_DOWN_BOX_DISABLE_LB, - ImageResources.DROP_DOWN_BOX_DISABLE_L); - - ninePatchResourceMap.setImages(WSTATE.ERROR, ColorResources.WHITE, - ColorResources.BLACK, - ImageResources.INPUT_BOX_ERROR_LT, - ImageResources.INPUT_BOX_ERROR_T, - ImageResources.INPUT_BOX_ERROR_RT, - ImageResources.INPUT_BOX_ERROR_R, - ImageResources.INPUT_BOX_ERROR_RB, - ImageResources.INPUT_BOX_ERROR_B, - ImageResources.INPUT_BOX_ERROR_LB, - ImageResources.INPUT_BOX_ERROR_L); - - ninePatchResourceMap.setImages(WSTATE.WARNING, ColorResources.WHITE, - ColorResources.BLACK, - ImageResources.INPUT_BOX_WARNING_LT, - ImageResources.INPUT_BOX_WARNING_T, - ImageResources.INPUT_BOX_WARNING_RT, - ImageResources.INPUT_BOX_WARNING_R, - ImageResources.INPUT_BOX_WARNING_RB, - ImageResources.INPUT_BOX_WARNING_B, - ImageResources.INPUT_BOX_WARNING_LB, - ImageResources.INPUT_BOX_WARNING_L); + ninePatchResourceMap.setImages(WSTATE.NORMAL, ColorResource.WHITE, + ColorResource.BLACK, + ImageResource.DROP_DOWN_BOX_NORMAL_LT, + ImageResource.DROP_DOWN_BOX_NORMAL_T, + ImageResource.DROP_DOWN_BOX_NORMAL_RT, + ImageResource.DROP_DOWN_BOX_NORMAL_R, + ImageResource.DROP_DOWN_BOX_NORMAL_RB, + ImageResource.DROP_DOWN_BOX_NORMAL_B, + ImageResource.DROP_DOWN_BOX_NORMAL_LB, + ImageResource.DROP_DOWN_BOX_NORMAL_L); + + ninePatchResourceMap.setImages(WSTATE.HOVER, ColorResource.WHITE, + ColorResource.BLACK, + ImageResource.DROP_DOWN_BOX_HOVER_LT, + ImageResource.DROP_DOWN_BOX_HOVER_T, + ImageResource.DROP_DOWN_BOX_HOVER_RT, + ImageResource.DROP_DOWN_BOX_HOVER_R, + ImageResource.DROP_DOWN_BOX_HOVER_RB, + ImageResource.DROP_DOWN_BOX_HOVER_B, + ImageResource.DROP_DOWN_BOX_HOVER_LB, + ImageResource.DROP_DOWN_BOX_HOVER_L); + + ninePatchResourceMap.setImages(WSTATE.SELECTED, ColorResource.WHITE, + ColorResource.BLACK, + ImageResource.DROP_DOWN_BOX_SELECTED_LT, + ImageResource.DROP_DOWN_BOX_SELECTED_T, + ImageResource.DROP_DOWN_BOX_SELECTED_RT, + ImageResource.DROP_DOWN_BOX_SELECTED_R, + ImageResource.DROP_DOWN_BOX_SELECTED_RB, + ImageResource.DROP_DOWN_BOX_SELECTED_B, + ImageResource.DROP_DOWN_BOX_SELECTED_LB, + ImageResource.DROP_DOWN_BOX_SELECTED_L); + + ninePatchResourceMap.setImages(WSTATE.DISABLE_ON, ColorResource.WHITE, + ColorResource.BLACK, + ImageResource.DROP_DOWN_BOX_DISABLE_LT, + ImageResource.DROP_DOWN_BOX_DISABLE_T, + ImageResource.DROP_DOWN_BOX_DISABLE_RT, + ImageResource.DROP_DOWN_BOX_DISABLE_R, + ImageResource.DROP_DOWN_BOX_DISABLE_RB, + ImageResource.DROP_DOWN_BOX_DISABLE_B, + ImageResource.DROP_DOWN_BOX_DISABLE_LB, + ImageResource.DROP_DOWN_BOX_DISABLE_L); + + ninePatchResourceMap.setImages(WSTATE.ERROR, ColorResource.WHITE, + ColorResource.BLACK, + ImageResource.INPUT_BOX_ERROR_LT, + ImageResource.INPUT_BOX_ERROR_T, + ImageResource.INPUT_BOX_ERROR_RT, + ImageResource.INPUT_BOX_ERROR_R, + ImageResource.INPUT_BOX_ERROR_RB, + ImageResource.INPUT_BOX_ERROR_B, + ImageResource.INPUT_BOX_ERROR_LB, + ImageResource.INPUT_BOX_ERROR_L); + + ninePatchResourceMap.setImages(WSTATE.WARNING, ColorResource.WHITE, + ColorResource.BLACK, + ImageResource.INPUT_BOX_WARNING_LT, + ImageResource.INPUT_BOX_WARNING_T, + ImageResource.INPUT_BOX_WARNING_RT, + ImageResource.INPUT_BOX_WARNING_R, + ImageResource.INPUT_BOX_WARNING_RB, + ImageResource.INPUT_BOX_WARNING_B, + ImageResource.INPUT_BOX_WARNING_LB, + ImageResource.INPUT_BOX_WARNING_L); } } diff --git a/src/org/tizen/emulator/manager/ui/renewal/widgets/ComboBoxPopup.java b/src/org/tizen/emulator/manager/ui/renewal/widgets/ComboBoxPopup.java index c4f8d08..5754983 100644 --- a/src/org/tizen/emulator/manager/ui/renewal/widgets/ComboBoxPopup.java +++ b/src/org/tizen/emulator/manager/ui/renewal/widgets/ComboBoxPopup.java @@ -52,10 +52,10 @@ import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.Event; import org.eclipse.swt.widgets.Listener; import org.eclipse.swt.widgets.Shell; -import org.tizen.emulator.manager.renewal.resources.ColorResources; -import org.tizen.emulator.manager.renewal.resources.FontResources; -import org.tizen.emulator.manager.renewal.resources.ImageResources; -import org.tizen.emulator.manager.renewal.resources.PatchImageResources; +import org.tizen.emulator.manager.renewal.resources.ColorResource; +import org.tizen.emulator.manager.renewal.resources.FontResource; +import org.tizen.emulator.manager.renewal.resources.ImageResource; +import org.tizen.emulator.manager.renewal.resources.PatchImageHelper; public class ComboBoxPopup { @@ -112,8 +112,8 @@ public class ComboBoxPopup { private void initCanvas() { popupCanvas = new Canvas(popupShell, SWT.DOUBLE_BUFFERED); - popupCanvas.setForeground(ColorResources.CONTENT_FONT.getColor()); - popupCanvas.setFont(FontResources.CONTENT.getFont()); + popupCanvas.setForeground(ColorResource.CONTENT_FONT.getColor()); + popupCanvas.setFont(FontResource.CONTENT.getFont()); List items = parentComboBox.getItemList(); Rectangle itemRect; @@ -251,9 +251,9 @@ public class ComboBoxPopup { List items = parentComboBox.getItemList(); for (int i = 0; i < itemRects.size(); i++) { if (selectedIndex == i) { - gc.setBackground(ColorResources.CREATE_VM_COMBO_POPUP_SELECT_ITEM.getColor()); + gc.setBackground(ColorResource.CREATE_VM_COMBO_POPUP_SELECT_ITEM.getColor()); } else { - gc.setBackground(ColorResources.WHITE.getColor()); + gc.setBackground(ColorResource.WHITE.getColor()); } gc.fillRectangle(itemRects.get(i)); @@ -268,18 +268,18 @@ public class ComboBoxPopup { private void drawBorder(PaintEvent e) { if (popupImage == null) { NinePatchResourceInfo ninePatchImagesInfo = - new NinePatchResourceInfo(ColorResources.WHITE, - ColorResources.WHITE, - ImageResources.CONTEXT_MENU_LT, - ImageResources.CONTEXT_MENU_T, - ImageResources.CONTEXT_MENU_RT, - ImageResources.CONTEXT_MENU_R, - ImageResources.CONTEXT_MENU_RB, - ImageResources.CONTEXT_MENU_B, - ImageResources.CONTEXT_MENU_LB, - ImageResources.CONTEXT_MENU_L); + new NinePatchResourceInfo(ColorResource.WHITE, + ColorResource.WHITE, + ImageResource.CONTEXT_MENU_LT, + ImageResource.CONTEXT_MENU_T, + ImageResource.CONTEXT_MENU_RT, + ImageResource.CONTEXT_MENU_R, + ImageResource.CONTEXT_MENU_RB, + ImageResource.CONTEXT_MENU_B, + ImageResource.CONTEXT_MENU_LB, + ImageResource.CONTEXT_MENU_L); Rectangle rect = ((Canvas) e.widget).getClientArea(); - popupImage = PatchImageResources.getComboPopupImage( + popupImage = PatchImageHelper.getComboPopupImage( rect.width, rect.height, ninePatchImagesInfo); } e.gc.drawImage(popupImage, 0, 0); diff --git a/src/org/tizen/emulator/manager/ui/renewal/widgets/CreateVMCombo.java b/src/org/tizen/emulator/manager/ui/renewal/widgets/CreateVMCombo.java index 290193e..56824cd 100644 --- a/src/org/tizen/emulator/manager/ui/renewal/widgets/CreateVMCombo.java +++ b/src/org/tizen/emulator/manager/ui/renewal/widgets/CreateVMCombo.java @@ -47,10 +47,10 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Event; import org.eclipse.swt.widgets.Listener; import org.eclipse.swt.widgets.Shell; -import org.tizen.emulator.manager.renewal.resources.ColorResources; -import org.tizen.emulator.manager.renewal.resources.FontResources; -import org.tizen.emulator.manager.renewal.resources.ImageResources; -import org.tizen.emulator.manager.renewal.resources.PatchImageResources; +import org.tizen.emulator.manager.renewal.resources.ColorResource; +import org.tizen.emulator.manager.renewal.resources.FontResource; +import org.tizen.emulator.manager.renewal.resources.ImageResource; +import org.tizen.emulator.manager.renewal.resources.PatchImageHelper; import org.tizen.emulator.manager.ui.renewal.tableviewer.ProfileButton; public class CreateVMCombo extends Canvas { @@ -91,28 +91,28 @@ public class CreateVMCombo extends Canvas { images = new ArrayList(); images.add(WSTATE.NORMAL.getId(), - PatchImageResources.getNinePatchButtonImage(width, height, nomalInfo)); + PatchImageHelper.getNinePatchButtonImage(width, height, nomalInfo)); images.add(WSTATE.HOVER.getId(), - PatchImageResources.getNinePatchButtonImage(width, height, hoverInfo)); + PatchImageHelper.getNinePatchButtonImage(width, height, hoverInfo)); images.add(WSTATE.PUSH.getId(), - PatchImageResources.getNinePatchButtonImage(width, height, selectedInfo)); + PatchImageHelper.getNinePatchButtonImage(width, height, selectedInfo)); images.add(WSTATE.SELECTED.getId(), - PatchImageResources.getNinePatchButtonImage(width, height, selectedInfo)); + PatchImageHelper.getNinePatchButtonImage(width, height, selectedInfo)); images.add(WSTATE.SELECTED_HOVER.getId(), - PatchImageResources.getNinePatchButtonImage(width, height, selectedInfo)); + PatchImageHelper.getNinePatchButtonImage(width, height, selectedInfo)); images.add(WSTATE.SELECTED_PUSH.getId(), - PatchImageResources.getNinePatchButtonImage(width, height, selectedInfo)); + PatchImageHelper.getNinePatchButtonImage(width, height, selectedInfo)); images.add(WSTATE.DISABLE_ON.getId(), - PatchImageResources.getNinePatchButtonImage(width, height, nomalInfo)); + PatchImageHelper.getNinePatchButtonImage(width, height, nomalInfo)); images.add(WSTATE.DISABLE_OFF.getId(), - PatchImageResources.getNinePatchButtonImage(width, height, nomalInfo)); + PatchImageHelper.getNinePatchButtonImage(width, height, nomalInfo)); - arrowButtonImage = ImageResources.DROP_DOWN_ARROW_NORMAL.getImage(); - arrowHoverButtonImage = ImageResources.DROP_DOWN_ARROW_HOVER.getImage(); + arrowButtonImage = ImageResource.DROP_DOWN_ARROW_NORMAL.getImage(); + arrowHoverButtonImage = ImageResource.DROP_DOWN_ARROW_HOVER.getImage(); - this.setBackground(ColorResources.WHITE.getColor()); - this.setForeground(ColorResources.CREATE_VM_COMBO_FONT.getColor()); - this.setFont(FontResources.COMBO_BUTTON.getFont()); + this.setBackground(ColorResource.WHITE.getColor()); + this.setForeground(ColorResource.CREATE_VM_COMBO_FONT.getColor()); + this.setFont(FontResource.COMBO_BUTTON.getFont()); } public void addListeners() { @@ -295,21 +295,21 @@ public class CreateVMCombo extends Canvas { disposeImages(); images.set(WSTATE.NORMAL.getId(), - PatchImageResources.getNinePatchButtonImage(width, height, nomalInfo)); + PatchImageHelper.getNinePatchButtonImage(width, height, nomalInfo)); images.set(WSTATE.HOVER.getId(), - PatchImageResources.getNinePatchButtonImage(width, height, hoverInfo)); + PatchImageHelper.getNinePatchButtonImage(width, height, hoverInfo)); images.set(WSTATE.PUSH.getId(), - PatchImageResources.getNinePatchButtonImage(width, height, selectedInfo)); + PatchImageHelper.getNinePatchButtonImage(width, height, selectedInfo)); images.set(WSTATE.SELECTED.getId(), - PatchImageResources.getNinePatchButtonImage(width, height, selectedInfo)); + PatchImageHelper.getNinePatchButtonImage(width, height, selectedInfo)); images.set(WSTATE.SELECTED_HOVER.getId(), - PatchImageResources.getNinePatchButtonImage(width, height, selectedInfo)); + PatchImageHelper.getNinePatchButtonImage(width, height, selectedInfo)); images.set(WSTATE.SELECTED_PUSH.getId(), - PatchImageResources.getNinePatchButtonImage(width, height, selectedInfo)); + PatchImageHelper.getNinePatchButtonImage(width, height, selectedInfo)); images.set(WSTATE.DISABLE_ON.getId(), - PatchImageResources.getNinePatchButtonImage(width, height, nomalInfo)); + PatchImageHelper.getNinePatchButtonImage(width, height, nomalInfo)); images.set(WSTATE.DISABLE_OFF.getId(), - PatchImageResources.getNinePatchButtonImage(width, height, nomalInfo)); + PatchImageHelper.getNinePatchButtonImage(width, height, nomalInfo)); } return size; } @@ -429,7 +429,7 @@ public class CreateVMCombo extends Canvas { e.gc.drawImage(selectedItem.getCreateIcon(), x, y); e.gc.drawText("Create " + selectedItem.getProfileName() + " Emulator", x + LEFT_TEXT_OFFSET, y, true); } else { - e.gc.drawImage(ImageResources.ICON_CREATE_NEW_VM.getImage(), x, y); + e.gc.drawImage(ImageResource.ICON_CREATE_NEW_VM.getImage(), x, y); e.gc.drawText("Create New Emulator", x + LEFT_TEXT_OFFSET, y, true); } @@ -449,37 +449,37 @@ public class CreateVMCombo extends Canvas { }; // - private final NinePatchResourceInfo hoverInfo = new NinePatchResourceInfo(ColorResources.WHITE, - ColorResources.TABLE_VIEWER_BG, - ImageResources.DROP_DOWN_BOX_HOVER_LT, - ImageResources.DROP_DOWN_BOX_HOVER_T, - ImageResources.DROP_DOWN_BOX_HOVER_RT, - ImageResources.DROP_DOWN_BOX_HOVER_R, - ImageResources.DROP_DOWN_BOX_HOVER_RB, - ImageResources.DROP_DOWN_BOX_HOVER_B, - ImageResources.DROP_DOWN_BOX_HOVER_LB, - ImageResources.DROP_DOWN_BOX_HOVER_L); - - private final NinePatchResourceInfo nomalInfo = new NinePatchResourceInfo(ColorResources.WHITE, - ColorResources.TABLE_VIEWER_BG, - ImageResources.DROP_DOWN_BOX_NORMAL_LT, - ImageResources.DROP_DOWN_BOX_NORMAL_T, - ImageResources.DROP_DOWN_BOX_NORMAL_RT, - ImageResources.DROP_DOWN_BOX_NORMAL_R, - ImageResources.DROP_DOWN_BOX_NORMAL_RB, - ImageResources.DROP_DOWN_BOX_NORMAL_B, - ImageResources.DROP_DOWN_BOX_NORMAL_LB, - ImageResources.DROP_DOWN_BOX_NORMAL_L); - - private final NinePatchResourceInfo selectedInfo = new NinePatchResourceInfo(ColorResources.WHITE, - ColorResources.TABLE_VIEWER_BG, - ImageResources.DROP_DOWN_BOX_SELECTED_LT, - ImageResources.DROP_DOWN_BOX_SELECTED_T, - ImageResources.DROP_DOWN_BOX_SELECTED_RT, - ImageResources.DROP_DOWN_BOX_SELECTED_R, - ImageResources.DROP_DOWN_BOX_SELECTED_RB, - ImageResources.DROP_DOWN_BOX_SELECTED_B, - ImageResources.DROP_DOWN_BOX_SELECTED_LB, - ImageResources.DROP_DOWN_BOX_SELECTED_L); + private final NinePatchResourceInfo hoverInfo = new NinePatchResourceInfo(ColorResource.WHITE, + ColorResource.TABLE_VIEWER_BG, + ImageResource.DROP_DOWN_BOX_HOVER_LT, + ImageResource.DROP_DOWN_BOX_HOVER_T, + ImageResource.DROP_DOWN_BOX_HOVER_RT, + ImageResource.DROP_DOWN_BOX_HOVER_R, + ImageResource.DROP_DOWN_BOX_HOVER_RB, + ImageResource.DROP_DOWN_BOX_HOVER_B, + ImageResource.DROP_DOWN_BOX_HOVER_LB, + ImageResource.DROP_DOWN_BOX_HOVER_L); + + private final NinePatchResourceInfo nomalInfo = new NinePatchResourceInfo(ColorResource.WHITE, + ColorResource.TABLE_VIEWER_BG, + ImageResource.DROP_DOWN_BOX_NORMAL_LT, + ImageResource.DROP_DOWN_BOX_NORMAL_T, + ImageResource.DROP_DOWN_BOX_NORMAL_RT, + ImageResource.DROP_DOWN_BOX_NORMAL_R, + ImageResource.DROP_DOWN_BOX_NORMAL_RB, + ImageResource.DROP_DOWN_BOX_NORMAL_B, + ImageResource.DROP_DOWN_BOX_NORMAL_LB, + ImageResource.DROP_DOWN_BOX_NORMAL_L); + + private final NinePatchResourceInfo selectedInfo = new NinePatchResourceInfo(ColorResource.WHITE, + ColorResource.TABLE_VIEWER_BG, + ImageResource.DROP_DOWN_BOX_SELECTED_LT, + ImageResource.DROP_DOWN_BOX_SELECTED_T, + ImageResource.DROP_DOWN_BOX_SELECTED_RT, + ImageResource.DROP_DOWN_BOX_SELECTED_R, + ImageResource.DROP_DOWN_BOX_SELECTED_RB, + ImageResource.DROP_DOWN_BOX_SELECTED_B, + ImageResource.DROP_DOWN_BOX_SELECTED_LB, + ImageResource.DROP_DOWN_BOX_SELECTED_L); // } diff --git a/src/org/tizen/emulator/manager/ui/renewal/widgets/CreateVMComboPopup.java b/src/org/tizen/emulator/manager/ui/renewal/widgets/CreateVMComboPopup.java index 5f275ca..f466702 100644 --- a/src/org/tizen/emulator/manager/ui/renewal/widgets/CreateVMComboPopup.java +++ b/src/org/tizen/emulator/manager/ui/renewal/widgets/CreateVMComboPopup.java @@ -46,8 +46,8 @@ import org.eclipse.swt.widgets.Canvas; import org.eclipse.swt.widgets.Event; import org.eclipse.swt.widgets.Listener; import org.eclipse.swt.widgets.Shell; -import org.tizen.emulator.manager.renewal.resources.ColorResources; -import org.tizen.emulator.manager.renewal.resources.FontResources; +import org.tizen.emulator.manager.renewal.resources.ColorResource; +import org.tizen.emulator.manager.renewal.resources.FontResource; import org.tizen.emulator.manager.ui.renewal.tableviewer.ProfileButton; class CreateVMComboPopup { @@ -115,8 +115,8 @@ class CreateVMComboPopup { popupShell.setLocation(parentPoint.x, parentPoint.y + parentRect.height); popupCanvas = new Canvas(popupShell, SWT.DOUBLE_BUFFERED); - popupCanvas.setForeground(ColorResources.CREATE_VM_COMBO_FONT.getColor()); - popupCanvas.setFont(FontResources.COMBO_BUTTON.getFont()); + popupCanvas.setForeground(ColorResource.CREATE_VM_COMBO_FONT.getColor()); + popupCanvas.setFont(FontResource.COMBO_BUTTON.getFont()); popupCanvas.addPaintListener(paintListener); popupCanvas.addDisposeListener(disposeListener); @@ -199,9 +199,9 @@ class CreateVMComboPopup { // drawing combo item for (int i = 0; i < itemRects.size(); i++) { if (selectedIndex == i) { - gc.setBackground(ColorResources.CREATE_VM_COMBO_POPUP_SELECT_ITEM.getColor()); + gc.setBackground(ColorResource.CREATE_VM_COMBO_POPUP_SELECT_ITEM.getColor()); } else { - gc.setBackground(ColorResources.WHITE.getColor()); + gc.setBackground(ColorResource.WHITE.getColor()); } gc.fillRectangle(itemRects.get(i)); @@ -214,9 +214,9 @@ class CreateVMComboPopup { // drawing line Rectangle clientRect= popupShell.getClientArea(); - gc.setForeground(ColorResources.CREATE_VM_COMBO_POPUP_OUTER_LINE.getColor()); + gc.setForeground(ColorResource.CREATE_VM_COMBO_POPUP_OUTER_LINE.getColor()); gc.drawRectangle(clientRect.x, clientRect.y, clientRect.width - LIEN_WIDTH, clientRect.height - LIEN_WIDTH); - gc.setForeground(ColorResources.CREATE_VM_COMBO_POPUP_INNER_LINE.getColor()); + gc.setForeground(ColorResource.CREATE_VM_COMBO_POPUP_INNER_LINE.getColor()); gc.drawRectangle(clientRect.x + LIEN_WIDTH, clientRect.y + LIEN_WIDTH, clientRect.width - LIEN_WIDTH - LINE_OFFSET, diff --git a/src/org/tizen/emulator/manager/ui/renewal/widgets/GrayButton.java b/src/org/tizen/emulator/manager/ui/renewal/widgets/GrayButton.java index 16eed0c..9ef55b5 100644 --- a/src/org/tizen/emulator/manager/ui/renewal/widgets/GrayButton.java +++ b/src/org/tizen/emulator/manager/ui/renewal/widgets/GrayButton.java @@ -34,9 +34,9 @@ import org.eclipse.swt.SWT; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Event; import org.eclipse.swt.widgets.Listener; -import org.tizen.emulator.manager.renewal.resources.ColorResources; -import org.tizen.emulator.manager.renewal.resources.FontResources; -import org.tizen.emulator.manager.renewal.resources.ImageResources; +import org.tizen.emulator.manager.renewal.resources.ColorResource; +import org.tizen.emulator.manager.renewal.resources.FontResource; +import org.tizen.emulator.manager.renewal.resources.ImageResource; public class GrayButton extends NinePatchButton { @@ -76,55 +76,55 @@ public class GrayButton extends NinePatchButton { } protected void initFont() { - setButtonFont(FontResources.GRAY_BTN_FONT.getFont()); - setButtonFontColor(ColorResources.GRAY_BTN_FONT.getColor()); + setButtonFont(FontResource.GRAY_BTN_FONT.getFont()); + setButtonFontColor(ColorResource.GRAY_BTN_FONT.getColor()); } private static void initNinePatchResourceMap() { ninePatchResourceMap = new NinePatchResourceMap(); - ninePatchResourceMap.setImages(WSTATE.NORMAL, ColorResources.GRAY_BTN_NORMAL, - ColorResources.BLACK, - ImageResources.GRAY_BTN_NORMAL_LT, - ImageResources.GRAY_BTN_NORMAL_T, - ImageResources.GRAY_BTN_NORMAL_RT, - ImageResources.GRAY_BTN_NORMAL_R, - ImageResources.GRAY_BTN_NORMAL_RB, - ImageResources.GRAY_BTN_NORMAL_B, - ImageResources.GRAY_BTN_NORMAL_LB, - ImageResources.GRAY_BTN_NORMAL_L); - - ninePatchResourceMap.setImages(WSTATE.HOVER, ColorResources.GRAY_BTN_HOVER, - ColorResources.BLACK, - ImageResources.GRAY_BTN_HOVER_LT, - ImageResources.GRAY_BTN_HOVER_T, - ImageResources.GRAY_BTN_HOVER_RT, - ImageResources.GRAY_BTN_HOVER_R, - ImageResources.GRAY_BTN_HOVER_RB, - ImageResources.GRAY_BTN_HOVER_B, - ImageResources.GRAY_BTN_HOVER_LB, - ImageResources.GRAY_BTN_HOVER_L); - - ninePatchResourceMap.setImages(WSTATE.PUSH, ColorResources.GRAY_BTN_PUSH, - ColorResources.BLACK, - ImageResources.GRAY_BTN_PUSH_LT, - ImageResources.GRAY_BTN_PUSH_T, - ImageResources.GRAY_BTN_PUSH_RT, - ImageResources.GRAY_BTN_PUSH_R, - ImageResources.GRAY_BTN_PUSH_RB, - ImageResources.GRAY_BTN_PUSH_B, - ImageResources.GRAY_BTN_PUSH_LB, - ImageResources.GRAY_BTN_PUSH_L); - - ninePatchResourceMap.setImages(WSTATE.DISABLE_ON, ColorResources.BTN_DISABLE, - ColorResources.BLACK, - ImageResources.BTN_DISABLE_LT, - ImageResources.BTN_DISABLE_T, - ImageResources.BTN_DISABLE_RT, - ImageResources.BTN_DISABLE_R, - ImageResources.BTN_DISABLE_RB, - ImageResources.BTN_DISABLE_B, - ImageResources.BTN_DISABLE_LB, - ImageResources.BTN_DISABLE_L); + ninePatchResourceMap.setImages(WSTATE.NORMAL, ColorResource.GRAY_BTN_NORMAL, + ColorResource.BLACK, + ImageResource.GRAY_BTN_NORMAL_LT, + ImageResource.GRAY_BTN_NORMAL_T, + ImageResource.GRAY_BTN_NORMAL_RT, + ImageResource.GRAY_BTN_NORMAL_R, + ImageResource.GRAY_BTN_NORMAL_RB, + ImageResource.GRAY_BTN_NORMAL_B, + ImageResource.GRAY_BTN_NORMAL_LB, + ImageResource.GRAY_BTN_NORMAL_L); + + ninePatchResourceMap.setImages(WSTATE.HOVER, ColorResource.GRAY_BTN_HOVER, + ColorResource.BLACK, + ImageResource.GRAY_BTN_HOVER_LT, + ImageResource.GRAY_BTN_HOVER_T, + ImageResource.GRAY_BTN_HOVER_RT, + ImageResource.GRAY_BTN_HOVER_R, + ImageResource.GRAY_BTN_HOVER_RB, + ImageResource.GRAY_BTN_HOVER_B, + ImageResource.GRAY_BTN_HOVER_LB, + ImageResource.GRAY_BTN_HOVER_L); + + ninePatchResourceMap.setImages(WSTATE.PUSH, ColorResource.GRAY_BTN_PUSH, + ColorResource.BLACK, + ImageResource.GRAY_BTN_PUSH_LT, + ImageResource.GRAY_BTN_PUSH_T, + ImageResource.GRAY_BTN_PUSH_RT, + ImageResource.GRAY_BTN_PUSH_R, + ImageResource.GRAY_BTN_PUSH_RB, + ImageResource.GRAY_BTN_PUSH_B, + ImageResource.GRAY_BTN_PUSH_LB, + ImageResource.GRAY_BTN_PUSH_L); + + ninePatchResourceMap.setImages(WSTATE.DISABLE_ON, ColorResource.BTN_DISABLE, + ColorResource.BLACK, + ImageResource.BTN_DISABLE_LT, + ImageResource.BTN_DISABLE_T, + ImageResource.BTN_DISABLE_RT, + ImageResource.BTN_DISABLE_R, + ImageResource.BTN_DISABLE_RB, + ImageResource.BTN_DISABLE_B, + ImageResource.BTN_DISABLE_LB, + ImageResource.BTN_DISABLE_L); } @Override diff --git a/src/org/tizen/emulator/manager/ui/renewal/widgets/HighLightButton.java b/src/org/tizen/emulator/manager/ui/renewal/widgets/HighLightButton.java index 52b195c..4d669ae 100644 --- a/src/org/tizen/emulator/manager/ui/renewal/widgets/HighLightButton.java +++ b/src/org/tizen/emulator/manager/ui/renewal/widgets/HighLightButton.java @@ -32,9 +32,9 @@ package org.tizen.emulator.manager.ui.renewal.widgets; import org.eclipse.swt.widgets.Composite; -import org.tizen.emulator.manager.renewal.resources.ColorResources; -import org.tizen.emulator.manager.renewal.resources.FontResources; -import org.tizen.emulator.manager.renewal.resources.ImageResources; +import org.tizen.emulator.manager.renewal.resources.ColorResource; +import org.tizen.emulator.manager.renewal.resources.FontResource; +import org.tizen.emulator.manager.renewal.resources.ImageResource; public class HighLightButton extends NinePatchButton { @@ -47,55 +47,55 @@ public class HighLightButton extends NinePatchButton { } protected void initFont() { - setButtonFont(FontResources.GRAY_BTN_FONT.getFont()); - setButtonFontColor(ColorResources.GRAY_BTN_FONT.getColor()); + setButtonFont(FontResource.GRAY_BTN_FONT.getFont()); + setButtonFontColor(ColorResource.GRAY_BTN_FONT.getColor()); } private static void initNinePatchResourceMap() { ninePatchResourceMap = new NinePatchResourceMap(); - ninePatchResourceMap.setImages(WSTATE.NORMAL, ColorResources.HIGHLIGHT_BTN_NORMAL, - ColorResources.BLACK, - ImageResources.HIGHLIGHT_BTN_NORMAL_LT, - ImageResources.HIGHLIGHT_BTN_NORMAL_T, - ImageResources.HIGHLIGHT_BTN_NORMAL_RT, - ImageResources.HIGHLIGHT_BTN_NORMAL_R, - ImageResources.HIGHLIGHT_BTN_NORMAL_RB, - ImageResources.HIGHLIGHT_BTN_NORMAL_B, - ImageResources.HIGHLIGHT_BTN_NORMAL_LB, - ImageResources.HIGHLIGHT_BTN_NORMAL_L); + ninePatchResourceMap.setImages(WSTATE.NORMAL, ColorResource.HIGHLIGHT_BTN_NORMAL, + ColorResource.BLACK, + ImageResource.HIGHLIGHT_BTN_NORMAL_LT, + ImageResource.HIGHLIGHT_BTN_NORMAL_T, + ImageResource.HIGHLIGHT_BTN_NORMAL_RT, + ImageResource.HIGHLIGHT_BTN_NORMAL_R, + ImageResource.HIGHLIGHT_BTN_NORMAL_RB, + ImageResource.HIGHLIGHT_BTN_NORMAL_B, + ImageResource.HIGHLIGHT_BTN_NORMAL_LB, + ImageResource.HIGHLIGHT_BTN_NORMAL_L); - ninePatchResourceMap.setImages(WSTATE.HOVER, ColorResources.HIGHLIGHT_BTN_HOVER, - ColorResources.BLACK, - ImageResources.HIGHLIGHT_BTN_HOVER_LT, - ImageResources.HIGHLIGHT_BTN_HOVER_T, - ImageResources.HIGHLIGHT_BTN_HOVER_RT, - ImageResources.HIGHLIGHT_BTN_HOVER_R, - ImageResources.HIGHLIGHT_BTN_HOVER_RB, - ImageResources.HIGHLIGHT_BTN_HOVER_B, - ImageResources.HIGHLIGHT_BTN_HOVER_LB, - ImageResources.HIGHLIGHT_BTN_HOVER_L); + ninePatchResourceMap.setImages(WSTATE.HOVER, ColorResource.HIGHLIGHT_BTN_HOVER, + ColorResource.BLACK, + ImageResource.HIGHLIGHT_BTN_HOVER_LT, + ImageResource.HIGHLIGHT_BTN_HOVER_T, + ImageResource.HIGHLIGHT_BTN_HOVER_RT, + ImageResource.HIGHLIGHT_BTN_HOVER_R, + ImageResource.HIGHLIGHT_BTN_HOVER_RB, + ImageResource.HIGHLIGHT_BTN_HOVER_B, + ImageResource.HIGHLIGHT_BTN_HOVER_LB, + ImageResource.HIGHLIGHT_BTN_HOVER_L); - ninePatchResourceMap.setImages(WSTATE.PUSH, ColorResources.HIGHLIGHT_BTN_PUSH, - ColorResources.BLACK, - ImageResources.HIGHLIGHT_BTN_PUSH_LT, - ImageResources.HIGHLIGHT_BTN_PUSH_T, - ImageResources.HIGHLIGHT_BTN_PUSH_RT, - ImageResources.HIGHLIGHT_BTN_PUSH_R, - ImageResources.HIGHLIGHT_BTN_PUSH_RB, - ImageResources.HIGHLIGHT_BTN_PUSH_B, - ImageResources.HIGHLIGHT_BTN_PUSH_LB, - ImageResources.HIGHLIGHT_BTN_PUSH_L); + ninePatchResourceMap.setImages(WSTATE.PUSH, ColorResource.HIGHLIGHT_BTN_PUSH, + ColorResource.BLACK, + ImageResource.HIGHLIGHT_BTN_PUSH_LT, + ImageResource.HIGHLIGHT_BTN_PUSH_T, + ImageResource.HIGHLIGHT_BTN_PUSH_RT, + ImageResource.HIGHLIGHT_BTN_PUSH_R, + ImageResource.HIGHLIGHT_BTN_PUSH_RB, + ImageResource.HIGHLIGHT_BTN_PUSH_B, + ImageResource.HIGHLIGHT_BTN_PUSH_LB, + ImageResource.HIGHLIGHT_BTN_PUSH_L); - ninePatchResourceMap.setImages(WSTATE.DISABLE_ON, ColorResources.BTN_DISABLE, - ColorResources.BLACK, - ImageResources.BTN_DISABLE_LT, - ImageResources.BTN_DISABLE_T, - ImageResources.BTN_DISABLE_RT, - ImageResources.BTN_DISABLE_R, - ImageResources.BTN_DISABLE_RB, - ImageResources.BTN_DISABLE_B, - ImageResources.BTN_DISABLE_LB, - ImageResources.BTN_DISABLE_L); + ninePatchResourceMap.setImages(WSTATE.DISABLE_ON, ColorResource.BTN_DISABLE, + ColorResource.BLACK, + ImageResource.BTN_DISABLE_LT, + ImageResource.BTN_DISABLE_T, + ImageResource.BTN_DISABLE_RT, + ImageResource.BTN_DISABLE_R, + ImageResource.BTN_DISABLE_RB, + ImageResource.BTN_DISABLE_B, + ImageResource.BTN_DISABLE_LB, + ImageResource.BTN_DISABLE_L); } @Override diff --git a/src/org/tizen/emulator/manager/ui/renewal/widgets/ImageButton.java b/src/org/tizen/emulator/manager/ui/renewal/widgets/ImageButton.java index 639c7a2..97db927 100644 --- a/src/org/tizen/emulator/manager/ui/renewal/widgets/ImageButton.java +++ b/src/org/tizen/emulator/manager/ui/renewal/widgets/ImageButton.java @@ -49,9 +49,9 @@ import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Event; import org.eclipse.swt.widgets.Listener; import org.eclipse.swt.widgets.TypedListener; -import org.tizen.emulator.manager.renewal.resources.ColorResources; -import org.tizen.emulator.manager.renewal.resources.FontResources; -import org.tizen.emulator.manager.renewal.resources.ImageResources; +import org.tizen.emulator.manager.renewal.resources.ColorResource; +import org.tizen.emulator.manager.renewal.resources.FontResource; +import org.tizen.emulator.manager.renewal.resources.ImageResource; public class ImageButton extends Canvas { private final Composite parent; @@ -92,8 +92,8 @@ public class ImageButton extends Canvas { for (WSTATE s : WSTATE.values()) { colors.add(s.getId(), null); - fontColors.add(s.getId(), ColorResources.GRAY_BTN_FONT.getColor()); - fonts.add(s.getId(), FontResources.BUTTON_FONT.getFont()); + fontColors.add(s.getId(), ColorResource.GRAY_BTN_FONT.getColor()); + fonts.add(s.getId(), FontResource.BUTTON_FONT.getFont()); images.add(s.getId(), null); } @@ -101,14 +101,14 @@ public class ImageButton extends Canvas { // ColorResources.BUTTON_DISABLE_FONT_COLOR.getColor()); if (checkStyle(style, SWT.RADIO)) { - this.setImages(ImageResources.RADIO_BUTTON_OFF.getImage(), - ImageResources.RADIO_BUTTON_OFF.getImage(), - ImageResources.RADIO_BUTTON_OFF.getImage(), - ImageResources.RADIO_BUTTON_ON.getImage(), - ImageResources.RADIO_BUTTON_ON.getImage(), - ImageResources.RADIO_BUTTON_ON.getImage(), - ImageResources.RADIO_BUTTON_ON_DISABLE.getImage(), - ImageResources.RADIO_BUTTON_OFF_DISABLE.getImage()); + this.setImages(ImageResource.RADIO_BUTTON_OFF.getImage(), + ImageResource.RADIO_BUTTON_OFF.getImage(), + ImageResource.RADIO_BUTTON_OFF.getImage(), + ImageResource.RADIO_BUTTON_ON.getImage(), + ImageResource.RADIO_BUTTON_ON.getImage(), + ImageResource.RADIO_BUTTON_ON.getImage(), + ImageResource.RADIO_BUTTON_ON_DISABLE.getImage(), + ImageResource.RADIO_BUTTON_OFF_DISABLE.getImage()); } } @@ -165,7 +165,7 @@ public class ImageButton extends Canvas { images.set(state.getId(), image); } - public void setImage(WSTATE state, ImageResources imageResource) { + public void setImage(WSTATE state, ImageResource imageResource) { imageMap.put(state, imageResource); } @@ -407,7 +407,7 @@ public class ImageButton extends Canvas { if (checkStyle(style, SWT.RADIO)) { x += RADIO_IMAGE_SIZE + 6; } else { - e.gc.setFont(FontResources.BUTTON_FONT.getFont()); + e.gc.setFont(FontResource.BUTTON_FONT.getFont()); Point extent = e.gc.textExtent(text); x += rect.x + ((rect.width - extent.x) / 2); } diff --git a/src/org/tizen/emulator/manager/ui/renewal/widgets/ImageRadioButton.java b/src/org/tizen/emulator/manager/ui/renewal/widgets/ImageRadioButton.java index bbd55e4..2afd384 100644 --- a/src/org/tizen/emulator/manager/ui/renewal/widgets/ImageRadioButton.java +++ b/src/org/tizen/emulator/manager/ui/renewal/widgets/ImageRadioButton.java @@ -41,7 +41,7 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Event; import org.eclipse.swt.widgets.Listener; -import org.tizen.emulator.manager.renewal.resources.ImageResources; +import org.tizen.emulator.manager.renewal.resources.ImageResource; public class ImageRadioButton extends Canvas { @@ -56,7 +56,7 @@ public class ImageRadioButton extends Canvas { addPaintListener(); } - public void setImage(WSTATE state, ImageResources imageResource) { + public void setImage(WSTATE state, ImageResource imageResource) { images.put(state, imageResource); } diff --git a/src/org/tizen/emulator/manager/ui/renewal/widgets/NinePatchBox.java b/src/org/tizen/emulator/manager/ui/renewal/widgets/NinePatchBox.java index 95edef9..7f80824 100644 --- a/src/org/tizen/emulator/manager/ui/renewal/widgets/NinePatchBox.java +++ b/src/org/tizen/emulator/manager/ui/renewal/widgets/NinePatchBox.java @@ -41,7 +41,7 @@ import org.eclipse.swt.graphics.Image; import org.eclipse.swt.graphics.Rectangle; import org.eclipse.swt.widgets.Canvas; import org.eclipse.swt.widgets.Composite; -import org.tizen.emulator.manager.renewal.resources.PatchImageResources; +import org.tizen.emulator.manager.renewal.resources.PatchImageHelper; public abstract class NinePatchBox extends Canvas{ @@ -118,7 +118,7 @@ public abstract class NinePatchBox extends Canvas{ return; } Rectangle rect = ((Canvas) e.widget).getClientArea(); - image = PatchImageResources.getNinePatchButtonImage( + image = PatchImageHelper.getNinePatchButtonImage( rect.width, rect.height, map.get(state)); imageMap.put(state, image); } diff --git a/src/org/tizen/emulator/manager/ui/renewal/widgets/NinePatchButton.java b/src/org/tizen/emulator/manager/ui/renewal/widgets/NinePatchButton.java index d5885d0..981ea75 100644 --- a/src/org/tizen/emulator/manager/ui/renewal/widgets/NinePatchButton.java +++ b/src/org/tizen/emulator/manager/ui/renewal/widgets/NinePatchButton.java @@ -38,7 +38,7 @@ import org.eclipse.swt.graphics.GC; import org.eclipse.swt.graphics.Image; import org.eclipse.swt.graphics.Rectangle; import org.eclipse.swt.widgets.Composite; -import org.tizen.emulator.manager.renewal.resources.PatchImageResources; +import org.tizen.emulator.manager.renewal.resources.PatchImageHelper; public abstract class NinePatchButton extends ImageButton { @@ -71,28 +71,28 @@ public abstract class NinePatchButton extends ImageButton { switch(state) { case HOVER: if (hoverImage == null) { - hoverImage = PatchImageResources.getNinePatchButtonImage(width, height, + hoverImage = PatchImageHelper.getNinePatchButtonImage(width, height, getNinePatchResourceMap().get(state)); } image = hoverImage; break; case PUSH: if (pushImage == null) { - pushImage = PatchImageResources.getNinePatchButtonImage(width, height, + pushImage = PatchImageHelper.getNinePatchButtonImage(width, height, getNinePatchResourceMap().get(state)); } image = pushImage; break; case DISABLE_ON: if (disableImage == null) { - disableImage = PatchImageResources.getNinePatchButtonImage(width, height, + disableImage = PatchImageHelper.getNinePatchButtonImage(width, height, getNinePatchResourceMap().get(state)); } image = disableImage; break; default: if (normalImage == null) { - normalImage = PatchImageResources.getNinePatchButtonImage(width, height, + normalImage = PatchImageHelper.getNinePatchButtonImage(width, height, getNinePatchResourceMap().get(WSTATE.NORMAL)); } image = normalImage; diff --git a/src/org/tizen/emulator/manager/ui/renewal/widgets/NinePatchResourceInfo.java b/src/org/tizen/emulator/manager/ui/renewal/widgets/NinePatchResourceInfo.java index 519c699..3c7fce8 100644 --- a/src/org/tizen/emulator/manager/ui/renewal/widgets/NinePatchResourceInfo.java +++ b/src/org/tizen/emulator/manager/ui/renewal/widgets/NinePatchResourceInfo.java @@ -33,17 +33,17 @@ package org.tizen.emulator.manager.ui.renewal.widgets; import java.util.HashMap; import java.util.Map; -import org.tizen.emulator.manager.renewal.resources.ColorResources; -import org.tizen.emulator.manager.renewal.resources.ImageResources; +import org.tizen.emulator.manager.renewal.resources.ColorResource; +import org.tizen.emulator.manager.renewal.resources.ImageResource; public class NinePatchResourceInfo { - private final Map map = new HashMap (); - private final ColorResources background; + private final Map map = new HashMap (); + private final ColorResource background; // This is used to make the corners of button transparent. // This color should be set as which is not included in button image. - private final ColorResources transparentColor; + private final ColorResource transparentColor; static final String LT = "lt"; static final String T = "t"; @@ -54,11 +54,11 @@ public class NinePatchResourceInfo { static final String LB = "lb"; static final String L = "l"; - public NinePatchResourceInfo(ColorResources background, ColorResources transparentColor, - ImageResources lt, ImageResources t, - ImageResources rt, ImageResources r, - ImageResources rb, ImageResources b, - ImageResources lb, ImageResources l) { + public NinePatchResourceInfo(ColorResource background, ColorResource transparentColor, + ImageResource lt, ImageResource t, + ImageResource rt, ImageResource r, + ImageResource rb, ImageResource b, + ImageResource lb, ImageResource l) { this.background = background; this.transparentColor = transparentColor; map.put(LT, lt); @@ -71,43 +71,43 @@ public class NinePatchResourceInfo { map.put(L, l); } - public ImageResources getLeftTopImage() { + public ImageResource getLeftTopImage() { return map.get(LT); } - public ImageResources getTopImage() { + public ImageResource getTopImage() { return map.get(T); } - public ImageResources getRightTopImage() { + public ImageResource getRightTopImage() { return map.get(RT); } - public ImageResources getRightImage() { + public ImageResource getRightImage() { return map.get(R); } - public ImageResources getRightBottomImage() { + public ImageResource getRightBottomImage() { return map.get(RB); } - public ImageResources getBottomImage() { + public ImageResource getBottomImage() { return map.get(B); } - public ImageResources getLeftBottomImage() { + public ImageResource getLeftBottomImage() { return map.get(LB); } - public ImageResources getLeftImage() { + public ImageResource getLeftImage() { return map.get(L); } - public ColorResources getBackground() { + public ColorResource getBackground() { return background; } - public ColorResources getTransparentColor() { + public ColorResource getTransparentColor() { return transparentColor; } } diff --git a/src/org/tizen/emulator/manager/ui/renewal/widgets/NinePatchResourceMap.java b/src/org/tizen/emulator/manager/ui/renewal/widgets/NinePatchResourceMap.java index ac76f77..7bab641 100644 --- a/src/org/tizen/emulator/manager/ui/renewal/widgets/NinePatchResourceMap.java +++ b/src/org/tizen/emulator/manager/ui/renewal/widgets/NinePatchResourceMap.java @@ -33,19 +33,19 @@ package org.tizen.emulator.manager.ui.renewal.widgets; import java.util.HashMap; import java.util.Map; -import org.tizen.emulator.manager.renewal.resources.ColorResources; -import org.tizen.emulator.manager.renewal.resources.ImageResources; +import org.tizen.emulator.manager.renewal.resources.ColorResource; +import org.tizen.emulator.manager.renewal.resources.ImageResource; public class NinePatchResourceMap { private final Map map = new HashMap(); - public void setImages(WSTATE wState, ColorResources background, ColorResources transparentColor, - ImageResources lt, ImageResources t, - ImageResources rt, ImageResources r, - ImageResources rb, ImageResources b, - ImageResources lb, ImageResources l) { + public void setImages(WSTATE wState, ColorResource background, ColorResource transparentColor, + ImageResource lt, ImageResource t, + ImageResource rt, ImageResource r, + ImageResource rb, ImageResource b, + ImageResource lb, ImageResource l) { map.put(wState, new NinePatchResourceInfo(background, transparentColor, lt, t, rt, r, rb, b, lb, l)); } diff --git a/src/org/tizen/emulator/manager/ui/renewal/widgets/TextBox.java b/src/org/tizen/emulator/manager/ui/renewal/widgets/TextBox.java index 7e01639..7004212 100644 --- a/src/org/tizen/emulator/manager/ui/renewal/widgets/TextBox.java +++ b/src/org/tizen/emulator/manager/ui/renewal/widgets/TextBox.java @@ -39,9 +39,9 @@ import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Canvas; import org.eclipse.swt.widgets.Composite; -import org.tizen.emulator.manager.renewal.resources.ColorResources; -import org.tizen.emulator.manager.renewal.resources.FontResources; -import org.tizen.emulator.manager.renewal.resources.ImageResources; +import org.tizen.emulator.manager.renewal.resources.ColorResource; +import org.tizen.emulator.manager.renewal.resources.FontResource; +import org.tizen.emulator.manager.renewal.resources.ImageResource; public class TextBox extends NinePatchBox { @@ -115,8 +115,8 @@ public class TextBox extends NinePatchBox { public void paintControl(PaintEvent e) { GC gc = e.gc; - gc.setForeground(ColorResources.DISABLED_TEXT.getColor()); - gc.setFont(FontResources.CONTENT.getFont()); + gc.setForeground(ColorResource.DISABLED_TEXT.getColor()); + gc.setFont(FontResource.CONTENT.getFont()); String displayText = WidgetHelper.shortenText(gc, text, ((Composite)e.widget).getClientArea()); int itemHeight = ((Composite)e.widget).getBounds().height; @@ -147,48 +147,48 @@ public class TextBox extends NinePatchBox { private static void initNinePatchResourceMap() { ninePatchResourceMap = new NinePatchResourceMap(); - ninePatchResourceMap.setImages(WSTATE.NORMAL, ColorResources.WHITE, - ColorResources.WHITE, - ImageResources.TEXT_INPUT_BOX_NORMAL_LT, - ImageResources.TEXT_INPUT_BOX_NORMAL_T, - ImageResources.TEXT_INPUT_BOX_NORMAL_RT, - ImageResources.TEXT_INPUT_BOX_NORMAL_R, - ImageResources.TEXT_INPUT_BOX_NORMAL_RB, - ImageResources.TEXT_INPUT_BOX_NORMAL_B, - ImageResources.TEXT_INPUT_BOX_NORMAL_LB, - ImageResources.TEXT_INPUT_BOX_NORMAL_L); - - ninePatchResourceMap.setImages(WSTATE.DISABLE_ON, ColorResources.WHITE, - ColorResources.WHITE, - ImageResources.TEXT_INPUT_BOX_DISABLE_LT, - ImageResources.TEXT_INPUT_BOX_DISABLE_T, - ImageResources.TEXT_INPUT_BOX_DISABLE_RT, - ImageResources.TEXT_INPUT_BOX_DISABLE_R, - ImageResources.TEXT_INPUT_BOX_DISABLE_RB, - ImageResources.TEXT_INPUT_BOX_DISABLE_B, - ImageResources.TEXT_INPUT_BOX_DISABLE_LB, - ImageResources.TEXT_INPUT_BOX_DISABLE_L); - - ninePatchResourceMap.setImages(WSTATE.ERROR, ColorResources.WHITE, - ColorResources.WHITE, - ImageResources.INPUT_BOX_ERROR_LT, - ImageResources.INPUT_BOX_ERROR_T, - ImageResources.INPUT_BOX_ERROR_RT, - ImageResources.INPUT_BOX_ERROR_R, - ImageResources.INPUT_BOX_ERROR_RB, - ImageResources.INPUT_BOX_ERROR_B, - ImageResources.INPUT_BOX_ERROR_LB, - ImageResources.INPUT_BOX_ERROR_L); - - ninePatchResourceMap.setImages(WSTATE.LEAD, ColorResources.WHITE, - ColorResources.WHITE, - ImageResources.TEXT_INPUT_BOX_LEAD_LT, - ImageResources.TEXT_INPUT_BOX_LEAD_T, - ImageResources.TEXT_INPUT_BOX_LEAD_RT, - ImageResources.TEXT_INPUT_BOX_LEAD_R, - ImageResources.TEXT_INPUT_BOX_LEAD_RB, - ImageResources.TEXT_INPUT_BOX_LEAD_B, - ImageResources.TEXT_INPUT_BOX_LEAD_LB, - ImageResources.TEXT_INPUT_BOX_LEAD_L); + ninePatchResourceMap.setImages(WSTATE.NORMAL, ColorResource.WHITE, + ColorResource.WHITE, + ImageResource.TEXT_INPUT_BOX_NORMAL_LT, + ImageResource.TEXT_INPUT_BOX_NORMAL_T, + ImageResource.TEXT_INPUT_BOX_NORMAL_RT, + ImageResource.TEXT_INPUT_BOX_NORMAL_R, + ImageResource.TEXT_INPUT_BOX_NORMAL_RB, + ImageResource.TEXT_INPUT_BOX_NORMAL_B, + ImageResource.TEXT_INPUT_BOX_NORMAL_LB, + ImageResource.TEXT_INPUT_BOX_NORMAL_L); + + ninePatchResourceMap.setImages(WSTATE.DISABLE_ON, ColorResource.WHITE, + ColorResource.WHITE, + ImageResource.TEXT_INPUT_BOX_DISABLE_LT, + ImageResource.TEXT_INPUT_BOX_DISABLE_T, + ImageResource.TEXT_INPUT_BOX_DISABLE_RT, + ImageResource.TEXT_INPUT_BOX_DISABLE_R, + ImageResource.TEXT_INPUT_BOX_DISABLE_RB, + ImageResource.TEXT_INPUT_BOX_DISABLE_B, + ImageResource.TEXT_INPUT_BOX_DISABLE_LB, + ImageResource.TEXT_INPUT_BOX_DISABLE_L); + + ninePatchResourceMap.setImages(WSTATE.ERROR, ColorResource.WHITE, + ColorResource.WHITE, + ImageResource.INPUT_BOX_ERROR_LT, + ImageResource.INPUT_BOX_ERROR_T, + ImageResource.INPUT_BOX_ERROR_RT, + ImageResource.INPUT_BOX_ERROR_R, + ImageResource.INPUT_BOX_ERROR_RB, + ImageResource.INPUT_BOX_ERROR_B, + ImageResource.INPUT_BOX_ERROR_LB, + ImageResource.INPUT_BOX_ERROR_L); + + ninePatchResourceMap.setImages(WSTATE.LEAD, ColorResource.WHITE, + ColorResource.WHITE, + ImageResource.TEXT_INPUT_BOX_LEAD_LT, + ImageResource.TEXT_INPUT_BOX_LEAD_T, + ImageResource.TEXT_INPUT_BOX_LEAD_RT, + ImageResource.TEXT_INPUT_BOX_LEAD_R, + ImageResource.TEXT_INPUT_BOX_LEAD_RB, + ImageResource.TEXT_INPUT_BOX_LEAD_B, + ImageResource.TEXT_INPUT_BOX_LEAD_LB, + ImageResource.TEXT_INPUT_BOX_LEAD_L); } } diff --git a/src/org/tizen/emulator/manager/ui/renewal/widgets/TextInputBox.java b/src/org/tizen/emulator/manager/ui/renewal/widgets/TextInputBox.java index e067b62..d5b7ba2 100644 --- a/src/org/tizen/emulator/manager/ui/renewal/widgets/TextInputBox.java +++ b/src/org/tizen/emulator/manager/ui/renewal/widgets/TextInputBox.java @@ -43,9 +43,9 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Event; import org.eclipse.swt.widgets.Listener; import org.eclipse.swt.widgets.Text; -import org.tizen.emulator.manager.renewal.resources.ColorResources; -import org.tizen.emulator.manager.renewal.resources.FontResources; -import org.tizen.emulator.manager.renewal.resources.ImageResources; +import org.tizen.emulator.manager.renewal.resources.ColorResource; +import org.tizen.emulator.manager.renewal.resources.FontResource; +import org.tizen.emulator.manager.renewal.resources.ImageResource; public class TextInputBox extends NinePatchBox{ @@ -102,10 +102,10 @@ public class TextInputBox extends NinePatchBox{ public void setEnabled(boolean enabled) { if (enabled) { setState(WSTATE.NORMAL); - text.setForeground(ColorResources.CONTENT_FONT.getColor()); + text.setForeground(ColorResource.CONTENT_FONT.getColor()); } else { setState(WSTATE.DISABLE_ON); - text.setForeground(ColorResources.DISABLED_TEXT.getColor()); + text.setForeground(ColorResource.DISABLED_TEXT.getColor()); } super.setEnabled(enabled); redraw(); @@ -114,10 +114,10 @@ public class TextInputBox extends NinePatchBox{ public void setFixed(boolean fixed) { if (fixed) { - text.setForeground(ColorResources.DISABLED_TEXT.getColor()); + text.setForeground(ColorResource.DISABLED_TEXT.getColor()); } else { - text.setForeground(ColorResources.CONTENT_FONT.getColor()); + text.setForeground(ColorResource.CONTENT_FONT.getColor()); } super.setEnabled(!fixed); } @@ -166,16 +166,16 @@ public class TextInputBox extends NinePatchBox{ data.verticalAlignment = SWT.CENTER; text = new Text(this, style); - text.setFont(FontResources.CONTENT.getFont()); - text.setForeground(ColorResources.CONTENT_FONT.getColor()); - text.setBackground(ColorResources.WHITE.getColor()); + text.setFont(FontResource.CONTENT.getFont()); + text.setForeground(ColorResource.CONTENT_FONT.getColor()); + text.setBackground(ColorResource.WHITE.getColor()); text.setLayoutData(data); if (needClearButton) { clearBtn = new ImageButton(this, SWT.PUSH); - clearBtn.setImages(ImageResources.BUTTON_TEXT_DELETE_NORMAL.getImage(), - ImageResources.BUTTON_TEXT_DELETE_HOVER.getImage(), - ImageResources.BUTTON_TEXT_DELETE_HOVER.getImage(), + clearBtn.setImages(ImageResource.BUTTON_TEXT_DELETE_NORMAL.getImage(), + ImageResource.BUTTON_TEXT_DELETE_HOVER.getImage(), + ImageResource.BUTTON_TEXT_DELETE_HOVER.getImage(), null); clearBtn.setEnabled(false); clearBtn.addListener(SWT.Selection, new Listener(){ @@ -261,7 +261,7 @@ public class TextInputBox extends NinePatchBox{ @Override public void paintControl(PaintEvent e) { // remove by overwriting border with background's color - e.gc.setForeground(ColorResources.WHITE.getColor()); + e.gc.setForeground(ColorResource.WHITE.getColor()); e.gc.setLineWidth(TEXT_BORDER_WIDTH); Rectangle rect = ((Text)e.widget).getBounds(); @@ -276,72 +276,72 @@ public class TextInputBox extends NinePatchBox{ private static void initNinePatchResourceMap() { ninePatchResourceMap = new NinePatchResourceMap(); - ninePatchResourceMap.setImages(WSTATE.NORMAL, ColorResources.WHITE, - ColorResources.BLACK, - ImageResources.TEXT_INPUT_BOX_NORMAL_LT, - ImageResources.TEXT_INPUT_BOX_NORMAL_T, - ImageResources.TEXT_INPUT_BOX_NORMAL_RT, - ImageResources.TEXT_INPUT_BOX_NORMAL_R, - ImageResources.TEXT_INPUT_BOX_NORMAL_RB, - ImageResources.TEXT_INPUT_BOX_NORMAL_B, - ImageResources.TEXT_INPUT_BOX_NORMAL_LB, - ImageResources.TEXT_INPUT_BOX_NORMAL_L); - - ninePatchResourceMap.setImages(WSTATE.HOVER, ColorResources.WHITE, - ColorResources.BLACK, - ImageResources.TEXT_INPUT_BOX_HOVER_LT, - ImageResources.TEXT_INPUT_BOX_HOVER_T, - ImageResources.TEXT_INPUT_BOX_HOVER_RT, - ImageResources.TEXT_INPUT_BOX_HOVER_R, - ImageResources.TEXT_INPUT_BOX_HOVER_RB, - ImageResources.TEXT_INPUT_BOX_HOVER_B, - ImageResources.TEXT_INPUT_BOX_HOVER_LB, - ImageResources.TEXT_INPUT_BOX_HOVER_L); - - ninePatchResourceMap.setImages(WSTATE.SELECTED, ColorResources.WHITE, - ColorResources.BLACK, - ImageResources.TEXT_INPUT_BOX_SELECT_LT, - ImageResources.TEXT_INPUT_BOX_SELECT_T, - ImageResources.TEXT_INPUT_BOX_SELECT_RT, - ImageResources.TEXT_INPUT_BOX_SELECT_R, - ImageResources.TEXT_INPUT_BOX_SELECT_RB, - ImageResources.TEXT_INPUT_BOX_SELECT_B, - ImageResources.TEXT_INPUT_BOX_SELECT_LB, - ImageResources.TEXT_INPUT_BOX_SELECT_L); - - ninePatchResourceMap.setImages(WSTATE.DISABLE_ON, ColorResources.WHITE, - ColorResources.BLACK, - ImageResources.TEXT_INPUT_BOX_DISABLE_LT, - ImageResources.TEXT_INPUT_BOX_DISABLE_T, - ImageResources.TEXT_INPUT_BOX_DISABLE_RT, - ImageResources.TEXT_INPUT_BOX_DISABLE_R, - ImageResources.TEXT_INPUT_BOX_DISABLE_RB, - ImageResources.TEXT_INPUT_BOX_DISABLE_B, - ImageResources.TEXT_INPUT_BOX_DISABLE_LB, - ImageResources.TEXT_INPUT_BOX_DISABLE_L); - - - ninePatchResourceMap.setImages(WSTATE.ERROR, ColorResources.WHITE, - ColorResources.BLACK, - ImageResources.INPUT_BOX_ERROR_LT, - ImageResources.INPUT_BOX_ERROR_T, - ImageResources.INPUT_BOX_ERROR_RT, - ImageResources.INPUT_BOX_ERROR_R, - ImageResources.INPUT_BOX_ERROR_RB, - ImageResources.INPUT_BOX_ERROR_B, - ImageResources.INPUT_BOX_ERROR_LB, - ImageResources.INPUT_BOX_ERROR_L); - - ninePatchResourceMap.setImages(WSTATE.LEAD, ColorResources.WHITE, - ColorResources.BLACK, - ImageResources.TEXT_INPUT_BOX_LEAD_LT, - ImageResources.TEXT_INPUT_BOX_LEAD_T, - ImageResources.TEXT_INPUT_BOX_LEAD_RT, - ImageResources.TEXT_INPUT_BOX_LEAD_R, - ImageResources.TEXT_INPUT_BOX_LEAD_RB, - ImageResources.TEXT_INPUT_BOX_LEAD_B, - ImageResources.TEXT_INPUT_BOX_LEAD_LB, - ImageResources.TEXT_INPUT_BOX_LEAD_L); + ninePatchResourceMap.setImages(WSTATE.NORMAL, ColorResource.WHITE, + ColorResource.BLACK, + ImageResource.TEXT_INPUT_BOX_NORMAL_LT, + ImageResource.TEXT_INPUT_BOX_NORMAL_T, + ImageResource.TEXT_INPUT_BOX_NORMAL_RT, + ImageResource.TEXT_INPUT_BOX_NORMAL_R, + ImageResource.TEXT_INPUT_BOX_NORMAL_RB, + ImageResource.TEXT_INPUT_BOX_NORMAL_B, + ImageResource.TEXT_INPUT_BOX_NORMAL_LB, + ImageResource.TEXT_INPUT_BOX_NORMAL_L); + + ninePatchResourceMap.setImages(WSTATE.HOVER, ColorResource.WHITE, + ColorResource.BLACK, + ImageResource.TEXT_INPUT_BOX_HOVER_LT, + ImageResource.TEXT_INPUT_BOX_HOVER_T, + ImageResource.TEXT_INPUT_BOX_HOVER_RT, + ImageResource.TEXT_INPUT_BOX_HOVER_R, + ImageResource.TEXT_INPUT_BOX_HOVER_RB, + ImageResource.TEXT_INPUT_BOX_HOVER_B, + ImageResource.TEXT_INPUT_BOX_HOVER_LB, + ImageResource.TEXT_INPUT_BOX_HOVER_L); + + ninePatchResourceMap.setImages(WSTATE.SELECTED, ColorResource.WHITE, + ColorResource.BLACK, + ImageResource.TEXT_INPUT_BOX_SELECT_LT, + ImageResource.TEXT_INPUT_BOX_SELECT_T, + ImageResource.TEXT_INPUT_BOX_SELECT_RT, + ImageResource.TEXT_INPUT_BOX_SELECT_R, + ImageResource.TEXT_INPUT_BOX_SELECT_RB, + ImageResource.TEXT_INPUT_BOX_SELECT_B, + ImageResource.TEXT_INPUT_BOX_SELECT_LB, + ImageResource.TEXT_INPUT_BOX_SELECT_L); + + ninePatchResourceMap.setImages(WSTATE.DISABLE_ON, ColorResource.WHITE, + ColorResource.BLACK, + ImageResource.TEXT_INPUT_BOX_DISABLE_LT, + ImageResource.TEXT_INPUT_BOX_DISABLE_T, + ImageResource.TEXT_INPUT_BOX_DISABLE_RT, + ImageResource.TEXT_INPUT_BOX_DISABLE_R, + ImageResource.TEXT_INPUT_BOX_DISABLE_RB, + ImageResource.TEXT_INPUT_BOX_DISABLE_B, + ImageResource.TEXT_INPUT_BOX_DISABLE_LB, + ImageResource.TEXT_INPUT_BOX_DISABLE_L); + + + ninePatchResourceMap.setImages(WSTATE.ERROR, ColorResource.WHITE, + ColorResource.BLACK, + ImageResource.INPUT_BOX_ERROR_LT, + ImageResource.INPUT_BOX_ERROR_T, + ImageResource.INPUT_BOX_ERROR_RT, + ImageResource.INPUT_BOX_ERROR_R, + ImageResource.INPUT_BOX_ERROR_RB, + ImageResource.INPUT_BOX_ERROR_B, + ImageResource.INPUT_BOX_ERROR_LB, + ImageResource.INPUT_BOX_ERROR_L); + + ninePatchResourceMap.setImages(WSTATE.LEAD, ColorResource.WHITE, + ColorResource.BLACK, + ImageResource.TEXT_INPUT_BOX_LEAD_LT, + ImageResource.TEXT_INPUT_BOX_LEAD_T, + ImageResource.TEXT_INPUT_BOX_LEAD_RT, + ImageResource.TEXT_INPUT_BOX_LEAD_R, + ImageResource.TEXT_INPUT_BOX_LEAD_RB, + ImageResource.TEXT_INPUT_BOX_LEAD_B, + ImageResource.TEXT_INPUT_BOX_LEAD_LB, + ImageResource.TEXT_INPUT_BOX_LEAD_L); } public void setClearButtonStatus() { diff --git a/src/org/tizen/emulator/manager/ui/renewal/widgets/WStateImageMap.java b/src/org/tizen/emulator/manager/ui/renewal/widgets/WStateImageMap.java index 8582a9b..3504c8c 100644 --- a/src/org/tizen/emulator/manager/ui/renewal/widgets/WStateImageMap.java +++ b/src/org/tizen/emulator/manager/ui/renewal/widgets/WStateImageMap.java @@ -35,14 +35,14 @@ import java.util.HashMap; import java.util.Map; import org.eclipse.swt.graphics.Image; -import org.tizen.emulator.manager.renewal.resources.ImageResources; +import org.tizen.emulator.manager.renewal.resources.ImageResource; public class WStateImageMap { - Map resources = new HashMap(); + Map resources = new HashMap(); Map images = new HashMap(); - public void put(WSTATE state, ImageResources imageResource) { + public void put(WSTATE state, ImageResource imageResource) { resources.put(state, imageResource); } @@ -50,7 +50,7 @@ public class WStateImageMap { public Image get(WSTATE state) { Image img = images.get(state); if (img == null) { - ImageResources imageResource = resources.get(state); + ImageResource imageResource = resources.get(state); if (imageResource == null) { return null; } diff --git a/src/org/tizen/emulator/manager/ui/renewal/widgets/WidgetHelper.java b/src/org/tizen/emulator/manager/ui/renewal/widgets/WidgetHelper.java index 110d59b..529a4bf 100644 --- a/src/org/tizen/emulator/manager/ui/renewal/widgets/WidgetHelper.java +++ b/src/org/tizen/emulator/manager/ui/renewal/widgets/WidgetHelper.java @@ -39,8 +39,8 @@ import org.eclipse.swt.graphics.Point; import org.eclipse.swt.graphics.Rectangle; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Widget; -import org.tizen.emulator.manager.renewal.resources.ColorResources; -import org.tizen.emulator.manager.renewal.resources.FontResources; +import org.tizen.emulator.manager.renewal.resources.ColorResource; +import org.tizen.emulator.manager.renewal.resources.FontResource; import org.tizen.emulator.manager.ui.renewal.item.modify.comp.ModifyItem; public class WidgetHelper { @@ -64,18 +64,18 @@ public class WidgetHelper { // - valign : center // - horizontal left: default 0 public static void drawText(Composite comp, final String text, final int horizentalAlign) { - drawText(comp, text, horizentalAlign, ColorResources.CONTENT_FONT); + drawText(comp, text, horizentalAlign, ColorResource.CONTENT_FONT); } public static void drawText(Composite comp, final String text, final int horizentalAlign - , final ColorResources fontColor) { + , final ColorResource fontColor) { comp.addPaintListener(new PaintListener() { @Override public void paintControl(PaintEvent e) { GC gc = e.gc; gc.setForeground(fontColor.getColor()); - gc.setFont(FontResources.CONTENT.getFont()); + gc.setFont(FontResource.CONTENT.getFont()); int itemHeight = ((Composite)e.widget).getBounds().height; Point textExt = gc.textExtent(text); @@ -109,7 +109,7 @@ public class WidgetHelper { } public static int calcTextWidth(Composite comp, String text) { - return calcTextWidth(comp, text, FontResources.CONTENT.getFont()); + return calcTextWidth(comp, text, FontResource.CONTENT.getFont()); } public static void drawSubTitle(Composite comp, final String text, final int horizentalAlign, @@ -119,8 +119,8 @@ public class WidgetHelper { public void paintControl(PaintEvent e) { GC gc = e.gc; - gc.setForeground(ColorResources.CONTENT_FONT.getColor()); - gc.setFont(FontResources.CONTENT.getFont()); + gc.setForeground(ColorResource.CONTENT_FONT.getColor()); + gc.setFont(FontResource.CONTENT.getFont()); // draw text int itemHeight = ((Composite)e.widget).getBounds().height; @@ -135,7 +135,7 @@ public class WidgetHelper { gc.drawText(text, posX, posY); // draw right vertical line - gc.setForeground(ColorResources.MODIFY_ITEM_LINE.getColor()); + gc.setForeground(ColorResource.MODIFY_ITEM_LINE.getColor()); gc.setLineWidth(ModifyItem.LINE_WIDTH); gc.drawLine(titleWidth -1, -1, titleWidth -1, itemHeight+1);