From f2167af5b0914dae4e7f3f1ca1727237b2dd0552 Mon Sep 17 00:00:00 2001
From: vito <vito@fanruan.com>
Date: Thu, 26 Dec 2024 17:36:51 +0800
Subject: [PATCH] =?UTF-8?q?Revert=20"REPORT-145379=20=E8=BF=9C=E7=A8=8B?=
 =?UTF-8?q?=E8=AE=BE=E8=AE=A1=E8=B0=83=E8=AF=95=E5=B7=A5=E5=85=B7=E9=80=82?=
 =?UTF-8?q?=E9=85=8Dgzip"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit b8fbc434ebb44a2edf05dfed8084126da94a4811.
---
 .../remote/RemoteDesignNetWorkAction.java     |  7 +++++
 .../remote/RemoteDesignNetWorkTablePane.java  | 28 +------------------
 .../fr/design/file/MultiTemplateTabPane.java  |  3 +-
 3 files changed, 10 insertions(+), 28 deletions(-)

diff --git a/designer-base/src/main/java/com/fr/design/debug/remote/RemoteDesignNetWorkAction.java b/designer-base/src/main/java/com/fr/design/debug/remote/RemoteDesignNetWorkAction.java
index 86adbc93a9..15c2900e75 100644
--- a/designer-base/src/main/java/com/fr/design/debug/remote/RemoteDesignNetWorkAction.java
+++ b/designer-base/src/main/java/com/fr/design/debug/remote/RemoteDesignNetWorkAction.java
@@ -2,8 +2,10 @@ package com.fr.design.debug.remote;
 
 import com.fine.theme.utils.FineUIUtils;
 import com.fr.design.actions.UpdateAction;
+import com.fr.design.dialog.FineJOptionPane;
 import com.fr.design.mainframe.DesignerContext;
 import com.fr.design.utils.gui.GUICoreUtils;
+import com.fr.workspace.WorkContext;
 
 import javax.swing.JDialog;
 import javax.swing.KeyStroke;
@@ -31,6 +33,11 @@ public class RemoteDesignNetWorkAction extends UpdateAction {
 
     @Override
     public void actionPerformed(ActionEvent e) {
+        if (WorkContext.getCurrent().isLocal()) {
+            FineJOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(),
+                    "Remote Design NetWork can't show on local environment.");
+            return;
+        }
         JDialog jDialog = new JDialog(DesignerContext.getDesignerFrame(), TITLE);
         jDialog.setSize(FineUIUtils.calPaneDimensionByContext(0.8, 0.6));
         RemoteDesignNetWorkTablePane netWorkPane = new RemoteDesignNetWorkTablePane();
diff --git a/designer-base/src/main/java/com/fr/design/debug/remote/RemoteDesignNetWorkTablePane.java b/designer-base/src/main/java/com/fr/design/debug/remote/RemoteDesignNetWorkTablePane.java
index 101ea19aff..5569919560 100644
--- a/designer-base/src/main/java/com/fr/design/debug/remote/RemoteDesignNetWorkTablePane.java
+++ b/designer-base/src/main/java/com/fr/design/debug/remote/RemoteDesignNetWorkTablePane.java
@@ -5,15 +5,11 @@ import com.fine.theme.icon.LazyIcon;
 import com.formdev.flatlaf.util.ScaledEmptyBorder;
 import com.fr.design.gui.ibutton.UIButton;
 import com.fr.design.gui.ibutton.UIToggleButton;
-import com.fr.design.ui.util.UIUtil;
 import com.fr.event.Event;
 import com.fr.event.EventDispatcher;
 import com.fr.event.Listener;
 import com.fr.workspace.WorkContext;
-import com.fr.workspace.Workspace;
-import com.fr.workspace.WorkspaceEvent;
 
-import javax.swing.JLabel;
 import javax.swing.JPanel;
 import javax.swing.JScrollPane;
 import javax.swing.JTable;
@@ -24,7 +20,6 @@ import javax.swing.table.DefaultTableModel;
 import javax.swing.table.TableCellRenderer;
 import javax.swing.table.TableColumn;
 import java.awt.BorderLayout;
-import java.awt.Color;
 import java.awt.Component;
 import java.util.concurrent.atomic.AtomicLong;
 
@@ -54,8 +49,7 @@ public class RemoteDesignNetWorkTablePane extends JPanel {
                 model.addRow(new Object[]{
                         count.incrementAndGet(),
                         dateFormat(requestInfo.getDate()),
-                        requestInfo.getHttpMethod() + "  "
-                                + requestInfo.getPath().substring(WorkContext.getCurrent().getPath().length() - 1),
+                        requestInfo.getPath().substring(WorkContext.getCurrent().getPath().length() - 1),
                         requestInfo.getStatus(),
                         simpleTime(requestInfo.getConsume()),
                         simpleSize(requestInfo.getRequestSize()),
@@ -131,29 +125,9 @@ public class RemoteDesignNetWorkTablePane extends JPanel {
         jToolBar.add(forbid);
         jToolBar.add(remove);
         jToolBar.add(refresh);
-        tip(jToolBar);
         add(jToolBar, BorderLayout.NORTH);
     }
 
-    private void tip(JToolBar jToolBar) {
-        JLabel jLabel = new JLabel();
-        jLabel.setForeground(Color.ORANGE);
-        jToolBar.addSeparator();
-        jToolBar.add(jLabel);
-        setTipIfNeed(jLabel);
-        EventDispatcher.listen(WorkspaceEvent.AfterSwitch, new Listener<Workspace>() {
-            @Override
-            public void on(Event event, Workspace workspace) {
-                setTipIfNeed(jLabel);
-            }
-        });
-    }
-
-    private static void setTipIfNeed(JLabel jLabel) {
-        UIUtil.invokeLaterIfNeeded(() -> jLabel.setText(
-                WorkContext.getCurrent().isLocal() ? "Remote Design NetWork can't show on local environment." : ""));
-    }
-
     /**
      * 清理监听
      */
diff --git a/designer-base/src/main/java/com/fr/design/file/MultiTemplateTabPane.java b/designer-base/src/main/java/com/fr/design/file/MultiTemplateTabPane.java
index a7eeb3ba53..dc70031db6 100644
--- a/designer-base/src/main/java/com/fr/design/file/MultiTemplateTabPane.java
+++ b/designer-base/src/main/java/com/fr/design/file/MultiTemplateTabPane.java
@@ -776,7 +776,8 @@ public class MultiTemplateTabPane extends Row {
             // 双击添加模板
             if (e.getClickCount() == DOUBLE_CLICK
                     && isOverBlank(e.getX())
-                    && newTemplateAction != null) {
+                    && newTemplateAction != null
+            ) {
                 newTemplateAction.actionPerformed(null);
             }
         }