10 files changed, 489 insertions, 563 deletions

diff --git a/src/cppcheckplus/control/MyContentPanel.java b/src/cppcheckplus/control/MyContentPanel.java
index 63d792a..f676cc8 100644
--- a/src/cppcheckplus/control/MyContentPanel.java
+++ b/src/cppcheckplus/control/MyContentPanel.java
@@ -1,16 +1,12 @@
-
 package cppcheckplus.control;
 
 import java.awt.BorderLayout;
-
 import javax.swing.JPanel;
 
-public class MyContentPanel extends JPanel
-{
-        public MyContentPanel()
-        {
-                super();
-                setLayout(new BorderLayout());
-                setBackground(MyContorlUtil.CONTENT_PANE_BACKGROUND);
-        }
+public class MyContentPanel extends JPanel {
+    public MyContentPanel() {
+        super();
+        setLayout(new BorderLayout());
+        setBackground(MyContorlUtil.CONTENT_PANE_BACKGROUND);
+    }
 }
diff --git a/src/cppcheckplus/control/MyHeader.java b/src/cppcheckplus/control/MyHeader.java
index 1b71704..2cd11b8 100644
--- a/src/cppcheckplus/control/MyHeader.java
+++ b/src/cppcheckplus/control/MyHeader.java
@@ -1,4 +1,3 @@
-
 package cppcheckplus.control;
 
 import java.awt.BorderLayout;
@@ -13,7 +12,6 @@ import java.awt.TexturePaint;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
 import java.awt.event.MouseListener;
-
 import javax.swing.BorderFactory;
 import javax.swing.ImageIcon;
 import javax.swing.JComponent;
@@ -22,180 +20,167 @@ import javax.swing.JPanel;
 import javax.swing.border.Border;
 
 
-
-public class MyHeader extends JPanel
-{
-        public static final ImageIcon RIGHT_ARROW_ICON = MyContorlUtil.getImageIcon("control/images/shrink_handler_right.png");
-        public static final ImageIcon LEFT_ARROW_ICON = MyContorlUtil.getImageIcon("control/images/shrink_handler_left.png");
-        private Color titleColor;
-        private boolean shrinked;
-        private ImageIcon backgroundImageIcon;
-        private Image backgroundLeftImage;
-        private Image backgroundRightImage;
-        private TexturePaint paint;
-        private int preferredHeight;
-        private JLabel lbResizeHandler;
-        private JLabel lbShrinkHandler;
-        private JLabel lbTitle;
-        private int normalPreferredWidth;
-        private MyListSplitListener splitListener;
-        private MouseListener shrinkListener;
-
-        public MyHeader()
-        {
-                super();
-                titleColor = new Color(215, 215, 216);
-                shrinked = false;
-                backgroundImageIcon = MyContorlUtil.getImageIcon("control/images/header_background.png");
-                backgroundLeftImage = MyContorlUtil.getImage("control/images/header_background_left.png");
-                backgroundRightImage = MyContorlUtil.getImage("control/images/header_background_right.png");
-                paint = MyContorlUtil.createTexturePaint("control/images/header_background.png");
-                preferredHeight = backgroundImageIcon.getIconHeight();
-                lbResizeHandler = new JLabel(MyContorlUtil.getImageIcon("control/images/resize_handler.png"));
-                lbShrinkHandler = new JLabel(getShrinkIcon(shrinked));
-                lbTitle = new JLabel();
-                normalPreferredWidth = 0;
-                splitListener = createSplitListener();
-                shrinkListener = new MouseAdapter() {
-                        public void mouseClicked(MouseEvent e)
-                        {
-                                changeShrink();
-                        }
-                };
-                init();
-        }
-
-        protected MyListSplitListener createSplitListener()
-        {
-                return new MyListSplitListener(this);
-        }
-
-        protected Border createBorder()
-        {
-                return BorderFactory.createEmptyBorder(4, 7, 0, 0);
-        }
-
-        private void init()
-        {
-                setBorder(createBorder());
-                setOpaque(false);
-                setLayout(new BorderLayout());
-                add(lbResizeHandler, getResizeHandlerLayoutConstraint());
-                add(lbShrinkHandler, getShrinkHandlerLayoutConstraint());
-                JComponent centerComponent = getCenterComponent();
-                if (centerComponent != null)
-                        add(centerComponent, "Center");
-                lbResizeHandler.addMouseMotionListener(splitListener);
-                lbResizeHandler.addMouseListener(splitListener);
-                lbShrinkHandler.addMouseListener(shrinkListener);
-                lbTitle.setFont(MyContorlUtil.FONT_14_BOLD);
-                lbTitle.setForeground(titleColor);
-                lbTitle.setBorder(BorderFactory.createEmptyBorder(2, 8, 0, 0));
-                updateCursor();
-                lbShrinkHandler.setBorder(BorderFactory.createEmptyBorder(0, 8, 2, 5));
-        }
-
-        protected JComponent getCenterComponent()
-        {
-                return lbTitle;
-        }
-
-        protected Object getResizeHandlerLayoutConstraint()
-        {
-                return "West";
-        }
-
-        protected Object getShrinkHandlerLayoutConstraint()
-        {
-                return "East";
-        }
-
-        protected void paintComponent(Graphics g)
-        {
-                Graphics2D g2d = (Graphics2D)g;
-                g2d.setPaint(paint);
-                g2d.fillRect(0, 0, getWidth(), getHeight());
-                g2d.drawImage(backgroundLeftImage, 0, 0, null);
-                int x = getWidth() - backgroundRightImage.getWidth(null);
-                int y = 0;
-                g2d.drawImage(backgroundRightImage, x, y, null);
-        }
-
-        public Dimension getPreferredSize()
-        {
-                return new Dimension(super.getPreferredSize().width, preferredHeight);
-        }
-
-        public void revalidateParent()
-        {
-                if (getParent() instanceof JComponent)
-                        ((JComponent)getParent()).revalidate();
-        }
-
-        public void changeShrink()
-        {
-                setShrink(!isShrinked());
-        }
-
-        public void setShrink(boolean shrinked)
-        {
-                if (shrinked != this.shrinked)
-                {
-                        Container parent = getParent();
-                        Dimension size = parent.getPreferredSize();
-                        if (shrinked)
-                        {
-                                normalPreferredWidth = size.width;
-                                size = new Dimension(getShrinkedWidth(), size.height);
-                        } else
-                        {
-                                int width = normalPreferredWidth;
-                                int height = parent.getPreferredSize().height;
-                                size = new Dimension(width, height);
-                        }
-                        parent.setPreferredSize(size);
-                        lbShrinkHandler.setIcon(getShrinkIcon(shrinked));
-                        revalidateParent();
-                        this.shrinked = shrinked;
-                        updateCursor();
-                        lbTitle.setVisible(!shrinked);
-                        lbResizeHandler.setVisible(!shrinked);
-                }
-        }
-
-        protected ImageIcon getShrinkIcon(boolean shrinked)
-        {
-                if (shrinked)
-                        return LEFT_ARROW_ICON;
-                else
-                        return RIGHT_ARROW_ICON;
-        }
-
-        private void updateCursor()
-        {
-                if (shrinked)
-                        lbResizeHandler.setCursor(Cursor.getDefaultCursor());
-                else
-                        lbResizeHandler.setCursor(Cursor.getPredefinedCursor(10));
-        }
-
-        public boolean isShrinked()
-        {
-                return shrinked;
-        }
-
-        public void setTitle(String title)
-        {
-                lbTitle.setText(title);
-        }
-
-        public String getTitle()
-        {
-                return lbTitle.getText();
-        }
-
-        protected int getShrinkedWidth()
-        {
-                return 37;
-        }
+public class MyHeader extends JPanel {
+    public static final ImageIcon RIGHT_ARROW_ICON =
+        MyContorlUtil.getImageIcon("control/images/shrink_handler_right.png");
+    public static final ImageIcon LEFT_ARROW_ICON =
+        MyContorlUtil.getImageIcon("control/images/shrink_handler_left.png");
+    private Color titleColor;
+    private boolean shrinked;
+    private ImageIcon backgroundImageIcon;
+    private Image backgroundLeftImage;
+    private Image backgroundRightImage;
+    private TexturePaint paint;
+    private int preferredHeight;
+    private JLabel lbResizeHandler;
+    private JLabel lbShrinkHandler;
+    private JLabel lbTitle;
+    private int normalPreferredWidth;
+    private MyListSplitListener splitListener;
+    private MouseListener shrinkListener;
+
+    public MyHeader() {
+        super();
+        titleColor = new Color(215, 215, 216);
+        shrinked = false;
+        backgroundImageIcon =
+            MyContorlUtil.getImageIcon("control/images/header_background.png");
+        backgroundLeftImage =
+            MyContorlUtil.getImage("control/images/header_background_left.png");
+        backgroundRightImage = MyContorlUtil.getImage(
+            "control/images/header_background_right.png");
+        paint = MyContorlUtil.createTexturePaint(
+            "control/images/header_background.png");
+        preferredHeight = backgroundImageIcon.getIconHeight();
+        lbResizeHandler = new JLabel(
+            MyContorlUtil.getImageIcon("control/images/resize_handler.png"));
+        lbShrinkHandler = new JLabel(getShrinkIcon(shrinked));
+        lbTitle = new JLabel();
+        normalPreferredWidth = 0;
+        splitListener = createSplitListener();
+        shrinkListener = new MouseAdapter() {
+            public void mouseClicked(MouseEvent e) {
+                changeShrink();
+            }
+        };
+        init();
+    }
+
+    protected MyListSplitListener createSplitListener() {
+        return new MyListSplitListener(this);
+    }
+
+    protected Border createBorder() {
+        return BorderFactory.createEmptyBorder(4, 7, 0, 0);
+    }
+
+    private void init() {
+        setBorder(createBorder());
+        setOpaque(false);
+        setLayout(new BorderLayout());
+        add(lbResizeHandler, getResizeHandlerLayoutConstraint());
+        add(lbShrinkHandler, getShrinkHandlerLayoutConstraint());
+        JComponent centerComponent = getCenterComponent();
+        if (centerComponent != null) {
+            add(centerComponent, "Center");
+        }
+        lbResizeHandler.addMouseMotionListener(splitListener);
+        lbResizeHandler.addMouseListener(splitListener);
+        lbShrinkHandler.addMouseListener(shrinkListener);
+        lbTitle.setFont(MyContorlUtil.FONT_14_BOLD);
+        lbTitle.setForeground(titleColor);
+        lbTitle.setBorder(BorderFactory.createEmptyBorder(2, 8, 0, 0));
+        updateCursor();
+        lbShrinkHandler.setBorder(BorderFactory.createEmptyBorder(0, 8, 2, 5));
+    }
+
+    protected JComponent getCenterComponent() {
+        return lbTitle;
+    }
+
+    protected Object getResizeHandlerLayoutConstraint() {
+        return "West";
+    }
+
+    protected Object getShrinkHandlerLayoutConstraint() {
+        return "East";
+    }
+
+    protected void paintComponent(Graphics g) {
+        Graphics2D g2d = (Graphics2D) g;
+        g2d.setPaint(paint);
+        g2d.fillRect(0, 0, getWidth(), getHeight());
+        g2d.drawImage(backgroundLeftImage, 0, 0, null);
+        int x = getWidth() - backgroundRightImage.getWidth(null);
+        int y = 0;
+        g2d.drawImage(backgroundRightImage, x, y, null);
+    }
+
+    public Dimension getPreferredSize() {
+        return new Dimension(super.getPreferredSize().width, preferredHeight);
+    }
+
+    public void revalidateParent() {
+        if (getParent() instanceof JComponent) {
+            ((JComponent) getParent()).revalidate();
+        }
+    }
+
+    public void changeShrink() {
+        setShrink(!isShrinked());
+    }
+
+    public void setShrink(boolean shrinked) {
+        if (shrinked != this.shrinked) {
+            Container parent = getParent();
+            Dimension size = parent.getPreferredSize();
+            if (shrinked) {
+                normalPreferredWidth = size.width;
+                size = new Dimension(getShrinkedWidth(), size.height);
+            } else {
+                int width = normalPreferredWidth;
+                int height = parent.getPreferredSize().height;
+                size = new Dimension(width, height);
+            }
+            parent.setPreferredSize(size);
+            lbShrinkHandler.setIcon(getShrinkIcon(shrinked));
+            revalidateParent();
+            this.shrinked = shrinked;
+            updateCursor();
+            lbTitle.setVisible(!shrinked);
+            lbResizeHandler.setVisible(!shrinked);
+        }
+    }
+
+    protected ImageIcon getShrinkIcon(boolean shrinked) {
+        if (shrinked) {
+            return LEFT_ARROW_ICON;
+        } else {
+            return RIGHT_ARROW_ICON;
+        }
+    }
+
+    private void updateCursor() {
+        if (shrinked) {
+            lbResizeHandler.setCursor(Cursor.getDefaultCursor());
+        } else {
+            lbResizeHandler.setCursor(Cursor.getPredefinedCursor(10));
+        }
+    }
+
+    public boolean isShrinked() {
+        return shrinked;
+    }
+
+    public String getTitle() {
+        return lbTitle.getText();
+    }
+
+    public void setTitle(String title) {
+        lbTitle.setText(title);
+    }
+
+    protected int getShrinkedWidth() {
+        return 37;
+    }
 }
diff --git a/src/cppcheckplus/control/MyList.java b/src/cppcheckplus/control/MyList.java
index 2a577ff..084ee74 100644
--- a/src/cppcheckplus/control/MyList.java
+++ b/src/cppcheckplus/control/MyList.java
@@ -1,68 +1,58 @@
-
 package cppcheckplus.control;
 
+import cppcheckplus.shortcut.MyShortcutItem;
+import cppcheckplus.shortcut.MyShortcutItemClickListenter;
 import java.awt.event.MouseEvent;
-
 import javax.swing.JList;
 import javax.swing.event.MouseInputAdapter;
 import javax.swing.event.MouseInputListener;
 
-import cppcheckplus.shortcut.MyShortcutItem;
-import cppcheckplus.shortcut.MyShortcutItemClickListenter;
 
+public class MyList extends JList {
+    private MyShortcutItemClickListenter clickListenter;
+
+    public MyList() {
+        init();
+    }
+
+    public void setListenter(MyShortcutItemClickListenter itemClickListenter) {
+        this.clickListenter = itemClickListenter;
+        MouseInputListener listener = new MouseInputAdapter() {
+            //通过Move设置Item为selected，从而触发渲染器处理，实现高亮
+            @Override
+            public void mouseMoved(MouseEvent e) {
+                int moveIndex = locationToIndex(e.getPoint());
+                setSelectedIndex(moveIndex);
+            }
+
+            //移动出去之后，清除选中，从而触发渲染器
+            @Override
+            public void mouseExited(MouseEvent e) {
+                getSelectionModel().clearSelection();
+            }
 
-public class MyList extends JList
-{
-        private  MyShortcutItemClickListenter clickListenter;
-        
-        public MyList()
-        {
-                init();
-        }
-        public void setListenter(MyShortcutItemClickListenter itemClickListenter)
-        {
-                this.clickListenter = itemClickListenter;
-                MouseInputListener listener = new MouseInputAdapter()
-                {
-                        //通过Move设置Item为selected，从而触发渲染器处理，实现高亮
-                        @Override
-                        public void mouseMoved(MouseEvent e)
-                        {
-                                int moveIndex = locationToIndex(e.getPoint());
-                                setSelectedIndex(moveIndex);
-                        }
-                        //移动出去之后，清除选中，从而触发渲染器
-                        @Override
-                        public void mouseExited(MouseEvent e)
-                        {
-                                getSelectionModel().clearSelection();
-                        }
+            @Override
+            public void mouseClicked(MouseEvent e) {
+                //因为该JList是单选模式，所以取第一个选择的就可以了
+                Object selObj = getSelectedValue();
+                if (selObj != null) {
+                    MyShortcutItem item = (MyShortcutItem) selObj;
+                    if (!item.isGroup()) {
+                        clickListenter.ItemClick(item.getActionCommand());
+                    }
+                }
+                //itemClick.ItemClick(actionCommand)
+            }
+        };
+        addMouseMotionListener(listener);
+        addMouseListener(listener);
+    }
 
-                        @Override
-                        public void mouseClicked(MouseEvent e)
-                        {
-                                //因为该JList是单选模式，所以取第一个选择的就可以了
-                                Object selObj = getSelectedValue();
-                                if(selObj != null)
-                                {
-                                        MyShortcutItem item = (MyShortcutItem)selObj;
-                                        if(!item.isGroup())
-                                        {
-                                                clickListenter.ItemClick(item.getActionCommand());
-                                        }
-                                }
-                                //itemClick.ItemClick(actionCommand)
-                        }
-                };
-                addMouseMotionListener(listener);
-                addMouseListener(listener);
-        }
-        private void init()
-        {
-                setFont(MyContorlUtil.FONT_12_BOLD);
-                setForeground(MyContorlUtil.DEFAULT_TEXT_COLOR);
-                setBackground(MyContorlUtil.LIST_BACKGROUND);
-                setCellRenderer(new MyListRenderer(this));
-                setSelectionMode(0);
-        }
+    private void init() {
+        setFont(MyContorlUtil.FONT_12_BOLD);
+        setForeground(MyContorlUtil.DEFAULT_TEXT_COLOR);
+        setBackground(MyContorlUtil.LIST_BACKGROUND);
+        setCellRenderer(new MyListRenderer(this));
+        setSelectionMode(0);
+    }
 }
diff --git a/src/cppcheckplus/control/MyListRenderer.java b/src/cppcheckplus/control/MyListRenderer.java
index 1495378..b407227 100644
--- a/src/cppcheckplus/control/MyListRenderer.java
+++ b/src/cppcheckplus/control/MyListRenderer.java
@@ -1,12 +1,12 @@
-
 package cppcheckplus.control;
 
+import cppcheckplus.shortcut.MyShortcutItem;
+import cppcheckplus.shortcut.MyShortcutPanel;
 import java.awt.BorderLayout;
 import java.awt.Color;
 import java.awt.Component;
 import java.awt.Dimension;
 import java.awt.Font;
-
 import javax.swing.BorderFactory;
 import javax.swing.DefaultListCellRenderer;
 import javax.swing.JLabel;
@@ -14,125 +14,111 @@ import javax.swing.JList;
 import javax.swing.JPanel;
 import javax.swing.OverlayLayout;
 
-import cppcheckplus.shortcut.MyShortcutItem;
-import cppcheckplus.shortcut.MyShortcutPanel;
-
 //快捷菜单
-public class MyListRenderer extends DefaultListCellRenderer
-{
-        private JPanel itemRender;
-        private int separatorHeight = 30;
-        //每组List的分割Group
-        private JPanel separatorPanel;
-        private JLabel separatorLabel;
-        private MySeparator separator;
-        private Color itemTextColor;
-        private Color separatorTextColor;
-        private Color itemSelectedBackground;
-        private Color itemSelectedBorder;
-        private Font separatorFont;
-        
-        public MyListRenderer(MyList list)
-        {
-                super();
-                itemRender = new JPanel(new BorderLayout());
-                separatorPanel = new JPanel() {
+public class MyListRenderer extends DefaultListCellRenderer {
+    private JPanel itemRender;
+    private int separatorHeight = 30;
+    //每组List的分割Group
+    private JPanel separatorPanel;
+    private JLabel separatorLabel;
+    private MySeparator separator;
+    private Color itemTextColor;
+    private Color separatorTextColor;
+    private Color itemSelectedBackground;
+    private Color itemSelectedBorder;
+    private Font separatorFont;
+
+    public MyListRenderer(MyList list) {
+        super();
+        itemRender = new JPanel(new BorderLayout());
+        separatorPanel = new JPanel() {
+
+            public Dimension getPreferredSize() {
+                Dimension size = super.getPreferredSize();
+                return new Dimension(size.width, separatorHeight);
+            }
+
+        };
+        //分割Group的样式
+        separatorLabel = new JLabel();
+        separator = new MySeparator(0);
+        separatorTextColor = Color.white;
+        separatorFont = MyContorlUtil.FONT_12_BOLD;
+
+        itemTextColor = MyContorlUtil.LIST_TEXT_COLOR;
+        itemSelectedBackground = new Color(199, 198, 200);
+        itemSelectedBorder = new Color(163, 163, 163);
+        itemRender.setOpaque(false);
+        itemRender.add(this, "Center");
+        separatorPanel.setLayout(new OverlayLayout(separatorPanel));
+        JPanel separatorHelpPane = new JPanel(new BorderLayout());
+        separatorHelpPane.setBorder(
+            BorderFactory.createEmptyBorder(12, 0, 0, 0));
+        separatorHelpPane.add(separator);
+        separatorHelpPane.setOpaque(false);
+        separatorPanel.setOpaque(false);
+        separatorLabel.setOpaque(true);
+        separatorLabel.setBackground(MyContorlUtil.LIST_BACKGROUND);
+        separatorLabel.setForeground(separatorTextColor);
+        separatorLabel.setFont(separatorFont);
+        separatorLabel.setVerticalAlignment(1);
+        separatorLabel.setBorder(BorderFactory.createEmptyBorder(0, 2, 0, 2));
+        JPanel labelHelpPane = new JPanel(new BorderLayout());
+        labelHelpPane.setBorder(BorderFactory.createEmptyBorder(6, 15, 0, 0));
+        labelHelpPane.add(separatorLabel, "West");
+        labelHelpPane.setOpaque(false);
+        separatorPanel.add(labelHelpPane);
+        separatorPanel.add(separatorHelpPane);
+    }
 
-                        public Dimension getPreferredSize()
-                        {
-                                Dimension size = super.getPreferredSize();
-                                return new Dimension(size.width, separatorHeight);
-                        }
+    public Component getListCellRendererComponent(JList list, Object value,
+                                                  int index, boolean isSelected,
+                                                  boolean cellHasFocus) {
+        MyShortcutItem shortcutItem = (MyShortcutItem) value;
+        //Group的渲染
+        if (shortcutItem.isGroup()) {
+            String groupName = shortcutItem.getText();
+            separatorLabel.setText(groupName);
+            separatorPanel.setToolTipText(groupName);
+            if (list.getParent() instanceof MyShortcutPanel) {
+                MyShortcutPanel pane = (MyShortcutPanel) list.getParent();
+                if (pane.isShrinked()) {
+                    separatorLabel.setText(" ");
+                    separatorLabel.setOpaque(false);
+                } else {
+                    separatorLabel.setOpaque(true);
+                }
+            }
+            return separatorPanel;
+        }
+        //普通Item的渲染
+        else {
+            setText(shortcutItem.getText());
+            setBackground(MyContorlUtil.LIST_BACKGROUND);
+            setToolTipText(shortcutItem.getToolTip());
+            setIcon(shortcutItem.getIcon());
+        }
 
-                };
-                //分割Group的样式
-                separatorLabel = new JLabel();
-                separator = new MySeparator(0);
-                separatorTextColor = Color.white;
-                separatorFont = MyContorlUtil.FONT_12_BOLD;
-                
-                itemTextColor = MyContorlUtil.LIST_TEXT_COLOR;  
-                itemSelectedBackground = new Color(199, 198, 200);
-                itemSelectedBorder = new Color(163, 163, 163);  
-                itemRender.setOpaque(false);
-                itemRender.add(this, "Center");
-                separatorPanel.setLayout(new OverlayLayout(separatorPanel));
-                JPanel separatorHelpPane = new JPanel(new BorderLayout());
-                separatorHelpPane.setBorder(BorderFactory.createEmptyBorder(12, 0, 0, 0));
-                separatorHelpPane.add(separator);
-                separatorHelpPane.setOpaque(false);
-                separatorPanel.setOpaque(false);
-                separatorLabel.setOpaque(true);
-                separatorLabel.setBackground(MyContorlUtil.LIST_BACKGROUND);
-                separatorLabel.setForeground(separatorTextColor);
-                separatorLabel.setFont(separatorFont);
-                separatorLabel.setVerticalAlignment(1);
-                separatorLabel.setBorder(BorderFactory.createEmptyBorder(0, 2, 0, 2));
-                JPanel labelHelpPane = new JPanel(new BorderLayout());
-                labelHelpPane.setBorder(BorderFactory.createEmptyBorder(6, 15, 0, 0));
-                labelHelpPane.add(separatorLabel, "West");
-                labelHelpPane.setOpaque(false);
-                separatorPanel.add(labelHelpPane);
-                separatorPanel.add(separatorHelpPane);
-        }
+        //判断List的父容器是否是快捷菜单面板，如果是，需要考虑收缩展开的处理
+        if (list.getParent() instanceof MyShortcutPanel) {
+            MyShortcutPanel pane = (MyShortcutPanel) list.getParent();
+            if (pane.isShrinked()) {
+                setBorder(BorderFactory.createEmptyBorder(2, 7, 1, 2));
+                setText("");
+            } else {
+                setBorder(BorderFactory.createEmptyBorder(2, 20, 1, 2));
+            }
+        }
+        if (isSelected) {
+            setBackground(itemSelectedBackground);
+            itemRender.setBorder(
+                BorderFactory.createLineBorder(itemSelectedBorder));
+        } else {
+            itemRender.setBorder(BorderFactory.createEmptyBorder(1, 1, 1, 1));
+        }
+        setForeground(itemTextColor);
 
-        public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected, boolean cellHasFocus)
-        {
-                MyShortcutItem shortcutItem = (MyShortcutItem)value;
-                //Group的渲染
-                if(shortcutItem.isGroup())
-                {
-                        String groupName = shortcutItem.getText();
-                        separatorLabel.setText(groupName);
-                        separatorPanel.setToolTipText(groupName);
-                        if (list.getParent() instanceof MyShortcutPanel)
-                        {
-                                MyShortcutPanel pane = (MyShortcutPanel)list.getParent();
-                                if (pane.isShrinked())
-                                {
-                                        separatorLabel.setText(" ");
-                                        separatorLabel.setOpaque(false);
-                                } else
-                                {
-                                        separatorLabel.setOpaque(true);
-                                }
-                        }
-                        return separatorPanel;
-                }
-                //普通Item的渲染
-                else 
-                {
-                        setText(shortcutItem.getText());
-                        setBackground(MyContorlUtil.LIST_BACKGROUND);
-                        setToolTipText(shortcutItem.getToolTip());
-                        setIcon(shortcutItem.getIcon());
-                }
-        
-                //判断List的父容器是否是快捷菜单面板，如果是，需要考虑收缩展开的处理
-                if (list.getParent() instanceof MyShortcutPanel)
-                {
-                        MyShortcutPanel pane = (MyShortcutPanel)list.getParent();
-                        if (pane.isShrinked())
-                        {
-                                setBorder(BorderFactory.createEmptyBorder(2, 7, 1, 2));
-                                setText("");
-                        } else
-                        {
-                                setBorder(BorderFactory.createEmptyBorder(2, 20, 1, 2));
-                        }
-                }
-                if (isSelected)
-                {
-                        setBackground(itemSelectedBackground);
-                        itemRender.setBorder(BorderFactory.createLineBorder(itemSelectedBorder));
-                } 
-                else
-                {
-                        itemRender.setBorder(BorderFactory.createEmptyBorder(1, 1, 1, 1));
-                }
-                setForeground(itemTextColor);
-                
-                return itemRender;
-        }
+        return itemRender;
+    }
 
 }
diff --git a/src/cppcheckplus/control/MyListSplitListener.java b/src/cppcheckplus/control/MyListSplitListener.java
index 4ee8fea..b594f98 100644
--- a/src/cppcheckplus/control/MyListSplitListener.java
+++ b/src/cppcheckplus/control/MyListSplitListener.java
@@ -1,50 +1,43 @@
-
 package cppcheckplus.control;
 
 import java.awt.Dimension;
 import java.awt.Point;
 import java.awt.event.MouseEvent;
-
 import javax.swing.JComponent;
 import javax.swing.event.MouseInputAdapter;
 
 
-public class MyListSplitListener extends MouseInputAdapter
-{
-        protected Point lastPoint;
-        protected MyHeader header;
-
-        public MyListSplitListener(MyHeader header)
-        {
-                lastPoint = null;
-                this.header = null;
-                this.header = header;
-        }
-
-        public void mousePressed(MouseEvent e)
-        {
-                if (!header.isShrinked())
-                        lastPoint = e.getPoint();
-        }
-
-        public void mouseReleased(MouseEvent e)
-        {
-                lastPoint = null;
-        }
-
-        public void mouseDragged(MouseEvent e)
-        {
-                if (!header.isShrinked() && lastPoint != null)
-                {
-                        JComponent parent = (JComponent)header.getParent();
-                        Dimension size = parent.getPreferredSize();
-                        Point thisPoint = e.getPoint();
-                        int xMovement = thisPoint.x - lastPoint.x;
-                        size.width -= xMovement;
-                        size.width = Math.max(size.width, 37);
-                        parent.setPreferredSize(size);
-                        header.revalidateParent();
-                }
-        }
+public class MyListSplitListener extends MouseInputAdapter {
+    protected Point lastPoint;
+    protected MyHeader header;
+
+    public MyListSplitListener(MyHeader header) {
+        lastPoint = null;
+        this.header = null;
+        this.header = header;
+    }
+
+    public void mousePressed(MouseEvent e) {
+        if (!header.isShrinked()) {
+            lastPoint = e.getPoint();
+        }
+    }
+
+    public void mouseReleased(MouseEvent e) {
+        lastPoint = null;
+    }
+
+    public void mouseDragged(MouseEvent e) {
+        if (!header.isShrinked() && lastPoint != null) {
+            JComponent parent = (JComponent) header.getParent();
+            Dimension size = parent.getPreferredSize();
+            Point thisPoint = e.getPoint();
+            int xMovement = thisPoint.x - lastPoint.x;
+            size.width -= xMovement;
+            size.width = Math.max(size.width, 37);
+            parent.setPreferredSize(size);
+            header.revalidateParent();
+        }
+    }
 
 }
diff --git a/src/cppcheckplus/control/MySeparator.java b/src/cppcheckplus/control/MySeparator.java
index f5ba4ad..a7769d7 100644
--- a/src/cppcheckplus/control/MySeparator.java
+++ b/src/cppcheckplus/control/MySeparator.java
@@ -1,40 +1,38 @@
-
 package cppcheckplus.control;
 
 import java.awt.Graphics;
 import java.awt.Graphics2D;
 import java.awt.Image;
 import java.awt.TexturePaint;
-
 import javax.swing.JSeparator;
 
 
-public class MySeparator extends JSeparator
-{
-        private Image image;
-        private TexturePaint paint;
-
-        public MySeparator()
-        {
-                image = MyContorlUtil.getImage("control/images/separator_background.png");
-                paint = MyContorlUtil.createTexturePaint("control/images/separator_background.png");
-        }
-
-        public MySeparator(int direction)
-        {
-                super(direction);
-                image = MyContorlUtil.getImage("control/images/separator_background.png");
-                paint = MyContorlUtil.createTexturePaint("control/images/separator_background.png");
-        }
-
-        public void paintComponent(Graphics g)
-        {
-                Graphics2D g2d = (Graphics2D)g;
-                g2d.setPaint(paint);
-                int x = 0;
-                int y = 0;
-                int width = getWidth();
-                int height = image.getHeight(null);
-                g2d.fillRect(x, y, width, height);
-        }
+public class MySeparator extends JSeparator {
+    private Image image;
+    private TexturePaint paint;
+
+    public MySeparator() {
+        image =
+            MyContorlUtil.getImage("control/images/separator_background.png");
+        paint = MyContorlUtil.createTexturePaint(
+            "control/images/separator_background.png");
+    }
+
+    public MySeparator(int direction) {
+        super(direction);
+        image =
+            MyContorlUtil.getImage("control/images/separator_background.png");
+        paint = MyContorlUtil.createTexturePaint(
+            "control/images/separator_background.png");
+    }
+
+    public void paintComponent(Graphics g) {
+        Graphics2D g2d = (Graphics2D) g;
+        g2d.setPaint(paint);
+        int x = 0;
+        int y = 0;
+        int width = getWidth();
+        int height = image.getHeight(null);
+        g2d.fillRect(x, y, width, height);
+    }
 }
diff --git a/src/cppcheckplus/control/MyTextField.java b/src/cppcheckplus/control/MyTextField.java
index d0ed080..1edae1e 100644
--- a/src/cppcheckplus/control/MyTextField.java
+++ b/src/cppcheckplus/control/MyTextField.java
@@ -1,4 +1,3 @@
-
 package cppcheckplus.control;
 
 import java.awt.Dimension;
@@ -6,7 +5,6 @@ import java.awt.Graphics;
 import java.awt.Graphics2D;
 import java.awt.Image;
 import java.awt.TexturePaint;
-
 import javax.swing.BorderFactory;
 import javax.swing.ImageIcon;
 import javax.swing.JTextField;
@@ -14,49 +12,50 @@ import javax.swing.border.Border;
 import javax.swing.plaf.metal.MetalTextFieldUI;
 
 
-public class MyTextField extends JTextField
-{
-        private Image backgroundLeftImage;
-        private Image backgroundRightImage;
-        private ImageIcon backgroundImageIcon;
-        private TexturePaint paint;
-        private Border border;
-
-        public MyTextField()
-        {
-                backgroundLeftImage = MyContorlUtil.getImage("control/images/textfield_background_left.png");
-                backgroundRightImage = MyContorlUtil.getImage("control/images/textfield_background_right.png");
-                backgroundImageIcon = MyContorlUtil.getImageIcon("control/images/textfield_background.png");
-                paint = MyContorlUtil.createTexturePaint("control/images/textfield_background.png");
-                border = BorderFactory.createEmptyBorder(1, 3, 1, 3);
-                init();
-        }
-        public MyTextField(String text)
-        {
-                this();
-                setText(text);
-        }
-
-        private void init()
-        {
-                setBorder(border);
-                setUI(new MetalTextFieldUI() {
-
-                        protected void paintBackground(Graphics g)
-                        {
-                                Graphics2D g2d = (Graphics2D)g;
-                                g2d.setPaint(paint);
-                                g2d.fillRect(0, 0, getWidth(), getHeight());
-                                g2d.drawImage(backgroundLeftImage, 0, 0, null);
-                                g2d.drawImage(backgroundRightImage, getWidth() - backgroundRightImage.getWidth(null), 0, null);
-                        }
-
-                });
-        }
-
-        public Dimension getPreferredSize()
-        {
-                return new Dimension(super.getPreferredSize().width, backgroundImageIcon.getIconHeight());
-        }
-        
+public class MyTextField extends JTextField {
+    private Image backgroundLeftImage;
+    private Image backgroundRightImage;
+    private ImageIcon backgroundImageIcon;
+    private TexturePaint paint;
+    private Border border;
+
+    public MyTextField() {
+        backgroundLeftImage = MyContorlUtil.getImage(
+            "control/images/textfield_background_left.png");
+        backgroundRightImage = MyContorlUtil.getImage(
+            "control/images/textfield_background_right.png");
+        backgroundImageIcon = MyContorlUtil.getImageIcon(
+            "control/images/textfield_background.png");
+        paint = MyContorlUtil.createTexturePaint(
+            "control/images/textfield_background.png");
+        border = BorderFactory.createEmptyBorder(1, 3, 1, 3);
+        init();
+    }
+
+    public MyTextField(String text) {
+        this();
+        setText(text);
+    }
+
+    private void init() {
+        setBorder(border);
+        setUI(new MetalTextFieldUI() {
+
+            protected void paintBackground(Graphics g) {
+                Graphics2D g2d = (Graphics2D) g;
+                g2d.setPaint(paint);
+                g2d.fillRect(0, 0, getWidth(), getHeight());
+                g2d.drawImage(backgroundLeftImage, 0, 0, null);
+                g2d.drawImage(backgroundRightImage,
+                    getWidth() - backgroundRightImage.getWidth(null), 0, null);
+            }
+
+        });
+    }
+
+    public Dimension getPreferredSize() {
+        return new Dimension(super.getPreferredSize().width,
+            backgroundImageIcon.getIconHeight());
+    }
+
 }
diff --git a/src/cppcheckplus/control/MyToolbarButton.java b/src/cppcheckplus/control/MyToolbarButton.java
index e709296..dff78cd 100644
--- a/src/cppcheckplus/control/MyToolbarButton.java
+++ b/src/cppcheckplus/control/MyToolbarButton.java
@@ -1,4 +1,3 @@
-
 package cppcheckplus.control;
 
 import java.awt.Color;
@@ -8,89 +7,77 @@ import java.awt.Graphics;
 import java.awt.Insets;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
-
 import javax.swing.BorderFactory;
 import javax.swing.Icon;
 import javax.swing.JButton;
 import javax.swing.border.Border;
 
-public class MyToolbarButton extends JButton
-{
-        private int buttonSize;
-        private Color roverBorderColor;
-        private Border roverBorder;
-        private Border emptyBorder;
+public class MyToolbarButton extends JButton {
+    private int buttonSize;
+    private Color roverBorderColor;
+    private Border roverBorder;
+    private Border emptyBorder;
 
-        public MyToolbarButton()
-        {
-                super();
-                buttonSize = 20;
-                roverBorderColor = MyContorlUtil.BUTTON_ROVER_COLOR;
-                roverBorder = new Border() {
+    public MyToolbarButton() {
+        super();
+        buttonSize = 20;
+        roverBorderColor = MyContorlUtil.BUTTON_ROVER_COLOR;
+        roverBorder = new Border() {
 
-                        public void paintBorder(Component c, Graphics g, int x, int y, int width, int height)
-                        {
-                                g.setColor(roverBorderColor);
-                                g.drawRect(x, y, width - 1, height - 1);
-                        }
+            public void paintBorder(Component c, Graphics g, int x, int y,
+                                    int width, int height) {
+                g.setColor(roverBorderColor);
+                g.drawRect(x, y, width - 1, height - 1);
+            }
 
-                        public Insets getBorderInsets(Component c)
-                        {
-                                return new Insets(1, 1, 1, 1);
-                        }
+            public Insets getBorderInsets(Component c) {
+                return new Insets(1, 1, 1, 1);
+            }
 
-                        public boolean isBorderOpaque()
-                        {
-                                return true;
-                        }
-                };
-                emptyBorder = BorderFactory.createEmptyBorder(1, 1, 1, 1);
-                init();
-        }
+            public boolean isBorderOpaque() {
+                return true;
+            }
+        };
+        emptyBorder = BorderFactory.createEmptyBorder(1, 1, 1, 1);
+        init();
+    }
 
-        private void init()
-        {
-                setVerticalAlignment(0);
-                setFont(MyContorlUtil.FONT_12_BOLD);
-                setOpaque(false);
-                setBorder(emptyBorder);
-                setContentAreaFilled(false);
-                setFocusPainted(false);
-                addMouseListener(new MouseAdapter() {
-                        public void mouseEntered(MouseEvent e)
-                        {
-                                setBorder(roverBorder);
-                        }
+    private void init() {
+        setVerticalAlignment(0);
+        setFont(MyContorlUtil.FONT_12_BOLD);
+        setOpaque(false);
+        setBorder(emptyBorder);
+        setContentAreaFilled(false);
+        setFocusPainted(false);
+        addMouseListener(new MouseAdapter() {
+            public void mouseEntered(MouseEvent e) {
+                setBorder(roverBorder);
+            }
 
-                        public void mouseExited(MouseEvent e)
-                        {
-                                setBorder(emptyBorder);
-                        }
-                });
-        }
+            public void mouseExited(MouseEvent e) {
+                setBorder(emptyBorder);
+            }
+        });
+    }
 
-        @Override
-        public void setIcon(Icon icon)
-        {
-                super.setIcon(icon);
-                if (icon == null)
-                {
-                        setPressedIcon(null);
-                        setRolloverIcon(null);
-                } else
-                {
-                        Icon pressedIcon = MyContorlUtil.createMovedIcon(icon);
-                        setPressedIcon(pressedIcon);
-                }
-        }
+    @Override
+    public void setIcon(Icon icon) {
+        super.setIcon(icon);
+        if (icon == null) {
+            setPressedIcon(null);
+            setRolloverIcon(null);
+        } else {
+            Icon pressedIcon = MyContorlUtil.createMovedIcon(icon);
+            setPressedIcon(pressedIcon);
+        }
+    }
 
 
-        @Override
-        public Dimension getPreferredSize()
-        {
-                int width = super.getPreferredSize().width;
-                width = Math.max(width, buttonSize);
-                int height = buttonSize;
-                return new Dimension(width, height);
-        }
+    @Override
+    public Dimension getPreferredSize() {
+        int width = super.getPreferredSize().width;
+        width = Math.max(width, buttonSize);
+        int height = buttonSize;
+        return new Dimension(width, height);
+    }
 }
diff --git a/src/cppcheckplus/control/UIFrame.java b/src/cppcheckplus/control/UIFrame.java
index a2a04ab..bb15707 100644
--- a/src/cppcheckplus/control/UIFrame.java
+++ b/src/cppcheckplus/control/UIFrame.java
@@ -21,16 +21,9 @@ import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
-import java.io.BufferedReader;
 import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
 import java.io.UnsupportedEncodingException;
 import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
 import javax.swing.BorderFactory;
 import javax.swing.JComponent;
 import javax.swing.JFileChooser;
@@ -193,7 +186,8 @@ public class UIFrame extends JFrame {
                         if (src != null && src.length() != 0) {
                             new Thread() {
                                 public void run() {
-                                    ToolsRegistry.executeTool("flawfinder", src);
+                                    ToolsRegistry.executeTool("flawfinder",
+                                        src);
                                     viewResult("flawfinder");
                                 }
                             }.start();
diff --git a/src/cppcheckplus/control/XChartletFullScreenListenter.java b/src/cppcheckplus/control/XChartletFullScreenListenter.java
index c7eca34..8890357 100644
--- a/src/cppcheckplus/control/XChartletFullScreenListenter.java
+++ b/src/cppcheckplus/control/XChartletFullScreenListenter.java
@@ -1,10 +1,8 @@
-
 package cppcheckplus.control;
 
 import javax.swing.JPanel;
 
 
-public interface XChartletFullScreenListenter
-{
-        public void fullScreen(JPanel chartPanellet);
+public interface XChartletFullScreenListenter {
+    public void fullScreen(JPanel chartPanellet);
 }