修改数据结构和保存逻辑删除 save button

Author: longforus

objectbox-models/default.json

@@ -5,7 +5,7 @@
   "entities": [
     {
       "id": "1:9070185516669921501",
-      "lastPropertyId": "6:5499539181800737854",
+      "lastPropertyId": "8:1187463951019417804",
       "name": "ApiBean",
       "properties": [
         {
@@ -18,20 +18,24 @@
         },
         {
           "id": "3:8086421898222647303",
-          "indexId": "1:4855703933356883490",
           "name": "url"
         },
-        {
-          "id": "4:5827927612626697138",
-          "name": "parameMap"
-        },
         {
           "id": "5:8038266698557329938",
           "name": "encryptType"
         },
         {
           "id": "6:5499539181800737854",
+          "indexId": "4:8865588299107533145",
           "name": "projectId"
+        },
+        {
+          "id": "7:9042463734489530509",
+          "name": "paramsMap"
+        },
+        {
+          "id": "8:1187463951019417804",
+          "name": "createDate"
         }
       ],
       "relations": []
@@ -59,16 +63,19 @@
     }
   ],
   "lastEntityId": "2:7225886512415135978",
-  "lastIndexId": "3:1701380745400854523",
+  "lastIndexId": "4:8865588299107533145",
   "lastRelationId": "0:0",
   "lastSequenceId": "0:0",
   "modelVersion": 4,
   "modelVersionParserMinimum": 4,
   "retiredEntityUids": [],
   "retiredIndexUids": [
-    4865196870853324190
+    4865196870853324190,
+    4855703933356883490
+  ],
+  "retiredPropertyUids": [
+    5827927612626697138
   ],
-  "retiredPropertyUids": [],
   "retiredRelationUids": [],
   "version": 1
 }

src/main/java/com/longforus/apidebugger/ui/MainPanel.form

@@ -188,34 +188,7 @@
           <preferredSize width="78" height="78"/>
           <requestFocusEnabled value="false"/>
           <text value=""/>
-        </properties>
-      </component>
-      <component id="e47f" class="javax.swing.JButton" binding="btnDelApi">
-        <constraints>
-          <grid row="4" column="8" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
-          <forms/>
-        </constraints>
-        <properties>
-          <text value="Delete"/>
-        </properties>
-      </component>
-      <component id="bbb13" class="javax.swing.JButton" binding="mBtnNewApi">
-        <constraints>
-          <grid row="3" column="8" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
-          <forms/>
-        </constraints>
-        <properties>
-          <text value="Copy New"/>
-        </properties>
-      </component>
-      <component id="80e6b" class="javax.swing.JButton" binding="mbtnDp">
-        <constraints>
-          <grid row="4" column="4" row-span="1" col-span="3" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
-          <forms/>
-        </constraints>
-        <properties>
-          <text value=" Default Parameter"/>
-          <toolTipText value=" Set Current Project Default Parameter"/>
+          <toolTipText value="Send"/>
         </properties>
       </component>
       <grid id="69c35" layout-manager="GridLayoutManager" row-count="1" column-count="3" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
@@ -264,6 +237,25 @@
           <forms/>
         </constraints>
       </component>
+      <component id="e47f" class="javax.swing.JButton" binding="btnDelApi">
+        <constraints>
+          <grid row="3" column="8" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
+          <forms/>
+        </constraints>
+        <properties>
+          <text value="Delete"/>
+        </properties>
+      </component>
+      <component id="80e6b" class="javax.swing.JButton" binding="mbtnDp">
+        <constraints>
+          <grid row="4" column="6" row-span="1" col-span="3" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
+          <forms/>
+        </constraints>
+        <properties>
+          <text value=" Default Parameter"/>
+          <toolTipText value=" Set Current Project Default Parameter"/>
+        </properties>
+      </component>
     </children>
   </grid>
 </form>

src/main/java/com/longforus/apidebugger/ui/MainPanel.java

@@ -12,6 +12,7 @@
 import com.teamdev.jxbrowser.chromium.Browser;
 import com.teamdev.jxbrowser.chromium.BrowserContext;
 import com.teamdev.jxbrowser.chromium.BrowserException;
+import com.teamdev.jxbrowser.chromium.JSFunction;
 import com.teamdev.jxbrowser.chromium.JSValue;
 import com.teamdev.jxbrowser.chromium.ProtocolService;
 import com.teamdev.jxbrowser.chromium.URLResponse;
@@ -50,7 +51,6 @@
 import javax.swing.JTextField;
 import javax.swing.JTextPane;
 import javax.swing.SizeRequirements;
-import javax.swing.border.Border;
 import javax.swing.event.MouseInputAdapter;
 import javax.swing.text.Element;
 import javax.swing.text.View;
