Merge pull request #1027 in DESIGN/design from ~ZACK/design:feature/10.0 to feature/10.0

* commit 'a5bb0bf8cd3693e0e9bfd4cae579ba01f9b4c625': 删掉sdk 冲突
5 years ago · c3ecab7af4
7 changed files with 100 additions and 203 deletions
--- a/designer-base/src/main/java/com/fr/design/update/ui/dialog/UpdateMainDialog.java
+++ b/designer-base/src/main/java/com/fr/design/update/ui/dialog/UpdateMainDialog.java
@ -35,6 +35,7 @@ import com.fr.json.JSONArray;
 import com.fr.json.JSONObject;
 import com.fr.log.FineLoggerFactory;
 import com.fr.stable.ArrayUtils;
+import com.fr.stable.EncodeConstants;
 import com.fr.stable.ProductConstants;
 import com.fr.stable.StableUtils;
 import com.fr.stable.StringUtils;
@ -513,16 +514,15 @@ public class UpdateMainDialog extends UIDialog {
        if (endTime.equals(lastUpdateCacheTime) || jsonArray.length() == 0 || ComparatorUtils.compare(endTime, lastUpdateCacheTime) <= 0) {
            return;
        }
-        OutputStreamWriter writerStream = new OutputStreamWriter(new FileOutputStream(cacheFile), "UTF-8");
-        BufferedWriter bufferWriter = new BufferedWriter(writerStream);
+        try (OutputStreamWriter writerStream = new OutputStreamWriter(new FileOutputStream(cacheFile), EncodeConstants.ENCODING_UTF_8);
+             BufferedWriter bufferWriter = new BufferedWriter(writerStream)) {
            for (int i = 0; i < jsonArray.length(); i++) {
                JSONObject jo = (JSONObject) jsonArray.get(i);
                bufferWriter.write((String) jo.get("update") + '\t' + jo.get("title"));
                bufferWriter.newLine();
                bufferWriter.flush();
            }
-        bufferWriter.close();
-        writerStream.close();
+        }
        lastUpdateCacheState = UPDATE_CACHE_STATE_SUCCESS;
        lastUpdateCacheTime = endTime;
        cacheProperty.updateProperty("updateTime", lastUpdateCacheTime);
@ -634,6 +634,7 @@ public class UpdateMainDialog extends UIDialog {

    /**
     * 获取当前jar的md5
+     *
     * @param currentJAR
     * @return
     */
--- a/designer-base/src/main/java/com/fr/design/utils/DesignUtils.java
+++ b/designer-base/src/main/java/com/fr/design/utils/DesignUtils.java
@ -67,8 +67,7 @@ public class DesignUtils {
     * @return 启动了返回true
     */
    public static boolean isStarted() {
-        try {
-            new Socket("localhost", port);
+        try (Socket socket = new Socket("localhost", port)) {
            return true;
        } catch (Exception ignored) {
        }
@ -116,6 +115,7 @@ public class DesignUtils {
     * @param startPort 端口
     * @param suffixs   文件后缀
     */
+    @SuppressWarnings("squid:S2095")
    public static void createListeningServer(final int startPort, final String[] suffixs) {
        ExecutorService service = Executors.newSingleThreadExecutor(new NamedThreadFactory("DesignClientListener"));
        service.execute(new Runnable() {
--- a/designer-chart/src/main/java/com/fr/van/chart/DownloadOnlineSourcesHelper.java
+++ b/designer-chart/src/main/java/com/fr/van/chart/DownloadOnlineSourcesHelper.java
@ -86,12 +86,14 @@ public class DownloadOnlineSourcesHelper implements DownloadSourcesEvent {
            initDialog();

            dialog.addWindowListener(new WindowAdapter() {
+                @Override
                public void windowClosing(WindowEvent e) {
                    //取消下载
                    result = false;
                    exitDialog();
                }

+                @Override
                public void windowOpened(WindowEvent e) {
                    downloadAndInstallPluginDependenceFile();
                    exitDialog();
@ -119,11 +121,11 @@ public class DownloadOnlineSourcesHelper implements DownloadSourcesEvent {

                httpClient = new HttpClient(CloudCenter.getInstance().acquireUrlByKind(siteInfo.siteKind));
                if (httpClient.getResponseCode() == HttpURLConnection.HTTP_OK) {
-                    InputStream reader = httpClient.getResponseStream();
                    String temp = StableUtils.pathJoin(PluginConstants.DOWNLOAD_PATH, PluginConstants.TEMP_FILE);
                    File file = new File(temp);
                    StableUtils.makesureFileExist(file);
-                    FileOutputStream writer = new FileOutputStream(temp);
+                    try (InputStream reader = httpClient.getResponseStream();
+                         FileOutputStream writer = new FileOutputStream(temp)) {
                        byte[] buffer = new byte[PluginConstants.BYTES_NUM];
                        int bytesRead;
                        while ((bytesRead = reader.read(buffer)) > 0 && result) {
@ -133,11 +135,8 @@ public class DownloadOnlineSourcesHelper implements DownloadSourcesEvent {
                            currentBytesRead += bytesRead;
                            setProgress(currentBytesRead);
                        }
-                    reader.close();
                        writer.flush();
-                    writer.close();
-
-
+                    }
                    if (result) {
                        //安装文件
                        IOUtils.unZipFilesGBK(temp, StableUtils.pathJoin(WorkContext.getCurrent().getPath(), siteInfo.localDir));
--- a/designer-realize/src/main/java/com/fr/design/mainframe/InformationCollector.java
+++ b/designer-realize/src/main/java/com/fr/design/mainframe/InformationCollector.java
@ -54,7 +54,6 @@ import java.util.concurrent.TimeUnit;

 /**
 * @author neil
- *
 * @date: 2015-4-8-下午5:11:46
 */
 public class InformationCollector implements XMLReadable, XMLWriter {
@ -253,24 +252,14 @@ public class InformationCollector implements XMLReadable, XMLWriter {
 	 * 将文件内容写到输出流中
 	 */
 	private static void writeEncodeContentToFile(String fileContent, File file) {
-		BufferedWriter bw = null;
-		try {
-			FileOutputStream fos = new FileOutputStream(file);
+		try (FileOutputStream fos = new FileOutputStream(file);
 			 OutputStreamWriter osw = new OutputStreamWriter(fos, EncodeConstants.ENCODING_UTF_8);
-			bw = new BufferedWriter(osw);
+			 BufferedWriter bw = new BufferedWriter(osw)) {
 			bw.write(fileContent);
 		} catch (Exception e) {
 			FineLoggerFactory.getLogger().error(e.getMessage(), e);
-		} finally {
-			if(bw != null){
-				try {
-					bw.close();
-				} catch (IOException e) {
 		}
 	}
-		}
-
-	}

 	@Override
 	public void writeXML(XMLPrintWriter writer) {
--- a/designer-sdk/pom.xml
+++ b/designer-sdk/pom.xml
@ -17,10 +17,5 @@
            <artifactId>designer-realize</artifactId>
            <version>10.0</version>
        </dependency>
-        <dependency>
-            <groupId>com.fr.report</groupId>
-            <artifactId>sdk-base</artifactId>
-            <version>10.0</version>
-        </dependency>
    </dependencies>
 </project>
--- a/designer-sdk/src/main/java/com/fr/sdk/designer/FineDesignUtils.java
+++ b/designer-sdk/src/main/java/com/fr/sdk/designer/FineDesignUtils.java
@ -1,80 +0,0 @@
-//package com.fr.sdk.designer;
-//
-//import com.fr.config.activator.ConfigurationActivator;
-//import com.fr.design.env.DesignerWorkspaceGenerator;
-//import com.fr.design.env.RemoteDesignerWorkspaceInfo;
-//import com.fr.log.FineLoggerFactory;
-//import com.fr.module.Activator;
-//import com.fr.module.Module;
-//import com.fr.module.tool.ActivatorToolBox;
-//import com.fr.report.ReportActivator;
-//import com.fr.report.RestrictionActivator;
-//import com.fr.report.module.ReportBaseActivator;
-//import com.fr.scheduler.SchedulerActivator;
-//import com.fr.sdk.server.shell.ModuleShell;
-//import com.fr.serialization.SerializationActivator;
-//import com.fr.stable.StringUtils;
-//import com.fr.startup.WorkspaceRegister;
-//import com.fr.store.StateServerActivator;
-//import com.fr.workspace.WorkContext;
-//import com.fr.workspace.connect.WorkspaceConnectionInfo;
-//import com.fr.workspace.engine.WorkspaceActivator;
-//import com.fr.workspace.server.ServerWorkspaceRegister;
-//
-///**
-// * 设计器SDK模块工具类，用来放一些设计器相关插件开发过程中常用的工具函数
-// */
-//public class FineDesignUtils {
-//
-//    /**
-//     * 创建一个连接远程服务器的模块
-//     * @param remoteUrl 远程服务器地址
-//     * @param username 用户名
-//     * @param password 密码
-//     * @return 模块代理对象 使用ModuleShell的start和stop控制模块启停
-//     */
-//    public static ModuleShell createRemoteServerModule(String remoteUrl, String username, String password) {
-//        return createRemoteServerModule(remoteUrl, username, password, StringUtils.EMPTY, StringUtils.EMPTY);
-//    }
-//
-//    /**
-//     * 创建一个连接远程服务器的模块
-//     * @param remoteUrl 远程服务器地址
-//     * @param username 用户名
-//     * @param password 密码
-//     * @param certPath https证书路径
-//     * @param certSecretKey 证书秘钥
-//     * @return 模块代理对象 使用ModuleShell的start和stop控制模块启停
-//     */
-//    public static ModuleShell createRemoteServerModule(final String remoteUrl, final String username, final String password, final String certPath, final String certSecretKey) {
-//        Module module = ActivatorToolBox.simpleLink(
-//                new WorkspaceActivator(),
-//                new SerializationActivator(),
-//                new Activator() {
-//                    @Override
-//                    public void start() {
-//                        WorkspaceConnectionInfo connectionInfo = new WorkspaceConnectionInfo(remoteUrl, username, password, certPath, certSecretKey);
-//                        try {
-//                            WorkContext.switchTo(DesignerWorkspaceGenerator.generate(RemoteDesignerWorkspaceInfo.create(connectionInfo)));
-//                        } catch (Exception e) {
-//                            FineLoggerFactory.getLogger().error(e.getMessage(),e);
-//                        }
-//                    }
-//
-//                    @Override
-//                    public void stop() {
-//
-//                    }
-//                },
-//                new ConfigurationActivator(),
-//                new StateServerActivator(),
-//                new SchedulerActivator(),
-//                new ReportBaseActivator(),
-//                new RestrictionActivator(),
-//                new ReportActivator(),
-//                new WorkspaceRegister(),
-//                new ServerWorkspaceRegister()
-//        );
-//        return new ModuleShell(module);
-//    }
-//}
--- a/designer-sdk/src/test/java/com/fr/sdk/FineDesignUtilsTest.java
+++ b/designer-sdk/src/test/java/com/fr/sdk/FineDesignUtilsTest.java
@ -1,7 +0,0 @@
-package com.fr.sdk;
-
-import junit.framework.TestCase;
-
-public class FineDesignUtilsTest extends TestCase {
-
-}