PROP : Refactoring CssSelectorCategory.

Refactoring CssSelectorCategory.

Change-Id: I6e5ea8db76076168ad3819249a60304822e7541c
Signed-off-by: nakyoung2.choi <nakyoung2.choi@samsung.com>

diff --git a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/properties/CategoryComposite.java b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/properties/CategoryComposite.java
index 9ea3e6a..bb6b536 100644 (file)
--- a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/properties/CategoryComposite.java
+++ b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/properties/CategoryComposite.java
@@ -69,7 +69,7 @@ public class CategoryComposite extends Composite {
     public CategoryComposite(Composite parent, String name, String brief) {
         this(parent, name);
         this.brief = brief;
-        setBriefLabel();
+        briefLabel = createBriefLabel();
     }
 
     protected void init() {
@@ -107,17 +107,18 @@ public class CategoryComposite extends Composite {
         // expandableComposite.setLayoutData(data);
     }
 
-    protected void setBriefLabel() {
-        briefLabel = new Label(expandableComposite, SWT.NONE);
-        briefLabel.setForeground(getDisplay().getSystemColor(SWT.COLOR_BLUE));
+    protected Label createBriefLabel() {
+        Label label = new Label(expandableComposite, SWT.NONE);
+        label.setForeground(getDisplay().getSystemColor(SWT.COLOR_BLUE));
 
-        FontData fontData = briefLabel.getFont().getFontData()[0];
+        FontData fontData = label.getFont().getFontData()[0];
         Font font =
                 new Font(getDisplay(), new FontData(fontData.getName(), fontData.getHeight(),
                                                     SWT.BOLD));
-        briefLabel.setFont(font);
+        label.setFont(font);
 
-        expandableComposite.setTextClient(briefLabel);
+        expandableComposite.setTextClient(label);
+        return label;
     }
 
     /**
@@ -169,7 +170,8 @@ public class CategoryComposite extends Composite {
             briefLabel.dispose();
             briefLabel = null;
         }
-        setBriefLabel();
+        
+        briefLabel = createBriefLabel();
         briefLabel.setText(msg);
         expandableComposite.layout();
 
@@ -227,7 +229,7 @@ public class CategoryComposite extends Composite {
             briefLabel.dispose();
             briefLabel = null;
         }
-        setBriefLabel();
+        briefLabel = createBriefLabel();
         briefLabel.setText(msg);
         expandableComposite.layout();
     }

diff --git a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/properties/method/Method.java b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/properties/method/Method.java
index 8fbfe02..c7317f9 100644 (file)
--- a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/properties/method/Method.java
+++ b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/properties/method/Method.java
@@ -432,6 +432,8 @@ public abstract class Method extends Composite {
 
     @Override
     public void setEnabled(boolean enabled) {
+       super.setEnabled(enabled);
+       
         if (funcButton != null && !funcButton.isDisposed()) {
             funcButton.setEnabled(enableReset & enabled);
         }

diff --git a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/properties/style/CssSelectorCategoryComposite.java b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/properties/style/CssSelectorCategoryComposite.java
index 0e28043..3e6e5d6 100644 (file)
--- a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/properties/style/CssSelectorCategoryComposite.java
+++ b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/properties/style/CssSelectorCategoryComposite.java
@@ -342,8 +342,8 @@ public class CssSelectorCategoryComposite extends CategoryComposite implements I
         }
     }
 
-    protected void setBriefLabel() {
-        return;
+    protected Label createBriefLabel() {
+        return null;
     }
 
     @Override

diff --git a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/properties/style/CssStyleTab.java b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/properties/style/CssStyleTab.java
index 80ccdd3..7e2537f 100644 (file)
--- a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/properties/style/CssStyleTab.java
+++ b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/properties/style/CssStyleTab.java
@@ -727,6 +727,9 @@ public class CssStyleTab extends PropertiesTabItem implements IPageDataListener
             }
 
             CategoryComposite categoryComposite = getCategory(descriptor);
+            if (categoryComposite == null) {
+               continue;
+            }
 
             for (CssPropertyDescriptor property : childDescriptor.getCssPropertyDescriptors()) {
 
@@ -1276,7 +1279,7 @@ public class CssStyleTab extends PropertiesTabItem implements IPageDataListener
 
         clear();
 
-        if (methods == null || methods.isEmpty()) {
+        if (methods.isEmpty()) {
             if (mode.equals(PropertiesMode.DESIGN)) {
                 createDesignerContents();
                 setDefaultSelector();