fix conflict

designer-base/src/com/fr/design/hyperlink/WebHyperNorthPane.java

@@ -2,7 +2,7 @@ package com.fr.design.hyperlink;
 
 import com.fr.config.ServerPreferenceConfig;
 import com.fr.design.constants.LayoutConstants;
-import com.fr.design.gui.itextarea.UITextArea;
+
 import com.fr.design.gui.itextfield.UITextField;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.utils.gui.GUICoreUtils;
@@ -11,8 +11,9 @@ import com.fr.js.WebHyperlink;
 import com.fr.stable.ProductConstants;
 import com.fr.stable.StringUtils;
 
-import javax.swing.*;
+import javax.swing.JPanel;
-import java.awt.*;
+import java.awt.BorderLayout;
+
 
 /**
  * chart 网页链接 定义属性 target url 特征的 界面
@@ -22,7 +23,7 @@ import java.awt.*;
 public class WebHyperNorthPane extends AbstractHyperNorthPane<WebHyperlink> {
     private UITextField itemNameTextField;
     private boolean needRenamePane = false;
-    private UITextArea urlTextField;
+    private UITextField urlTextField;
 
     public WebHyperNorthPane(boolean needRenamePane) {
         this.needRenamePane = needRenamePane;
@@ -46,9 +47,11 @@ public class WebHyperNorthPane extends AbstractHyperNorthPane<WebHyperlink> {
     protected JPanel setHeaderPanel() {
         JPanel headerPane = FRGUIPaneFactory.createBorderLayout_L_Pane();
 
-        urlTextField = new UITextArea(1,headerPane.getWidth());
+        urlTextField = new UITextField(43);
         urlTextField.setText(ProductConstants.WEBSITE_URL);
 
+
+        //UILabel label = new UILabel(Inter.getLocText(new String[]{"Example","Or"}, new String[]{":http://www.baidu.com","/main.jsp"}));
         JPanel urlWithHelp = GUICoreUtils.createNamedPane(urlTextField, "URL:");
 
         if (this.needRenamePane) {

designer-chart/src/com/fr/design/ChartTypeInterfaceManager.java

@@ -27,7 +27,6 @@ import com.fr.design.chartinterface.RangeIndependentChartInterface;
 import com.fr.design.chartinterface.StockIndependentChartInterface;
 import com.fr.design.chartinterface.XYScatterIndependentChartInterface;
 import com.fr.design.condition.ConditionAttributesPane;
-import com.fr.design.file.HistoryTemplateListPane;
 import com.fr.design.gui.core.WidgetOption;
 import com.fr.design.gui.frpane.AttributeChangeListener;
 import com.fr.design.mainframe.chart.AbstractChartAttrPane;
@@ -60,7 +59,6 @@ import com.fr.plugin.chart.radar.VanChartRadarPlot;
 import com.fr.plugin.chart.scatter.VanChartScatterPlot;
 import com.fr.plugin.chart.structure.VanChartStructurePlot;
 import com.fr.plugin.chart.treemap.VanChartTreeMapPlot;
-import com.fr.plugin.chart.vanchart.imgevent.design.DesignImageEvent;
 import com.fr.plugin.chart.wordcloud.VanChartWordCloudPlot;
 import com.fr.plugin.injectable.PluginModule;
 import com.fr.plugin.injectable.PluginSingleInjection;
@@ -69,7 +67,6 @@ import com.fr.stable.ArrayUtils;
 import com.fr.stable.EnvChangedListener;
 import com.fr.stable.StringUtils;
 import com.fr.stable.plugin.ExtraChartDesignClassManagerProvider;
-import com.fr.van.chart.DownloadOnlineSourcesHelper;
 import com.fr.van.chart.area.AreaIndependentVanChartInterface;
 import com.fr.van.chart.bar.BarIndependentVanChartInterface;
 import com.fr.van.chart.bubble.BubbleIndependentVanChartInterface;
@@ -111,11 +108,12 @@ public class ChartTypeInterfaceManager implements ExtraChartDesignClassManagerPr
     private static ChartTypeInterfaceManager classManager = new ChartTypeInterfaceManager();
     
     private static LinkedHashMap<String, CloseableContainedMap<String, IndependentChartUIProvider, LinkedHashMap>> chartTypeInterfaces =
-            new LinkedHashMap<String, CloseableContainedMap<String, IndependentChartUIProvider, LinkedHashMap>>();
+        new LinkedHashMap<String, CloseableContainedMap<String, IndependentChartUIProvider, LinkedHashMap>>();
 
     private static Map<String, String> idAndPriorityMap = new HashMap<String, String>();
 
     public synchronized static ChartTypeInterfaceManager getInstance() {
+        
         return classManager;
     }
     
@@ -132,13 +130,11 @@ public class ChartTypeInterfaceManager implements ExtraChartDesignClassManagerPr
             public void envChanged() {
                 //重新注册designModuleFactory
                 DesignModuleFactory.registerExtraWidgetOptions(initWidgetOption());
-                DesignImageEvent.registerDefaultCallbackEvent(HistoryTemplateListPane.getInstance());
-                DesignImageEvent.registerDownloadSourcesEvent(new DownloadOnlineSourcesHelper());
             }
         });
     }
     
-    private static WidgetOption[] initWidgetOption() {
+    public static WidgetOption[] initWidgetOption() {
 
         ChartInternationalNameContentBean[] typeName = ChartTypeManager.getInstance().getAllChartBaseNames();
         ChartWidgetOption[] child = new ChartWidgetOption[typeName.length];
@@ -246,7 +242,7 @@ public class ChartTypeInterfaceManager implements ExtraChartDesignClassManagerPr
             if (!chartTypeInterfaces.containsKey(priority)) {
                 //新建一个具体图表列表
                 CloseableContainedMap<String, IndependentChartUIProvider, LinkedHashMap> chartUIList
-                        = new CloseableContainedMap<String, IndependentChartUIProvider, LinkedHashMap>(LinkedHashMap.class);
+                    = new CloseableContainedMap<String, IndependentChartUIProvider, LinkedHashMap>(LinkedHashMap.class);
                 chartUIList.put(plotID, provider);
                 chartTypeInterfaces.put(priority, chartUIList);
             } else {
@@ -438,8 +434,8 @@ public class ChartTypeInterfaceManager implements ExtraChartDesignClassManagerPr
     private boolean plotInChart(String plotID, String priority) {
         
         return chartTypeInterfaces != null
-                && chartTypeInterfaces.containsKey(priority)
+            && chartTypeInterfaces.containsKey(priority)
-                && chartTypeInterfaces.get(priority).containsKey(plotID);
+            && chartTypeInterfaces.get(priority).containsKey(plotID);
     }