[diablu commit] r311 - in trunk/SMS2OSC/src/pt/citar/diablu/sms2osc: . gui util

0 views
Skip to first unread message

codesite...@google.com

unread,
Nov 5, 2008, 12:25:16 PM11/5/08
to diablu...@googlegroups.com
Author: pedro.r.santos
Date: Wed Nov 5 09:24:30 2008
New Revision: 311

Added:
trunk/SMS2OSC/src/pt/citar/diablu/sms2osc/util/S2OTextAreaHandler.java
Modified:
trunk/SMS2OSC/src/pt/citar/diablu/sms2osc/S2O.java
trunk/SMS2OSC/src/pt/citar/diablu/sms2osc/gui/S2OGUI.form
trunk/SMS2OSC/src/pt/citar/diablu/sms2osc/gui/S2OGUI.java

Log:
Logger implemented

Modified: trunk/SMS2OSC/src/pt/citar/diablu/sms2osc/S2O.java
==============================================================================
--- trunk/SMS2OSC/src/pt/citar/diablu/sms2osc/S2O.java (original)
+++ trunk/SMS2OSC/src/pt/citar/diablu/sms2osc/S2O.java Wed Nov 5 09:24:30
2008
@@ -1,14 +1,19 @@
package pt.citar.diablu.sms2osc;

+import java.io.IOException;
import java.util.logging.ConsoleHandler;
+import java.util.logging.FileHandler;
+import java.util.logging.Handler;
import java.util.logging.Level;
import java.util.logging.Logger;
+import java.util.logging.SimpleFormatter;
import pt.citar.diablu.sms2osc.bluetooth.S2OBTConnection;
import pt.citar.diablu.sms2osc.gui.S2OGUI;
import pt.citar.diablu.sms2osc.osc.S2OOscClient;
import pt.citar.diablu.sms2osc.osc.S2OOscServer;
import pt.citar.diablu.sms2osc.util.S2OCommPortList;
import pt.citar.diablu.sms2osc.util.S2OProperties;
+import pt.citar.diablu.sms2osc.util.S2OTextAreaHandler;


