REPORT-8709 and REPORT-8763

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

@@ -116,7 +116,6 @@ public class ChartTypeInterfaceManager implements ExtraChartDesignClassManagerPr
     private static Map<String, String> idAndPriorityMap = new HashMap<String, String>();
 
     public synchronized static ChartTypeInterfaceManager getInstance() {
-        DesignModuleFactory.registerExtraWidgetOptions(initWidgetOption());
         return classManager;
     }
 

designer-form/src/com/fr/design/mainframe/FormParaWidgetPane.java

@@ -317,9 +317,15 @@ public class FormParaWidgetPane extends JPanel {
             @Override
             public void mouseClicked(MouseEvent e) {
                 initWidgetTypePopUp();
-                widgetTypePopupMenu.show(FormParaWidgetPane.this,
-                        (int) jSeparatorLayout.getLocation().getX() + BORDER,
-                        (int) jSeparatorLayout.getLocation().getY());
+                if(jSeparatorChart != null) {
+                    widgetTypePopupMenu.show(FormParaWidgetPane.this,
+                            (int) jSeparatorChart.getLocation().getX() + BORDER,
+                            (int) jSeparatorChart.getLocation().getY());
+                }else{
+                    widgetTypePopupMenu.show(FormParaWidgetPane.this,
+                            (int) jSeparatorLayout.getLocation().getX() + BORDER,
+                            (int) jSeparatorLayout.getLocation().getY());
+                }
             }
 
         });