From 9c8b01bddd244789b743281b038a4db6bbb97889 Mon Sep 17 00:00:00 2001
From: xiaohu <xiaohu@finereport.com>
Date: Mon, 18 Apr 2016 15:40:38 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E9=80=8F=E6=98=8E=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 designer/designer.iml                                     | 8 --------
 designer_base/designer_base.iml                           | 7 -------
 .../src/com/fr/design/style/color/ColorSelectPane.java    | 5 +++++
 .../chart/gui/style/series/UIColorPickerPane4Map.java     | 5 +++++
 designer_form/designer_form.iml                           | 8 --------
 5 files changed, 10 insertions(+), 23 deletions(-)

diff --git a/designer/designer.iml b/designer/designer.iml
index c798a6fe0..661dcd939 100644
--- a/designer/designer.iml
+++ b/designer/designer.iml
@@ -7,15 +7,7 @@
     </content>
     <orderEntry type="jdk" jdkName="jdk1.8" jdkType="JavaSDK" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="base" />
-    <orderEntry type="module" module-name="base-basic" />
-    <orderEntry type="module" module-name="base-calculate" />
-    <orderEntry type="module" module-name="base-data" />
-    <orderEntry type="module" module-name="base-file" />
-    <orderEntry type="module" module-name="base-performance" />
-    <orderEntry type="module" module-name="base-stable" />
     <orderEntry type="module" module-name="designer_base" />
-    <orderEntry type="module" module-name="engine" />
     <orderEntry type="library" name="lib" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/designer_base/designer_base.iml b/designer_base/designer_base.iml
index d20642b28..b01c0c88b 100644
--- a/designer_base/designer_base.iml
+++ b/designer_base/designer_base.iml
@@ -7,13 +7,6 @@
     </content>
     <orderEntry type="jdk" jdkName="jdk1.8" jdkType="JavaSDK" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="base" />
-    <orderEntry type="module" module-name="base-basic" />
-    <orderEntry type="module" module-name="base-calculate" />
-    <orderEntry type="module" module-name="base-data" />
-    <orderEntry type="module" module-name="base-file" />
-    <orderEntry type="module" module-name="base-performance" />
-    <orderEntry type="module" module-name="base-stable" />
     <orderEntry type="library" name="lib" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/designer_base/src/com/fr/design/style/color/ColorSelectPane.java b/designer_base/src/com/fr/design/style/color/ColorSelectPane.java
index ac323ea38..7370bfff7 100644
--- a/designer_base/src/com/fr/design/style/color/ColorSelectPane.java
+++ b/designer_base/src/com/fr/design/style/color/ColorSelectPane.java
@@ -46,6 +46,11 @@ public class ColorSelectPane extends TransparentPane implements ColorSelectable
     	super(true);
     	initialCompents(true);
     }
