Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Run ./gradlew :spotlessApply #1347

Merged
merged 1 commit into from
Oct 15, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion java/org/contikios/cooja/AbstractionLevelDescription.java
Original file line number Diff line number Diff line change
Expand Up @@ -44,4 +44,3 @@
public @interface AbstractionLevelDescription {
String value();
}

1 change: 0 additions & 1 deletion java/org/contikios/cooja/ClassDescription.java
Original file line number Diff line number Diff line change
Expand Up @@ -45,4 +45,3 @@
public @interface ClassDescription {
String value();
}

3 changes: 1 addition & 2 deletions java/org/contikios/cooja/MoteInterface.java
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,11 @@

import java.util.Collection;
import javax.swing.JPanel;
import org.jdom2.Element;

import org.contikios.cooja.interfaces.PolledAfterActiveTicks;
import org.contikios.cooja.interfaces.PolledAfterAllTicks;
import org.contikios.cooja.interfaces.PolledBeforeActiveTicks;
import org.contikios.cooja.interfaces.PolledBeforeAllTicks;
import org.jdom2.Element;

/**
* A mote interface represents a mote property. Typically, this is a simulated
Expand Down
4 changes: 1 addition & 3 deletions java/org/contikios/cooja/MoteType.java
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,9 @@
import java.util.Collection;
import java.util.List;
import javax.swing.JComponent;

import org.jdom2.Element;

import org.contikios.cooja.contikimote.ContikiMoteType;
import org.contikios.cooja.dialogs.MessageList;
import org.jdom2.Element;

/**
* The mote type defines properties common for several motes. These properties
Expand Down
2 changes: 0 additions & 2 deletions java/org/contikios/cooja/Plugin.java
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,7 @@
package org.contikios.cooja;

import java.util.Collection;

import javax.swing.JInternalFrame;

import org.jdom2.Element;

/**
Expand Down
2 changes: 0 additions & 2 deletions java/org/contikios/cooja/RadioConnection.java
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,6 @@
package org.contikios.cooja;

import java.util.ArrayList;


import org.contikios.cooja.interfaces.Radio;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Expand Down
4 changes: 2 additions & 2 deletions java/org/contikios/cooja/SimEventCentral.java
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,11 @@
import java.util.Collection;
import java.util.Optional;
import java.util.function.BiConsumer;
import org.contikios.cooja.interfaces.Log;
import org.contikios.cooja.util.AnyMoteEventTriggers;
import org.contikios.cooja.util.ArrayUtils;
import org.contikios.cooja.util.EventTriggers;
import org.jdom2.Element;
import org.contikios.cooja.interfaces.Log;
import org.contikios.cooja.util.ArrayUtils;

/**
* Simulation event central. Simplifies implementations of plugins that observe
Expand Down
2 changes: 0 additions & 2 deletions java/org/contikios/cooja/VisPlugin.java
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,9 @@
package org.contikios.cooja;

import java.util.Collection;

import javax.swing.JInternalFrame;
import javax.swing.event.InternalFrameAdapter;
import javax.swing.event.InternalFrameEvent;

import org.jdom2.Element;

/**
Expand Down
4 changes: 2 additions & 2 deletions java/org/contikios/cooja/contikimote/ContikiMote.java
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,13 @@
package org.contikios.cooja.contikimote;

import java.util.ArrayList;
import org.contikios.cooja.MoteType;
import org.contikios.cooja.Simulation;
import org.contikios.cooja.interfaces.PolledAfterActiveTicks;
import org.contikios.cooja.interfaces.PolledAfterAllTicks;
import org.contikios.cooja.interfaces.PolledBeforeActiveTicks;
import org.contikios.cooja.interfaces.PolledBeforeAllTicks;
import org.contikios.cooja.MoteType;
import org.contikios.cooja.mote.memory.SectionMoteMemory;
import org.contikios.cooja.Simulation;
import org.contikios.cooja.motes.AbstractWakeupMote;

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@
import org.contikios.cooja.Cooja;
import org.contikios.cooja.Mote;
import org.contikios.cooja.MoteInterface;

import org.contikios.cooja.interfaces.PolledAfterActiveTicks;
import org.contikios.cooja.mote.memory.VarMemory;
import org.slf4j.Logger;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,6 @@
package org.contikios.cooja.contikimote.interfaces;

import javax.swing.JPanel;


import org.contikios.cooja.Mote;
import org.contikios.cooja.Simulation;
import org.contikios.cooja.contikimote.ContikiMote;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,10 +55,9 @@
import org.contikios.cooja.Cooja;
import org.contikios.cooja.Mote;
import org.contikios.cooja.MoteInterface;
import org.jdom2.Element;

import org.contikios.cooja.interfaces.PolledAfterActiveTicks;
import org.contikios.cooja.mote.memory.VarMemory;
import org.jdom2.Element;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@
import java.awt.Graphics;
import javax.swing.JPanel;
import org.contikios.cooja.Mote;

import org.contikios.cooja.interfaces.LED;
import org.contikios.cooja.interfaces.PolledAfterActiveTicks;
import org.contikios.cooja.mote.memory.VarMemory;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,6 @@

import java.util.ArrayList;
import java.util.Collection;

import org.jdom2.Element;

import org.contikios.cooja.COOJARadioPacket;
import org.contikios.cooja.Mote;
import org.contikios.cooja.RadioPacket;
Expand All @@ -46,6 +43,7 @@
import org.contikios.cooja.mote.memory.VarMemory;
import org.contikios.cooja.radiomediums.UDGM;
import org.contikios.cooja.util.CCITT_CRC;
import org.jdom2.Element;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

Expand Down
2 changes: 0 additions & 2 deletions java/org/contikios/cooja/dialogs/AbstractCompileDialog.java
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.ArrayList;

import javax.swing.AbstractAction;
import javax.swing.Action;
import javax.swing.BorderFactory;
Expand All @@ -65,7 +64,6 @@
import javax.swing.event.DocumentEvent;
import javax.swing.event.DocumentListener;
import javax.swing.filechooser.FileNameExtensionFilter;

import org.contikios.cooja.Cooja;
import org.contikios.cooja.MoteInterface;
import org.contikios.cooja.interfaces.Clock;
Expand Down
2 changes: 0 additions & 2 deletions java/org/contikios/cooja/dialogs/BufferSettings.java
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@
import java.awt.event.ActionEvent;
import java.awt.event.KeyEvent;
import java.text.NumberFormat;

import javax.swing.AbstractAction;
import javax.swing.Action;
import javax.swing.BorderFactory;
Expand All @@ -47,7 +46,6 @@
import javax.swing.JLabel;
import javax.swing.JOptionPane;
import javax.swing.KeyStroke;

import org.contikios.cooja.Cooja;
import org.contikios.cooja.SimEventCentral;
import org.contikios.cooja.Simulation;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@
import javax.swing.event.DocumentEvent;
import javax.swing.event.DocumentListener;
import javax.swing.table.DefaultTableModel;

import org.contikios.cooja.Cooja;
import org.contikios.cooja.contikimote.ContikiMoteType;
import org.contikios.cooja.contikimote.ContikiMoteType.NetworkStack;
Expand Down
2 changes: 0 additions & 2 deletions java/org/contikios/cooja/dialogs/CreateSimDialog.java
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@
import java.text.NumberFormat;
import java.util.Random;
import java.util.Vector;

import javax.swing.AbstractAction;
import javax.swing.BorderFactory;
import javax.swing.Box;
Expand All @@ -55,7 +54,6 @@
import javax.swing.JLabel;
import javax.swing.JTextField;
import javax.swing.KeyStroke;

import org.contikios.cooja.Cooja;
import org.contikios.cooja.RadioMedium;
import org.contikios.cooja.Simulation;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,6 @@
import javax.swing.filechooser.FileFilter;
import javax.swing.table.AbstractTableModel;
import javax.swing.table.DefaultTableCellRenderer;

import org.contikios.cooja.COOJAProject;
import org.contikios.cooja.Cooja;
import org.contikios.cooja.ProjectConfig;
Expand Down
6 changes: 2 additions & 4 deletions java/org/contikios/cooja/dialogs/SerialUI.java
Original file line number Diff line number Diff line change
Expand Up @@ -37,22 +37,20 @@
import java.awt.event.KeyAdapter;
import java.awt.event.KeyEvent;
import java.awt.event.MouseEvent;
import java.util.Arrays;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import javax.swing.JButton;
import javax.swing.JOptionPane;
import javax.swing.JPanel;
import javax.swing.JScrollPane;
import javax.swing.JTextArea;
import javax.swing.JTextField;

import org.jdom2.Element;

import org.contikios.cooja.Mote;
import org.contikios.cooja.interfaces.Log;
import org.contikios.cooja.interfaces.SerialPort;
import org.contikios.cooja.util.EventTriggers;
import org.jdom2.Element;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

Expand Down
1 change: 0 additions & 1 deletion java/org/contikios/cooja/dialogs/TableColumnAdjuster.java
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
import java.util.Arrays;

import javax.swing.JTable;
import javax.swing.event.TableModelEvent;
import javax.swing.event.TableModelListener;
Expand Down
2 changes: 0 additions & 2 deletions java/org/contikios/cooja/dialogs/UpdateAggregator.java
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,7 @@
import java.awt.EventQueue;
import java.util.ArrayList;
import java.util.List;

import javax.swing.Timer;

import org.contikios.cooja.plugins.LogListener;

/**
Expand Down
2 changes: 0 additions & 2 deletions java/org/contikios/cooja/interfaces/ApplicationRadio.java
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,6 @@
import javax.swing.JFormattedTextField;
import javax.swing.JLabel;
import javax.swing.JPanel;


import org.contikios.cooja.Mote;
import org.contikios.cooja.MoteTimeEvent;
import org.contikios.cooja.RadioPacket;
Expand Down
1 change: 0 additions & 1 deletion java/org/contikios/cooja/interfaces/Battery.java
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@
package org.contikios.cooja.interfaces;

import javax.swing.JPanel;

import org.contikios.cooja.ClassDescription;
import org.contikios.cooja.Mote;
import org.contikios.cooja.MoteInterface;
Expand Down
2 changes: 0 additions & 2 deletions java/org/contikios/cooja/interfaces/Clock.java
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,10 @@
import java.awt.event.MouseEvent;
import java.util.ArrayList;
import java.util.Collection;

import javax.swing.JButton;
import javax.swing.JLabel;
import javax.swing.JPanel;
import javax.swing.JTextField;

import org.contikios.cooja.ClassDescription;
import org.contikios.cooja.Mote;
import org.contikios.cooja.MoteInterface;
Expand Down
2 changes: 1 addition & 1 deletion java/org/contikios/cooja/interfaces/MoteID.java
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@
import java.util.LinkedHashMap;
import javax.swing.JLabel;
import javax.swing.JPanel;
import org.contikios.cooja.Cooja;
import org.contikios.cooja.ClassDescription;
import org.contikios.cooja.Cooja;
import org.contikios.cooja.Mote;
import org.contikios.cooja.MoteInterface;
import org.jdom2.Element;
Expand Down
3 changes: 1 addition & 2 deletions java/org/contikios/cooja/mote/memory/VarMemory.java
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,9 @@

import java.util.Collection;
import java.util.Set;

import org.contikios.cooja.mote.memory.MemoryInterface.Symbol;
import org.contikios.cooja.mote.memory.MemoryInterface.SegmentMonitor;
import org.contikios.cooja.mote.memory.MemoryInterface.SegmentMonitor.EventType;
import org.contikios.cooja.mote.memory.MemoryInterface.Symbol;

/**
* Represents memory that can be accessed with names of variables.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,10 @@
import java.util.HashMap;
import org.contikios.cooja.MoteType;
import org.contikios.cooja.RadioPacket;
import org.contikios.cooja.mote.memory.SectionMoteMemory;
import org.contikios.cooja.Simulation;
import org.contikios.cooja.interfaces.ApplicationSerialPort;
import org.contikios.cooja.interfaces.Radio;
import org.contikios.cooja.mote.memory.SectionMoteMemory;

/**
* Abstract application mote.
Expand Down
1 change: 0 additions & 1 deletion java/org/contikios/cooja/motes/DisturberMoteType.java
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@
package org.contikios.cooja.motes;

import java.awt.Container;

import org.contikios.cooja.AbstractionLevelDescription;
import org.contikios.cooja.COOJARadioPacket;
import org.contikios.cooja.ClassDescription;
Expand Down
6 changes: 2 additions & 4 deletions java/org/contikios/cooja/motes/ImportAppMoteType.java
Original file line number Diff line number Diff line change
Expand Up @@ -41,16 +41,14 @@
import java.nio.file.Path;
import java.util.ArrayList;
import java.util.Collection;

import org.contikios.cooja.Cooja;
import org.jdom2.Element;

import org.contikios.cooja.AbstractionLevelDescription;
import org.contikios.cooja.ClassDescription;
import org.contikios.cooja.Cooja;
import org.contikios.cooja.Mote;
import org.contikios.cooja.MoteType;
import org.contikios.cooja.Simulation;
import org.contikios.cooja.dialogs.ImportAppMoteDialog;
import org.jdom2.Element;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

Expand Down
1 change: 0 additions & 1 deletion java/org/contikios/cooja/mspmote/MspCompileDialog.java
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@

import javax.swing.JScrollPane;
import javax.swing.JTextArea;

import org.contikios.cooja.Cooja;
import org.contikios.cooja.dialogs.AbstractCompileDialog;
import org.contikios.cooja.mote.BaseContikiMoteType;
Expand Down
8 changes: 4 additions & 4 deletions java/org/contikios/cooja/mspmote/MspMote.java
Original file line number Diff line number Diff line change
Expand Up @@ -33,13 +33,13 @@
import java.awt.Component;
import java.io.File;
import java.io.PrintStream;
import org.contikios.cooja.Simulation.SimulationStop;
import org.contikios.cooja.WatchpointMote;
import org.contikios.cooja.ContikiError;
import org.contikios.cooja.Cooja;
import org.contikios.cooja.MoteType;
import org.contikios.cooja.Simulation;
import org.contikios.cooja.Simulation.SimulationStop;
import org.contikios.cooja.Watchpoint;
import org.contikios.cooja.WatchpointMote;
import org.contikios.cooja.motes.AbstractEmulatedMote;
import org.contikios.cooja.mspmote.plugins.CodeVisualizerSkin;
import org.contikios.cooja.mspmote.plugins.MspBreakpoint;
Expand All @@ -51,19 +51,19 @@
import se.sics.mspsim.cli.LineListener;
import se.sics.mspsim.cli.LineOutputStream;
import se.sics.mspsim.core.EmulationException;
import se.sics.mspsim.core.EmulationLogger.WarningType;
import se.sics.mspsim.core.LogListener;
import se.sics.mspsim.core.Loggable;
import se.sics.mspsim.core.MSP430;
import se.sics.mspsim.core.EmulationLogger.WarningType;
import se.sics.mspsim.platform.GenericNode;
import se.sics.mspsim.profiler.SimpleProfiler;
import se.sics.mspsim.ui.ManagedWindow;
import se.sics.mspsim.ui.WindowManager;
import se.sics.mspsim.util.ComponentRegistry;
import se.sics.mspsim.util.ConfigManager;
import se.sics.mspsim.util.DebugInfo;
import se.sics.mspsim.util.ELF;
import se.sics.mspsim.util.MapEntry;
import se.sics.mspsim.profiler.SimpleProfiler;

/**
* @author Fredrik Osterlind
Expand Down
Loading