把原来代码重不符合PMD要求的更正了

designer_base/src/com/fr/design/formula/FormulaPane.java

@@ -8,6 +8,7 @@ import com.fr.design.border.UIRoundedBorder;
 import com.fr.design.constants.UIConstants;
 import com.fr.design.dialog.BasicDialog;
 import com.fr.design.dialog.BasicPane;
+import com.fr.design.fun.FunctionGroupDefineProvider;
 import com.fr.design.gui.ibutton.UIButton;
 import com.fr.design.gui.icontainer.UIScrollPane;
 import com.fr.design.gui.ilable.UILabel;
@@ -65,28 +66,15 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula{
         initComponents();
     }
     
-    protected void initComponents() {
+    private void initFormulaTextAreaKeyListener(){
-        this.setLayout(new BorderLayout(4, 4));
-
-        // text
-        JPanel textPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
-        this.add(textPane, BorderLayout.CENTER);
-
-        JPanel checkBoxandbuttonPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane();
-
-        UILabel formulaLabel = new UILabel(Inter.getLocText("FormulaD-Input_formula_in_the_text_area_below") + ":"
-                + "                         ");
-        formulaLabel.setBorder(BorderFactory.createEmptyBorder(4, 4, 4, 4));
-        formulaTextArea = new RSyntaxTextArea();
-        configFormulaArea();
     	formulaTextArea.addKeyListener(this);
-
     	formulaTextArea.addKeyListener(new KeyAdapter() {
             public void keyReleased(KeyEvent e) {
                 formulaTextArea.setForeground(Color.black);
                 String text = formulaTextArea.getText();
                 // 判断在中文输入状态是否还包含提示符 要删掉
-                String tip = "\n\n\n" + Inter.getLocText("Tips:You_Can_Input_B1_To_Input_The_Data_Of_The_First_Row_Second_Column");
+                //Tips:You_Can_Input_B1_To_Input_The_Data_Of_The_First_Row_Second_Column
+                String tip = "\n\n\n" + Inter.getLocText("FR-Design_FormulaPane_Tips");
                 if(text.contains(tip)) {
                     text = text.substring(0, text.indexOf(tip));
                     insertPosition = 0;
@@ -94,9 +82,10 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula{
                 }
             }
         });
+    }
     
+    private void initFormulaTextAreaMouseListener(){
     	formulaTextArea.addMouseListener(new MouseAdapter() {
-
             @Override
             public void mousePressed(MouseEvent e) {
                 insertPosition = formulaTextArea.getCaretPosition();
@@ -119,52 +108,81 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula{
                 }
             }
         });
-        UIScrollPane formulaTextAreaScrollPane = new UIScrollPane(formulaTextArea);
+    }
-        formulaTextAreaScrollPane.setBorder(null);
-        textPane.add(formulaLabel, BorderLayout.NORTH);
-        textPane.add(formulaTextAreaScrollPane, BorderLayout.CENTER);
-        textPane.add(checkBoxandbuttonPane, BorderLayout.SOUTH);
-
-        // tipsPane
-        JPanel tipsPane = new JPanel(new BorderLayout(4, 4));
-        this.add(tipsPane, BorderLayout.EAST);
     
-        JPanel searchPane = new JPanel(new BorderLayout(4, 4));
+    private void initFormulaTextArea(){
-        searchPane.add(keyWordTextField, BorderLayout.CENTER);
+    	formulaTextArea = new RSyntaxTextArea();
-        UIButton searchButton = new UIButton(Inter.getLocText("Search"));
+        configFormulaArea();
-        searchPane.add(searchButton, BorderLayout.EAST);
+        initFormulaTextAreaKeyListener();
-        tipsPane.add(searchPane, BorderLayout.NORTH);
+        initFormulaTextAreaMouseListener();
+    }
     
+    private void initKeyWordTextFieldKeyListener(){
     	keyWordTextField.addKeyListener(new KeyListener() {
-
             @Override
             public void keyTyped(KeyEvent e) {
             }
-
             @Override
             public void keyReleased(KeyEvent e) {
             }
-
             @Override
             public void keyPressed(KeyEvent e) {
                 if (e.getKeyCode() == KeyEvent.VK_ENTER) {
                     String toFind = keyWordTextField.getText();
                     search(toFind, false);
-
                     fixFunctionNameList();
                     e.consume();
                 }
             }
         });
+    }
     
+    private void initTipsPane(){
+    	// tipsPane
+        JPanel tipsPane = new JPanel(new BorderLayout(4, 4));
+        this.add(tipsPane, BorderLayout.EAST);
+
+        JPanel searchPane = new JPanel(new BorderLayout(4, 4));
+        searchPane.add(keyWordTextField, BorderLayout.CENTER);
+        UIButton searchButton = new UIButton(Inter.getLocText("FR-Design_FormulaPane_Search"));
+        searchPane.add(searchButton, BorderLayout.EAST);
+        tipsPane.add(searchPane, BorderLayout.NORTH);
+        initKeyWordTextFieldKeyListener();
         tipsList = new JList(listModel);
         tipsList.addMouseListener(new DoubleClick());
         UIScrollPane tipsScrollPane = new UIScrollPane(tipsList);
         tipsScrollPane.setPreferredSize(new Dimension(170, 75));
         tipsScrollPane.setBorder(new UIRoundedBorder(UIConstants.LINE_COLOR, 1, UIConstants.ARC));
-
         tipsPane.add(tipsScrollPane, BorderLayout.CENTER);
+        searchButton.addActionListener(new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                String toFind = keyWordTextField.getText();
+                search(toFind, false);
+                formulaTextArea.requestFocusInWindow();
+                fixFunctionNameList();
+            }
+        });
+    }
     