public class S2O {
@@ -16,10 +21,13 @@
private Logger logger;
private S2OCommPortList commPortList;
private S2OProperties properties;
- private ConsoleHandler ch = new ConsoleHandler();
+


private S2OGUI gui;
+ private S2OTextAreaHandler textAreaHandler;
+ private ConsoleHandler consoleHandler;
+ private FileHandler fileHandler;
private S2OOscServer oscServer;
private S2OOscClient oscClient;

@@ -30,27 +38,56 @@
public S2O()
{
logger = Logger.getLogger("pt.citar.diablu.sms2osc");
- ch.setLevel(Level.ALL);
- logger.addHandler(ch);
- System.out.println(logger.getHandlers()[0].getLevel());
-
- logger.log(Level.SEVERE, "start");
- commPortList = new S2OCommPortList();
properties = new S2OProperties(this);
+ commPortList = new S2OCommPortList();
+ gui = new S2OGUI(this);
+ setupLogger();
+
properties.loadProperties();
oscServer = new S2OOscServer(this);
oscClient = new S2OOscClient(this);
- gui = new S2OGUI(this);
+
btConnection = new S2OBTConnection(this,
properties.getGateway(), "COM6", 57600, "Siemens", "S65");
+
+


}

+
public static void main(String[] args) {

S2O s2o = new S2O();
s2o.gui.setVisible(true);

+ s2o.logger.log(Level.SEVERE, "SEVERE");
+ s2o.logger.log(Level.WARNING, "WARNING");
+ s2o.logger.log(Level.INFO, "INFO");
+ s2o.logger.log(Level.CONFIG, "CONFIG");
+ s2o.logger.log(Level.FINE, "FINE");
+ s2o.logger.log(Level.FINER, "FINER");
+ s2o.logger.log(Level.FINEST, "FINEST");
+
+ }
+
+ private void setupLogger()
+ {
+ logger.setLevel(Level.ALL);
+
+ textAreaHandler = new S2OTextAreaHandler(gui.getLogTextArea());
+ consoleHandler = new ConsoleHandler();
+ try {
+ fileHandler = new FileHandler("logs.txt");
+ } catch (IOException ex) {
+ logger.log(Level.SEVERE, null, ex);
+ } catch (SecurityException ex) {
+ logger.log(Level.SEVERE, null, ex);
+ }
+ fileHandler.setFormatter(new SimpleFormatter());
+
+ logger.addHandler(textAreaHandler);
+ logger.addHandler(fileHandler);
+
}

public S2OGUI getGui() {
@@ -81,6 +118,16 @@
public S2OOscClient getOscClient() {
return oscClient;
}
+
+ public S2OTextAreaHandler getTextAreaHandler() {
+ return textAreaHandler;
+ }
+
+ public Logger getLogger() {
+ return logger;
+ }
+
+


Modified: trunk/SMS2OSC/src/pt/citar/diablu/sms2osc/gui/S2OGUI.form
==============================================================================
--- trunk/SMS2OSC/src/pt/citar/diablu/sms2osc/gui/S2OGUI.form (original)
+++ trunk/SMS2OSC/src/pt/citar/diablu/sms2osc/gui/S2OGUI.form Wed Nov 5
09:24:30 2008
@@ -359,7 +359,7 @@

<Layout
class="org.netbeans.modules.form.compat2.layouts.support.JScrollPaneSupportLayout"/>
<SubComponents>
- <Component class="javax.swing.JTextArea" name="jTextArea1">
+ <Component class="javax.swing.JTextArea"
name="logTextArea">
<Properties>
<Property name="columns" type="int" value="20"/>
<Property name="rows" type="int" value="5"/>
@@ -369,15 +369,13 @@
</Container>
<Component class="javax.swing.JComboBox" name="jComboBox1">
<Properties>
- <Property name="model" type="javax.swing.ComboBoxModel"
editor="org.netbeans.modules.form.editors2.ComboBoxModelEditor">
- <StringArray count="4">
- <StringItem index="0" value="Item 1"/>
- <StringItem index="1" value="Item 2"/>
- <StringItem index="2" value="Item 3"/>
- <StringItem index="3" value="Item 4"/>
- </StringArray>
+ <Property name="model" type="javax.swing.ComboBoxModel"
editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
+ <Connection code="new
javax.swing.DefaultComboBoxModel(new String[] { &quot;SEVERE&quot;,
&quot;WARNING&quot;, &quot;INFO&quot;, &quot;CONFIG&quot;,
&quot;FINE&quot;, &quot;FINER&quot;, &quot;FINEST&quot; })" type="code"/>
</Property>
</Properties>
+ <Events>
+ <EventHandler event="actionPerformed"
listener="java.awt.event.ActionListener"
parameters="java.awt.event.ActionEvent"
handler="jComboBox1ActionPerformed"/>
+ </Events>
</Component>
</SubComponents>
</Container>

Modified: trunk/SMS2OSC/src/pt/citar/diablu/sms2osc/gui/S2OGUI.java
==============================================================================
--- trunk/SMS2OSC/src/pt/citar/diablu/sms2osc/gui/S2OGUI.java (original)
+++ trunk/SMS2OSC/src/pt/citar/diablu/sms2osc/gui/S2OGUI.java Wed Nov 5
09:24:30 2008
@@ -1,6 +1,8 @@

package pt.citar.diablu.sms2osc.gui;

+import java.util.logging.Level;
+import javax.swing.JTextArea;
import pt.citar.diablu.sms2osc.*;


@@ -46,7 +48,7 @@
CommPortLabel = new javax.swing.JLabel();
jPanel1 = new javax.swing.JPanel();
jScrollPane1 = new javax.swing.JScrollPane();
- jTextArea1 = new javax.swing.JTextArea();
+ logTextArea = new javax.swing.JTextArea();
jComboBox1 = new javax.swing.JComboBox();


setDefaultCloseOperation(javax.swing.WindowConstants.EXIT_ON_CLOSE);
@@ -228,11 +230,16 @@

S2OTabbedPane.addTab("Connection", ConnectionPanel);

- jTextArea1.setColumns(20);
- jTextArea1.setRows(5);
- jScrollPane1.setViewportView(jTextArea1);
+ logTextArea.setColumns(20);
+ logTextArea.setRows(5);
+ jScrollPane1.setViewportView(logTextArea);

- jComboBox1.setModel(new javax.swing.DefaultComboBoxModel(new
String[] { "Item 1", "Item 2", "Item 3", "Item 4" }));
+ jComboBox1.setModel(new javax.swing.DefaultComboBoxModel(new
String[]
{ "SEVERE", "WARNING", "INFO", "CONFIG", "FINE", "FINER", "FINEST" }));
+ jComboBox1.addActionListener(new java.awt.event.ActionListener() {
+ public void actionPerformed(java.awt.event.ActionEvent evt) {
+ jComboBox1ActionPerformed(evt);
+ }
+ });

javax.swing.GroupLayout jPanel1Layout = new
javax.swing.GroupLayout(jPanel1);
jPanel1.setLayout(jPanel1Layout);
@@ -289,6 +296,20 @@
s2o.getOscServer().stop();
}//GEN-LAST:event_OSCConnectButtonActionPerformed

+private void jComboBox1ActionPerformed(java.awt.event.ActionEvent evt)
{//GEN-FIRST:event_jComboBox1ActionPerformed
+
+ s2o.getLogger().setLevel(Level.parse((String)
jComboBox1.getSelectedItem()));
+
+ s2o.getLogger().log(Level.SEVERE, "SEVERE");
+ s2o.getLogger().log(Level.WARNING, "WARNING");
+ s2o.getLogger().log(Level.INFO, "INFO");
+ s2o.getLogger().log(Level.CONFIG, "CONFIG");
+ s2o.getLogger().log(Level.FINE, "FINE");
+ s2o.getLogger().log(Level.FINER, "FINER");
+ s2o.getLogger().log(Level.FINEST, "FINEST");
+
+}//GEN-LAST:event_jComboBox1ActionPerformed
+

// Variables declaration - do not modify//GEN-BEGIN:variables
private javax.swing.JLabel CommPortLabel;
@@ -310,7 +331,7 @@
private javax.swing.JComboBox jComboBox1;
private javax.swing.JPanel jPanel1;
private javax.swing.JScrollPane jScrollPane1;
- private javax.swing.JTextArea jTextArea1;
+ private javax.swing.JTextArea logTextArea;
// End of variables declaration//GEN-END:variables

public String getHostname() {
@@ -330,7 +351,11 @@
OSCConnectButton.setText("Stop Server");
else
OSCConnectButton.setText("Start Server");
- }
+ }
+
+ public JTextArea getLogTextArea() {
+ return logTextArea;
+ }