@@ -73,7 +73,6 @@ public class MainPanel extends JFrame {
     private JComboBox mCbEncrypt;
     private JTable mTbParams;
     private JTextPane mTpInfo;
-    private JButton mBtnNewApi;
     private JLabel lbStatus;
     private JPanel baseP;
     private JButton btnDelUrl;
@@ -229,15 +228,13 @@ private void initEvent() {
                 }
             }
         });
-        mBtnNewApi.addActionListener(e -> UIActionHandler.INSTANCE.onNewApi());
         mBtnSend.addActionListener(e -> UIActionHandler.INSTANCE.onSend());
         btnClear.addActionListener(e -> UIActionHandler.INSTANCE.onClearParams());
         mCbMethod.addItemListener(e -> UIActionHandler.INSTANCE.onMethodChanged(mCbMethod.getSelectedIndex()));
         mCbEncrypt.addItemListener(e -> UIActionHandler.INSTANCE.onEncryptTypeChanged(((IEncryptHandler) e.getItem()).getTypeCode()));
     }
 
     private void initTextPanel() {
-
         mTpInfo.addMouseListener(new MouseInputAdapter() {
             @Override
             public void mouseClicked(MouseEvent e) {
@@ -355,8 +352,8 @@ protected void finalize() throws Throwable {
     }
 
     public String getCurApiUrl() {
-        if (mCbBaseUrl.getSelectedItem() != null) {
-            return mCbApiUrl.getSelectedItem().toString();
+        if (mCbApiUrl.getEditor().getItem() != null) {
+            return mCbApiUrl.getEditor().getItem().toString();
         }
         return "";
     }
@@ -452,17 +449,8 @@ public String getCurBaseUrl() {
         mBtnSend.setPreferredSize(new Dimension(78, 78));
         mBtnSend.setRequestFocusEnabled(false);
         mBtnSend.setText("");
+        mBtnSend.setToolTipText("Send");
         baseP.add(mBtnSend, cc.xywh(11, 4, 1, 2));
-        btnDelApi = new JButton();
-        btnDelApi.setText("Delete");
-        baseP.add(btnDelApi, cc.xy(9, 5));
-        mBtnNewApi = new JButton();
-        mBtnNewApi.setText("Copy New");
-        baseP.add(mBtnNewApi, cc.xy(9, 4));
-        mbtnDp = new JButton();
-        mbtnDp.setText(" Default Parameter");
-        mbtnDp.setToolTipText(" Set Current Project Default Parameter");
-        baseP.add(mbtnDp, cc.xyw(5, 5, 3));
         final JPanel panel2 = new JPanel();
         panel2.setLayout(new com.intellij.uiDesigner.core.GridLayoutManager(1, 3, new Insets(0, 0, 0, 0), -1, -1));
         panel2.setBackground(new Color(-15856893));
@@ -485,6 +473,13 @@ public String getCurBaseUrl() {
             com.intellij.uiDesigner.core.GridConstraints.SIZEPOLICY_CAN_SHRINK | com.intellij.uiDesigner.core.GridConstraints.SIZEPOLICY_CAN_GROW,
             com.intellij.uiDesigner.core.GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false));
         baseP.add(mBrowserView, cc.xywh(1, 8, 13, 2));
+        btnDelApi = new JButton();
+        btnDelApi.setText("Delete");
+        baseP.add(btnDelApi, cc.xy(9, 4));
+        mbtnDp = new JButton();
+        mbtnDp.setText(" Default Parameter");
+        mbtnDp.setToolTipText(" Set Current Project Default Parameter");
+        baseP.add(mbtnDp, cc.xyw(7, 5, 3));
     }
 
     /** @noinspection ALL */

src/main/java/com/longforus/apidebugger/ui/send.png

@@ -48,14 +48,14 @@ object HttpManage {
 
             @Throws(IOException::class)
             override fun onResponse(call: Call, response: Response) {
-                UIActionHandler.onSaveApi(mainPanel.cbApiUrl.selectedItem)
+                UIActionHandler.onSaveApi(mainPanel.cbApiUrl.editor.item)
                 mainPanel.lbStatus.text = "onResponse code: ${response.code()} "
-                mainPanel.tpInfo.append("consuming: ${System.currentTimeMillis() - startTime}ms  \n ", Color.BLUE)
+                mainPanel.tpInfo.append("\nconsuming: ${System.currentTimeMillis() - startTime}ms  \n", Color.BLUE)
                 if (response.isSuccessful) {
                     val body = response.body() ?: return
                     val bytes = body.bytes()
                     val resStr = String(bytes)
-                    mainPanel.tpInfo.append("response size: ${bytes.size} byte  \n ", Color.BLUE)
+                    mainPanel.tpInfo.append("response size: ${bytes.size} byte  \n", Color.BLUE)
                     val json = mGson.fromJson<JsonObject>(resStr, JsonObject::class.java)
                     val jsonStr = mGson.toJson(json, JsonObject::class.java)
                     MyValueHandler.curShowJsonStr = jsonStr

src/main/kotlin/com/longforus/apidebugger/HttpManage.kt

@@ -29,13 +29,16 @@ object UIActionHandler {
             val apiBean: ApiBean
             if (selectedItem is String) {
                 apiBean = ApiBean(selectedItem, it.id)
-                apiBean.encryptType = mainPanel.selectedEncryptID
-                apiBean.method = mainPanel.selectedMethodType
-                apiBean.paramsMap = getParamsMap(mainPanel.tbParams)
-                it.apis.add(0, apiBean)
-                val model = mainPanel.cbApiUrl.model as DefaultComboBoxModel
-                model.insertElementAt(apiBean, 0)
-                MyValueHandler.curApi = apiBean
+                if (!it.apis.contains(apiBean)) {
+                    apiBean.encryptType = mainPanel.selectedEncryptID
+                    apiBean.method = mainPanel.selectedMethodType
+                    apiBean.paramsMap = getParamsMap(mainPanel.tbParams)
+                    it.apis.add(0, apiBean)
+                    val model = mainPanel.cbApiUrl.model as DefaultComboBoxModel
+                    model.insertElementAt(apiBean, 0)
+                    mainPanel.cbApiUrl.selectedIndex = 0
+                    MyValueHandler.curApi = apiBean
+                }
             } else {
                 apiBean = selectedItem as ApiBean
                 apiBean.encryptType = mainPanel.selectedEncryptID
@@ -63,7 +66,6 @@ object UIActionHandler {
         val clone = MyValueHandler.curApi?.clone() as ApiBean?
         clone?.let {
             OB.apiBox.put(it)
-            MyValueHandler.curProject?.apis?.add(it)
             MyValueHandler.curApi = it
             mainPanel.cbApiUrl.insertItemAt(it, 0)
             mainPanel.cbApiUrl.selectedIndex = 0

src/main/kotlin/com/longforus/apidebugger/UIActionHandler.kt

@@ -10,31 +10,30 @@ import io.objectbox.annotation.Index
  * Description :
  */
 @Entity
-data class ApiBean(@Id
+class ApiBean(@Id(assignable = true)
 var id: Long = 0,
     var method: Int = 0,
-    @Index
     var url: String = "",
     @Convert(converter = MapDbConverter::class,
         dbType = String::class)
     var paramsMap: MutableMap<String, String> = HashMap(),
-    var encryptType: Int = 0,var projectId:Long = 0): kotlin.Cloneable {
+    var encryptType: Int = 0, @Index var projectId: Long = 0, val createDate: Long = System.currentTimeMillis()) : kotlin.Cloneable {
 
-    constructor(url: String,projectId: Long) : this() {
+    constructor(url: String, projectId: Long) : this() {
         this.url = url
         this.projectId = projectId
+        this.id = hashCode().toLong()
     }
 
 
-
     companion object {
-        fun getTableValueList(bean:ApiBean):MutableList<TableBean>{
+        fun getTableValueList(bean: ApiBean): MutableList<TableBean> {
             if (bean.paramsMap.isEmpty()) {
                 return mutableListOf()
             }
             val list = mutableListOf<TableBean>()
             bean.paramsMap.forEach {
-                list.add(TableBean(true,it.key,it.value))
+                list.add(TableBean(true, it.key, it.value))
             }
             return list
         }
@@ -47,13 +46,32 @@ var id: Long = 0,
 
 
     public override fun clone(): Any {
-        val map = HashMap<String,String>()
+        val map = HashMap<String, String>()
         paramsMap.forEach { t, u ->
             map[t] = u
         }
-        return ApiBean(method = this.method,url = this.url+"新",paramsMap = map,encryptType = this.encryptType,projectId = this.projectId)
+        val bean = ApiBean(method = this.method, url = this.url + "新", paramsMap = map, encryptType = this.encryptType, projectId = this.projectId)
+        bean.id = bean.hashCode().toLong()
+        return bean
     }
 
+    override fun equals(other: Any?): Boolean {
+        if (this === other) return true
+        if (javaClass != other?.javaClass) return false
+
+        other as ApiBean
+
+        if (url != other.url) return false
+        if (projectId != other.projectId) return false
+
+        return true
+    }
+
+    override fun hashCode(): Int {
+        var result = url.hashCode()
+        result = 31 * result + projectId.hashCode()
+        return result
+    }
 
 
 }

src/main/kotlin/com/longforus/apidebugger/bean/ApiBean.kt

@@ -28,7 +28,7 @@ data class ProjectBean(
             field.clear()
             field.addAll(OB.apiBox.query {
                 equal(ApiBean_.projectId, id)
-            }.find().sortedByDescending { apiBean -> apiBean.id })
+            }.find().sortedByDescending { apiBean -> apiBean.createDate })
             return field
         }