diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/common/Peer.java | 7 | ||||
| -rw-r--r-- | src/tesseract/TesseractServer.java | 35 | ||||
| -rw-r--r-- | src/tesseract/TesseractUI.java | 43 | ||||
| -rw-r--r-- | src/tesseract/chatbox/Chatbox.java | 1 | ||||
| -rw-r--r-- | src/tesseract/newmenu/NewParticleEmitterMenuItem.java | 1 |
5 files changed, 25 insertions, 62 deletions
diff --git a/src/common/Peer.java b/src/common/Peer.java index 9fe4560..f202664 100644 --- a/src/common/Peer.java +++ b/src/common/Peer.java @@ -618,6 +618,11 @@ public class Peer extends Observable { }
public String getMyName() {
- return myInfo.toString();
+ if (myInfo == null) {
+ return "Not Connected";
+
+ } else {
+ return myInfo.toString();
+ }
}
}
diff --git a/src/tesseract/TesseractServer.java b/src/tesseract/TesseractServer.java deleted file mode 100644 index 6899d7f..0000000 --- a/src/tesseract/TesseractServer.java +++ /dev/null @@ -1,35 +0,0 @@ -package tesseract; - -import java.io.BufferedReader; -import java.io.IOException; -import java.io.InputStreamReader; - -import common.Peer; - - -/** - * This class is not part of the deliverable. This class is simply a server to - * help peers get into the network. - * - * @author jesse - */ -public class TesseractServer { - public static void main(String[] args) { - BufferedReader in = new BufferedReader(new InputStreamReader(System.in)); - Peer server = new Peer(); - server.createNetwork(); - - try { - Thread.sleep(2000); - } catch (InterruptedException e1) { - } - while (true) { - System.out.print("Enter text to send: "); - try { - String input = in.readLine(); - server.sendExtraToAllPeers(input); - } catch (IOException e) { - } - } - } -} diff --git a/src/tesseract/TesseractUI.java b/src/tesseract/TesseractUI.java index a70a58f..5f947d6 100644 --- a/src/tesseract/TesseractUI.java +++ b/src/tesseract/TesseractUI.java @@ -9,27 +9,21 @@ import java.awt.event.MouseEvent; import java.awt.event.MouseMotionAdapter; import java.awt.event.MouseWheelEvent; import java.awt.event.MouseWheelListener; -import java.io.IOException; -import java.net.InetAddress; -import java.net.UnknownHostException; +import java.awt.event.WindowAdapter; +import java.awt.event.WindowEvent; import javax.media.j3d.BoundingBox; import javax.media.j3d.Canvas3D; import javax.media.j3d.Node; import javax.media.j3d.Transform3D; import javax.media.j3d.TransformGroup; -import javax.swing.JButton; import javax.swing.JCheckBoxMenuItem; import javax.swing.JFrame; import javax.swing.JMenu; import javax.swing.JMenuBar; import javax.swing.JMenuItem; import javax.swing.JOptionPane; -import javax.swing.JPanel; import javax.swing.JPopupMenu; -import javax.swing.JScrollPane; -import javax.swing.JTextArea; -import javax.swing.JTextPane; import javax.swing.SwingUtilities; import javax.swing.Timer; import javax.vecmath.Point3d; @@ -141,9 +135,11 @@ public class TesseractUI extends JFrame { setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); myPeer = new Peer(true); + myPeer.createNetwork(); + setTitle("Tesseract Project " + myPeer.getMyName()); + myChatbox = new Chatbox(myPeer); myChatbox.setLocationRelativeTo(this); - myPeer.addObserver(myChatbox); myWorld = new World( new BoundingBox(new Point3d(-UNIT / 2, -UNIT / 2, -UNIT / 2), new Point3d(UNIT / 2, UNIT / 2, UNIT / 2)), @@ -171,11 +167,12 @@ public class TesseractUI extends JFrame { setExtendedState(getExtendedState() | JFrame.MAXIMIZED_BOTH); } - // THIS IS WHERE OBJECTS ARE FORCED INTO EXISTANCE - // TODO: REMOVE TEST CODE - - //myPeer.connectToNetwork("127.0.0.1"); - //myPeer.createNetwork(); + // Shutdown Nicely + addWindowListener(new WindowAdapter() { + public void windowClosing(final WindowEvent e) { + myPeer.disconnectFromNetwork(); + } + }); } /** @@ -218,19 +215,13 @@ public class TesseractUI extends JFrame { join.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { - int isFirst = JOptionPane.showConfirmDialog( - myCanvas, - "Is this the first node in the network?", - "", - JOptionPane.YES_NO_OPTION); - if (isFirst == 0) { - myPeer.createNetwork(); - } else { - String ip = JOptionPane.showInputDialog("Enter the IP to connect to: "); - if (ip != null ) { - myPeer.connectToNetwork(ip); - } + String ip = JOptionPane.showInputDialog("Enter the IP to connect to: "); + if (ip != null ) { + myPeer.disconnectFromNetwork(); + myPeer.connectToNetwork(ip); + setTitle("Tesseract Project " + myPeer.getMyName()); } + myChatbox.setMyName(); //sets myName Field of Chatbox to Peer ID. } }); diff --git a/src/tesseract/chatbox/Chatbox.java b/src/tesseract/chatbox/Chatbox.java index 94138c9..5e3d872 100644 --- a/src/tesseract/chatbox/Chatbox.java +++ b/src/tesseract/chatbox/Chatbox.java @@ -97,6 +97,7 @@ public class Chatbox extends JFrame implements Observer { attachListeners();
myName = "OFFLINE";
this.setName("Chatbox");
+ thePeer.addObserver(this);
}
/**
diff --git a/src/tesseract/newmenu/NewParticleEmitterMenuItem.java b/src/tesseract/newmenu/NewParticleEmitterMenuItem.java index 4ad08f8..6088bfe 100644 --- a/src/tesseract/newmenu/NewParticleEmitterMenuItem.java +++ b/src/tesseract/newmenu/NewParticleEmitterMenuItem.java @@ -52,6 +52,7 @@ public class NewParticleEmitterMenuItem extends MenuItem { */
private void buildParams() {
myParameters.put("Frequency", new Float(0f));
+ myParameters.put("Position", new Vector3f(0, 0.49f, 0));
this.makePanel();
myReadData.get("Frequency").setText(((Float)
Icosahedron.DEFAULT_SCALE).toString());
|