Merge pull request #138 in DESIGN/design from ~MATA.LI/designrel:release/10.0 to release/10.0

* commit 'f6114de21e2ee926a7484097a255631f36382dc2':
  remote REPORT-8860 and REPORT-6379
  REPORT-8860 and REPORT-6379
  fix conflict
  fix conflict
  REPORT-8860 and REPORT-6379
  REPORT-8709 and REPORT-8763
  REPORT-8709 and REPORT-8763

designer-base/src/com/fr/design/data/datapane/connect/ConnectionManagerPane.java

@@ -12,21 +12,11 @@ import java.awt.*;
 import java.util.HashMap;
 
 public class ConnectionManagerPane extends LoadingBasicPane implements ConnectionShowPane {
-    private UITextField connectionTextField;
+
     private ConnectionListPane connectionListPane;
 
     protected void initComponents(JPanel container) {
         container.setLayout(FRGUIPaneFactory.createBorderLayout());
-
-        JPanel connectionPathPane = FRGUIPaneFactory.createBorderLayout_L_Pane();
-        container.add(connectionPathPane, BorderLayout.NORTH);
-
-        connectionPathPane.setBorder(BorderFactory.createEmptyBorder(6, 2, 2, 2));
-
-        connectionPathPane.add(new UILabel(Inter.getLocText("FR-Designer_Save_Path") + ":"), BorderLayout.WEST);
-        this.connectionTextField = new UITextField();
-        connectionPathPane.add(connectionTextField, BorderLayout.CENTER);
-        this.connectionTextField.setEditable(false);
         connectionListPane = new ConnectionListPane() {
             protected void rename(String oldName, String newName) {
                 super.rename(oldName, newName);

designer-base/src/com/fr/design/data/tabledata/tabledatapane/ProcedureManagerPane.java

@@ -11,21 +11,11 @@ import javax.swing.*;
 import java.awt.*;
 
 public class ProcedureManagerPane extends LoadingBasicPane {
-	private UITextField connectionTextField;
 	private ProcedureListPane procedureListPane;
 
 	protected void initComponents(JPanel container) {
 		container.setLayout(FRGUIPaneFactory.createBorderLayout());
 
-		JPanel connectionPathPane = FRGUIPaneFactory.createBorderLayout_L_Pane();
-		container.add(connectionPathPane, BorderLayout.NORTH);
-
-		connectionPathPane.setBorder(BorderFactory.createEmptyBorder(6, 2, 2, 2));
-
-		connectionPathPane.add(new UILabel(Inter.getLocText("FR-Designer_Save_Path") + ":"), BorderLayout.WEST);
-		this.connectionTextField = new UITextField();
-		connectionPathPane.add(connectionTextField, BorderLayout.CENTER);
-		this.connectionTextField.setEditable(false);
         procedureListPane = new ProcedureListPane();
 		container.add(procedureListPane, BorderLayout.CENTER);
 	}

designer-base/src/com/fr/design/data/tabledata/tabledatapane/TableDataManagerPane.java

@@ -18,7 +18,6 @@ import java.util.Map;
 
 public class TableDataManagerPane extends LoadingBasicPane {
 
-	private UITextField tableDataTextField;
 	private TableDataPaneController tableDataPane;
 
 	@Override
@@ -29,14 +28,6 @@ public class TableDataManagerPane extends LoadingBasicPane {
 	private void initTableDataManagerPane(JPanel container) {
 		container.setLayout(FRGUIPaneFactory.createBorderLayout());
 
-		JPanel tableDataPathPane = FRGUIPaneFactory.createBorderLayout_L_Pane();
-		container.add(tableDataPathPane, BorderLayout.NORTH);
-
-
-		tableDataPathPane.add(new UILabel(Inter.getLocText("FR-Designer_Save_Path") + ":"), BorderLayout.WEST);
-		this.tableDataTextField = new UITextField();
-		tableDataPathPane.add(tableDataTextField, BorderLayout.CENTER);
-		this.tableDataTextField.setEditable(false);
 		TableDataPaneProcessor paneProcessor = ExtraDesignClassManager.getInstance().getSingle(TableDataPaneProcessor.XML_TAG);
 		TableDataPaneController pane = null;
 		if (paneProcessor != null) {

designer-base/src/com/fr/design/formula/FunctionManagerPane.java

@@ -33,23 +33,11 @@ import java.util.List;
 
 public class FunctionManagerPane extends BasicPane {
 
-    private UITextField functionTextField;
     private FunctionControlPane functionControlPane;
 
     public FunctionManagerPane() {
         this.setLayout(FRGUIPaneFactory.createBorderLayout());
 
-        //path pane
-        JPanel datasourcePathPane = FRGUIPaneFactory.createBorderLayout_L_Pane();
-        this.add(datasourcePathPane, BorderLayout.NORTH);
-
-
-        datasourcePathPane.add(new UILabel(Inter.getLocText(
-            "Function-Function_File") + ":"), BorderLayout.WEST);
-        this.functionTextField = new UITextField();
-        datasourcePathPane.add(this.functionTextField, BorderLayout.CENTER);
-        this.functionTextField.setEditable(false);
-
         functionControlPane = new FunctionControlPane();
         this.add(functionControlPane, BorderLayout.CENTER);
     }

designer-base/src/com/fr/design/parameter/ParameterManagerPane.java

@@ -13,21 +13,11 @@ import java.awt.*;
 
 
 public class ParameterManagerPane extends BasicPane {
-    private UITextField parameterTextField;
     private ParameterArrayPane parameterArrayPane;
 
     public ParameterManagerPane() {
         this.setLayout(FRGUIPaneFactory.createBorderLayout());
 
-        JPanel parameterPathPane = FRGUIPaneFactory.createBorderLayout_L_Pane();
-        this.add(parameterPathPane, BorderLayout.NORTH);
-
-
-        parameterPathPane.add(new UILabel(Inter.getLocText("FR-Designer_Save_Path") + ":"), BorderLayout.WEST);
-        this.parameterTextField = new UITextField();
-        parameterPathPane.add(parameterTextField, BorderLayout.CENTER);
-        this.parameterTextField.setEditable(false);
-
         parameterArrayPane = new ParameterArrayPane();
         this.add(parameterArrayPane, BorderLayout.CENTER);
     }

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) jSeparatorChart.getLocation().getX() + BORDER,
-                        (int) jSeparatorChart.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());
+                }
             }
 
         });

designer-realize/src/com/fr/design/actions/server/StyleManagerPane.java

@@ -12,20 +12,11 @@ import javax.swing.*;
 import java.awt.*;
 
 public class StyleManagerPane extends BasicPane {
-	private UITextField StyleTextField;
 	private StyleArrayPane styleArrayPane;
 	
 	public StyleManagerPane(){
 		this.setLayout(FRGUIPaneFactory.createBorderLayout());
 		
-		JPanel stylePathPane = FRGUIPaneFactory.createBorderLayout_L_Pane();
-		this.add(stylePathPane, BorderLayout.NORTH);
-		
-		stylePathPane.add(new UILabel(Inter.getLocText("FR-Designer_Save_Path") + ":"), BorderLayout.WEST);
-		this.StyleTextField = new UITextField();
-		stylePathPane.add(StyleTextField, BorderLayout.CENTER);
-		this.StyleTextField.setEditable(false);
-		
 		styleArrayPane = new StyleArrayPane();
 		this.add(styleArrayPane, BorderLayout.CENTER);
 	}

designer-realize/src/com/fr/design/webattr/EditReportServerParameterPane.java

@@ -24,7 +24,6 @@ import java.awt.*;
  * Edit Report Server Parameter.
  */
 public class EditReportServerParameterPane extends LoadingBasicPane {
-    private UITextField configFileTextField;
 
     private UITabbedPane tabbedPane;
 
@@ -50,17 +49,6 @@ public class EditReportServerParameterPane extends LoadingBasicPane {
         JPanel defaultPane = container;
         defaultPane.setLayout(FRGUIPaneFactory.createBorderLayout());
 
-        //path pane
-        JPanel datasourcePathPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
-        defaultPane.add(datasourcePathPane, BorderLayout.NORTH);
-        
-        datasourcePathPane.add(GUICoreUtils.createFlowPane(new Component[] {
-        		new UILabel(Inter.getLocText(
-                "ReportServerP-Report_server_parameter") + ":"),
-                (this.configFileTextField = new UITextField(40))
-        }, FlowLayout.LEFT), BorderLayout.WEST);
-        
-        this.configFileTextField.setEditable(false);
         //Tabbed Pane
         tabbedPane = new UITabbedPane();
         defaultPane.add(tabbedPane, BorderLayout.CENTER);

designer-realize/src/com/fr/design/webattr/WidgetManagerPane.java

@@ -15,22 +15,13 @@ import java.awt.*;
 import java.io.File;
 
 public class WidgetManagerPane extends LoadingBasicPane {
-	private UITextField widgetTextField;
+
 	private WidgetConfigPane widgetConfigPane;
 
     @Override
 	protected void initComponents(JPanel container) {
         container.setLayout(FRGUIPaneFactory.createBorderLayout());
 
-		JPanel widgetPathPane = FRGUIPaneFactory.createBorderLayout_L_Pane();
-		container.add(widgetPathPane, BorderLayout.NORTH);
-
-
-		widgetPathPane.add(new UILabel(Inter.getLocText("FR-Designer_Save_Path") + ":"), BorderLayout.WEST);
-		this.widgetTextField = new UITextField();
-		widgetPathPane.add(widgetTextField, BorderLayout.CENTER);
-		this.widgetTextField.setEditable(false);
-
 		widgetConfigPane = new WidgetConfigPane();
 		container.add(widgetConfigPane, BorderLayout.CENTER);
     }