Browse Source

Merge branch 'release/9.0' of http://cloud.finedevelop.com:2015/scm/~kerry/design into release/9.0

kerry 7 years ago
parent
commit
467aa47b4f
  1. 2
      designer_base/src/com/fr/design/extra/exe/GetPluginFromStoreExecutor.java
  2. 8
      designer_form/src/com/fr/design/mainframe/ComponentTree.java

2
designer_base/src/com/fr/design/extra/exe/GetPluginFromStoreExecutor.java

@ -23,7 +23,7 @@ public class GetPluginFromStoreExecutor implements Executor {
private String scope; private String scope;
public GetPluginFromStoreExecutor(JSONObject info) { public GetPluginFromStoreExecutor(JSONObject info) {
this.category = info.optString("category"); this.category = info.optString("categories");
this.fee = info.optString("fee"); this.fee = info.optString("fee");
this.seller = info.optString("seller"); this.seller = info.optString("seller");
this.scope = info.optString("scope"); this.scope = info.optString("scope");

8
designer_form/src/com/fr/design/mainframe/ComponentTree.java

@ -20,6 +20,8 @@ import java.awt.Container;
import java.awt.Dimension; import java.awt.Dimension;
import java.awt.Graphics; import java.awt.Graphics;
import java.awt.Point; import java.awt.Point;
import java.awt.event.KeyAdapter;
import java.awt.event.KeyEvent;
import java.awt.event.MouseAdapter; import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent; import java.awt.event.MouseEvent;
import java.awt.image.BufferedImage; import java.awt.image.BufferedImage;
@ -56,6 +58,12 @@ public class ComponentTree extends JTree {
ComponetTreeMouseListener componetTreeMouseListener = new ComponetTreeMouseListener(this); ComponetTreeMouseListener componetTreeMouseListener = new ComponetTreeMouseListener(this);
this.addMouseMotionListener(componetTreeMouseListener); this.addMouseMotionListener(componetTreeMouseListener);
this.addMouseListener(componetTreeMouseListener); this.addMouseListener(componetTreeMouseListener);
this.addKeyListener(new KeyAdapter() {
@Override
public void keyPressed(KeyEvent e) {
designer.dispatchEvent(e);
}
});
} }
public FormDesigner getDesigner() { public FormDesigner getDesigner() {

Loading…
Cancel
Save