Author: bdonlan
Date: 2005-01-07 01:35:01 -0500 (Fri, 07 Jan 2005)
New Revision: 535
Modified:
/
trunk/misc/javer/src/javer/JaverUI.java
trunk/misc/javer/src/javer/JaverUIPanel.form
trunk/misc/javer/src/javer/JaverUIPanel.java
Log:
[EMAIL PROTECTED]: bdonlan | 2005-01-07T06:34:38.772371Z
UI tweaks:
* . is a synonym for /
* /say added
* ; added as an alias for /me
* Close button works now
Property changes on:
___________________________________________________________________
Name: svk:merge
- 1f59643a-e6e5-0310-bc24-f7d4c744f460:/haver/local:11214
+ 1f59643a-e6e5-0310-bc24-f7d4c744f460:/haver/local:11216
Modified: trunk/misc/javer/src/javer/JaverUI.java
===================================================================
--- trunk/misc/javer/src/javer/JaverUI.java 2005-01-07 05:37:01 UTC (rev
534)
+++ trunk/misc/javer/src/javer/JaverUI.java 2005-01-07 06:35:01 UTC (rev
535)
@@ -14,6 +14,7 @@
/** Creates new form JaverUI */
public JaverUI() {
+ addWindowListener(new CloseListener());
add(new JaverUIPanel("odin.haverdev.org", 7070));
pack();
}
@@ -51,6 +52,31 @@
}
});
}
+
+ private final class CloseListener implements java.awt.event.WindowListener
{
+ public void windowOpened(java.awt.event.WindowEvent e) {
+ }
+
+ public void windowIconified(java.awt.event.WindowEvent e) {
+ }
+
+ public void windowDeiconified(java.awt.event.WindowEvent e) {
+ }
+
+ public void windowDeactivated(java.awt.event.WindowEvent e) {
+ }
+
+ public void windowClosing(java.awt.event.WindowEvent e) {
+ System.exit(0);
+ }
+
+ public void windowClosed(java.awt.event.WindowEvent e) {
+ }
+
+ public void windowActivated(java.awt.event.WindowEvent e) {
+ }
+ }
+
// Variables declaration - do not modify//GEN-BEGIN:variables
Modified: trunk/misc/javer/src/javer/JaverUIPanel.form
===================================================================
--- trunk/misc/javer/src/javer/JaverUIPanel.form 2005-01-07 05:37:01 UTC
(rev 534)
+++ trunk/misc/javer/src/javer/JaverUIPanel.form 2005-01-07 06:35:01 UTC
(rev 535)
@@ -5,6 +5,10 @@
<Layout
class="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout"/>
<SubComponents>
<Container class="javax.swing.JTabbedPane" name="jTabbedPane1">
+ <Properties>
+ <Property name="tabLayoutPolicy" type="int" value="1"/>
+ <Property name="tabPlacement" type="int" value="3"/>
+ </Properties>
<Constraints>
<Constraint
layoutClass="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout"
value="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout$BorderConstraintsDescription">
<BorderConstraints direction="Center"/>
Modified: trunk/misc/javer/src/javer/JaverUIPanel.java
===================================================================
--- trunk/misc/javer/src/javer/JaverUIPanel.java 2005-01-07 05:37:01 UTC
(rev 534)
+++ trunk/misc/javer/src/javer/JaverUIPanel.java 2005-01-07 06:35:01 UTC
(rev 535)
@@ -318,6 +318,8 @@
setLayout(new java.awt.BorderLayout());
+
jTabbedPane1.setTabLayoutPolicy(javax.swing.JTabbedPane.SCROLL_TAB_LAYOUT);
+ jTabbedPane1.setTabPlacement(javax.swing.JTabbedPane.BOTTOM);
add(jTabbedPane1, java.awt.BorderLayout.CENTER);
jPanel2.setLayout(new javax.swing.BoxLayout(jPanel2,
javax.swing.BoxLayout.Y_AXIS));
@@ -363,8 +365,14 @@
}
}
String query = input.getText();
- if (processLine(query)) {
- input.setText("");
+ input.setText("");
+ if (!processLine(query)) {
+ try {
+ TextTab tab = (TextTab) jTabbedPane1.getSelectedComponent();
+ tab.putText("--- Erroneous command: " + query);
+ } catch (ClassCastException e) {
+ putServer("--- Erroneous command: " + query);
+ }
}
}//GEN-LAST:event_inputKeyTyped
@@ -441,6 +449,18 @@
return true;
}
});
+ commands.put("say", new CommandHandler() {
+ boolean trigger(String arg) throws IOException {
+ try {
+ QueryTab q = (QueryTab)
jTabbedPane1.getSelectedComponent();
+ q.sendText(arg);
+ return true;
+ } catch(ClassCastException e) {
+ return false;
+ }
+ }
+ });
+ commands.put("", commands.get("say"));
commands.put("act", new CommandHandler() {
boolean trigger(String arg) throws IOException {
UserQueryTab tab;
@@ -471,32 +491,38 @@
public boolean processLine(String query) {
try {
- if (query.charAt(0) == '/') {
- if (query.charAt(1) != ' ') {
- String command, arg;
- int endcommand = query.indexOf(' ');
- if (endcommand == -1) {
- command = query.substring(1);
- arg = "";
- } else {
- command = query.substring(1, endcommand);
- arg = query.substring(endcommand + 1);
- }
- System.out.println("COMMAND: " + command + " ARG: " + arg);
- if (!commands.containsKey(command.toLowerCase()))
- return false;
- System.out.println("triggering\n");
- return
((CommandHandler)commands.get(command)).trigger(arg);
+ if (query.charAt(0) == '/' || query.charAt(0) == '.') {
+ String command, arg;
+ int endcommand = query.indexOf(' ');
+ if (endcommand == -1) {
+ command = query.substring(1);
+ arg = "";
} else {
- query = query.substring(2);
+ command = query.substring(1, endcommand);
+ arg = query.substring(endcommand + 1);
}
+ System.out.println("COMMAND: " + command + " ARG: " + arg);
+ if (!commands.containsKey(command.toLowerCase()))
+ return false;
+ System.out.println("triggering\n");
+ return ((CommandHandler)commands.get(command)).trigger(arg);
}
try {
QueryTab tab = (QueryTab) jTabbedPane1.getSelectedComponent();
- tab.sendText(query);
+ int i;
+ if (query.indexOf(';') != 0) {
+ tab.sendText(query);
+ return true;
+ }
+ for (i = 1; i < query.length(); i++) {
+ if (query.charAt(i) != ' ')
+ break;
+ }
+ query = query.substring(i);
+ tab.sendAction(query);
return true;
} catch (java.lang.ClassCastException ex) {
- return false;
+ return true;
}
} catch (IOException e) {
cli.eventIOException(e);
