Browse Source

bug fix

master
XiaXiang 8 years ago
parent
commit
40d6bfbb41
  1. 5
      designer/src/com/fr/design/mainframe/alphafine/search/manager/RecentSearchManager.java
  2. 3
      designer_base/src/com/fr/design/actions/help/alphafine/RemindPane.java

5
designer/src/com/fr/design/mainframe/alphafine/search/manager/RecentSearchManager.java

@ -97,7 +97,10 @@ public class RecentSearchManager extends XMLFileManager implements AlphaFineSear
private void addModelToList(List<AlphaCellModel> list, String name) {
try {
list.add(CellModelHelper.getModelFromJson(new JSONObject(name)));
AlphaCellModel model = CellModelHelper.getModelFromJson(new JSONObject(name));
if (model != null) {
list.add(CellModelHelper.getModelFromJson(new JSONObject(name)));
}
} catch (JSONException e) {
FRLogger.getLogger().error(e.getMessage());
}

3
designer_base/src/com/fr/design/actions/help/alphafine/RemindPane.java

@ -46,6 +46,7 @@ public class RemindPane extends JPanel {
openButton.addMouseListener(new MouseAdapter() {
@Override
public void mousePressed(MouseEvent e) {
manager.setOperateCount(0);
dialog.dispose();
AlphafineContext.fireAlphaFineContextListener();
@ -77,7 +78,7 @@ public class RemindPane extends JPanel {
closeButton.addMouseListener(new MouseAdapter() {
@Override
public void mousePressed(MouseEvent e) {
//manager.setOperateCount(0);
manager.setOperateCount(0);
dialog.dispose();
}

Loading…
Cancel
Save