重构代码

lamborc · lamborc · commit 8a8e6277aa37 · 2018-07-02T10:14:19.000+08:00
diff --git a/src/main/java/UI/panel/fm/FileHisPanel.java b/src/main/java/UI/panel/fm/FileHisPanel.java
@@ -1,9 +1,8 @@
 package UI.panel.fm;
 
 import UI.ConstantsUI;
-import com.nbs.tools.DateHelper;
+import io.nbs.commons.helper.DateHelper;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.lang3.time.DateFormatUtils;
 
 import javax.swing.*;
 import java.awt.*;
diff --git a/src/main/java/UI/panel/im/IMPanel.java b/src/main/java/UI/panel/im/IMPanel.java
@@ -11,7 +11,7 @@
 import com.nbs.entity.PeerInfoBase;
 import com.nbs.ipfs.IPFSHelper;
 import com.nbs.ipfs.entity.IpfsMessage;
-import com.nbs.tools.DateHelper;
+import io.nbs.commons.helper.DateHelper;
 import io.nbs.client.cnsts.ColorCnst;
 import com.nbs.ui.panels.ChatPanel;
 import io.nbs.commons.utils.Base64CodecUtil;
diff --git a/src/main/java/com/nbs/biz/PeersOperatorService.java b/src/main/java/com/nbs/biz/PeersOperatorService.java
@@ -2,7 +2,7 @@
 
 import com.nbs.biz.data.entity.PeerContactsEntity;
 import com.nbs.biz.service.PeerContactsService;
-import com.nbs.tools.DateHelper;
+import io.nbs.commons.helper.DateHelper;
 import io.nbs.sdk.beans.PeerInfo;
 import org.apache.ibatis.session.SqlSession;
 
diff --git a/src/main/java/com/nbs/ui/holder/MessageLeftTextViewHolder.java b/src/main/java/com/nbs/ui/holder/MessageLeftTextViewHolder.java
@@ -7,6 +7,7 @@
 import io.nbs.client.ui.components.VerticalFlowLayout;
 import com.nbs.ui.components.messages.NBSLeftImageMessageBubble;
 import com.nbs.ui.frames.MainFrame;
+import io.nbs.client.ui.holders.BaseMessageViewHolder;
 
 import javax.swing.*;
 import java.awt.*;
@@ -19,7 +20,7 @@
  * Copyright (c) 2018, NBS , lambor.c<lanbery@gmail.com>.
  * All rights reserved.
  */
