From a8792b475b850528cfba9ad6f78f6aaec426b9bd Mon Sep 17 00:00:00 2001 From: zhangmenghan Date: Mon, 15 Jul 2024 17:47:12 +0800 Subject: [PATCH 1/6] src/intellij_plugin/cmake2gn/gn_IntelliJ_plugin/src/com/sk/gn java Signed-off-by: zhangmenghan --- .../src/com/sk/gn/action/SelectBankAction.java | 2 +- .../src/com/sk/gn/action/SelectOriginCodeAction.java | 2 +- .../src/com/sk/gn/dialog/ConfirmDialog.java | 7 ++++--- .../src/com/sk/gn/dialog/ConfirmDialogPane.java | 2 +- .../src/com/sk/gn/dialog/ErrorDialog.java | 3 ++- .../src/com/sk/gn/dialog/GenDialogPane.java | 8 ++++---- .../src/com/sk/gn/dialog/GenGenerateDialog.java | 9 ++++----- .../src/com/sk/gn/dialog/GenResultDialog.java | 2 +- .../gn_IntelliJ_plugin/src/com/sk/gn/ng/GnDTS.java | 4 ++-- .../gn_IntelliJ_plugin/src/com/sk/gn/ng/GnMenuDTS.java | 6 +++--- .../gn_IntelliJ_plugin/src/com/sk/gn/utils/FileUtil.java | 2 +- .../src/com/sk/gn/utils/GenNotification.java | 4 ++-- 12 files changed, 26 insertions(+), 25 deletions(-) diff --git a/src/intellij_plugin/cmake2gn/gn_IntelliJ_plugin/src/com/sk/gn/action/SelectBankAction.java b/src/intellij_plugin/cmake2gn/gn_IntelliJ_plugin/src/com/sk/gn/action/SelectBankAction.java index ffa40a7c..7a237b4f 100644 --- a/src/intellij_plugin/cmake2gn/gn_IntelliJ_plugin/src/com/sk/gn/action/SelectBankAction.java +++ b/src/intellij_plugin/cmake2gn/gn_IntelliJ_plugin/src/com/sk/gn/action/SelectBankAction.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 Shenzhen Kaihong Digital Industry Development Co., Ltd. + * Copyright (c) 2024 Shenzhen Kaihong Digital Industry Development Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at diff --git a/src/intellij_plugin/cmake2gn/gn_IntelliJ_plugin/src/com/sk/gn/action/SelectOriginCodeAction.java b/src/intellij_plugin/cmake2gn/gn_IntelliJ_plugin/src/com/sk/gn/action/SelectOriginCodeAction.java index affb6276..61d153a8 100644 --- a/src/intellij_plugin/cmake2gn/gn_IntelliJ_plugin/src/com/sk/gn/action/SelectOriginCodeAction.java +++ b/src/intellij_plugin/cmake2gn/gn_IntelliJ_plugin/src/com/sk/gn/action/SelectOriginCodeAction.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 Shenzhen Kaihong Digital Industry Development Co., Ltd. + * Copyright (c) 2024 Shenzhen Kaihong Digital Industry Development Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at diff --git a/src/intellij_plugin/cmake2gn/gn_IntelliJ_plugin/src/com/sk/gn/dialog/ConfirmDialog.java b/src/intellij_plugin/cmake2gn/gn_IntelliJ_plugin/src/com/sk/gn/dialog/ConfirmDialog.java index a880debc..160b3f2b 100644 --- a/src/intellij_plugin/cmake2gn/gn_IntelliJ_plugin/src/com/sk/gn/dialog/ConfirmDialog.java +++ b/src/intellij_plugin/cmake2gn/gn_IntelliJ_plugin/src/com/sk/gn/dialog/ConfirmDialog.java @@ -1,11 +1,10 @@ /* - * Copyright (c) 2022 Guangzhou Digitalchina Information Technology Co., Ltd. - * All rights reserved. + * Copyright (c) 2024 Shenzhen Kaihong Digital Industry Development Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, @@ -13,6 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package com.sk.gn.dialog; import com.intellij.openapi.ui.DialogWrapper; @@ -32,6 +32,7 @@ public class ConfirmDialog extends DialogWrapper { /** * 构造函数 + * * @param message 弹出框信息内容 */ public ConfirmDialog(String message) { diff --git a/src/intellij_plugin/cmake2gn/gn_IntelliJ_plugin/src/com/sk/gn/dialog/ConfirmDialogPane.java b/src/intellij_plugin/cmake2gn/gn_IntelliJ_plugin/src/com/sk/gn/dialog/ConfirmDialogPane.java index f083c554..7052aab8 100644 --- a/src/intellij_plugin/cmake2gn/gn_IntelliJ_plugin/src/com/sk/gn/dialog/ConfirmDialogPane.java +++ b/src/intellij_plugin/cmake2gn/gn_IntelliJ_plugin/src/com/sk/gn/dialog/ConfirmDialogPane.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 Shenzhen Kaihong Digital Industry Development Co., Ltd. + * Copyright (c) 2024 Shenzhen Kaihong Digital Industry Development Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at diff --git a/src/intellij_plugin/cmake2gn/gn_IntelliJ_plugin/src/com/sk/gn/dialog/ErrorDialog.java b/src/intellij_plugin/cmake2gn/gn_IntelliJ_plugin/src/com/sk/gn/dialog/ErrorDialog.java index 589dfbb0..dc73ff79 100644 --- a/src/intellij_plugin/cmake2gn/gn_IntelliJ_plugin/src/com/sk/gn/dialog/ErrorDialog.java +++ b/src/intellij_plugin/cmake2gn/gn_IntelliJ_plugin/src/com/sk/gn/dialog/ErrorDialog.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 Shenzhen Kaihong Digital Industry Development Co., Ltd. + * Copyright (c) 2024 Shenzhen Kaihong Digital Industry Development Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -68,6 +68,7 @@ public class ErrorDialog extends JDialog { addWindowListener(new WindowAdapter() { /** * close dialog + * * @param windowEvent WindowEvent */ @Override diff --git a/src/intellij_plugin/cmake2gn/gn_IntelliJ_plugin/src/com/sk/gn/dialog/GenDialogPane.java b/src/intellij_plugin/cmake2gn/gn_IntelliJ_plugin/src/com/sk/gn/dialog/GenDialogPane.java index ddf1bd5c..7d9a65c0 100644 --- a/src/intellij_plugin/cmake2gn/gn_IntelliJ_plugin/src/com/sk/gn/dialog/GenDialogPane.java +++ b/src/intellij_plugin/cmake2gn/gn_IntelliJ_plugin/src/com/sk/gn/dialog/GenDialogPane.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 Shenzhen Kaihong Digital Industry Development Co., Ltd. + * Copyright (c) 2024 Shenzhen Kaihong Digital Industry Development Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -71,7 +71,7 @@ public class GenDialogPane extends JDialog implements SelectOutDirAction.SelectP private JButton selectTransplantButton; private JButton selectScriptButton; private JTextField subsystemTextField; - private JTextField test_partTextField; + private JTextField testPartTextField; private JTextField compileTextField; private JTextField inputScriptTextField; private JComboBox comboBox; @@ -256,7 +256,7 @@ public class GenDialogPane extends JDialog implements SelectOutDirAction.SelectP createCopyResMakeRawFile(); createCopyResToolChainFile(); GenNotification.notifyMessage(this.project, "", "正在生成", NotificationType.INFORMATION); - String command; + String command = ''; command = genCommand(); try { if (!TextUtils.isEmpty(command) && callExtProcess(command)) { @@ -424,7 +424,7 @@ public class GenDialogPane extends JDialog implements SelectOutDirAction.SelectP private void genResultLog(Process process) { BufferedReader stdInput = new BufferedReader(new InputStreamReader(process.getInputStream())); BufferedReader stdError = new BufferedReader(new InputStreamReader(process.getErrorStream())); - String sErr; + String sErr = ''; String sOut; sErr = getErrorResult(stdError); if (TextUtils.isEmpty(sErr)) { diff --git a/src/intellij_plugin/cmake2gn/gn_IntelliJ_plugin/src/com/sk/gn/dialog/GenGenerateDialog.java b/src/intellij_plugin/cmake2gn/gn_IntelliJ_plugin/src/com/sk/gn/dialog/GenGenerateDialog.java index 0429418b..3ade2fc0 100644 --- a/src/intellij_plugin/cmake2gn/gn_IntelliJ_plugin/src/com/sk/gn/dialog/GenGenerateDialog.java +++ b/src/intellij_plugin/cmake2gn/gn_IntelliJ_plugin/src/com/sk/gn/dialog/GenGenerateDialog.java @@ -1,11 +1,10 @@ /* - * Copyright (c) 2022 Guangzhou Digitalchina Information Technology Co., Ltd. - * All rights reserved. + * Copyright (c) 2024 Shenzhen Kaihong Digital Industry Development Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, @@ -109,9 +108,9 @@ public class GenGenerateDialog extends DialogWrapper { /** * 自定义 ok Action */ - protected class CustomOKAction extends DialogWrapperAction { + protected class CustomOkAction extends DialogWrapperAction { - protected CustomOKAction() { + protected CustomOkAction() { super("OK"); } diff --git a/src/intellij_plugin/cmake2gn/gn_IntelliJ_plugin/src/com/sk/gn/dialog/GenResultDialog.java b/src/intellij_plugin/cmake2gn/gn_IntelliJ_plugin/src/com/sk/gn/dialog/GenResultDialog.java index 42f8eecb..d9b594b9 100644 --- a/src/intellij_plugin/cmake2gn/gn_IntelliJ_plugin/src/com/sk/gn/dialog/GenResultDialog.java +++ b/src/intellij_plugin/cmake2gn/gn_IntelliJ_plugin/src/com/sk/gn/dialog/GenResultDialog.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 Shenzhen Kaihong Digital Industry Development Co., Ltd. + * Copyright (c) 2024 Shenzhen Kaihong Digital Industry Development Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at diff --git a/src/intellij_plugin/cmake2gn/gn_IntelliJ_plugin/src/com/sk/gn/ng/GnDTS.java b/src/intellij_plugin/cmake2gn/gn_IntelliJ_plugin/src/com/sk/gn/ng/GnDTS.java index ebd170b2..5d824dfd 100644 --- a/src/intellij_plugin/cmake2gn/gn_IntelliJ_plugin/src/com/sk/gn/ng/GnDTS.java +++ b/src/intellij_plugin/cmake2gn/gn_IntelliJ_plugin/src/com/sk/gn/ng/GnDTS.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 Shenzhen Kaihong Digital Industry Development Co., Ltd. + * Copyright (c) 2024 Shenzhen Kaihong Digital Industry Development Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -32,7 +32,7 @@ import com.sk.gn.utils.GenNotification; * @version: v1.0.0 * @since 2022-09-21 */ -public class GnDTS extends AnAction { +public class GnDts extends AnAction { @Override public void actionPerformed(AnActionEvent anActionEvent) { diff --git a/src/intellij_plugin/cmake2gn/gn_IntelliJ_plugin/src/com/sk/gn/ng/GnMenuDTS.java b/src/intellij_plugin/cmake2gn/gn_IntelliJ_plugin/src/com/sk/gn/ng/GnMenuDTS.java index 9e609d8f..729a78ea 100644 --- a/src/intellij_plugin/cmake2gn/gn_IntelliJ_plugin/src/com/sk/gn/ng/GnMenuDTS.java +++ b/src/intellij_plugin/cmake2gn/gn_IntelliJ_plugin/src/com/sk/gn/ng/GnMenuDTS.java @@ -1,10 +1,10 @@ /* - * Copyright (c) 2022 Guangzhou Digitalchina Information Technology Co., Ltd. + * Copyright (c) 2024 Shenzhen Kaihong Digital Industry Development Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, @@ -28,7 +28,7 @@ import org.jetbrains.annotations.NotNull; * @version: v1.0.0 * @since 2022-09-27 */ -public class GnMenuDTS extends AnAction { +public class GnMenuDts extends AnAction { @Override public void actionPerformed(@NotNull AnActionEvent anActionEvent) { diff --git a/src/intellij_plugin/cmake2gn/gn_IntelliJ_plugin/src/com/sk/gn/utils/FileUtil.java b/src/intellij_plugin/cmake2gn/gn_IntelliJ_plugin/src/com/sk/gn/utils/FileUtil.java index 8f771c19..66c86d11 100644 --- a/src/intellij_plugin/cmake2gn/gn_IntelliJ_plugin/src/com/sk/gn/utils/FileUtil.java +++ b/src/intellij_plugin/cmake2gn/gn_IntelliJ_plugin/src/com/sk/gn/utils/FileUtil.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 Shenzhen Kaihong Digital Industry Development Co., Ltd. + * Copyright (c) 2024 Shenzhen Kaihong Digital Industry Development Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at diff --git a/src/intellij_plugin/cmake2gn/gn_IntelliJ_plugin/src/com/sk/gn/utils/GenNotification.java b/src/intellij_plugin/cmake2gn/gn_IntelliJ_plugin/src/com/sk/gn/utils/GenNotification.java index 5281519d..53618a1c 100644 --- a/src/intellij_plugin/cmake2gn/gn_IntelliJ_plugin/src/com/sk/gn/utils/GenNotification.java +++ b/src/intellij_plugin/cmake2gn/gn_IntelliJ_plugin/src/com/sk/gn/utils/GenNotification.java @@ -1,10 +1,10 @@ /* - * Copyright (c) 2022 Guangzhou Digitalchina Information Technology Co., Ltd. + * Copyright (c) 2024 Shenzhen Kaihong Digital Industry Development Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, -- Gitee From 46f4e7255b1faad2e27713566de7bbb540b2787c Mon Sep 17 00:00:00 2001 From: zhangmenghan Date: Mon, 15 Jul 2024 17:51:12 +0800 Subject: [PATCH 2/6] src/intellij_plugin/dts2cpp/napi_IntelliJ_plugin/src/com/sk/action/ java Signed-off-by: zhangmenghan --- .../src/com/sk/action/BrowseAction.java | 2 +- .../src/com/sk/action/GenAction.java | 2 +- .../src/com/sk/action/ScriptAction.java | 26 ++++++++--------- .../src/com/sk/action/SelectCppAction.java | 28 ++++++++++--------- 4 files changed, 30 insertions(+), 28 deletions(-) diff --git a/src/intellij_plugin/dts2cpp/napi_IntelliJ_plugin/src/com/sk/action/BrowseAction.java b/src/intellij_plugin/dts2cpp/napi_IntelliJ_plugin/src/com/sk/action/BrowseAction.java index d32bb01a..abe0524d 100644 --- a/src/intellij_plugin/dts2cpp/napi_IntelliJ_plugin/src/com/sk/action/BrowseAction.java +++ b/src/intellij_plugin/dts2cpp/napi_IntelliJ_plugin/src/com/sk/action/BrowseAction.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 Shenzhen Kaihong Digital Industry Development Co., Ltd. + * Copyright (c) 2024 Shenzhen Kaihong Digital Industry Development Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at diff --git a/src/intellij_plugin/dts2cpp/napi_IntelliJ_plugin/src/com/sk/action/GenAction.java b/src/intellij_plugin/dts2cpp/napi_IntelliJ_plugin/src/com/sk/action/GenAction.java index 5865428b..5aedf22e 100644 --- a/src/intellij_plugin/dts2cpp/napi_IntelliJ_plugin/src/com/sk/action/GenAction.java +++ b/src/intellij_plugin/dts2cpp/napi_IntelliJ_plugin/src/com/sk/action/GenAction.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 Shenzhen Kaihong Digital Industry Development Co., Ltd. + * Copyright (c) 2024 Shenzhen Kaihong Digital Industry Development Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at diff --git a/src/intellij_plugin/dts2cpp/napi_IntelliJ_plugin/src/com/sk/action/ScriptAction.java b/src/intellij_plugin/dts2cpp/napi_IntelliJ_plugin/src/com/sk/action/ScriptAction.java index f549b152..baff49b2 100644 --- a/src/intellij_plugin/dts2cpp/napi_IntelliJ_plugin/src/com/sk/action/ScriptAction.java +++ b/src/intellij_plugin/dts2cpp/napi_IntelliJ_plugin/src/com/sk/action/ScriptAction.java @@ -1,17 +1,17 @@ /* - * Copyright (c) 2022 Shenzhen Kaihong Digital Industry Development Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +* Copyright (c) 2024 Shenzhen Kaihong Digital Industry Development Co., Ltd. +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ package com.sk.action; import javax.swing.JButton; diff --git a/src/intellij_plugin/dts2cpp/napi_IntelliJ_plugin/src/com/sk/action/SelectCppAction.java b/src/intellij_plugin/dts2cpp/napi_IntelliJ_plugin/src/com/sk/action/SelectCppAction.java index e1b713cd..8ab96cc9 100644 --- a/src/intellij_plugin/dts2cpp/napi_IntelliJ_plugin/src/com/sk/action/SelectCppAction.java +++ b/src/intellij_plugin/dts2cpp/napi_IntelliJ_plugin/src/com/sk/action/SelectCppAction.java @@ -1,17 +1,17 @@ /* - * Copyright (c) 2022 Shenzhen Kaihong Digital Industry Development Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +* Copyright (c) 2024 Shenzhen Kaihong Digital Industry Development Co., Ltd. +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ package com.sk.action; import javax.swing.JButton; @@ -38,6 +38,7 @@ public class SelectCppAction implements ActionListener { /** * 构造函数 + * * @param button .cpp文件选择按钮 * @param textField .cpp文件文本选择框 * @param genPath 生成框架路径 @@ -51,6 +52,7 @@ public class SelectCppAction implements ActionListener { /** * 按钮监听函数 + * * @param actionEvent .cpp文件选择事件 * @throws log 输出异常 */ -- Gitee From 8ba1ace4ecb9120ed5dd2e163bdb3fb45225a1bc Mon Sep 17 00:00:00 2001 From: zhangmenghan Date: Mon, 15 Jul 2024 20:53:42 +0800 Subject: [PATCH 3/6] modified dts2cpp Signed-off-by: zhangmenghan --- .../src/com/sk/action/ScriptAction.java | 26 +++++++++---------- .../src/com/sk/action/SelectCppAction.java | 26 +++++++++---------- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/src/intellij_plugin/dts2cpp/napi_IntelliJ_plugin/src/com/sk/action/ScriptAction.java b/src/intellij_plugin/dts2cpp/napi_IntelliJ_plugin/src/com/sk/action/ScriptAction.java index baff49b2..5e7dcea9 100644 --- a/src/intellij_plugin/dts2cpp/napi_IntelliJ_plugin/src/com/sk/action/ScriptAction.java +++ b/src/intellij_plugin/dts2cpp/napi_IntelliJ_plugin/src/com/sk/action/ScriptAction.java @@ -1,17 +1,17 @@ /* -* Copyright (c) 2024 Shenzhen Kaihong Digital Industry Development Co., Ltd. -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ + * Copyright (c) 2024 Shenzhen Kaihong Digital Industry Development Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package com.sk.action; import javax.swing.JButton; diff --git a/src/intellij_plugin/dts2cpp/napi_IntelliJ_plugin/src/com/sk/action/SelectCppAction.java b/src/intellij_plugin/dts2cpp/napi_IntelliJ_plugin/src/com/sk/action/SelectCppAction.java index 8ab96cc9..1cc6ac64 100644 --- a/src/intellij_plugin/dts2cpp/napi_IntelliJ_plugin/src/com/sk/action/SelectCppAction.java +++ b/src/intellij_plugin/dts2cpp/napi_IntelliJ_plugin/src/com/sk/action/SelectCppAction.java @@ -1,17 +1,17 @@ /* -* Copyright (c) 2024 Shenzhen Kaihong Digital Industry Development Co., Ltd. -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ + * Copyright (c) 2024 Shenzhen Kaihong Digital Industry Development Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package com.sk.action; import javax.swing.JButton; -- Gitee From 73ebd228024472c704df51d73964d7ec5fe6deb0 Mon Sep 17 00:00:00 2001 From: zhangmenghan Date: Tue, 16 Jul 2024 09:27:26 +0800 Subject: [PATCH 4/6] cmake2n_codecheck Signed-off-by: zhangmenghan --- .../gn_IntelliJ_plugin/src/com/sk/gn/dialog/ConfirmDialog.java | 2 +- .../gn_IntelliJ_plugin/src/com/sk/gn/dialog/ErrorDialog.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/intellij_plugin/cmake2gn/gn_IntelliJ_plugin/src/com/sk/gn/dialog/ConfirmDialog.java b/src/intellij_plugin/cmake2gn/gn_IntelliJ_plugin/src/com/sk/gn/dialog/ConfirmDialog.java index 160b3f2b..515f8302 100644 --- a/src/intellij_plugin/cmake2gn/gn_IntelliJ_plugin/src/com/sk/gn/dialog/ConfirmDialog.java +++ b/src/intellij_plugin/cmake2gn/gn_IntelliJ_plugin/src/com/sk/gn/dialog/ConfirmDialog.java @@ -32,7 +32,7 @@ public class ConfirmDialog extends DialogWrapper { /** * 构造函数 - * + * * @param message 弹出框信息内容 */ public ConfirmDialog(String message) { diff --git a/src/intellij_plugin/cmake2gn/gn_IntelliJ_plugin/src/com/sk/gn/dialog/ErrorDialog.java b/src/intellij_plugin/cmake2gn/gn_IntelliJ_plugin/src/com/sk/gn/dialog/ErrorDialog.java index dc73ff79..9dc1d02b 100644 --- a/src/intellij_plugin/cmake2gn/gn_IntelliJ_plugin/src/com/sk/gn/dialog/ErrorDialog.java +++ b/src/intellij_plugin/cmake2gn/gn_IntelliJ_plugin/src/com/sk/gn/dialog/ErrorDialog.java @@ -68,7 +68,7 @@ public class ErrorDialog extends JDialog { addWindowListener(new WindowAdapter() { /** * close dialog - * + * * @param windowEvent WindowEvent */ @Override -- Gitee From dd17251723fe5472d3d6a0549ec8fed5ec2c5a7e Mon Sep 17 00:00:00 2001 From: zhangmenghan Date: Tue, 16 Jul 2024 09:46:14 +0800 Subject: [PATCH 5/6] codecheck Signed-off-by: zhangmenghan --- .../napi_IntelliJ_plugin/src/com/sk/action/SelectCppAction.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/intellij_plugin/dts2cpp/napi_IntelliJ_plugin/src/com/sk/action/SelectCppAction.java b/src/intellij_plugin/dts2cpp/napi_IntelliJ_plugin/src/com/sk/action/SelectCppAction.java index 1cc6ac64..e811d2fe 100644 --- a/src/intellij_plugin/dts2cpp/napi_IntelliJ_plugin/src/com/sk/action/SelectCppAction.java +++ b/src/intellij_plugin/dts2cpp/napi_IntelliJ_plugin/src/com/sk/action/SelectCppAction.java @@ -52,7 +52,7 @@ public class SelectCppAction implements ActionListener { /** * 按钮监听函数 - * + * * @param actionEvent .cpp文件选择事件 * @throws log 输出异常 */ -- Gitee From bebb92931c762a8cbb5fb1d483324dc1a58014dc Mon Sep 17 00:00:00 2001 From: zhangmenghan Date: Tue, 16 Jul 2024 09:56:45 +0800 Subject: [PATCH 6/6] codecheck Signed-off-by: zhangmenghan --- .../napi_IntelliJ_plugin/src/com/sk/action/SelectCppAction.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/intellij_plugin/dts2cpp/napi_IntelliJ_plugin/src/com/sk/action/SelectCppAction.java b/src/intellij_plugin/dts2cpp/napi_IntelliJ_plugin/src/com/sk/action/SelectCppAction.java index e811d2fe..6465999f 100644 --- a/src/intellij_plugin/dts2cpp/napi_IntelliJ_plugin/src/com/sk/action/SelectCppAction.java +++ b/src/intellij_plugin/dts2cpp/napi_IntelliJ_plugin/src/com/sk/action/SelectCppAction.java @@ -38,7 +38,7 @@ public class SelectCppAction implements ActionListener { /** * 构造函数 - * + * * @param button .cpp文件选择按钮 * @param textField .cpp文件文本选择框 * @param genPath 生成框架路径 -- Gitee