From: g0vgs Date: Tue, 31 Dec 2002 12:22:44 +0000 (+0000) Subject: Add updates to the java client from Rene, OZ1LQH X-Git-Tag: PRE-1-52~100 X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=ef3eaa49d2dfc9ce74411ec534d31c46875d28e7;p=spider.git Add updates to the java client from Rene, OZ1LQH --- diff --git a/Changes b/Changes index 8a4971f7..430db59a 100644 --- a/Changes +++ b/Changes @@ -1,3 +1,5 @@ +31Dec02======================================================================= +1. Update files in the java client with fixes and additions from Rene, OZ1LQH 05Dec02======================================================================= 1. Fix SSID issues with AGWMsg. 2. updated show/hftable, vhftable, hfstats, vhfstats and dxstats after K1XX diff --git a/spider-web/StreamListener.class b/spider-web/StreamListener.class index a22ce617..272484b6 100644 Binary files a/spider-web/StreamListener.class and b/spider-web/StreamListener.class differ diff --git a/spider-web/beam.class b/spider-web/beam.class index 2a2d393d..7b475e47 100644 Binary files a/spider-web/beam.class and b/spider-web/beam.class differ diff --git a/spider-web/beam.java b/spider-web/beam.java index d73417b4..7184f3b4 100755 --- a/spider-web/beam.java +++ b/spider-web/beam.java @@ -6,7 +6,8 @@ public class beam extends Dialog super(parent, "Call/Prefix/Other", true); this.parent = parent; this.setFont(font); - +// Prefix=""; // Make sure that the input field is always empty when box displayed. + Panel p1 = new Panel(); p1.setLayout(new GridLayout(2,2)); p1.add(new Label("Enter Your Choice (Call/Prefix/Other) ")); @@ -26,7 +27,6 @@ public class beam extends Dialog if (arg.equals("OK")) { dispose(); parent.setPrefix(prefix.getText()); - } else if (arg.equals("Cancel")) { dispose(); diff --git a/spider-web/dxannounce.class b/spider-web/dxannounce.class index 0b02b4c9..6e9ab847 100644 Binary files a/spider-web/dxannounce.class and b/spider-web/dxannounce.class differ diff --git a/spider-web/dxannounce.java b/spider-web/dxannounce.java index 163c8fad..c4c833f5 100755 --- a/spider-web/dxannounce.java +++ b/spider-web/dxannounce.java @@ -7,8 +7,9 @@ public class dxannounce extends Dialog super(parent, "Dx Announce", true); this.parent = parent; this.setFont(font); - - +// Call2 = ""; +// Freq = ""; +// Remarks = ""; // Make sure that Call2, Freq and Remarks are empty when box is displayed. Panel p1 = new Panel(); p1.setLayout(new GridLayout(3,2)); @@ -25,10 +26,6 @@ public class dxannounce extends Dialog // p3.add(freq = new TextField(Remarks,30)); // add("Center",p3); - - - - Panel p2 = new Panel(); p2.add(new Button("OK")); p2.add(new Button("Cancel")); @@ -36,7 +33,6 @@ public class dxannounce extends Dialog resize(250,150); - show(); } @@ -46,12 +42,8 @@ public class dxannounce extends Dialog parent.setCall2(call2.getText()); parent.setFreq(freq.getText()); parent.setRemarks(remarks.getText()); - - - } - else if (arg.equals("Cancel")) { dispose(); } diff --git a/spider-web/idleTime.class b/spider-web/idleTime.class index 174de880..c15111e2 100644 Binary files a/spider-web/idleTime.class and b/spider-web/idleTime.class differ diff --git a/spider-web/setDate.class b/spider-web/setDate.class index 0e31ec32..c1564380 100644 Binary files a/spider-web/setDate.class and b/spider-web/setDate.class differ diff --git a/spider-web/spiderclient.class b/spider-web/spiderclient.class index 4d45a246..d2ad6457 100644 Binary files a/spider-web/spiderclient.class and b/spider-web/spiderclient.class differ diff --git a/spider-web/spiderclient.java b/spider-web/spiderclient.java index d47fa931..87e487c0 100755 --- a/spider-web/spiderclient.java +++ b/spider-web/spiderclient.java @@ -15,8 +15,8 @@ public class spiderclient extends Applet { p = getParameter("CALL"); if (p != null) cf.setCall(p); - p = getParameter("PASSWORD"); - if (p != null) cf.setPassword(p); + p = getParameter("PASSWORD"); + if (p != null) cf.setPassword(p); p = getParameter("FULLNAME"); if (p != null) cf.setFullname(p); diff --git a/spider-web/spiderframe.class b/spider-web/spiderframe.class index a4b83833..dd34ecd6 100644 Binary files a/spider-web/spiderframe.class and b/spider-web/spiderframe.class differ diff --git a/spider-web/spiderframe.java b/spider-web/spiderframe.java index 6f6f60c2..f3ee2f3b 100755 --- a/spider-web/spiderframe.java +++ b/spider-web/spiderframe.java @@ -56,11 +56,14 @@ menubar.add(show); set = new Menu("Settings"); set.add(new MenuItem("Set Beep")); + set.add(new MenuItem("Set No Beep")); set.add(new MenuItem("Set QTH / City")); set.add(new MenuItem("Set Name")); set.add(new MenuItem("Set Locator")); set.add(new MenuItem("Set HomeNode")); - set.add(new MenuItem("Show Personal Settings")); + set.add(new MenuItem("Set DX-Grid")); + set.add(new MenuItem("Set No DX-Grid")); + set.add(new MenuItem("Show Personal Settings")); menubar.add(set); @@ -77,10 +80,6 @@ menubar.add(mailbox); - - - - this.setMenuBar(menubar); setLayout(new BorderLayout()); @@ -143,100 +142,90 @@ menubar.add(mailbox); gbc.gridheight = h; gbl.setConstraints(c, gbc); p.add(c); - } + } public void setColors() { output.setBackground(OutBackgroundColor); output.setForeground(OutForegroundColor); input.setBackground(InBackgroundColor); input.setForeground(InForegroundColor); - } + } public void setFonts() { output.setFont(OutFont); input.setFont(InFont); - } + } public void initPrintStream(PrintStream out) { this.out = out; - } + } public void setText(String s) { int i; - for (i=0; i < s.length(); i++) { + for (i=0; i < s.length(); i++) { if (s.charAt(i) == '\007') parent.beep(); - } + } output.appendText(s +'\n'); - idle.resetTimer(); - } + idle.resetTimer(); + } public void setCall(String s) { Call = s; - } + } - public void setPassword(String s) { - Password = s ; - } + public void setPassword(String s) { + Password = s ; + } public void setPrefix(String s) { Prefix = s; } - - - + public void setCall2(String s) { Call2 = s; } - public void setFreq(String s) { + public void setFreq(String s) { Freq = s; } - - public void setRemarks(String s) { + public void setRemarks(String s) { Remarks = s; } - - - public void setTime(String s) { DateLabel.setText(s); - } + } public void setIdle(String s) { IdleLabel.setText(s); - } + } public String getCall() { return Call; - } + } - public String getPassword() { - return Password; - } + public String getPassword() { + return Password; + } public String setPrefix(){ - return Prefix; - } + return Prefix; + } public String setCall2(){ - return Call2; - } + return Call2; + } public String setFreq(){ - return Freq; - } + return Freq; + } public String setRemarks(){ - return Remarks; - } - - - - + return Remarks; + } public void setFullname(String s) { Fullname = s; @@ -244,35 +233,35 @@ menubar.add(mailbox); connect_menuitem.disable(); else connect_menuitem.enable(); - } + } public String getFullname() { return Fullname; - } + } public void setHostname(String s) { Hostname = s; - } + } public String getHostname() { return Hostname; - } + } public void setPort(String s) { Port = s; - } + } public String getPort() { return Port; - } + } public void setChannel(String s) { Channel = s; - } + } public String getChannel() { return Channel; - } + } // public void login() { // PersonalPreferences pp = new PersonalPreferences(this, Call, Fullname, OutFont); @@ -280,27 +269,20 @@ menubar.add(mailbox); public void antrichtung () { beam pp = new beam (this, Prefix,OutFont); - } + } - public void dxannounce () { - dxannounce pp = new dxannounce (this, Call2, Freq, Remarks, OutFont); - } +// public void dxannounce () { +// dxannounce pp = new dxannounce (this, Call2, Freq, Remarks, OutFont); +// } - - - - public boolean handleEvent(Event evt) { if (evt.id == Event.KEY_PRESS) { if (evt.key == '\n') { - - idle.resetTimer(); output.appendText(input.getText()+'\n'); out.println(input.getText()); - if (MaxInputPos < 255) { InputPos++; @@ -334,11 +316,9 @@ menubar.add(mailbox); else { input.setText(""); } - } return true; } - return super.handleEvent(evt); } @@ -406,6 +386,10 @@ menubar.add(mailbox); } public boolean action(Event evt, Object arg) { + Prefix = ""; + Call2 = ""; + Freq = ""; + Remarks = ""; if (evt.target instanceof MenuItem) { if (arg.equals("Quit")) { this.hide(); @@ -441,82 +425,80 @@ menubar.add(mailbox); if (Connected) out.println("sh/wwv"); } else if (arg.equals("Show Beam Direction")) { beam pp = new beam(this, Prefix, OutFont); - if (Connected) out.println ("sh/heading " + Prefix ); + if ((Connected) && !(Prefix.equals(""))) out.println ("sh/heading " + Prefix ); } else if (arg.equals("Search DX")) { beam pp = new beam(this, Prefix, OutFont); - if (Connected) out.println ("sh/dx " + Prefix ); + if ((Connected) && !(Prefix.equals(""))) out.println ("sh/dx " + Prefix ); } else if (arg.equals("Search QSL Info")) { beam pp = new beam(this, Prefix, OutFont); - if (Connected) out.println ("sh/qsl " + Prefix ); + if ((Connected) && !(Prefix.equals(""))) out.println ("sh/qsl " + Prefix ); } else if (arg.equals("Search Address")) { beam pp = new beam(this, Prefix, OutFont); - if (Connected) out.println ("sh/qrz " + Prefix ); + if ((Connected) && !(Prefix.equals(""))) out.println ("sh/qrz " + Prefix ); } else if (arg.equals("Search QSL Manager")) { beam pp = new beam(this, Prefix, OutFont); - if (Connected) out.println ("sh/qsl " + Prefix ); + if ((Connected) && !(Prefix.equals(""))) out.println ("sh/qsl " + Prefix ); } else if (arg.equals("Search DXCC")) { beam pp = new beam(this, Prefix, OutFont); - if (Connected) out.println ("sh/pr " + Prefix ); + if ((Connected) && !(Prefix.equals(""))) out.println ("sh/pr " + Prefix ); // button settings } else if (arg.equals("Set Beep")) { if (Connected) out.println("set/beep"); - }else if (arg.equals("Set QTH / City")) { - beam pp = new beam(this, Prefix, OutFont); - if (Connected) out.println ("set/qth " + Prefix ); + } else if (arg.equals("Set No Beep")) { + if (Connected) out.println("set/nobeep"); - - }else if (arg.equals("Set Name")) { + } else if (arg.equals("Set QTH / City")) { beam pp = new beam(this, Prefix, OutFont); - if (Connected) out.println ("set/name " + Prefix ); + if ((Connected) && !(Prefix.equals(""))) out.println ("set/qth " + Prefix ); + + } else if (arg.equals("Set Name")) { + beam pp = new beam(this, Prefix, OutFont); + if ((Connected) && !(Prefix.equals(""))) out.println ("set/name " + Prefix ); - } - else if (arg.equals("Set Locator")) { + } else if (arg.equals("Set Locator")) { beam pp = new beam(this, Prefix, OutFont); - if (Connected) out.println ("set/qra " + Prefix ); + if ((Connected) && !(Prefix.equals(""))) out.println ("set/qra " + Prefix ); - } - else if (arg.equals("Set HomeNode")) { - if (Connected) out.println ("set/homenode " + Prefix ); + } else if (arg.equals("Set HomeNode")) { + beam pp = new beam(this, Prefix, OutFont); + if ((Connected) && !(Prefix.equals(""))) out.println ("set/homenode " + Prefix ); - } - else if (arg.equals("Show Personal Settings")) { - if (Connected) out.println ("sh/sta " + Call ); + } else if (arg.equals("Set DX-Grid")) { + if (Connected) out.println("set/dxgrid"); + } else if (arg.equals("Set No DX-Grid")) { + if (Connected) out.println("set/nodxgrid"); + + } else if (arg.equals("Show Personal Settings")) { + if (Connected) out.println ("sh/sta " + Call ); } // dx announce else if (arg.equals("DXannounce")) { dxannounce pp = new dxannounce(this, Call2, Freq, Remarks, OutFont); - if (Connected) out.println ("dx " + Freq + " " + Call2 + " " + Remarks ); - + if ((Connected) && !(Call2.equals(""))) out.println ("dx " + Freq + " " + Call2 + " " + Remarks ); } // mailbox else if (arg.equals("Last 10 Msgs")) { if (Connected) out.println ("dir" ); - } - else if (arg.equals("Last 50 Msgs")) { + } else if (arg.equals("Last 50 Msgs")) { if (Connected) out.println ("dir/50" ); - } - else if (arg.equals("New Messages")) { + } else if (arg.equals("New Messages")) { if (Connected) out.println ("dir/new" ); - } - else if (arg.equals("Own Messages")) { + } else if (arg.equals("Own Messages")) { if (Connected) out.println ("dir/own" ); - } - - - + } else return false; } else if (evt.target instanceof Button) { @@ -529,10 +511,8 @@ menubar.add(mailbox); parent.dodisconnect(); } else return false; } - else return false; } - return true; } @@ -566,8 +546,8 @@ menubar.add(mailbox); private Label connectState = new Label("not connected"); - private Color OutBackgroundColor = new Color(0,0,66); - private Color OutForegroundColor = new Color(255,255,0); + private Color OutBackgroundColor = Color.black; + private Color OutForegroundColor = Color.yellow; private Color OutOwnColor = Color.red; private Color InBackgroundColor = new Color(234,199,135); private Color InForegroundColor = Color.red; @@ -589,11 +569,6 @@ menubar.add(mailbox); private String Remarks = new String (""); - - - - - private PrintStream out = null; private String InputBuffer[] = new String[256]; @@ -605,7 +580,6 @@ menubar.add(mailbox); private boolean Connected; private spiderclient parent; - } class setDate extends Thread { @@ -624,12 +598,9 @@ class setDate extends Thread { cf.setTime(today.toLocaleString()); } } - private Date today = new Date(); - } - class idleTime extends Thread { spiderframe cf; @@ -646,7 +617,6 @@ class idleTime extends Thread { } public void run() { - for(;;) { try { sleep(1000); } catch (InterruptedException e) {} count++;