[Zerofile-svn] SF.net SVN: zerofile: [31] trunk/src
Status: Pre-Alpha
Brought to you by:
karl-bengtsson
Menu
▾
▴
[Zerofile-svn] SF.net SVN: zerofile: [31] trunk/src
|
From: <kar...@us...> - 2007-11-06 18:22:20
|
Revision: 31
http://zerofile.svn.sourceforge.net/zerofile/?rev=31&view=rev
Author: karl-bengtsson
Date: 2007-11-06 10:22:06 -0800 (Tue, 06 Nov 2007)
Log Message:
-----------
*) Made all GUI components in ZeroFileMainWindow private static attributes of that class, rather than local attributes in the startMainWindow()-method. This makes it possible to access and change them with public static methods of that class, which is useful when for instance updating the contact list.
*) Built methods for adding and removing contacts to said contact list. Also added a DefaultListModel tied to the list, through which changes are done (in accordance with the MVC pattern)
*) Added some (very ugly) stub code for testing to the XMPPLinkLocalHost and ZeroconfBrowsing classes, which will be replaced ASAP.
*) Bugfix in ZeroconfRegistration: the "last" TXT property was capitalized, and is now lowercase as it should be.
Modified Paths:
--------------
trunk/src/XMPPLinkLocalHost.java
trunk/src/ZeroFile.java
trunk/src/ZeroFileMainWindow.java
trunk/src/ZeroconfBrowsing.java
trunk/src/ZeroconfRegistration.java
Modified: trunk/src/XMPPLinkLocalHost.java
===================================================================
--- trunk/src/XMPPLinkLocalHost.java 2007-11-06 17:07:38 UTC (rev 30)
+++ trunk/src/XMPPLinkLocalHost.java 2007-11-06 18:22:06 UTC (rev 31)
@@ -1,4 +1,12 @@
// Stub class, to represent a compatible XMPP-capable host on the ZeroConf network
public class XMPPLinkLocalHost {
-
+ private String _ipAddress;
+ public XMPPLinkLocalHost(String ipAddress)
+ {
+ _ipAddress = ipAddress;
+ }
+ public String getIPAddress()
+ {
+ return _ipAddress;
+ }
}
Modified: trunk/src/ZeroFile.java
===================================================================
--- trunk/src/ZeroFile.java 2007-11-06 17:07:38 UTC (rev 30)
+++ trunk/src/ZeroFile.java 2007-11-06 18:22:06 UTC (rev 31)
@@ -15,8 +15,13 @@
ZeroconfRegistration.registerService();
ZeroconfRegistration.set1st("Testar");
ZeroconfRegistration.setLast("Nisse");
+ ZeroFileMainWindow.addContact("Test 1");
+ ZeroFileMainWindow.addContact("Test 2");
+ ZeroFileMainWindow.addContact("Test 3");
+ ZeroFileMainWindow.addContact("Test 4");
+ ZeroFileMainWindow.removeContact("Test 3");
Thread.sleep(5000);
- ZeroconfRegistration.setStatus("dnd");
+ ZeroconfRegistration.setStatus("away");
Thread.sleep(15000);
ZeroconfRegistration.unregisterService();
}
Modified: trunk/src/ZeroFileMainWindow.java
===================================================================
--- trunk/src/ZeroFileMainWindow.java 2007-11-06 17:07:38 UTC (rev 30)
+++ trunk/src/ZeroFileMainWindow.java 2007-11-06 18:22:06 UTC (rev 31)
@@ -7,58 +7,76 @@
/**
* @author Karl Bengtsson
*/
+ private static JFrame _mainWindowFrame;
+ private static JMenuBar _mainMenuBar;
+ private static JMenu _fileMenu;
+ private static JMenuItem _settingsMenuItem;
+ private static JMenuItem _quitMenuItem;
+ private static JMenu _helpMenu;
+ private static JMenuItem _aboutMenuItem;
+ private static JComboBox _statusLista;
+ private static DefaultListModel _contactListModel;
+ private static JList _contactList;
+ static void addContact(String c)
+ {
+ _contactListModel.addElement(c);
+ }
+ static void removeContact(String c)
+ {
+ _contactListModel.removeElement(c);
+ }
static void startMainWindow()
{
// Grundkittet, JFrame + JMenuBar
- JFrame mainWindowFrame = new JFrame();
- mainWindowFrame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
- JMenuBar mainMenuBar = new JMenuBar();
+ _mainWindowFrame = new JFrame();
+ _mainWindowFrame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
+ _mainMenuBar = new JMenuBar();
// File menu
- JMenu fileMenu = new JMenu("File");
- mainMenuBar.add(fileMenu);
- JMenuItem settingsMenuItem = new JMenuItem("Settings...");
- settingsMenuItem.addActionListener(new ActionListener(){
+ _fileMenu = new JMenu("File");
+ _mainMenuBar.add(_fileMenu);
+ _settingsMenuItem = new JMenuItem("Settings...");
+ _settingsMenuItem.addActionListener(new ActionListener(){
public void actionPerformed(ActionEvent e) {
ZeroFileSettingsWindow.startSettingsWindow();
}
});
- fileMenu.add(settingsMenuItem);
- JMenuItem quitMenuItem = new JMenuItem("Quit");
- quitMenuItem.addActionListener(new ActionListener(){
+ _fileMenu.add(_settingsMenuItem);
+ _quitMenuItem = new JMenuItem("Quit");
+ _quitMenuItem.addActionListener(new ActionListener(){
public void actionPerformed(ActionEvent e) {
System.exit(1);
}
});
- fileMenu.add(quitMenuItem);
+ _fileMenu.add(_quitMenuItem);
// Help menu
- JMenu helpMenu = new JMenu("Help");
- mainMenuBar.add(helpMenu);
- JMenuItem aboutMenuItem = new JMenuItem("About..");
- helpMenu.add(aboutMenuItem);
+ _helpMenu = new JMenu("Help");
+ _mainMenuBar.add(_helpMenu);
+ _aboutMenuItem = new JMenuItem("About..");
+ _helpMenu.add(_aboutMenuItem);
// Layout, storlekar, samt koppling av JMenuBar
- mainWindowFrame.setLayout(new GridLayout(0,1,1,1));
- mainWindowFrame.setMinimumSize(new Dimension(120,300));
- mainWindowFrame.setSize(new Dimension(150,400));
- mainWindowFrame.setJMenuBar(mainMenuBar);
+ _mainWindowFrame.setLayout(new GridLayout(0,1,1,1));
+ _mainWindowFrame.setMinimumSize(new Dimension(120,300));
+ _mainWindowFrame.setSize(new Dimension(150,400));
+ _mainWindowFrame.setJMenuBar(_mainMenuBar);
// Statuslista
String[] statusModes = {"Available","Away","Do not disturb"};
- JComboBox statusLista = new JComboBox(statusModes);
- statusLista.setMaximumSize(new Dimension(20,100));
- mainWindowFrame.add(statusLista);
+ _statusLista = new JComboBox(statusModes);
+ _statusLista.setMaximumSize(new Dimension(20,100));
+ _mainWindowFrame.add(_statusLista);
// Kontaktlista
- String[] TestKontakter = {"Din mamma","Din pappa","Din syster","Din broder","Din chef"};
- JList contactList = new JList(TestKontakter);
- contactList.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
- contactList.setLayoutOrientation(JList.VERTICAL);
- contactList.setSize(500,700);
- mainWindowFrame.add(contactList);
+ _contactListModel = new DefaultListModel();
+ _contactList = new JList(_contactListModel);
+ _contactList.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
+ _contactList.setLayoutOrientation(JList.VERTICAL);
+ _contactList.setSize(500,700);
+ _mainWindowFrame.add(_contactList);
// Sm\x8All upp f\x9Anstret
- mainWindowFrame.setVisible(true);
+ _mainWindowFrame.setVisible(true);
}
}
\ No newline at end of file
Modified: trunk/src/ZeroconfBrowsing.java
===================================================================
--- trunk/src/ZeroconfBrowsing.java 2007-11-06 17:07:38 UTC (rev 30)
+++ trunk/src/ZeroconfBrowsing.java 2007-11-06 18:22:06 UTC (rev 31)
@@ -1,4 +1,8 @@
// TODO
public class ZeroconfBrowsing {
-
+ static XMPPLinkLocalHost[] findXMPPHosts()
+ {
+ XMPPLinkLocalHost[] testArr = {new XMPPLinkLocalHost("192.168.0.1"),new XMPPLinkLocalHost("192.168.0.2")};
+ return testArr;
+ }
}
Modified: trunk/src/ZeroconfRegistration.java
===================================================================
--- trunk/src/ZeroconfRegistration.java 2007-11-06 17:07:38 UTC (rev 30)
+++ trunk/src/ZeroconfRegistration.java 2007-11-06 18:22:06 UTC (rev 31)
@@ -115,7 +115,7 @@
}
static String getLast()
{
- return _txtRecord.getValueAsString("Last");
+ return _txtRecord.getValueAsString("last");
}
static void setLast(String Last)
@@ -123,7 +123,7 @@
{
if (_r!=null)
{
- _txtRecord.set("Last",Last);
+ _txtRecord.set("last",Last);
_r.getTXTRecord().update(0, _txtRecord.getRawBytes(), 0);
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
