Skip to content

Commit 8947c7a

Browse files
author
Fredrik Osterlind
committed
reverted previous plugin name changes, instead build displayed names when menu is created
1 parent 37c407b commit 8947c7a

File tree

20 files changed

+152
-111
lines changed

20 files changed

+152
-111
lines changed

‎tools/cooja/apps/avrora/src/se/sics/cooja/avrmote/MicaZMoteType.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,15 +37,18 @@
3737
import java.io.File;
3838
import java.util.ArrayList;
3939
import java.util.Collection;
40+
4041
import javax.swing.BorderFactory;
4142
import javax.swing.Box;
4243
import javax.swing.BoxLayout;
4344
import javax.swing.Icon;
4445
import javax.swing.JLabel;
4546
import javax.swing.JPanel;
4647
import javax.swing.JTextArea;
48+
4749
import org.apache.log4j.Logger;
4850
import org.jdom.Element;
51+
4952
import se.sics.cooja.AbstractionLevelDescription;
5053
import se.sics.cooja.ClassDescription;
5154
import se.sics.cooja.GUI;
@@ -68,10 +71,10 @@
6871

6972
/**
7073
* AVR-based MicaZ mote types emulated in Avrora.
71-
*
74+
*
7275
* @author Joakim Eriksson, Fredrik Osterlind
7376
*/
74-
@ClassDescription("MicaZ mote...")
77+
@ClassDescription("MicaZ mote")
7578
@AbstractionLevelDescription("Emulated level")
7679
public class MicaZMoteType implements MoteType {
7780
private static Logger logger = Logger.getLogger(MicaZMoteType.class);

‎tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/ESBMoteType.java

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,25 @@
3131

3232
package se.sics.cooja.mspmote;
3333

34-
import java.awt.*;
34+
import java.awt.Container;
35+
import java.awt.Image;
36+
import java.awt.MediaTracker;
37+
import java.awt.Toolkit;
3538
import java.io.File;
3639
import java.net.URL;
37-
import javax.swing.*;
40+
41+
import javax.swing.Icon;
42+
import javax.swing.ImageIcon;
43+
import javax.swing.JOptionPane;
3844

3945
import org.apache.log4j.Logger;
40-
import se.sics.cooja.*;
46+
47+
import se.sics.cooja.AbstractionLevelDescription;
48+
import se.sics.cooja.ClassDescription;
49+
import se.sics.cooja.GUI;
50+
import se.sics.cooja.MoteInterface;
51+
import se.sics.cooja.MoteType;
52+
import se.sics.cooja.Simulation;
4153
import se.sics.cooja.dialogs.CompileContiki;
4254
import se.sics.cooja.dialogs.MessageList;
4355
import se.sics.cooja.dialogs.MessageList.MessageContainer;
@@ -53,7 +65,7 @@
5365
import se.sics.cooja.mspmote.interfaces.MspSerial;
5466
import se.sics.cooja.mspmote.interfaces.TR1001Radio;
5567

56-
@ClassDescription("ESB mote...")
68+
@ClassDescription("ESB mote")
5769
@AbstractionLevelDescription("Emulated level")
5870
public class ESBMoteType extends MspMoteType {
5971
private static Logger logger = Logger.getLogger(ESBMoteType.class);
@@ -209,7 +221,7 @@ public File getExpectedFirmwareFile(File source) {
209221

210222
return new File(parentDir, sourceNoExtension + ".esb");
211223
}
212-
224+
213225
protected String getTargetName() {
214226
return "esb";
215227
}

‎tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/Exp5438MoteType.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,13 +56,13 @@
5656
import se.sics.cooja.interfaces.Position;
5757
import se.sics.cooja.interfaces.RimeAddress;
5858
import se.sics.cooja.mspmote.interfaces.Exp5438LED;
59+
import se.sics.cooja.mspmote.interfaces.Msp802154Radio;
5960
import se.sics.cooja.mspmote.interfaces.MspClock;
6061
import se.sics.cooja.mspmote.interfaces.MspDebugOutput;
6162
import se.sics.cooja.mspmote.interfaces.MspMoteID;
62-
import se.sics.cooja.mspmote.interfaces.Msp802154Radio;
6363
import se.sics.cooja.mspmote.interfaces.UsciA1Serial;
6464

65-
@ClassDescription("EXP430F5438 mote...")
65+
@ClassDescription("EXP430F5438 mote")
6666
@AbstractionLevelDescription("Emulated level")
6767
public class Exp5438MoteType extends MspMoteType {
6868
private static Logger logger = Logger.getLogger(Exp5438MoteType.class);
@@ -190,7 +190,7 @@ public Class<? extends MoteInterface>[] getAllMoteInterfaceClasses() {
190190
MspMoteID.class,
191191
Msp802154Radio.class,
192192
UsciA1Serial.class,
193-
Exp5438LED.class,
193+
Exp5438LED.class,
194194
/*Exp5438LCD.class,*/ /* TODO */
195195
MspDebugOutput.class
196196
};
@@ -202,7 +202,7 @@ public File getExpectedFirmwareFile(File source) {
202202

203203
return new File(parentDir, sourceNoExtension + ".exp5438");
204204
}
205-
205+
206206
protected String getTargetName() {
207207
return "exp5438";
208208
}

‎tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/SkyMoteType.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,18 +58,18 @@
5858
import se.sics.cooja.interfaces.MoteAttributes;
5959
import se.sics.cooja.interfaces.Position;
6060
import se.sics.cooja.interfaces.RimeAddress;
61+
import se.sics.cooja.mspmote.interfaces.Msp802154Radio;
6162
import se.sics.cooja.mspmote.interfaces.MspClock;
6263
import se.sics.cooja.mspmote.interfaces.MspDebugOutput;
6364
import se.sics.cooja.mspmote.interfaces.MspMoteID;
65+
import se.sics.cooja.mspmote.interfaces.MspSerial;
6466
import se.sics.cooja.mspmote.interfaces.SkyButton;
65-
import se.sics.cooja.mspmote.interfaces.Msp802154Radio;
6667
import se.sics.cooja.mspmote.interfaces.SkyCoffeeFilesystem;
6768
import se.sics.cooja.mspmote.interfaces.SkyFlash;
6869
import se.sics.cooja.mspmote.interfaces.SkyLED;
69-
import se.sics.cooja.mspmote.interfaces.MspSerial;
7070
import se.sics.cooja.mspmote.interfaces.SkyTemperature;
7171

72-
@ClassDescription("Sky mote...")
72+
@ClassDescription("Sky mote")
7373
@AbstractionLevelDescription("Emulated level")
7474
public class SkyMoteType extends MspMoteType {
7575
private static Logger logger = Logger.getLogger(SkyMoteType.class);
@@ -229,7 +229,7 @@ public File getExpectedFirmwareFile(File source) {
229229

230230
return new File(parentDir, sourceNoExtension + ".sky");
231231
}
232-
232+
233233
protected String getTargetName() {
234234
return "sky";
235235
}

‎tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/TyndallMoteType.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,14 +55,14 @@
5555
import se.sics.cooja.interfaces.MoteAttributes;
5656
import se.sics.cooja.interfaces.Position;
5757
import se.sics.cooja.interfaces.RimeAddress;
58+
import se.sics.cooja.mspmote.interfaces.Msp802154Radio;
5859
import se.sics.cooja.mspmote.interfaces.MspClock;
5960
import se.sics.cooja.mspmote.interfaces.MspDebugOutput;
6061
import se.sics.cooja.mspmote.interfaces.MspMoteID;
61-
import se.sics.cooja.mspmote.interfaces.Msp802154Radio;
6262
import se.sics.cooja.mspmote.interfaces.TyndallLED;
6363
import se.sics.cooja.mspmote.interfaces.UsciA0Serial;
6464

65-
@ClassDescription("Tyndall mote...")
65+
@ClassDescription("Tyndall mote")
6666
@AbstractionLevelDescription("Emulated level")
6767
public class TyndallMoteType extends MspMoteType {
6868
private static Logger logger = Logger.getLogger(TyndallMoteType.class);
@@ -201,7 +201,7 @@ public File getExpectedFirmwareFile(File source) {
201201

202202
return new File(parentDir, sourceNoExtension + ".tyndall");
203203
}
204-
204+
205205
protected String getTargetName() {
206206
return "tyndall";
207207
}

‎tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/WismoteMoteType.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
import se.sics.cooja.mspmote.interfaces.MspLED;
4646
import se.sics.cooja.mspmote.interfaces.MspMoteID;
4747

48-
@ClassDescription("Wismote mote...")
48+
@ClassDescription("Wismote mote")
4949
@AbstractionLevelDescription("Emulated level")
5050
public class WismoteMoteType extends AbstractMspMoteType {
5151

‎tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/Z1MoteType.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
import se.sics.cooja.mspmote.interfaces.MspLED;
4747
import se.sics.cooja.mspmote.interfaces.MspMoteID;
4848

49-
@ClassDescription("Z1 mote...")
49+
@ClassDescription("Z1 mote")
5050
@AbstractionLevelDescription("Emulated level")
5151
public class Z1MoteType extends AbstractMspMoteType {
5252

‎tools/cooja/apps/powertracker/java/PowerTracker.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@
6969
*
7070
* @author Fredrik Osterlind, Adam Dunkels
7171
*/
72-
@ClassDescription("Mote radio duty cycle...")
72+
@ClassDescription("Mote radio duty cycle")
7373
@PluginType(PluginType.SIM_PLUGIN)
7474
public class PowerTracker extends VisPlugin {
7575
private static Logger logger = Logger.getLogger(PowerTracker.class);

‎tools/cooja/java/se/sics/cooja/GUI.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -829,7 +829,7 @@ public void menuSelected(MenuEvent e) {
829829
}
830830

831831
String description = GUI.getDescriptionOf(moteTypeClass);
832-
menuItem = new JMenuItem(description);
832+
menuItem = new JMenuItem(description + "...");
833833
menuItem.setActionCommand("create mote type");
834834
menuItem.putClientProperty("class", moteTypeClass);
835835
/* menuItem.setToolTipText(abstractionLevelDescription);*/

‎tools/cooja/java/se/sics/cooja/contikimote/ContikiMoteType.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@
9090
*
9191
* @author Fredrik Osterlind
9292
*/
93-
@ClassDescription("Cooja mote...")
93+
@ClassDescription("Cooja mote")
9494
@AbstractionLevelDescription("OS level")
9595
public class ContikiMoteType implements MoteType {
9696
private static Logger logger = Logger.getLogger(ContikiMoteType.class);

‎tools/cooja/java/se/sics/cooja/motes/ImportAppMoteType.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,9 @@
4040
import java.net.URLClassLoader;
4141
import java.util.ArrayList;
4242
import java.util.Collection;
43+
4344
import org.jdom.Element;
45+
4446
import se.sics.cooja.AbstractionLevelDescription;
4547
import se.sics.cooja.ClassDescription;
4648
import se.sics.cooja.Mote;
@@ -52,7 +54,7 @@
5254
/**
5355
* @author Fredrik Osterlind
5456
*/
55-
@ClassDescription("Import Java mote...")
57+
@ClassDescription("Import Java mote")
5658
@AbstractionLevelDescription("Application level")
5759
public class ImportAppMoteType extends AbstractApplicationMoteType {
5860

@@ -109,7 +111,7 @@ public boolean setConfigXML(Simulation simulation,
109111
}
110112

111113
public boolean configureAndInit(Container parentContainer,
112-
Simulation simulation, boolean visAvailable)
114+
Simulation simulation, boolean visAvailable)
113115
throws MoteTypeCreationException {
114116
this.simulation = simulation;
115117

@@ -256,7 +258,7 @@ public File getTestClassFile() {
256258
public boolean isTestSubclass(Class<?> type) {
257259
return type.isAssignableFrom(testClass);
258260
}
259-
261+
260262
public Class<?> getTestClass() {
261263
return testClass;
262264
}

‎tools/cooja/java/se/sics/cooja/plugins/BufferListener.java

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@
107107
/**
108108
* @author Fredrik Osterlind, Niclas Finne
109109
*/
110-
@ClassDescription("Buffer view...")
110+
@ClassDescription("Buffer view")
111111
@PluginType(PluginType.SIM_PLUGIN)
112112
public class BufferListener extends VisPlugin {
113113
private static final long serialVersionUID = 1L;
@@ -132,7 +132,7 @@ public class BufferListener extends VisPlugin {
132132

133133
final static int MAX_BUFFER_SIZE = 128;
134134

135-
private static ArrayList<Class<? extends Parser>> bufferParsers =
135+
private static ArrayList<Class<? extends Parser>> bufferParsers =
136136
new ArrayList<Class<? extends Parser>>();
137137
static {
138138
registerBufferParser(ByteArrayParser.class);
@@ -148,7 +148,7 @@ public class BufferListener extends VisPlugin {
148148

149149
/* TODO Hide identical lines? */
150150

151-
private static ArrayList<Class<? extends Buffer>> bufferTypes =
151+
private static ArrayList<Class<? extends Buffer>> bufferTypes =
152152
new ArrayList<Class<? extends Buffer>>();
153153
static {
154154
registerBufferType(PacketbufBuffer.class);
@@ -787,7 +787,7 @@ private void repaintTimeColumn() {
787787
private void updateTitle() {
788788
if (buffer != null) {
789789
String status = buffer.getStatusString();
790-
setTitle("Buffer Listener - " +
790+
setTitle("Buffer Listener - " +
791791
((status!=null)?status:GUI.getDescriptionOf(buffer)) + " " +
792792
"- " + memoryMonitors.size() + " buffers on " + motes.size() + " motes");
793793
}
@@ -872,7 +872,7 @@ public void run() {
872872
repaintTimeColumn();
873873
} else if ("parser".equals(name)) {
874874
String parserClassname = element.getText();
875-
Class<? extends Parser> parserClass =
875+
Class<? extends Parser> parserClass =
876876
simulation.getGUI().tryLoadClass(this, Parser.class, parserClassname);
877877
if (parserClass == null) {
878878
logger.warn("Could not create buffer parser: could not find class: " + parserClassname);
@@ -960,7 +960,7 @@ public void run() {
960960
return;
961961
}
962962
}
963-
});
963+
});
964964
}
965965

966966
public static class BufferAccess {
@@ -1271,7 +1271,7 @@ public void actionPerformed(ActionEvent e) {
12711271
@SuppressWarnings("unchecked")
12721272
public void actionPerformed(ActionEvent e) {
12731273
Class<? extends Parser> bpClass =
1274-
(Class<? extends Parser>)
1274+
(Class<? extends Parser>)
12751275
((JMenuItem) e.getSource()).getClientProperty("CLASS");
12761276
setParser(bpClass);
12771277
}
@@ -1291,7 +1291,7 @@ private void updateParserMenu() {
12911291
@SuppressWarnings("unchecked")
12921292
public void actionPerformed(ActionEvent e) {
12931293
Class<? extends Buffer> btClass =
1294-
(Class<? extends Buffer>)
1294+
(Class<? extends Buffer>)
12951295
((JMenuItem) e.getSource()).getClientProperty("CLASS");
12961296

12971297
Buffer b = createBufferInstance(btClass);
@@ -1610,7 +1610,7 @@ public String parseString(BufferAccess ba) {
16101610
public static class PrintableCharactersParser extends StringParser {
16111611
public String parseString(BufferAccess ba) {
16121612
/* TODO Diff? */
1613-
return new String(ba.mem).replaceAll("[^\\p{Print}]", "");
1613+
return new String(ba.mem).replaceAll("[^\\p{Print}]", "");
16141614
}
16151615
}
16161616

@@ -1692,7 +1692,7 @@ public void paintComponent(Graphics g, JComponent c) {
16921692
if (diff != null && diff[x]) {
16931693
red = true;
16941694
}
1695-
int v = (int)0xff&ba.mem[x];
1695+
int v = 0xff&ba.mem[x];
16961696
int h = Math.min(v/16, 15); /* crop */
16971697
if (red) {
16981698
g.setColor(Color.RED);

0 commit comments

Comments
 (0)