Merge branch 'release/10.0' of http://cloud.finedevelop.com:2015/scm/~kerry/design_10.0 into release/10.0

designer-realize/src/main/java/com/fr/design/report/SelectImagePane.java

@@ -1,21 +1,18 @@
 package com.fr.design.report;
 
-import com.fr.base.BaseUtils;
 import com.fr.base.Style;
 import com.fr.design.dialog.BasicPane;
+import com.fr.design.gui.frpane.ImgChooseWrapper;
 import com.fr.design.gui.ibutton.UIButton;
 import com.fr.design.gui.ibutton.UIRadioButton;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.style.background.image.ImageFileChooser;
 import com.fr.design.style.background.image.ImagePreviewPane;
-import com.fr.design.utils.ImageUtils;
 import com.fr.design.utils.gui.GUICoreUtils;
-import com.fr.general.ImageWithSuffix;
 import com.fr.report.cell.Elem;
 import com.fr.report.cell.cellattr.CellImage;
 import com.fr.report.cell.painter.CellImagePainter;
 import com.fr.stable.Constants;
-import com.fr.stable.CoreGraphHelper;
 
 import javax.swing.BorderFactory;
 import javax.swing.ButtonGroup;
@@ -27,7 +24,6 @@ import java.awt.GridLayout;
 import java.awt.Image;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
-import java.awt.image.BufferedImage;
 import java.io.File;
 
 /**
@@ -44,8 +40,6 @@ public class SelectImagePane extends BasicPane {
 
     private Style imageStyle = null;
 
-    private Image previewImage = null;
-
     private File imageFile;
 
     public SelectImagePane() {
@@ -119,21 +113,8 @@ public class SelectImagePane extends BasicPane {
                     .showOpenDialog(SelectImagePane.this);
             if (returnVal != JFileChooser.CANCEL_OPTION) {
                 File selectedFile = imageFileChooser.getSelectedFile();
-
-                if (selectedFile != null && selectedFile.isFile()) {
-                    String filePath = selectedFile.getPath();
-                    BufferedImage image = BaseUtils.readImage(filePath);
-                    CoreGraphHelper.waitForImage(image);
-
-                    imageFile = selectedFile;
-                    setImageStyle();
-                    previewPane.setImageWithSuffix(ImageWithSuffix.build(image, ImageUtils.getImageType(selectedFile)));
-                    previewPane.setImageStyle(imageStyle);
-                    previewImage = image;
-                } else {
-                    previewPane.setImage(null);
-                }
-                previewPane.repaint();
+                imageFile = selectedFile;
+                ImgChooseWrapper.getInstance(previewPane, imageFileChooser, imageStyle, null).dealWithImageFile(returnVal);
             }
         }
     };
@@ -202,7 +183,6 @@ public class SelectImagePane extends BasicPane {
 
     public void setImage(Image image) {
         previewPane.setImage(image);
-        this.previewImage = image;
     }
 
     public CellImage update() {

designer-realize/src/main/java/com/fr/start/module/DesignerActivator.java

@@ -3,8 +3,12 @@ package com.fr.start.module;
 import com.fr.base.BaseFormula;
 import com.fr.base.Formula;
 import com.fr.base.MultiFieldParameter;
+import com.fr.base.passport.FinePassportListenerAdapter;
+import com.fr.base.passport.FinePassportManager;
 import com.fr.base.process.ProcessOperator;
 import com.fr.chart.chartattr.ChartCollection;
+import com.fr.config.MarketConfig;
+import com.fr.design.DesignerEnvManager;
 import com.fr.design.ExtraDesignClassManager;
 import com.fr.design.actions.NewFormAction;
 import com.fr.design.actions.core.ActionFactory;
@@ -129,6 +133,7 @@ public class DesignerActivator extends Activator {
         loadLogAppender();
         DesignerSocketIO.update();
         UserInfoPane.getInstance().updateBBSUserInfo();
+        storePassport();
     }
 
     private void loadLogAppender() {
@@ -392,6 +397,16 @@ public class DesignerActivator extends Activator {
         StableFactory.registerMarkedObject(ElementCaseThumbnailProcessor.MARK_STRING, new ElementCaseThumbnail());
     }
 
+    private static void storePassport() {
+        FinePassportManager.getInstance().storePassport(MarketConfig.getInstance().getBbsUsername(), DesignerEnvManager.getEnvManager().getActivationKey());
+        FinePassportManager.getInstance().addPassportListener(new FinePassportListenerAdapter() {
+            @Override
+            public void onLoginSuccess() {
+                FinePassportManager.getInstance().storePassport(MarketConfig.getInstance().getBbsUsername(), DesignerEnvManager.getEnvManager().getActivationKey());
+            }
+        });
+    }
+
     @Override
     public void stop() {
         unloadLogAppender();