ViewVC Help

View File | Revision Log | Show Annotations | Revision Graph | Root Listing

root/i-scream/projects/cms/source/conient/uk/org/iscream/cms/conient/Conient.java

Comparing projects/cms/source/conient/uk/org/iscream/cms/conient/Conient.java (file contents):
Revision 1.25 by ajm, Tue Feb 27 15:11:44 2001 UTC vs.
Revision 1.29 by ajm, Mon Mar 19 01:38:16 2001 UTC

#	Line 1 | Line 1
1		//---PACKAGE DECLARATION---
2	<	package uk.ac.ukc.iscream.conient;
2	>	package uk.org.iscream.conient;
3
4		//---IMPORTS---
5		import javax.swing.*;
#	Line 28 | Line 28 | public class Conient extends JFrame {
28		/**
29		* The initial width of the window
30		*/
31	<	private final int DEFAULT_WIDTH = 600;
31	>	private final int DEFAULT_WIDTH = 700;
32
33		/**
34		* The initial height of the window
#	Line 75 | Line 75 | public class Conient extends JFrame {
75		// the main frame (passed the two panels)
76		Conient client = new Conient(data, control);
77		conientFrame = (Frame) client;
78	<	Conient.addMessage("Conient {an i-scream Client} © 2001 University of Kent & Project i-scream");
78	>	Conient.addMessage("Conient {an i-scream Client} © 2001 The i-scream Project (http://www.i-scream.org.uk)");
79
80		Conient.addMessage("Conient ready.");
81
#	Line 98 | Line 98 | public class Conient extends JFrame {
98		/**
99		* Creates a new Swing Client Frame
100		*/
101	<	private Conient(JPanel data, ControlPanel control) {
101	>	private Conient(JSplitPane data, ControlPanel control) {
102		// set up the Frame
103		super("Conient {an i-scream Client}");
104		setSize(DEFAULT_WIDTH, DEFAULT_HEIGHT);
#	Line 111 | Line 111 | public class Conient extends JFrame {
111
112		// add the control pane to the top border
113		getContentPane().add(control, "North");
114	<
115	<	// create a scrollable pane for the data in the centre
116	<	JScrollPane scrollPane = new JScrollPane(data);
117	<	getContentPane().add(scrollPane, "Center");
114	>	// add the data pane to the centre
115	>	getContentPane().add(data);
116
117		// setup the status panel
118		JPanel bottom = new JPanel();

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines
>	Changed lines