Added:
trunk/SMS2OSC/src/pt/citar/diablu/sms2osc/util/S2OTextAreaHandler.java
==============================================================================
--- (empty file)
+++ trunk/SMS2OSC/src/pt/citar/diablu/sms2osc/util/S2OTextAreaHandler.java
Wed Nov 5 09:24:30 2008
@@ -0,0 +1,57 @@
+package pt.citar.diablu.sms2osc.util;
+
+import java.util.Vector;
+import java.util.logging.Handler;
+import java.util.logging.Level;
+import java.util.logging.LogRecord;
+import javax.swing.JTextArea;
+
+
+public class S2OTextAreaHandler extends Handler{
+
+ private static int MAXLOGS = 20;
+ private JTextArea textArea;
+ private Level level;
+ private Vector<LogRecord> logs;
+
+ public S2OTextAreaHandler(JTextArea textArea) {
+ this.textArea = textArea;
+ logs = new Vector<LogRecord>();
+ this.level = Level.ALL;
+ }
+
+ @Override
+ public void publish(LogRecord record) {
+
+ if(logs.size() == MAXLOGS)
+ logs.remove(0);
+ if(level.intValue() <= record.getLevel().intValue())
+ {
+ textArea.setText("");
+ logs.add(record);
+
+ for(int i = 0; i < logs.size(); i++)
+ { if(i != 0)
+ textArea.append("\n");
+ textArea.append(logs.elementAt(i).getMessage());
+ textArea.setCaretPosition(textArea.getText().length() - 1);
+ }
+ }
+ }
+
+ @Override
+ public void flush() {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
+ @Override
+ public void close() throws SecurityException {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
+ @Override
+ public void setLevel(Level level) {
+ this.level = level;
+ }
+
+}

Reply all
Reply to author
Forward
0 new messages