+    protected void initComponents() {
+        this.setLayout(new BorderLayout(4, 4));
+        // text
+        JPanel textPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
+        this.add(textPane, BorderLayout.CENTER);
+        JPanel checkBoxandbuttonPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane();
+        UILabel formulaLabel = new UILabel(Inter.getLocText("FormulaD-Input_formula_in_the_text_area_below") + ":"
+                + "                         ");
+        formulaLabel.setBorder(BorderFactory.createEmptyBorder(4, 4, 4, 4));
+        initFormulaTextArea();
+        
+        UIScrollPane formulaTextAreaScrollPane = new UIScrollPane(formulaTextArea);
+        formulaTextAreaScrollPane.setBorder(null);
+        textPane.add(formulaLabel, BorderLayout.NORTH);
+        textPane.add(formulaTextAreaScrollPane, BorderLayout.CENTER);
+        textPane.add(checkBoxandbuttonPane, BorderLayout.SOUTH);
+
+        initTipsPane();
 
         UIButton checkValidButton = new UIButton(Inter.getLocText("FormulaD-Check_Valid"));
         checkValidButton.addActionListener(checkValidActionListener);
@@ -173,20 +191,7 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula{
         checkBoxPane.setPreferredSize(new Dimension(450, 30));
         checkBoxandbuttonPane.add(checkBoxPane, BorderLayout.WEST);
         checkBoxandbuttonPane.add(checkValidButton, BorderLayout.EAST);
-
         extendCheckBoxPane(checkBoxPane);
-
-        searchButton.addActionListener(new ActionListener() {
-
-            @Override
-            public void actionPerformed(ActionEvent e) {
-                String toFind = keyWordTextField.getText();
-                search(toFind, false);
-                formulaTextArea.requestFocusInWindow();
-
-                fixFunctionNameList();
-            }
-        });
         variableTreeAndDescriptionArea = new VariableTreeAndDescriptionArea();
         this.add(variableTreeAndDescriptionArea, BorderLayout.SOUTH);
     }
@@ -257,11 +262,17 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula{
             this.formulaTextArea.setText(StringUtils.EMPTY);
         }
     }
