f

designer-base/src/com/fr/design/actions/help/alphafine/AlphaFineConfigManager.java

@@ -1,6 +1,5 @@
 package com.fr.design.actions.help.alphafine;
 
-import com.fr.base.FRContext;
 import com.fr.license.function.VT4FR;
 import com.fr.stable.OperatingSystem;
 import com.fr.stable.StringUtils;
@@ -75,7 +74,7 @@ public class AlphaFineConfigManager implements XMLable {
 
     public static boolean isALPHALicAvailable() {
     
-        return FRContext.getCommonOperator() != null && VT4FR.AlphaFine.isSupport();
+        return VT4FR.AlphaFine.isSupport();
     }
 
     @Override

designer-base/src/com/fr/design/mainframe/DesignerFrame.java

@@ -4,7 +4,6 @@
 package com.fr.design.mainframe;
 
 import com.fr.base.BaseUtils;
-import com.fr.base.FRContext;
 import com.fr.design.DesignModelAdapter;
 import com.fr.design.DesignState;
 import com.fr.design.DesignerEnvManager;
@@ -836,18 +835,18 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta
      */
     public void openTemplate(FILE tplFile) {
         // 测试连接，如果连接失败，则提示
-        try {
+//        try {
-            if (FRContext.getCommonOperator() != null
+//            if (FRContext.getCommonOperator() != null
-                    && !FRContext.getCommonOperator().testServerConnectionWithOutShowMessagePane()) {
+//                    && !FRContext.getCommonOperator().testServerConnectionWithOutShowMessagePane()) {
-                JOptionPane.showMessageDialog(
+//                JOptionPane.showMessageDialog(
-                        DesignerContext.getDesignerFrame(),
+//                        DesignerContext.getDesignerFrame(),
-                        Inter.getLocText(new String[]{"FR-Chart-Server_disconnected", "FR-Server-Design_template_unopened"}, new String[]{
+//                        Inter.getLocText(new String[]{"FR-Chart-Server_disconnected", "FR-Server-Design_template_unopened"}, new String[]{
-                                ",", "!"}), Inter.getLocText("FR-Server-All_Error"), JOptionPane.ERROR_MESSAGE);
+//                                ",", "!"}), Inter.getLocText("FR-Server-All_Error"), JOptionPane.ERROR_MESSAGE);
-                return;
+//                return;
-            }
+//            }
-        } catch (Exception e) {
+//        } catch (Exception e) {
-            FineLoggerFactory.getLogger().error(e.getMessage());
+//            FineLoggerFactory.getLogger().error(e.getMessage());
-        }
+//        }
 
         // p:判断一下，如何文件为空或者文件不存在，直接返回.
         if (tplFile == null || !tplFile.exists()) {

designer-base/src/com/fr/design/mainframe/DesignerFrameFileDealerPane.java

@@ -37,19 +37,10 @@ import com.fr.stable.CoreConstants;
 import com.fr.stable.StableUtils;
 import com.fr.stable.project.ProjectConstants;
 
-import javax.swing.BorderFactory;
+import javax.swing.*;
-import javax.swing.Box;
-import javax.swing.BoxLayout;
-import javax.swing.JDialog;
-import javax.swing.JPanel;
-import javax.swing.SwingConstants;
 import javax.swing.event.DocumentEvent;
 import javax.swing.event.DocumentListener;
-import java.awt.BorderLayout;
+import java.awt.*;
-import java.awt.CardLayout;
-import java.awt.Color;
-import java.awt.Dimension;
-import java.awt.GridLayout;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.KeyAdapter;
@@ -59,37 +50,48 @@ import java.util.Map;
 import java.util.Set;
 
 public class DesignerFrameFileDealerPane extends JPanel implements FileToolbarStateChangeListener, ResponseDataSourceChange {
+    
     private static final String FILE = "file";
+    
     private static DesignerFrameFileDealerPane THIS;
-
+    
     private CardLayout card;
+    
     private JPanel cardPane;
-
+    
     private FileOperations selectedOperation;
+    
     private UIToolbar toolBar;
-
+    
     private OpenReportAction openReportAction = new OpenReportAction();
+    
     private RefreshTreeAction refreshTreeAction = new RefreshTreeAction();
+    
     private OpenFolderAction openFolderAction = new OpenFolderAction();
+    
     private RenameAction renameAction = new RenameAction();
+    
     private DelFileAction delFileAction = new DelFileAction();
-
+    
-
+    
     /**
      * 刷新
      */
     public void refresh() {
+    
         selectedOperation.refresh();
     }
-
+    
     public static final DesignerFrameFileDealerPane getInstance() {
+        
         if (THIS == null) {
             THIS = new DesignerFrameFileDealerPane();
         }
         return THIS;
     }
-
+    
     private DesignerFrameFileDealerPane() {
+        
         setLayout(new BorderLayout());
         toolBar = ToolBarDef.createJToolBar();
         toolBar.setBorder(BorderFactory.createMatteBorder(0, 0, 1, 0, UIConstants.TOOLBAR_BORDER_COLOR));
@@ -100,22 +102,23 @@ public class DesignerFrameFileDealerPane extends JPanel implements FileToolbarSt
         parent.setBorder(BorderFactory.createEmptyBorder(3, 0, 4, 0));
         tooBarPane.add(parent, BorderLayout.CENTER);
         tooBarPane.add(new UIMenuHighLight(), BorderLayout.SOUTH);
-
+        
         add(tooBarPane, BorderLayout.NORTH);
         cardPane = new JPanel(card = new CardLayout());
         cardPane.add(TemplateTreePane.getInstance(), FILE);
-
+        
         selectedOperation = TemplateTreePane.getInstance();
         card.show(cardPane, FILE);
-
+        
         TemplateTreePane.getInstance().setToobarStateChangeListener(this);
-
+        
         add(cardPane, BorderLayout.CENTER);
         stateChange();
     }
-
+    
-
+    
     public final void setCurrentEditingTemplate(JTemplate<?, ?> jt) {
+        
         DesignModelAdapter.setCurrentModelAdapter(jt == null ? null : jt.getModel());
         fireDSChanged();
         TableDataTreePane.getInstance(DesignModelAdapter.getCurrentModelAdapter());
@@ -125,35 +128,37 @@ public class DesignerFrameFileDealerPane extends JPanel implements FileToolbarSt
         if (BaseUtils.isAuthorityEditing()) {
             RolesAlreadyEditedPane.getInstance().refreshDockingView();
         }
-
+        
         jt.setComposite();
         jt.refreshToolArea();
         jt.fireJTemplateOpened();
         jt.requestFocus();
         jt.revert();
-
+        
         FRContext.getLogger().info("\"" + jt.getEditingFILE().getName() + "\"" + Inter.getLocText("LOG-Has_Been_Openned") + "!");
     }
-
+    
     /**
      * 刷新菜单
      */
     public void refreshDockingView() {
+    
         ToolBarDef toolbarDef = new ToolBarDef();
         toolbarDef.addShortCut(openReportAction, refreshTreeAction);
         toolbarDef.addShortCut(openFolderAction, renameAction);
         toolbarDef.addShortCut(delFileAction);
         Set<ShortCut> extraShortCuts = ExtraDesignClassManager.getInstance().getExtraShortCuts();
-        for (ShortCut shortCut : extraShortCuts){
+        for (ShortCut shortCut : extraShortCuts) {
             toolbarDef.addShortCut(shortCut);
         }
-
+    
         toolbarDef.updateToolBar(toolBar);
         refreshActions();
     }
-
+    
-
+    
     private void refreshActions() {
+        
         openReportAction.setEnabled(false);
         refreshTreeAction.setEnabled(true);
         openFolderAction.setEnabled(false);
@@ -161,123 +166,134 @@ public class DesignerFrameFileDealerPane extends JPanel implements FileToolbarSt
         delFileAction.setEnabled(false);
         this.repaint();
     }
-
+    
     /**
      * 响应数据集改变
      */
     public void fireDSChanged() {
+    
         fireDSChanged(new HashMap<String, String>());
     }
-
+    
     /**
-     *  响应数据集改变
+     * 响应数据集改变
-     * @param map     改变名字的数据集
+     *
+     * @param map 改变名字的数据集
      */
     public void fireDSChanged(Map<String, String> map) {
+    
         DesignTableDataManager.fireDSChanged(map);
     }
-
+    
-
+    
     /*
      * Open Report Action
      */
     private class OpenReportAction extends UpdateAction {
-
+        
         public OpenReportAction() {
+            
             this.setName(KeySetUtils.OPEN_TEMPLATE.getMenuKeySetName());
             this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/buttonicon/open.png"));
         }
-
+        
         @Override
         public void actionPerformed(ActionEvent evt) {
+            
             selectedOperation.openSelectedReport();
         }
-
+        
     }
-
+    
     private class OpenFolderAction extends UpdateAction {
-
+        
         public OpenFolderAction() {
+            
             this.setName(Inter.getLocText("FR-Designer_Show_in_Containing_Folder"));
             this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/m_file/view_folder.png"));
         }
-
+        
         @Override
         public void actionPerformed(ActionEvent evt) {
+            
             selectedOperation.openContainerFolder();
         }
     }
-
+    
     /*
      * 刷新ReportletsTree
      */
     private class RefreshTreeAction extends UpdateAction {
-
+        
         public RefreshTreeAction() {
+            
             this.setName(Inter.getLocText("FR-Designer_Refresh"));
             this.setSmallIcon(UIConstants.REFRESH_ICON);
         }
-
+        
         @Override
         public void actionPerformed(ActionEvent evt) {
+            
             selectedOperation.refresh();
             stateChange();
         }
     }
-
+    
     /*
      * 重命名文件
      */
     private class RenameAction extends UpdateAction {
-
+        
         public RenameAction() {
+            
             this.setName(Inter.getLocText("FR-Designer_Rename"));
             this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/data/source/rename.png"));
         }
-
+        
         @Override
         public void actionPerformed(ActionEvent evt) {
+            
             new RenameDialog();
             MutilTempalteTabPane.getInstance().repaint();
         }
-
+        
     }
-
+    
     /*
      * 删除指定文件
      */
     private class DelFileAction extends UpdateAction {
-
+        
         public DelFileAction() {
+            
             this.setName(Inter.getLocText("FR-Designer_Remove"));
             this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/data/source/delete.png"));
         }
-
+        
         @Override
         public void actionPerformed(ActionEvent evt) {
+            
             selectedOperation.deleteFile();
         }
     }
-
+    
     /**
      * 按钮状态改变
      */
     @Override
     public void stateChange() {
-        //当前环境为远程环境时
+    
-        if (FRContext.getCommonOperator() != null) {
+        if (selectedOperation.getSelectedTemplatePath() != null) {
-            //当前环境为本地环境时
+            openReportAction.setEnabled(true);
-            if (selectedOperation.getSelectedTemplatePath() != null) {
+            renameAction.setEnabled(true);
-                openReportAction.setEnabled(true);
+            delFileAction.setEnabled(true);
-                renameAction.setEnabled(true);
+        } else {
-                delFileAction.setEnabled(true);
+            openReportAction.setEnabled(false);
-            } else {
+            renameAction.setEnabled(false);
-                openReportAction.setEnabled(false);
+            delFileAction.setEnabled(false);
-                renameAction.setEnabled(false);
-                delFileAction.setEnabled(false);
-            }
-            openFolderAction.setEnabled(containsFolderNums() + seletedTemplateNums() != 0);
         }
+        openFolderAction.setEnabled(containsFolderNums() + seletedTemplateNums() != 0);
+        
         refreshTreeAction.setEnabled(true);
         if (containsFolderNums() > 0 && (containsFolderNums() + seletedTemplateNums() > 1)) {
             refreshActions();
@@ -288,21 +304,22 @@ public class DesignerFrameFileDealerPane extends JPanel implements FileToolbarSt
             renameAction.setEnabled(false);
             delFileAction.setEnabled(true);
         }
-
+    
     }
-
+    
     /**
      * 是否包含文件夹
      *
      * @return
      */
-
+    
     private int containsFolderNums() {
+        
         TemplateFileTree fileTree = TemplateTreePane.getInstance().getTemplateFileTree();
         if (fileTree.getSelectionPaths() == null) {
             return 0;
         }
-
+        
         //选择的包含文件和文件夹的数目
         if (fileTree.getSelectionPaths().length == 0) {
             return 0;
@@ -310,45 +327,53 @@ public class DesignerFrameFileDealerPane extends JPanel implements FileToolbarSt
         //所有的num减去模板的num，得到文件夹的num
         return fileTree.getSelectionPaths().length - fileTree.getSelectedTemplatePaths().length;
     }
-
+    
     /**
      * 是否选择了多个模板
      *
      * @return
      */
     private int seletedTemplateNums() {
+    
         TemplateFileTree fileTree = TemplateTreePane.getInstance().getTemplateFileTree();
         if (fileTree.getSelectionPaths() == null) {
             return 0;
         }
-
+    
         return fileTree.getSelectedTemplatePaths().length;
     }
-
+    
-
+    
     // js: 重命名对话框，模仿Eclipse的重命名，支持快捷键F2，Enter，ESC
     private class RenameDialog {
-
+        
         private UITextField jt;
+        
         private String userInput;
+        
         private String oldName;
+        
         private UILabel hintsLabel;
+        
         private UIButton confirmButton;
+        
         private JDialog jd;
+        
         private String suffix;
-
+        
         public RenameDialog() {
+            
             final String reportPath = selectedOperation.getSelectedTemplatePath();
             if (reportPath == null) {
                 return;
             }
-
+            
             final FileNodeFILE nodeFile = new FileNodeFILE(new FileNode(StableUtils.pathJoin(ProjectConstants.REPORTLETS_NAME, reportPath), false));
             final String path = nodeFile.getPath();
             oldName = nodeFile.getName();
             suffix = oldName.substring(oldName.lastIndexOf(CoreConstants.DOT), oldName.length());
             oldName = oldName.replaceAll(suffix, "");
-
+            
             jd = new JDialog();
             jd.setLayout(new GridLayout(2, 2));
             jd.setModal(true);
@@ -359,14 +384,14 @@ public class DesignerFrameFileDealerPane extends JPanel implements FileToolbarSt
             jt.getDocument().addDocumentListener(getdoDocumentListener());
             jt.selectAll();
             jt.setPreferredSize(new Dimension(150, 20));
-
+            
             JPanel newNamePanel = new JPanel();
             newNamePanel.setLayout(new BoxLayout(newNamePanel, BoxLayout.X_AXIS));
             newNamePanel.add(Box.createHorizontalGlue());
             newNamePanel.add(newNameLabel);
             newNamePanel.add(Box.createHorizontalStrut(5));
             jd.add(newNamePanel);
-
+            
             JPanel jtPanel = new JPanel();
             jtPanel.setLayout(new BoxLayout(jtPanel, BoxLayout.Y_AXIS));
             JPanel containJt = new JPanel(new BorderLayout());
@@ -376,42 +401,46 @@ public class DesignerFrameFileDealerPane extends JPanel implements FileToolbarSt
             jtPanel.add(containJt);
             jtPanel.add(Box.createVerticalGlue());
             jd.add(jtPanel);
-
+            
             addUITextFieldListener(nodeFile, path);
-
+            
             hintsLabel = new UILabel();
             hintsLabel.setBounds(20, 50, 250, 30);
             hintsLabel.setMaximumSize(new Dimension(200, 30));
             hintsLabel.setHorizontalAlignment(SwingConstants.RIGHT);
             hintsLabel.setForeground(Color.RED);
             hintsLabel.setVisible(false);
-
+            
             confirmButton = new UIButton(Inter.getLocText("FR-Designer_Confirm"));
             confirmButton.setPreferredSize(new Dimension(80, 25));
             confirmButton.setMinimumSize(new Dimension(80, 25));
             confirmButton.setMaximumSize(new Dimension(80, 25));
             confirmButton.addActionListener(new ActionListener() {
+    
                 public void actionPerformed(ActionEvent e) {
+        
                     confirmClose(nodeFile, path);
                 }
             });
-
+            
             UIButton cancelButton = new UIButton(Inter.getLocText("FR-Designer_Cancel"));
             cancelButton.setPreferredSize(new Dimension(80, 25));
             cancelButton.setMinimumSize(new Dimension(80, 25));
             cancelButton.setMaximumSize(new Dimension(80, 25));
-
+            
             cancelButton.addActionListener(new ActionListener() {
+                
                 public void actionPerformed(ActionEvent e) {
+                    
                     jd.dispose();
                 }
             });
-
+            
             JPanel hintsPanel = new JPanel();
             hintsPanel.setLayout(new BorderLayout());
             hintsPanel.add(hintsLabel, BorderLayout.EAST);
             jd.add(hintsLabel);
-
+            
             JPanel btPanel = new JPanel(new BorderLayout());
             btPanel.setLayout(new BoxLayout(btPanel, BoxLayout.X_AXIS));
             btPanel.add(Box.createHorizontalGlue());
@@ -420,7 +449,7 @@ public class DesignerFrameFileDealerPane extends JPanel implements FileToolbarSt
             btPanel.add(cancelButton);
             btPanel.add(Box.createHorizontalStrut(20));
             jd.add(btPanel);
-
+            
             jd.setSize(380, 200);
             jd.setTitle(Inter.getLocText("FR-Designer_Rename"));
             jd.setResizable(false);
@@ -430,22 +459,24 @@ public class DesignerFrameFileDealerPane extends JPanel implements FileToolbarSt
             GUICoreUtils.centerWindow(jd);
             jd.setVisible(true);
         }
-
+        
         public void confirmClose(FileNodeFILE nodeFile, String path) {
+            
             userInput = userInput == null ? oldName : userInput;
             String oldPath = path.replaceAll("/", "\\\\");
             String newPath = path.replace(nodeFile.getName(), userInput + suffix);
             renameTemplateInMemory(nodeFile, userInput + suffix, oldName + suffix);
             DesignerEnvManager.getEnvManager().replaceRecentOpenedFilePath(oldPath, newPath.replaceAll("/", "\\\\"));
-
+            
             //模版重命名
             ResourceIOUtils.renameTo(path, newPath);
             selectedOperation.refresh();
             DesignerContext.getDesignerFrame().setTitle();
             jd.dispose();
         }
-
+        
         private void renameTemplateInMemory(FILE tplFile, String newName, String oldName) {
+            
             JTemplate<?, ?> dPane = getSpecialTemplateByFILE(tplFile);
             if (dPane == null) {
                 return;
@@ -453,20 +484,24 @@ public class DesignerFrameFileDealerPane extends JPanel implements FileToolbarSt
             FILE renameFile = dPane.getEditingFILE();
             renameFile.setPath(renameFile.getPath().replace(oldName, newName));
         }
-
+        
         // 增加enter以及esc快捷键的支持
         public void addUITextFieldListener(final FileNodeFILE nodeFile, final String path) {
-
+    
             jt.addKeyListener(new KeyAdapter() {
+        
                 public void keyPressed(KeyEvent e) {
+            
                     if (e.getKeyCode() == KeyEvent.VK_ESCAPE) {
                         jd.dispose();
                     }
                 }
             });
-
+    
             jt.addKeyListener(new KeyAdapter() {
+        
                 public void keyPressed(KeyEvent e) {
+            
                     if (e.getKeyCode() == KeyEvent.VK_ENTER) {
                         if (confirmButton.isEnabled()) {
                             confirmClose(nodeFile, path);
@@ -474,30 +509,35 @@ public class DesignerFrameFileDealerPane extends JPanel implements FileToolbarSt
                     }
                 }
             });
-
+    
         }
-
+        
         // UITextField的输入监听
         public DocumentListener getdoDocumentListener() {
+    
             DocumentListener dl = new DocumentListener() {
-
+        
                 public void changedUpdate(DocumentEvent e) {
+            
                     isNameAlreadyExist();
                 }
-
+        
                 public void insertUpdate(DocumentEvent e) {
+            
                     isNameAlreadyExist();
                 }
-
+        
                 public void removeUpdate(DocumentEvent e) {
+            
                     isNameAlreadyExist();
                 }
             };
-
+    
             return dl;
         }
-
+        
         private void isNameAlreadyExist() {
+            
             userInput = jt.getText().trim();
             if (selectedOperation.isNameAlreadyExist(userInput, oldName, suffix)) {
                 jt.selectAll();
@@ -511,12 +551,13 @@ public class DesignerFrameFileDealerPane extends JPanel implements FileToolbarSt
             }
         }
     }
-
+    
     /**
      * @param tplFile
      * @return 内存中的template重命名一下
      */
     private JTemplate<?, ?> getSpecialTemplateByFILE(FILE tplFile) {
+    
         HistoryTemplateListPane historyHandle = HistoryTemplateListPane.getInstance();
         if (ComparatorUtils.equals(historyHandle.getCurrentEditingTemplate().getEditingFILE(), tplFile)) {
             return historyHandle.getCurrentEditingTemplate();
@@ -528,5 +569,5 @@ public class DesignerFrameFileDealerPane extends JPanel implements FileToolbarSt
         }
         return null;
     }
-
+    
 }

designer-base/src/com/fr/design/mainframe/JTemplate.java

@@ -523,18 +523,18 @@ public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>>
         if (editingFILE == null) {
             return false;
         }
-        //检查一下连接是否成功
+//        //检查一下连接是否成功
-        try {
+//        try {
-            if (FRContext.getCommonOperator() != null && !FRContext.getCommonOperator().testServerConnectionWithOutShowMessagePane()) {
+//            if (FRContext.getCommonOperator() != null && !FRContext.getCommonOperator().testServerConnectionWithOutShowMessagePane()) {
-                //连接不成功，提示
+//                //连接不成功，提示
-                JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(),
+//                JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(),
-                        Inter.getLocText(new String[]{"server_disconnected", "template_unsaved"}, new String[]{",", "!"})
+//                        Inter.getLocText(new String[]{"server_disconnected", "template_unsaved"}, new String[]{",", "!"})
-                        , Inter.getLocText("FR-Designer_Error"), JOptionPane.ERROR_MESSAGE);
+//                        , Inter.getLocText("FR-Designer_Error"), JOptionPane.ERROR_MESSAGE);
-                return false;
+//                return false;
-            }
+//            }
-        } catch (Exception e) {
+//        } catch (Exception e) {
-            FineLoggerFactory.getLogger().error(e.getMessage());
+//            FineLoggerFactory.getLogger().error(e.getMessage());
-        }
+//        }
 
 
         // 检查一下editingFILE是不是已存在的文件,如果不存在则用saveAs

designer-base/src/com/fr/design/utils/DesignUtils.java

@@ -20,7 +20,6 @@ import com.fr.general.GeneralContext;
 import com.fr.general.Inter;
 import com.fr.general.http.HttpClient;
 import com.fr.log.FineLoggerFactory;
-import com.fr.security.JwtUtils;
 import com.fr.stable.ArrayUtils;
 import com.fr.stable.CodeUtils;
 import com.fr.stable.EncodeConstants;
@@ -47,7 +46,6 @@ import java.net.ServerSocket;
 import java.net.Socket;
 import java.net.URI;
 import java.net.URLEncoder;
-import java.util.Calendar;
 import java.util.Enumeration;
 import java.util.Locale;
 
@@ -302,16 +300,6 @@ public class DesignUtils {
     
         if (!WorkContext.getCurrent().isLocal()) {
             try {
-                if (Utils.isEmbeddedParameter(postfixOfUri)) {
-                    String time = Calendar.getInstance().getTime().toString().replaceAll(" ", "");
-//                    boolean isUserPrivilege = FRContext.getCommonOperator()).writePrivilegeMap(time, postfixOfUri);
-                    boolean isUserPrivilege = false;
-                    postfixOfUri = isUserPrivilege ? postfixOfUri + "&fr_check_url=" + time + "&id=" + FRContext.getCommonOperator().getUserID() : postfixOfUri;
-                }
-                // 加参数给远程设计校验权限。
-                String design = JwtUtils.createDefaultJWT(FRContext.getCommonOperator().getUser());
-                postfixOfUri = postfixOfUri + "&design=" + design;
-
                 String urlPath = getWebBrowserPath();
                 Desktop.getDesktop().browse(new URI(urlPath + postfixOfUri));
             } catch (Exception e) {