Browse Source

Merge pull request #44 in BA/design from ~XIAXIANG/design:dev to dev

* commit '231796a2f33cf1d24c688abfe03e3c2a4491f3f0':
  rt
  rt
master
neil 9 years ago
parent
commit
f73e5af19f
  1. 2
      designer/src/com/fr/design/mainframe/AuthorityEditToolBarPane.java
  2. 2
      designer/src/com/fr/design/mainframe/AuthorityToolBarPane.java
  3. 2
      designer/src/com/fr/design/mainframe/ElementCasePaneAuthorityEditPane.java
  4. 7
      designer_base/src/com/fr/design/gui/itree/refreshabletree/RefreshableJTree.java
  5. 2
      designer_base/src/com/fr/design/gui/itree/refreshabletree/UserObjectRefreshJTree.java
  6. 2
      designer_base/src/com/fr/design/roleAuthority/RoleTree.java

2
designer/src/com/fr/design/mainframe/AuthorityEditToolBarPane.java

File diff suppressed because one or more lines are too long

2
designer/src/com/fr/design/mainframe/AuthorityToolBarPane.java

File diff suppressed because one or more lines are too long

2
designer/src/com/fr/design/mainframe/ElementCasePaneAuthorityEditPane.java

File diff suppressed because one or more lines are too long

7
designer_base/src/com/fr/design/gui/itree/refreshabletree/RefreshableJTree.java

@ -9,6 +9,7 @@ import javax.swing.tree.*;
import com.fr.general.NameObject;
import com.fr.design.constants.UIConstants;
import com.fr.design.gui.itooltip.UIToolTip;
import com.fr.design.gui.itree.checkboxtree.CheckBoxTree;
import com.fr.general.ComparatorUtils;
import com.fr.general.Inter;
import com.fr.stable.StringUtils;
@ -16,7 +17,7 @@ import com.fr.stable.StringUtils;
import java.awt.*;
import java.awt.event.MouseEvent;
public abstract class RefreshableJTree extends JTree {
public abstract class RefreshableJTree extends CheckBoxTree {
private static final int WIDTH_BETWEEN_NODES = 20; //tree父子节点之间最左侧横向像素的差
private Icon icon;
@ -31,7 +32,9 @@ public abstract class RefreshableJTree extends JTree {
public RefreshableJTree() {
this(null);
}
public boolean isCheckBoxVisible(TreePath path) {
return false;
}
public RefreshableJTree(Object rootObj) {
super(new DefaultTreeModel(new ExpandMutableTreeNode(rootObj)));
DefaultTreeModel model = (DefaultTreeModel) getModel();

2
designer_base/src/com/fr/design/gui/itree/refreshabletree/UserObjectRefreshJTree.java

@ -133,7 +133,7 @@ public abstract class UserObjectRefreshJTree<T extends UserObjectOP<?>> extends
super.setSelectionPath(treePath);
}
private MouseListener treeMouseListener = new MouseAdapter() {
protected MouseListener treeMouseListener = new MouseAdapter() {
public void mousePressed(MouseEvent e) {
if (SwingUtilities.isLeftMouseButton(e)) {
TreePath path = getPathForLocation(e.getX(), e.getY());

2
designer_base/src/com/fr/design/roleAuthority/RoleTree.java

File diff suppressed because one or more lines are too long
Loading…
Cancel
Save