-
+    //hugh:为啥会是10呢？搞不懂~~~
+    private static final int KEY_10 = 10;
+    //上下左右
+    private static final int KEY_37 = 37;
+    private static final int KEY_38 = 38;
+    private static final int KEY_39 = 39;
+    private static final int KEY_40 = 40;
     @Override
     public void keyReleased(KeyEvent e) {
         int key = e.getKeyCode();
-        if (key == 38 || key == 40 || key == 37 || key == 39 || key == 10) //如果是删除符号  ，为了可读性 没有和其他按键的程序相融合
+        if (key == KEY_38 || key == KEY_40 || key == KEY_37 || key == KEY_39 || key == KEY_10) //如果是删除符号  ，为了可读性 没有和其他按键的程序相融合
         {
             listModel.removeAllElements();
             currentPosition = formulaTextArea.getCaretPosition();
@@ -465,7 +476,8 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula{
             String content = formula.getContent();
             if (content.trim().equals("=")) {
                 this.formulaTextArea.setForeground(Color.gray);
-                this.formulaTextArea.setText("\n\n\n" + Inter.getLocText("Tips:You_Can_Input_B1_To_Input_The_Data_Of_The_First_Row_Second_Column"));
+                //Tips:You_Can_Input_B1_To_Input_The_Data_Of_The_First_Row_Second_Column
+                this.formulaTextArea.setText("\n\n\n" + Inter.getLocText("FR-Design_FormulaPane_Tips"));
                 this.formulaTextArea.setCaretPosition(0);
                 ifHasBeenWriten = 0;
                 this.listModel.removeAllElements();
@@ -553,21 +565,20 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula{
             this.initComponents();
         }
         
-        private void initComponents() {
+        private void initFunctionTypeList(JPanel functionPane){
-            this.setLayout(new BorderLayout(4, 4));
-
-            // Function
-            JPanel functionPane = new JPanel(new BorderLayout(4, 4));
-            this.add(functionPane, BorderLayout.WEST);
-
-
         	functionTypeList = new QuickList(functionTypeListModel);
             UIScrollPane functionTypeScrollPane = new UIScrollPane(functionTypeList);
             functionTypeScrollPane.setBorder(new UIRoundedBorder(UIConstants.LINE_COLOR, 1, UIConstants.ARC));
             functionTypeScrollPane.setPreferredSize(new Dimension(140, 200));
             functionPane.add(this.createNamePane(Inter.getLocText("FormulaD-Function_category") + ":", functionTypeScrollPane), BorderLayout.WEST);
-            functionTypeList.setCellRenderer(new DefaultListCellRenderer() {
+            initTypeListCellRenderer();
+            initGroupTypeModel();
+            initTypeListSelectionListener();
+        }
         
+        private void initTypeListCellRenderer(){
+        	functionTypeList.setCellRenderer(
+        		new DefaultListCellRenderer() {
                 @Override
                 public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected, boolean cellHasFocus) {
                     super.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus);
@@ -577,53 +588,47 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula{
                     return this;
                 }
             });
-
-            functionTypeListModel.addElement(FunctionConstants.COMMON);
-            for (int i = 0; i < FunctionConstants.EMBFUNCTIONS.length; i++) {
-                functionTypeListModel.addElement(FunctionConstants.EMBFUNCTIONS[i]);
-            }
-            functionTypeListModel.addElement(FunctionConstants.ALL);
-            functionTypeListModel.addElement(FunctionConstants.CUSTOM);
-            functionTypeListModel.addElement(FunctionConstants.PLUGIN);
-            //hugh:自定义函数分组
-            Set<Mutable> groups = ExtraClassManager.getInstance().getArray(FunctionGroupDefineProvider.MARK_STRING);
-            if(!groups.isEmpty()){
-            	for(Mutable group : groups){
-            		functionTypeListModel.addElement(group);
         }
-            }
-            functionTypeList.addListSelectionListener(new ListSelectionListener() {
         
+        private void initTypeListSelectionListener(){
+        	functionTypeList.addListSelectionListener(new ListSelectionListener() {
                 public void valueChanged(ListSelectionEvent evt) {
                     Object selectedValue = ((JList) evt.getSource()).getSelectedValue();
                     if (!(selectedValue instanceof FunctionGroup)) {
                         return;
                     }
-
                     NameAndDescription[] nads = ((FunctionGroup) selectedValue).getDescriptions();
                     functionNameModel = (DefaultListModel) functionNameList.getModel();
-
                     functionNameModel.clear();
-
                     for (NameAndDescription nad : nads) {
                         functionNameModel.addElement(nad);
                     }
-
                     if (functionNameModel.size() > 0) {
                         functionNameList.setSelectedIndex(0);
                         functionNameList.ensureIndexIsVisible(0);
                     }
                 }
             });
+        }
         
-            functionNameList = new JList(new DefaultListModel());
+        private void initGroupTypeModel(){
-            UIScrollPane functionNameScrollPane = new UIScrollPane(functionNameList);
+        	 functionTypeListModel.addElement(FunctionConstants.COMMON);
-            functionNameScrollPane.setPreferredSize(new Dimension(140, 200));
+             for (int i = 0; i < FunctionConstants.EMBFUNCTIONS.length; i++) {
-            functionPane.add(
+                 functionTypeListModel.addElement(FunctionConstants.EMBFUNCTIONS[i]);
-                    this.createNamePane(Inter.getLocText("FormulaD-Function_name") + ":", functionNameScrollPane),
+             }
-                    BorderLayout.CENTER);
+             functionTypeListModel.addElement(FunctionConstants.ALL);
-            functionNameScrollPane.setBorder(new UIRoundedBorder(UIConstants.LINE_COLOR, 1, UIConstants.ARC));
+             functionTypeListModel.addElement(FunctionConstants.CUSTOM);
+             functionTypeListModel.addElement(FunctionConstants.PLUGIN);
+             //hugh:自定义函数分组
+             Set<Mutable> groups = ExtraClassManager.getInstance().getArray(FunctionGroupDefineProvider.MARK_STRING);
+             if(!groups.isEmpty()){
+             	for(Mutable group : groups){
+             		functionTypeListModel.addElement(group);
+             	}
+             }
+        }
         
+        private void initFunctionNameListCellRenderer(){
         	functionNameList.setCellRenderer(new DefaultListCellRenderer() {
 
                 @Override
@@ -635,7 +640,9 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula{
                     return this;
                 }
             });
+        } 
         
+        private void initFunctionNameListSelectionListener(){
         	functionNameList.addListSelectionListener(new ListSelectionListener() {
 
                 public void valueChanged(ListSelectionEvent evt) {
@@ -650,11 +657,11 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula{
                     descriptionTextArea.moveCaretPosition(0);
                 }
             });
+        }
         
+        private void initFunctionNameListMouseListener(){
         	functionNameList.addMouseListener(new MouseAdapter() {
-
                 public void mouseClicked(MouseEvent evt) {
-
                     if (evt.getClickCount() >= 2) {
                         Object selectedValue = functionNameList.getSelectedValue();
                         if (!(selectedValue instanceof NameAndDescription)) {
@@ -664,7 +671,6 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula{
                         applyText(insert);
 
                     }
-
                     if (SwingUtilities.isRightMouseButton(evt)) {
                         JPopupMenu popupMenu = new JPopupMenu();
                         LookDetailAction lookDetailAction = new LookDetailAction();
@@ -675,24 +681,28 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula{
                     }
                 }
             });
+        }
         
-            // vairable.
+        private void initFunctionNameList(JPanel functionPane){
-            variablesTree = new JTree();
+        	functionNameList = new JList(new DefaultListModel());
-            UIScrollPane variablesTreePane = new UIScrollPane(variablesTree);
+            UIScrollPane functionNameScrollPane = new UIScrollPane(functionNameList);
-            variablesTreePane.setBorder(new UIRoundedBorder(UIConstants.LINE_COLOR, 1, UIConstants.ARC));
+            functionNameScrollPane.setPreferredSize(new Dimension(140, 200));
-            this.add(this.createNamePane(
+            functionPane.add(
-                    Inter.getLocText("Variables") + ":", variablesTreePane), BorderLayout.CENTER);
+                    this.createNamePane(Inter.getLocText("FormulaD-Function_name") + ":", functionNameScrollPane),
-            variablesTree.setRootVisible(false);
+                    BorderLayout.CENTER);
-            variablesTree.setShowsRootHandles(true);
+            functionNameScrollPane.setBorder(new UIRoundedBorder(UIConstants.LINE_COLOR, 1, UIConstants.ARC));
-            variablesTree.addMouseListener(applyTextMouseListener);
+            initFunctionNameListCellRenderer();
-            variablesTree.setCellRenderer(applyTreeCellRenderer);
+            initFunctionNameListSelectionListener();
+            initFunctionNameListMouseListener();
+        }
         
+        private void initDescriptionTextArea(){
         	// Description
             descriptionTextArea = new UITextArea(16, 27);
 
             UIScrollPane desScrollPane = new UIScrollPane(descriptionTextArea);
             desScrollPane.setBorder(null);
-            this.add(this.createNamePane(Inter.getLocText("Formula_Description") + ":", desScrollPane), BorderLayout.EAST);
+            this.add(this.createNamePane(Inter.getLocText("FR-Design_FormulaPane_Formula_Description") + ":", desScrollPane), BorderLayout.EAST);
             descriptionTextArea.setBackground(new Color(255, 255, 225));
             descriptionTextArea.setLineWrap(true);
             descriptionTextArea.setWrapStyleWord(true);
@@ -706,63 +716,84 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula{
                 }
             });
 
-            variablesTree.addTreeSelectionListener(new TreeSelectionListener() {
-
-                public void valueChanged(TreeSelectionEvent e) {
-                    Object selectedValue = ((DefaultMutableTreeNode) variablesTree.getLastSelectedPathComponent()).getUserObject();
-                    if (selectedValue == null) {
-                        return;
         }
         
-                    StringBuilder desBuf = new StringBuilder();
+        private StringBuilder getText(TextUserObject selectedValue,String path) throws IOException{
-                    try {
     		Reader desReader;
-                        String path;
+    		StringBuilder desBuf = new StringBuilder();
-
+    		InputStream desInputStream = BaseUtils.readResource(path+ ((TextUserObject) selectedValue).displayText+".txt");
-                        Locale locale = FRContext.getLocale();
-                        if (locale.equals(Locale.CHINA)) {
-                            path = "/com/fr/design/insert/formula/variable/cn/";
-                        } else {
-                            path = "/com/fr/design/insert/formula/variable/en/";
-                        }
-                        if (selectedValue instanceof TextUserObject) {
-
-                            InputStream desInputStream = BaseUtils.readResource(path
-                                    + ((TextUserObject) selectedValue).displayText
-                                    + ".txt");
             if (desInputStream == null) {
                 String description = "";
-
                 desReader = new StringReader(description);
             } else {
-                                desReader = new InputStreamReader(
+                desReader = new InputStreamReader(desInputStream);
-                                        desInputStream);
             }
-
+            BufferedReader reader = new BufferedReader(desReader);
-                            BufferedReader reader = new BufferedReader(
-                                    desReader);
             String lineText;
             while ((lineText = reader.readLine()) != null) {
                 if (desBuf.length() > 0) {
                     desBuf.append('\n');
                 }
-
                 desBuf.append(lineText);
             }
-
             reader.close();
             desReader.close();
+            return desBuf;
+    	}
+        
+        private void initVariablesTreeSelectionListener(){
+        	variablesTree.addTreeSelectionListener(new TreeSelectionListener() {
+            	public void valueChanged(TreeSelectionEvent e) {
+            		Object selectedValue = ((DefaultMutableTreeNode) variablesTree.getLastSelectedPathComponent()).getUserObject();
+                    if (selectedValue == null) {
+                        return;
+                    }
+                    StringBuilder desBuf = new StringBuilder();
+                    try {
+                        String path;
+                        Locale locale = FRContext.getLocale();
+                        if (locale.equals(Locale.CHINA)) {
+                            path = "/com/fr/design/insert/formula/variable/cn/";
+                        } else {
+                            path = "/com/fr/design/insert/formula/variable/en/";
+                        }
+                        if (selectedValue instanceof TextUserObject) {
+                        	desBuf = getText((TextUserObject)selectedValue,path);
                         }
                     } catch (IOException exp) {
                         FRContext.getLogger().error(exp.getMessage(), exp);
                     }
-
                     descriptionTextArea.setText(desBuf.toString());
-
                     descriptionTextArea.moveCaretPosition(0);
                 }
             });
+        }
+        
+        private void initVariablesTree(){
+        	 // vairable.
+            variablesTree = new JTree();
+            UIScrollPane variablesTreePane = new UIScrollPane(variablesTree);
+            variablesTreePane.setBorder(new UIRoundedBorder(UIConstants.LINE_COLOR, 1, UIConstants.ARC));
+            this.add(this.createNamePane(
+                    Inter.getLocText("FR-Design_FormulaPane_Variables") + ":", variablesTreePane), BorderLayout.CENTER);
+            variablesTree.setRootVisible(false);
+            variablesTree.setShowsRootHandles(true);
+            variablesTree.addMouseListener(applyTextMouseListener);
+            variablesTree.setCellRenderer(applyTreeCellRenderer);
             
+            initDescriptionTextArea();
+            
+            initVariablesTreeSelectionListener();
+        }
+        
+        private void initComponents() {
+            this.setLayout(new BorderLayout(4, 4));
+            // Function
+            JPanel functionPane = new JPanel(new BorderLayout(4, 4));
+            this.add(functionPane, BorderLayout.WEST);
+            initFunctionTypeList(functionPane);
+            initFunctionNameList(functionPane);
+            initVariablesTree();
             // 选择:
             functionTypeList.setSelectedIndex(0);
         }
@@ -773,7 +804,7 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula{
         private class LookDetailAction extends UpdateAction {
 
             public LookDetailAction() {
-                this.setName(Inter.getLocText("Function_Detail"));
+                this.setName(Inter.getLocText("FR-Design_FormulaPane_Function_Detail"));
                 this.setMnemonic('L');
                 this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/m_file/preview.png"));
             }
@@ -788,7 +819,7 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula{
             BasicPane basicPane = new BasicPane() {
             	@Override
             	protected String title4PopupWindow() {
-            		return Inter.getLocText("Function_Detail");
+            		return Inter.getLocText("FR-Design_FormulaPane_Function_Detail");
             	}
             };
             basicPane.setLayout(FRGUIPaneFactory.createBorderLayout());
@@ -879,52 +910,28 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula{
                 rootNode.add(bindCellNode);
             }
             
-            {
+            rootNode.add(new TextFolderUserObject(Inter.getLocText("FormulaD-Data_Fields"),
-                MutableTreeNode tableTreeNode = new TextFolderUserObject(
-                        Inter.getLocText("FormulaD-Data_Fields"),
             		BaseUtils.readIcon("/com/fr/design/images/dialog/table.png"),
-                        variableResolver.resolveColumnNames()).createMutableTreeNode();
+                    variableResolver.resolveColumnNames()).createMutableTreeNode());
             
-                rootNode.add(tableTreeNode);
-            }
-
-            {
             // Set cutReport Variable
-                rootNode.add(new TextFolderUserObject(
+            rootNode.add(new TextFolderUserObject(Inter.getLocText("FR-Design_FormulaPane_Variables"),
-                        Inter.getLocText("Variables"),
             		BaseUtils.readIcon("/com/fr/design/images/dialog/variable.png"),
             		variableResolver.resolveCurReportVariables()).createMutableTreeNode());
-            }
             
-
+            rootNode.add(new TextFolderUserObject(Inter.getLocText(new String[]{"Datasource-Datasource", "Parameter"}),
-            {
-                rootNode.add(new TextFolderUserObject(
-                        Inter.getLocText(new String[]{"Datasource-Datasource", "Parameter"}),
             		BaseUtils.readIcon("/com/fr/design/images/dialog/parameter.gif"),
             		variableResolver.resolveTableDataParameterVariables()).createMutableTreeNode());
-            }
-
             
-            {
+            rootNode.add(new TextFolderUserObject(Inter.getLocText("ParameterD-Report_Parameter"),
-                MutableTreeNode reportParameterTreeNode = new TextFolderUserObject(
-                        Inter.getLocText("ParameterD-Report_Parameter"),
             		BaseUtils.readIcon("/com/fr/design/images/m_report/p.gif"),
-                        variableResolver.resolveReportParameterVariables()).createMutableTreeNode();
+            		variableResolver.resolveReportParameterVariables()).createMutableTreeNode());
-
-                rootNode.add(reportParameterTreeNode);
-            }
             
-            {
+            rootNode.add(new TextFolderUserObject(Inter.getLocText("M_Server-Global_Parameters"),
-                MutableTreeNode globalParameterTreeNode = new TextFolderUserObject(
-                        Inter.getLocText("M_Server-Global_Parameters"),
                     BaseUtils.readIcon("/com/fr/design/images/dialog/parameter.gif"),
-                        variableResolver.resolveGlobalParameterVariables()).createMutableTreeNode();
+                    variableResolver.resolveGlobalParameterVariables()).createMutableTreeNode());
-                rootNode.add(globalParameterTreeNode);
-            }
-
             
             variableModel.reload();
-
             // Expand
             for (int row = 0; row < this.variablesTree.getRowCount(); row++) {
                 this.variablesTree.expandRow(row);
@@ -1003,6 +1010,6 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula{
             buffer.append("|");
             buffer.append("\n");
         }
-        System.out.println(buffer.toString());
+        FRContext.getLogger().debug(buffer.toString());
     }
 }

designer_base/src/com/fr/design/formula/FunctionConstants.java

@@ -1,6 +1,7 @@
 package com.fr.design.formula;
 
 import com.fr.base.FRContext;
+import com.fr.design.fun.FunctionGroupDefineProvider;
 import com.fr.file.FunctionManager;
 import com.fr.file.FunctionManagerProvider;
 import com.fr.function.*;
@@ -11,7 +12,6 @@ import com.fr.stable.EncodeConstants;
 import com.fr.stable.OperatingSystem;
 import com.fr.stable.StableUtils;
 import com.fr.stable.StringUtils;
-import com.fr.stable.fun.FunctionGroupDefineProvider;
 import com.fr.stable.fun.mark.Mutable;
 import com.fr.stable.script.Function;
 import com.fr.stable.script.FunctionDef;