-public class MessageLeftTextViewHolder extends BaseMessageViewHolder{
+public class MessageLeftTextViewHolder extends BaseMessageViewHolder {
     public JLabel sender = new JLabel();
     public SizeAutoAdjustTextArea text;
     public NBSLeftImageMessageBubble messageBubble = new NBSLeftImageMessageBubble();
diff --git a/src/main/java/com/nbs/ui/holder/MessageRightTextViewHolder.java b/src/main/java/com/nbs/ui/holder/MessageRightTextViewHolder.java
@@ -9,6 +9,7 @@
 import com.nbs.ui.components.SizeAutoAdjustTextArea;
 import com.nbs.ui.components.messages.NBSRightImageMessageBubble;
 import com.nbs.ui.frames.MainFrame;
+import io.nbs.client.ui.holders.BaseMessageViewHolder;
 
 import javax.swing.*;
 import java.awt.*;
@@ -21,7 +22,7 @@
  * Copyright (c) 2018, NBS , lambor.c<lanbery@gmail.com>.
  * All rights reserved.
  */
-public class MessageRightTextViewHolder extends  BaseMessageViewHolder{
+public class MessageRightTextViewHolder extends BaseMessageViewHolder {
     public SizeAutoAdjustTextArea text;
     ImageIcon defaltIcon = new ImageIcon(ConfigHelper.PROFILE_ROOT+"avatars/default_avatar.png");
     public NBSIconButton messageButton = new NBSIconButton(defaltIcon,defaltIcon,"");
diff --git a/src/main/java/com/nbs/ui/holder/MessageSystemMessageViewHolder.java b/src/main/java/com/nbs/ui/holder/MessageSystemMessageViewHolder.java
@@ -3,6 +3,7 @@
 import io.nbs.client.cnsts.FontUtil;
 import io.nbs.client.cnsts.ColorCnst;
 import io.nbs.client.ui.components.VerticalFlowLayout;
+import io.nbs.client.ui.holders.BaseMessageViewHolder;
 
 import javax.swing.*;
 import java.awt.*;
@@ -15,7 +16,7 @@
  * Copyright (c) 2018, NBS , lambor.c<lanbery@gmail.com>.
  * All rights reserved.
  */
-public class MessageSystemMessageViewHolder extends  BaseMessageViewHolder{
+public class MessageSystemMessageViewHolder extends BaseMessageViewHolder {
     public JLabel text = new JLabel();
     private JPanel timePanel = new JPanel();
     private JPanel textPanel;
diff --git a/src/main/java/com/nbs/ui/panels/ContactsPanel.java b/src/main/java/com/nbs/ui/panels/ContactsPanel.java
@@ -11,7 +11,7 @@
 import com.nbs.ipfs.IPFSHelper;
 import com.nbs.ipfs.entity.IpfsMessage;
 import com.nbs.tools.ConfigHelper;
-import com.nbs.tools.DateHelper;
+import io.nbs.commons.helper.DateHelper;
 import io.nbs.client.adapter.ContactsItemAdapter;
 import io.nbs.client.cnsts.ColorCnst;
 import io.nbs.client.ui.components.GBC;
diff --git a/src/main/java/io/nbs/client/adapter/ContactsItemAdapter.java b/src/main/java/io/nbs/client/adapter/ContactsItemAdapter.java
@@ -2,10 +2,10 @@
 
 import io.nbs.client.vo.ContactsItem;
 import io.nbs.client.ui.holders.AvatarViewHolder;
-import io.nbs.client.ui.holders.ContactsItemViewHolder;
+import io.nbs.client.ui.panels.im.views.ContactsItemViewHolder;
 import io.nbs.client.cnsts.ColorCnst;
 import com.nbs.ui.components.NbsBorder;
-import io.nbs.client.ui.holders.ContactsAvatarViewHolder;
+import io.nbs.client.ui.panels.im.views.ContactsAvatarViewHolder;
 import io.nbs.client.listener.AbstractMouseListener;
 import io.nbs.commons.utils.AvatarUtil;
 import io.nbs.commons.helper.CharacterParser;
diff --git a/src/main/java/io/nbs/client/adapter/MessageAdapter.java b/src/main/java/io/nbs/client/adapter/MessageAdapter.java
@@ -3,7 +3,7 @@
 import com.nbs.entity.MessageItem;
 import com.nbs.tools.MessageViewHolderCacheHelper;
 import io.nbs.client.ui.components.NbsListView;
-import com.nbs.ui.holder.BaseMessageViewHolder;
+import io.nbs.client.ui.holders.BaseMessageViewHolder;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/src/main/java/io/nbs/client/ui/holders/AvatarViewHolder.java b/src/main/java/io/nbs/client/ui/holders/AvatarViewHolder.java
@@ -12,4 +12,5 @@
  * All rights reserved.
  */
 public abstract class AvatarViewHolder extends ViewHolder {
+
 }
diff --git a/src/main/java/io/nbs/client/ui/holders/BaseMessageViewHolder.java b/src/main/java/io/nbs/client/ui/holders/BaseMessageViewHolder.java
@@ -1,4 +1,4 @@
-package com.nbs.ui.holder;
+package io.nbs.client.ui.holders;
 
 import io.nbs.client.ui.holders.ViewHolder;
 
diff --git a/src/main/java/io/nbs/client/ui/panels/im/IMRightPanel.java b/src/main/java/io/nbs/client/ui/panels/im/IMRightPanel.java
@@ -17,19 +17,24 @@
  * All rights reserved.
  */
 public class IMRightPanel extends ParentAvailablePanel {
+
+    private static IMRightPanel context;
     /**
      * win 窗口控制
      */
     public static TitlePanel winTitlePanel;
     public IMRightPanel(JPanel parent) {
         super(parent);
+        context = this;
         initComponents();
         initView();
     }
 
     private void initComponents(){
         winTitlePanel = new TitlePanel(this);
         winTitlePanel.setTitle(ConfigurationHelper.getInstance().getI18nProperty("nbs.ui.panel.im.label","NBS World IM"));
+
+
     }
 
     private void initView(){
@@ -39,4 +44,8 @@ private void initView(){
 
         add(winTitlePanel,BorderLayout.NORTH);
     }
+
+    public static IMRightPanel getContext() {
+        return context;
+    }
 }
diff --git a/src/main/java/io/nbs/client/ui/panels/im/views/ContactsAvatarViewHolder.java b/src/main/java/io/nbs/client/ui/panels/im/views/ContactsAvatarViewHolder.java
@@ -1,4 +1,4 @@
-package io.nbs.client.ui.holders;
+package io.nbs.client.ui.panels.im.views;
 
 import io.nbs.client.ui.holders.AvatarViewHolder;
 
diff --git a/src/main/java/io/nbs/client/ui/panels/im/views/ContactsItemViewHolder.java b/src/main/java/io/nbs/client/ui/panels/im/views/ContactsItemViewHolder.java
@@ -1,4 +1,4 @@
-package io.nbs.client.ui.holders;
+package io.nbs.client.ui.panels.im.views;
 
 import io.nbs.client.cnsts.FontUtil;
 import io.nbs.client.cnsts.ColorCnst;
diff --git a/src/main/java/io/nbs/commons/helper/DateHelper.java b/src/main/java/io/nbs/commons/helper/DateHelper.java
@@ -9,7 +9,7 @@
  *
  */
 
-package com.nbs.tools;
+package io.nbs.commons.helper;
 
 import org.apache.commons.lang3.time.DateFormatUtils;
 
diff --git a/src/main/java/io/nbs/sdk/readme.md b/src/main/java/io/nbs/sdk/readme.md
@@ -0,0 +1 @@
+# IPFS 实体对象

Original file line number	Diff line number	Diff line change
`@@ -12,4 +12,5 @@`
`12`	`12`	`* All rights reserved.`
`13`	`13`	`*/`
`14`	`14`	`public abstract class AvatarViewHolder extends ViewHolder {`
	`15`	`+`
`15`	`16`	`}`