+
+    public ColorSelectPane(boolean isSupportTransparent) {
+        super(isSupportTransparent);
+        initialCompents(isSupportTransparent);
+    }
     
     private void initialCompents(boolean isSupportTransparent) {
 
diff --git a/designer_chart/src/com/fr/design/mainframe/chart/gui/style/series/UIColorPickerPane4Map.java b/designer_chart/src/com/fr/design/mainframe/chart/gui/style/series/UIColorPickerPane4Map.java
index 2d26a1e09..78043ed38 100644
--- a/designer_chart/src/com/fr/design/mainframe/chart/gui/style/series/UIColorPickerPane4Map.java
+++ b/designer_chart/src/com/fr/design/mainframe/chart/gui/style/series/UIColorPickerPane4Map.java
@@ -20,6 +20,11 @@ public class UIColorPickerPane4Map extends UIColorPickerPane {
   	}
 
     private class ColorSelectPane4Map extends ColorSelectPane {
+
+        public ColorSelectPane4Map(){
+            super(false);
+        }
+
    		public void initCenterPaneChildren(JPanel centerPane) {
    			JPanel menuColorPane1 = new JPanel();
    			centerPane.add(menuColorPane1);
diff --git a/designer_form/designer_form.iml b/designer_form/designer_form.iml
index 842981108..127e5281c 100644
--- a/designer_form/designer_form.iml
+++ b/designer_form/designer_form.iml
@@ -9,13 +9,5 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="designer_base" exported="" />
     <orderEntry type="library" scope="PROVIDED" name="lib" level="project" />
-    <orderEntry type="module" module-name="base" />
-    <orderEntry type="module" module-name="base-basic" />
-    <orderEntry type="module" module-name="base-calculate" />
-    <orderEntry type="module" module-name="base-data" />
-    <orderEntry type="module" module-name="base-file" />
-    <orderEntry type="module" module-name="base-performance" />
-    <orderEntry type="module" module-name="base-stable" />
-    <orderEntry type="module" module-name="form" />
   </component>
 </module>
\ No newline at end of file

From 150a3fcbf45f5bf105d1826c334b8e75b5b28bcc Mon Sep 17 00:00:00 2001
From: xiaohu <xiaohu@finereport.com>
Date: Mon, 18 Apr 2016 15:43:07 +0800
Subject: [PATCH 2/2] update

---
 .gitignore                      | 1 +
 designer/designer.iml           | 8 ++++++++
 designer_base/designer_base.iml | 7 +++++++
 designer_form/designer_form.iml | 8 ++++++++
 4 files changed, 24 insertions(+)

diff --git a/.gitignore b/.gitignore
index ebfc6188b..ec8c85a73 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ designer/bin
 designer_base/bin
 designer_chart/bin
 designer_form/bin
+*.iml
diff --git a/designer/designer.iml b/designer/designer.iml
index 661dcd939..c798a6fe0 100644
--- a/designer/designer.iml
+++ b/designer/designer.iml
@@ -7,7 +7,15 @@
     </content>
     <orderEntry type="jdk" jdkName="jdk1.8" jdkType="JavaSDK" />
     <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="base" />
+    <orderEntry type="module" module-name="base-basic" />
+    <orderEntry type="module" module-name="base-calculate" />
+    <orderEntry type="module" module-name="base-data" />
+    <orderEntry type="module" module-name="base-file" />
+    <orderEntry type="module" module-name="base-performance" />
+    <orderEntry type="module" module-name="base-stable" />
     <orderEntry type="module" module-name="designer_base" />
+    <orderEntry type="module" module-name="engine" />
     <orderEntry type="library" name="lib" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/designer_base/designer_base.iml b/designer_base/designer_base.iml
index b01c0c88b..d20642b28 100644
--- a/designer_base/designer_base.iml
+++ b/designer_base/designer_base.iml
@@ -7,6 +7,13 @@
     </content>
     <orderEntry type="jdk" jdkName="jdk1.8" jdkType="JavaSDK" />
     <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="base" />
+    <orderEntry type="module" module-name="base-basic" />
+    <orderEntry type="module" module-name="base-calculate" />
+    <orderEntry type="module" module-name="base-data" />
+    <orderEntry type="module" module-name="base-file" />
+    <orderEntry type="module" module-name="base-performance" />
+    <orderEntry type="module" module-name="base-stable" />
     <orderEntry type="library" name="lib" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/designer_form/designer_form.iml b/designer_form/designer_form.iml
index 127e5281c..842981108 100644
--- a/designer_form/designer_form.iml
+++ b/designer_form/designer_form.iml
@@ -9,5 +9,13 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="designer_base" exported="" />
     <orderEntry type="library" scope="PROVIDED" name="lib" level="project" />
+    <orderEntry type="module" module-name="base" />
+    <orderEntry type="module" module-name="base-basic" />
+    <orderEntry type="module" module-name="base-calculate" />
+    <orderEntry type="module" module-name="base-data" />
+    <orderEntry type="module" module-name="base-file" />
+    <orderEntry type="module" module-name="base-performance" />
+    <orderEntry type="module" module-name="base-stable" />
+    <orderEntry type="module" module-name="form" />
   </component>
 </module>
\ No newline at end of file