Browse Source

Merge remote-tracking branch 'mm/9.0' into 9.0

master
plough 7 years ago
parent
commit
1024f5c230
  1. 2
      designer/src/com/fr/design/mainframe/bbs/UserInfoLabel.java
  2. 2
      designer_base/src/com/fr/design/DesignerEnvManager.java
  3. 12
      designer_base/src/com/fr/design/menu/MenuManager.java
  4. 4
      designer_chart/src/com/fr/design/chart/series/PlotSeries/MapCustomPane.java

2
designer/src/com/fr/design/mainframe/bbs/UserInfoLabel.java

@ -265,7 +265,7 @@ public class UserInfoLabel extends UILabel {
UIMenuItem closeOther = new UIMenuItem(Inter.getLocText("FR-Designer-BBSLogin_Switch-Account"));
closeOther.addMouseListener(new MouseAdapter() {
public void mousePressed(MouseEvent e) {
// BBSPluginLogin.getInstance().logOut();
BBSPluginLogin.getInstance().logOut();
UserLoginContext.fireLoginContextListener();
}

2
designer_base/src/com/fr/design/DesignerEnvManager.java

@ -1802,7 +1802,7 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter {
}
writer.startTAG("Env");
// writer.classAttr(env.getClass());
writer.classAttr(env.getClass());
writer.attr("name", name);
env.writeXML(writer);

12
designer_base/src/com/fr/design/menu/MenuManager.java

@ -138,12 +138,12 @@ public class MenuManager extends XMLFileManager {
if (name.isEmpty()) {
return;
}
// try {
// MenuAction action = (MenuAction) reader.getAttrAsClass().newInstance();
// menu.addShortCut(action);
// } catch (Exception exp) {
// FRLogger.getLogger().error(exp.getMessage(), exp);
// }
try {
MenuAction action = (MenuAction) reader.getAttrAsClass().newInstance();
menu.addShortCut(action);
} catch (Exception exp) {
FRLogger.getLogger().error(exp.getMessage(), exp);
}
} else if (reader.getTagName().equals("Menu")) {
final MenuDef submenu = new MenuDef();
String tmpVal = StringUtils.EMPTY;

4
designer_chart/src/com/fr/design/chart/series/PlotSeries/MapCustomPane.java

@ -19,7 +19,7 @@ import com.fr.general.GeneralUtils;
import com.fr.general.Inter;
import com.fr.general.data.DataModel;
import com.fr.stable.StringUtils;
//import org.apache.batik.swing.svg.SVGFileFilter;
import org.apache.batik.swing.svg.SVGFileFilter;
import javax.swing.*;
import java.awt.*;
@ -107,7 +107,7 @@ refreshAreaNameBox();
public void actionPerformed(ActionEvent evt) {
JFileChooser svgFileChooser = new JFileChooser();
// svgFileChooser.addChoosableFileFilter(new SVGFileFilter());
svgFileChooser.addChoosableFileFilter(new SVGFileFilter());
if (StringUtils.isNotBlank(lastSelectPath)) {
svgFileChooser.setSelectedFile(new File(lastSelectPath));
}

Loading…
Cancel
Save