From e16a5d65dfae1b9f0bda12ab6611355e522ab588 Mon Sep 17 00:00:00 2001 From: Enrico Joerns Date: Fri, 11 Jul 2014 02:14:46 +0200 Subject: [PATCH] [cooja] plugins/analyzers: Added @Override annotations --- .../contikios/cooja/plugins/RadioLogger.java | 34 +++++++++++++++++++ .../plugins/analyzers/ICMPv6Analyzer.java | 1 + .../plugins/analyzers/IEEE802154Analyzer.java | 2 ++ .../plugins/analyzers/IPHCPacketAnalyzer.java | 2 ++ .../plugins/analyzers/IPv6PacketAnalyzer.java | 2 ++ 5 files changed, 41 insertions(+) diff --git a/tools/cooja/java/org/contikios/cooja/plugins/RadioLogger.java b/tools/cooja/java/org/contikios/cooja/plugins/RadioLogger.java index 2205f1c68..70eba23bb 100644 --- a/tools/cooja/java/org/contikios/cooja/plugins/RadioLogger.java +++ b/tools/cooja/java/org/contikios/cooja/plugins/RadioLogger.java @@ -187,6 +187,7 @@ public class RadioLogger extends VisPlugin { private static final long serialVersionUID = 1692207305977527004L; + @Override public String getColumnName(int col) { if (col == COLUMN_TIME && formatTimeString) { return "Time"; @@ -194,14 +195,17 @@ public class RadioLogger extends VisPlugin { return COLUMN_NAMES[col]; } + @Override public int getRowCount() { return connections.size(); } + @Override public int getColumnCount() { return COLUMN_NAMES.length; } + @Override public Object getValueAt(int row, int col) { if (row < 0 || row >= connections.size()) { return ""; @@ -247,6 +251,7 @@ public class RadioLogger extends VisPlugin { return null; } + @Override public boolean isCellEditable(int row, int col) { if (col == COLUMN_FROM) { /* Highlight source */ @@ -265,6 +270,7 @@ public class RadioLogger extends VisPlugin { return false; } + @Override public Class getColumnClass(int c) { return getValueAt(0, c).getClass(); } @@ -274,6 +280,7 @@ public class RadioLogger extends VisPlugin { private static final long serialVersionUID = -2199726885069809686L; + @Override public String getToolTipText(MouseEvent e) { java.awt.Point p = e.getPoint(); int rowIndex = rowAtPoint(p); @@ -328,6 +335,7 @@ public class RadioLogger extends VisPlugin { /* Toggle time format */ dataTable.getTableHeader().addMouseListener(new MouseAdapter() { + @Override public void mouseClicked(MouseEvent e) { int colIndex = dataTable.columnAtPoint(e.getPoint()); int columnIndex = dataTable.convertColumnIndexToModel(colIndex); @@ -342,6 +350,7 @@ public class RadioLogger extends VisPlugin { }); dataTable.addKeyListener(new KeyAdapter() { + @Override public void keyPressed(KeyEvent e) { if (e.getKeyCode() == KeyEvent.VK_SPACE) { showInAllAction.actionPerformed(null); @@ -366,6 +375,7 @@ public class RadioLogger extends VisPlugin { dataTable.setRowSorter(logFilter); dataTable.getSelectionModel().addListSelectionListener(new ListSelectionListener() { + @Override public void valueChanged(ListSelectionEvent e) { int row = dataTable.getSelectedRow(); if (row < 0) { @@ -394,11 +404,13 @@ public class RadioLogger extends VisPlugin { payloadMenu.add(new JMenuItem(aliasAction)); payloadMenu.add(new JCheckBoxMenuItem(showDuplicatesAction) { + @Override public boolean isSelected() { return showDuplicates; } }); payloadMenu.add(new JCheckBoxMenuItem(hideNoDestinationAction) { + @Override public boolean isSelected() { return hideNoDestinationPackets; } @@ -469,6 +481,7 @@ public class RadioLogger extends VisPlugin { /* Search text field */ searchField.setVisible(false); searchField.addKeyListener(new KeyAdapter() { + @Override public void keyPressed(KeyEvent e) { if (e.getKeyCode() == KeyEvent.VK_ENTER) { searchSelectNext( @@ -494,6 +507,7 @@ public class RadioLogger extends VisPlugin { adjuster.packColumns(); radioMedium.addRadioMediumObserver(radioMediumObserver = new Observer() { + @Override public void update(Observable obs, Object obj) { RadioConnection conn = radioMedium.getLastConnection(); if (conn == null) { @@ -505,6 +519,7 @@ public class RadioLogger extends VisPlugin { loggedConn.connection = conn; loggedConn.packet = conn.getSource().getLastPacketTransmitted(); java.awt.EventQueue.invokeLater(new Runnable() { + @Override public void run() { int lastSize = connections.size(); // Check if the last row is visible @@ -536,6 +551,7 @@ public class RadioLogger extends VisPlugin { } } + @Override public void startPlugin() { super.startPlugin(); rebuildAllEntries(); @@ -583,6 +599,7 @@ public class RadioLogger extends VisPlugin { */ public void trySelectTime(final long time) { java.awt.EventQueue.invokeLater(new Runnable() { + @Override public void run() { if (dataTable.getRowCount() == 0) { return; @@ -614,6 +631,7 @@ public class RadioLogger extends VisPlugin { try { logFilter.setRowFilter(null); RowFilter filter = new RowFilter() { + @Override public boolean include(RowFilter.Entry entry) { int row = (Integer) entry.getIdentifier(); RadioConnectionLog current = connections.get(row); @@ -760,12 +778,14 @@ public class RadioLogger extends VisPlugin { } } + @Override public void closePlugin() { if (radioMediumObserver != null) { radioMedium.deleteRadioMediumObserver(radioMediumObserver); } } + @Override public Collection getConfigXML() { ArrayList config = new ArrayList(); @@ -812,6 +832,7 @@ public class RadioLogger extends VisPlugin { return config; } + @Override public boolean setConfigXML(Collection configXML, boolean visAvailable) { for (Element element : configXML) { String name = element.getName(); @@ -835,6 +856,7 @@ public class RadioLogger extends VisPlugin { final Action action; if (analyzerName != null && ((action = analyzerMap.get(analyzerName)) != null)) { java.awt.EventQueue.invokeLater(new Runnable() { + @Override public void run() { action.putValue(Action.SELECTED_KEY, Boolean.TRUE); action.actionPerformed(null); @@ -862,6 +884,7 @@ public class RadioLogger extends VisPlugin { String data = null; String tooltip = null; + @Override public String toString() { if (data == null) { RadioLogger.this.prepareDataString(this); @@ -906,6 +929,7 @@ public class RadioLogger extends VisPlugin { Action action = new AbstractAction(name) { private static final long serialVersionUID = -608913700422638454L; + @Override public void actionPerformed(ActionEvent event) { if (analyzers != analyzerList) { analyzers = analyzerList; @@ -922,6 +946,7 @@ public class RadioLogger extends VisPlugin { private Action clearAction = new AbstractAction("Clear") { private static final long serialVersionUID = -6135583266684643117L; + @Override public void actionPerformed(ActionEvent e) { int size = connections.size(); if (size > 0) { @@ -935,6 +960,7 @@ public class RadioLogger extends VisPlugin { private Action copyAction = new AbstractAction("Copy selected") { private static final long serialVersionUID = 8412062977916108054L; + @Override public void actionPerformed(ActionEvent e) { Clipboard clipboard = Toolkit.getDefaultToolkit().getSystemClipboard(); @@ -954,6 +980,7 @@ public class RadioLogger extends VisPlugin { private Action copyAllAction = new AbstractAction("Copy all") { private static final long serialVersionUID = 1905586689441157304L; + @Override public void actionPerformed(ActionEvent e) { Clipboard clipboard = Toolkit.getDefaultToolkit().getSystemClipboard(); @@ -970,6 +997,7 @@ public class RadioLogger extends VisPlugin { private Action saveAction = new AbstractAction("Save to file...") { private static final long serialVersionUID = -3942984643211482179L; + @Override public void actionPerformed(ActionEvent e) { JFileChooser fc = new JFileChooser(); int returnVal = fc.showSaveDialog(Cooja.getTopParentContainer()); @@ -1014,6 +1042,7 @@ public class RadioLogger extends VisPlugin { private Action timeLineAction = new AbstractAction("Timeline") { private static final long serialVersionUID = -4035633464748224192L; + @Override public void actionPerformed(ActionEvent e) { int selectedRow = dataTable.getSelectedRow(); if (selectedRow < 0) return; @@ -1038,6 +1067,7 @@ public class RadioLogger extends VisPlugin { private Action logListenerAction = new AbstractAction("Mote output") { private static final long serialVersionUID = 1985006491187878651L; + @Override public void actionPerformed(ActionEvent e) { int selectedRow = dataTable.getSelectedRow(); if (selectedRow < 0) return; @@ -1066,6 +1096,7 @@ public class RadioLogger extends VisPlugin { putValue(ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_SPACE, 0, true)); } + @Override public void actionPerformed(ActionEvent e) { timeLineAction.actionPerformed(null); logListenerAction.actionPerformed(null); @@ -1076,6 +1107,7 @@ public class RadioLogger extends VisPlugin { private Action aliasAction = new AbstractAction("Payload alias...") { private static final long serialVersionUID = -1678771087456128721L; + @Override public void actionPerformed(ActionEvent e) { int selectedRow = dataTable.getSelectedRow(); if (selectedRow < 0) return; @@ -1127,6 +1159,7 @@ public class RadioLogger extends VisPlugin { private boolean showDuplicates = false; private AbstractAction showDuplicatesAction = new AbstractAction("Show duplicates") { + @Override public void actionPerformed(ActionEvent e) { showDuplicates = !showDuplicates; rebuildAllEntries(); @@ -1135,6 +1168,7 @@ public class RadioLogger extends VisPlugin { private boolean hideNoDestinationPackets = false; private AbstractAction hideNoDestinationAction = new AbstractAction("Hide airshots") { + @Override public void actionPerformed(ActionEvent e) { hideNoDestinationPackets = !hideNoDestinationPackets; rebuildAllEntries(); diff --git a/tools/cooja/java/org/contikios/cooja/plugins/analyzers/ICMPv6Analyzer.java b/tools/cooja/java/org/contikios/cooja/plugins/analyzers/ICMPv6Analyzer.java index f1e3b0aa0..7b1d03fd0 100644 --- a/tools/cooja/java/org/contikios/cooja/plugins/analyzers/ICMPv6Analyzer.java +++ b/tools/cooja/java/org/contikios/cooja/plugins/analyzers/ICMPv6Analyzer.java @@ -38,6 +38,7 @@ public class ICMPv6Analyzer extends PacketAnalyzer { "NEIGHBOR_SOLICITATION", "NEIGHBOR_ADVERTISEMENT", "REDIRECT", "ROUTER RENUMBER", "NODE INFORMATION QUERY", "NODE INFORMATION RESPONSE"}; + @Override public int analyzePacket(Packet packet, StringBuffer brief, StringBuffer verbose) { int type = packet.get(0) & 0xff; diff --git a/tools/cooja/java/org/contikios/cooja/plugins/analyzers/IEEE802154Analyzer.java b/tools/cooja/java/org/contikios/cooja/plugins/analyzers/IEEE802154Analyzer.java index 4175a2be4..ce94e8e14 100644 --- a/tools/cooja/java/org/contikios/cooja/plugins/analyzers/IEEE802154Analyzer.java +++ b/tools/cooja/java/org/contikios/cooja/plugins/analyzers/IEEE802154Analyzer.java @@ -47,6 +47,7 @@ public class IEEE802154Analyzer extends PacketAnalyzer { } } + @Override public boolean matchPacket(Packet packet) { return packet.level == MAC_LEVEL; } @@ -59,6 +60,7 @@ public class IEEE802154Analyzer extends PacketAnalyzer { * next handler */ + @Override public int analyzePacket(Packet packet, StringBuffer brief, StringBuffer verbose) { if (pcapExporter != null) { diff --git a/tools/cooja/java/org/contikios/cooja/plugins/analyzers/IPHCPacketAnalyzer.java b/tools/cooja/java/org/contikios/cooja/plugins/analyzers/IPHCPacketAnalyzer.java index 9b77a6ed7..7cbb97935 100644 --- a/tools/cooja/java/org/contikios/cooja/plugins/analyzers/IPHCPacketAnalyzer.java +++ b/tools/cooja/java/org/contikios/cooja/plugins/analyzers/IPHCPacketAnalyzer.java @@ -61,10 +61,12 @@ public class IPHCPacketAnalyzer extends PacketAnalyzer { private static final int IPHC_DISPATCH = 0x60; /* packet must be on network level && have a IPHC dispatch */ + @Override public boolean matchPacket(Packet packet) { return packet.level == NETWORK_LEVEL && (packet.get(0) & 0xe0) == IPHC_DISPATCH; } + @Override public int analyzePacket(Packet packet, StringBuffer brief, StringBuffer verbose) { diff --git a/tools/cooja/java/org/contikios/cooja/plugins/analyzers/IPv6PacketAnalyzer.java b/tools/cooja/java/org/contikios/cooja/plugins/analyzers/IPv6PacketAnalyzer.java index 421014418..0dc34896e 100644 --- a/tools/cooja/java/org/contikios/cooja/plugins/analyzers/IPv6PacketAnalyzer.java +++ b/tools/cooja/java/org/contikios/cooja/plugins/analyzers/IPv6PacketAnalyzer.java @@ -13,10 +13,12 @@ public class IPv6PacketAnalyzer extends PacketAnalyzer { private static final int IPV6_DISPATCH = 0x41; + @Override public boolean matchPacket(Packet packet) { return packet.level == NETWORK_LEVEL && packet.get(0) == IPV6_DISPATCH; } + @Override public int analyzePacket(Packet packet, StringBuffer brief, StringBuffer verbose) {