From 8017da94139699970932336a3f14efe1d391046a Mon Sep 17 00:00:00 2001 From: Shaun Bennett Date: Wed, 20 Jan 2016 10:25:31 -0500 Subject: [PATCH] Delete JedisTest --- .../src/ca/phinary/jedistest/Main.java | 93 ------------------- .../src/ca/phinary/jedistest/api/Chat.java | 8 -- .../phinary/jedistest/api/ChatListener.java | 6 -- .../src/ca/phinary/jedistest/api/Console.java | 6 -- .../ca/phinary/jedistest/api/Messenger.java | 9 -- .../ca/phinary/jedistest/gui/ChatFrame.java | 42 --------- .../ca/phinary/jedistest/gui/ChatPane.java | 60 ------------ .../ca/phinary/jedistest/gui/ConsolePane.java | 33 ------- .../ca/phinary/jedistest/model/JedisChat.java | 51 ---------- .../jedistest/model/JedisPublisher.java | 93 ------------------- .../jedistest/model/JedisSubscriber.java | 49 ---------- .../jedistest/model/SubscribeWorker.java | 56 ----------- 12 files changed, 506 deletions(-) delete mode 100644 Plugins/JedisTest/src/ca/phinary/jedistest/Main.java delete mode 100644 Plugins/JedisTest/src/ca/phinary/jedistest/api/Chat.java delete mode 100644 Plugins/JedisTest/src/ca/phinary/jedistest/api/ChatListener.java delete mode 100644 Plugins/JedisTest/src/ca/phinary/jedistest/api/Console.java delete mode 100644 Plugins/JedisTest/src/ca/phinary/jedistest/api/Messenger.java delete mode 100644 Plugins/JedisTest/src/ca/phinary/jedistest/gui/ChatFrame.java delete mode 100644 Plugins/JedisTest/src/ca/phinary/jedistest/gui/ChatPane.java delete mode 100644 Plugins/JedisTest/src/ca/phinary/jedistest/gui/ConsolePane.java delete mode 100644 Plugins/JedisTest/src/ca/phinary/jedistest/model/JedisChat.java delete mode 100644 Plugins/JedisTest/src/ca/phinary/jedistest/model/JedisPublisher.java delete mode 100644 Plugins/JedisTest/src/ca/phinary/jedistest/model/JedisSubscriber.java delete mode 100644 Plugins/JedisTest/src/ca/phinary/jedistest/model/SubscribeWorker.java diff --git a/Plugins/JedisTest/src/ca/phinary/jedistest/Main.java b/Plugins/JedisTest/src/ca/phinary/jedistest/Main.java deleted file mode 100644 index de4481d4b..000000000 --- a/Plugins/JedisTest/src/ca/phinary/jedistest/Main.java +++ /dev/null @@ -1,93 +0,0 @@ -package ca.phinary.jedistest; - -import javax.swing.*; - -import java.awt.event.WindowEvent; -import java.awt.event.WindowListener; - -import ca.phinary.jedistest.gui.ChatFrame; -import ca.phinary.jedistest.model.JedisChat; - -public class Main -{ - public static void main(String[] args) - { - SwingUtilities.invokeLater(new Runnable() - { - @Override - public void run() - { - try - { - UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName()); - } - catch (ClassNotFoundException e) - { - e.printStackTrace(); - } - catch (InstantiationException e) - { - e.printStackTrace(); - } - catch (IllegalAccessException e) - { - e.printStackTrace(); - } - catch (UnsupportedLookAndFeelException e) - { - e.printStackTrace(); - } - - ChatFrame chatFrame = new ChatFrame(); - final JedisChat jedisChat = new JedisChat(chatFrame, "phinaryTest", "10.33.53.16", 6379); - - chatFrame.addWindowListener(new WindowListener() - { - @Override - public void windowOpened(WindowEvent e) - { - - } - - @Override - public void windowClosing(WindowEvent e) - { - - } - - @Override - public void windowClosed(WindowEvent e) - { - jedisChat.close(); - } - - @Override - public void windowIconified(WindowEvent e) - { - - } - - @Override - public void windowDeiconified(WindowEvent e) - { - - } - - @Override - public void windowActivated(WindowEvent e) - { - - } - - @Override - public void windowDeactivated(WindowEvent e) - { - - } - }); - } - }); - - } - -} diff --git a/Plugins/JedisTest/src/ca/phinary/jedistest/api/Chat.java b/Plugins/JedisTest/src/ca/phinary/jedistest/api/Chat.java deleted file mode 100644 index adfee2df0..000000000 --- a/Plugins/JedisTest/src/ca/phinary/jedistest/api/Chat.java +++ /dev/null @@ -1,8 +0,0 @@ -package ca.phinary.jedistest.api; - -public interface Chat -{ - public void addListener(ChatListener chatListener); - - public void clearListeners(); -} diff --git a/Plugins/JedisTest/src/ca/phinary/jedistest/api/ChatListener.java b/Plugins/JedisTest/src/ca/phinary/jedistest/api/ChatListener.java deleted file mode 100644 index d650ac563..000000000 --- a/Plugins/JedisTest/src/ca/phinary/jedistest/api/ChatListener.java +++ /dev/null @@ -1,6 +0,0 @@ -package ca.phinary.jedistest.api; - -public interface ChatListener -{ - public void onChat(String message); -} diff --git a/Plugins/JedisTest/src/ca/phinary/jedistest/api/Console.java b/Plugins/JedisTest/src/ca/phinary/jedistest/api/Console.java deleted file mode 100644 index fa899383f..000000000 --- a/Plugins/JedisTest/src/ca/phinary/jedistest/api/Console.java +++ /dev/null @@ -1,6 +0,0 @@ -package ca.phinary.jedistest.api; - -public interface Console -{ - public void println(String line); -} diff --git a/Plugins/JedisTest/src/ca/phinary/jedistest/api/Messenger.java b/Plugins/JedisTest/src/ca/phinary/jedistest/api/Messenger.java deleted file mode 100644 index bf94b9e42..000000000 --- a/Plugins/JedisTest/src/ca/phinary/jedistest/api/Messenger.java +++ /dev/null @@ -1,9 +0,0 @@ -package ca.phinary.jedistest.api; - -public interface Messenger -{ - public Chat getChat(); - - public Console getConsole(); - -} diff --git a/Plugins/JedisTest/src/ca/phinary/jedistest/gui/ChatFrame.java b/Plugins/JedisTest/src/ca/phinary/jedistest/gui/ChatFrame.java deleted file mode 100644 index 7ae888aa6..000000000 --- a/Plugins/JedisTest/src/ca/phinary/jedistest/gui/ChatFrame.java +++ /dev/null @@ -1,42 +0,0 @@ -package ca.phinary.jedistest.gui; - -import javax.swing.*; - -import java.awt.*; - -import ca.phinary.jedistest.api.Chat; -import ca.phinary.jedistest.api.Console; -import ca.phinary.jedistest.api.Messenger; - -public class ChatFrame extends JFrame implements Messenger -{ - private ConsolePane _console; - private ChatPane _chat; - - public ChatFrame() - { - setLayout(new BorderLayout()); - - _console = new ConsolePane(); - _chat = new ChatPane(this); - - add(_console, BorderLayout.CENTER); - add(_chat, BorderLayout.SOUTH); - - setTitle("Phinary's Redis Chat"); - setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE); - pack(); - setLocationRelativeTo(null); - setVisible(true); - } - - public Console getConsole() - { - return _console; - } - - public Chat getChat() - { - return _chat; - } -} diff --git a/Plugins/JedisTest/src/ca/phinary/jedistest/gui/ChatPane.java b/Plugins/JedisTest/src/ca/phinary/jedistest/gui/ChatPane.java deleted file mode 100644 index 8234bff85..000000000 --- a/Plugins/JedisTest/src/ca/phinary/jedistest/gui/ChatPane.java +++ /dev/null @@ -1,60 +0,0 @@ -package ca.phinary.jedistest.gui; - -import javax.swing.*; -import javax.swing.border.Border; -import javax.swing.border.EmptyBorder; -import java.awt.*; -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; -import java.util.ArrayList; - -import ca.phinary.jedistest.api.Chat; -import ca.phinary.jedistest.api.ChatListener; - -public class ChatPane extends JPanel implements ActionListener, Chat -{ - private ArrayList _chatListeners; - - private JTextField _textField; - private JButton _sendButton; - - public ChatPane(JFrame frame) - { - _chatListeners = new ArrayList(); - - _textField = new JTextField(); - _sendButton = new JButton("Send"); - - setBorder(new EmptyBorder(5, 10, 5, 10)); - setLayout(new BorderLayout()); - - add(_textField, BorderLayout.CENTER); - add(_sendButton, BorderLayout.EAST); - - _sendButton.addActionListener(this); - frame.getRootPane().setDefaultButton(_sendButton); - } - - @Override - public void actionPerformed(ActionEvent e) - { - String text = _textField.getText(); - for (ChatListener listener : _chatListeners) - { - listener.onChat(text); - } - _textField.setText(""); - } - - @Override - public void addListener(ChatListener chatListener) - { - _chatListeners.add(chatListener); - } - - @Override - public void clearListeners() - { - _chatListeners.clear(); - } -} diff --git a/Plugins/JedisTest/src/ca/phinary/jedistest/gui/ConsolePane.java b/Plugins/JedisTest/src/ca/phinary/jedistest/gui/ConsolePane.java deleted file mode 100644 index 2fb0293c3..000000000 --- a/Plugins/JedisTest/src/ca/phinary/jedistest/gui/ConsolePane.java +++ /dev/null @@ -1,33 +0,0 @@ -package ca.phinary.jedistest.gui; - -import javax.swing.*; -import javax.swing.border.TitledBorder; -import java.awt.*; - -import ca.phinary.jedistest.api.Console; - -public class ConsolePane extends JPanel implements Console -{ - private JScrollPane _scrollPane; - private JTextArea _textArea; - - public ConsolePane() - { - _textArea = new JTextArea(); - _textArea.setEditable(false); - _textArea.setPreferredSize(new Dimension(800, 400)); - _scrollPane = new JScrollPane(_textArea); - _scrollPane.setVerticalScrollBarPolicy(ScrollPaneConstants.VERTICAL_SCROLLBAR_ALWAYS); - - setLayout(new BorderLayout()); - setBorder(new TitledBorder("Console")); - - add(_scrollPane, BorderLayout.CENTER); - } - - public synchronized void println(String line) - { - _textArea.append(line + "\n"); - } - -} diff --git a/Plugins/JedisTest/src/ca/phinary/jedistest/model/JedisChat.java b/Plugins/JedisTest/src/ca/phinary/jedistest/model/JedisChat.java deleted file mode 100644 index ff37cdf67..000000000 --- a/Plugins/JedisTest/src/ca/phinary/jedistest/model/JedisChat.java +++ /dev/null @@ -1,51 +0,0 @@ -package ca.phinary.jedistest.model; - -import ca.phinary.jedistest.api.Messenger; -import redis.clients.jedis.Jedis; -import redis.clients.jedis.JedisPool; -import redis.clients.jedis.JedisPoolConfig; - -public class JedisChat -{ - private JedisPool _jedisPool; - private String _channel; - - private Messenger _messenger; - private JedisPublisher _publisher; - - public JedisChat(Messenger messenger, final String channel, String host, int port) - { - _jedisPool = new JedisPool(new JedisPoolConfig(), host, port); - _channel = channel; - _messenger = messenger; - - _publisher = new JedisPublisher(messenger.getConsole(), _jedisPool, channel); - _messenger.getChat().addListener(_publisher); - - startListen(); - } - - public void startListen() - { - _messenger.getConsole().println("Attempting to connect to redis server..."); - try - { - final Jedis jedis = _jedisPool.getResource(); - - _messenger.getConsole().println("Successfully connected!"); - - SubscribeWorker worker = new SubscribeWorker(_messenger.getConsole(), _jedisPool, _channel); - worker.execute(); - - } catch (Exception e) - { - _messenger.getConsole().println("Failed to connect to redis server!"); - } - } - - public void close() - { - System.out.println("close"); - _publisher.close(); - } -} diff --git a/Plugins/JedisTest/src/ca/phinary/jedistest/model/JedisPublisher.java b/Plugins/JedisTest/src/ca/phinary/jedistest/model/JedisPublisher.java deleted file mode 100644 index 445c338f3..000000000 --- a/Plugins/JedisTest/src/ca/phinary/jedistest/model/JedisPublisher.java +++ /dev/null @@ -1,93 +0,0 @@ -package ca.phinary.jedistest.model; - -import javax.swing.*; -import java.net.InetAddress; -import java.util.List; - -import ca.phinary.jedistest.api.ChatListener; -import ca.phinary.jedistest.api.Console; -import redis.clients.jedis.JedisPool; - -public class JedisPublisher implements ChatListener -{ - private Console _console; - private JedisPool _jedisPool; - private String _channelName; - - public JedisPublisher(Console console, JedisPool jedisPool, String channelName) - { - _console = console; - _jedisPool = jedisPool; - _channelName = channelName; - - sendConnectMessage(); - } - - @Override - public void onChat(String message) - { - String hostName = "Unknown"; - - try - { - hostName = InetAddress.getLocalHost().toString(); - } - catch(Exception e) { }; - - message(hostName + " > " + message); - } - - private void sendConnectMessage() - { - String hostName = "Unknown"; - - try - { - hostName = InetAddress.getLocalHost().toString(); - } - catch(Exception e) { }; - - message(hostName + " has connected to the channel"); - } - - public void close() - { - String hostName = "Unknown"; - - try - { - hostName = InetAddress.getLocalHost().toString(); - } - catch(Exception e) { }; - - - message(hostName + " has disconnected from the channel"); - } - - private void message(final String text) - { - new SwingWorker() - { - @Override - protected Void doInBackground() throws Exception - { - try - { - _jedisPool.getResource().publish(_channelName, text); - } - catch (Exception e) - { - publish("Failed to send message: " + e.getMessage()); - } - return null; - } - - @Override - protected void process(List chunks) - { - for (String s : chunks) - _console.println(s); - } - }.execute(); - } -} diff --git a/Plugins/JedisTest/src/ca/phinary/jedistest/model/JedisSubscriber.java b/Plugins/JedisTest/src/ca/phinary/jedistest/model/JedisSubscriber.java deleted file mode 100644 index a1df8dedd..000000000 --- a/Plugins/JedisTest/src/ca/phinary/jedistest/model/JedisSubscriber.java +++ /dev/null @@ -1,49 +0,0 @@ -package ca.phinary.jedistest.model; - -import redis.clients.jedis.JedisPubSub; - -public class JedisSubscriber extends JedisPubSub -{ - private SubscribeWorker _jedisWorker; - - public JedisSubscriber(SubscribeWorker jedisWorker) - { - _jedisWorker = jedisWorker; - } - - @Override - public void onMessage(String channel, String message) - { - _jedisWorker.onMessage(message); - } - - @Override - public void onPMessage(String s, String s1, String s2) - { - System.out.println("Pmessage:" + s + " " + s1 + " " + s2); - } - - @Override - public void onSubscribe(String s, int i) - { - System.out.println("Subcribe: s " + i); - } - - @Override - public void onUnsubscribe(String s, int i) - { - System.out.println("UnSubcribe: s " + i); - } - - @Override - public void onPUnsubscribe(String s, int i) - { - System.out.println("PUnSubcribe: s " + i); - } - - @Override - public void onPSubscribe(String s, int i) - { - System.out.println("Subcribe: s " + i); - } -} diff --git a/Plugins/JedisTest/src/ca/phinary/jedistest/model/SubscribeWorker.java b/Plugins/JedisTest/src/ca/phinary/jedistest/model/SubscribeWorker.java deleted file mode 100644 index 27b159657..000000000 --- a/Plugins/JedisTest/src/ca/phinary/jedistest/model/SubscribeWorker.java +++ /dev/null @@ -1,56 +0,0 @@ -package ca.phinary.jedistest.model; - -import javax.swing.*; - -import java.util.List; - -import ca.phinary.jedistest.api.Console; -import redis.clients.jedis.Jedis; -import redis.clients.jedis.JedisPool; - -public class SubscribeWorker extends SwingWorker -{ - private Console _console; - private JedisPool _jedisPool; - private JedisSubscriber _jedisSubscriber; - private String _channel; - - public SubscribeWorker(Console console, JedisPool jedisPool, String channel) - { - _console = console; - _jedisPool = jedisPool; - _jedisSubscriber = new JedisSubscriber(this); - _channel = channel; - } - - @Override - protected Void doInBackground() throws Exception - { - publish("Attempting to connect to channel: " + _channel); - try - { - Jedis j = _jedisPool.getResource(); - publish("Successfully connected to channel!"); - _jedisPool.getResource().subscribe(_jedisSubscriber, _channel); - } catch (Exception e) - { - publish("Connection to channel failed:" + e.getMessage()); - } - - return null; - } - - public void onMessage(String s) - { - publish(s); - } - - @Override - protected void process(List chunks) - { - for (String s : chunks) - { - _console.println(s); - } - } -}