From e927d287230b475dd5505dd84dac24282c4b3853 Mon Sep 17 00:00:00 2001 From: Harald Wolff Date: Fri, 14 Jul 2017 12:59:44 +0200 Subject: [PATCH] import cleanup --- .../hwo/servicelink/AsynchronServiceLinkProvider.java | 2 -- src/org/hwo/servicelink/ServiceLink.java | 4 ---- src/org/hwo/servicelink/ServiceLinkTelegram.java | 3 --- src/org/hwo/servicelink/ServiceLinkV1Telegram.java | 5 ----- src/org/hwo/servicelink/ServiceLinkV2Telegram.java | 7 ------- src/org/hwo/servicelink/ServiceRegisterCache.java | 1 - .../hwo/servicelink/exceptions/CRCFailedException.java | 2 -- .../servicelink/exceptions/ServiceLinkException.java | 4 ---- src/org/hwo/servicelink/register/RegisterType.java | 1 - .../hwo/servicelink/register/basetypes/BitField.java | 4 ---- .../ui/servicelink/register/FloatRegisterEditor.java | 4 ---- .../register/IndexedListRegisterEditor.java | 10 ---------- .../register/IndexedListServiceRegister.java | 2 -- .../ui/servicelink/register/IntegerRegisterEditor.java | 5 ----- .../register/JServiceRegisterSourceEditor.java | 1 - .../hwo/ui/servicelink/register/ServiceRegister.java | 6 ------ .../servicelink/register/ServiceRegisterControl.java | 4 ---- .../servicelink/register/bitfield/BitFieldEditor.java | 6 ------ 18 files changed, 71 deletions(-) diff --git a/src/org/hwo/servicelink/AsynchronServiceLinkProvider.java b/src/org/hwo/servicelink/AsynchronServiceLinkProvider.java index b4ff0b7..f476408 100644 --- a/src/org/hwo/servicelink/AsynchronServiceLinkProvider.java +++ b/src/org/hwo/servicelink/AsynchronServiceLinkProvider.java @@ -3,8 +3,6 @@ package org.hwo.servicelink; import java.util.Hashtable; import java.util.LinkedList; import java.util.List; -import static org.hwo.logging.Logging.*; -import static org.hwo.logging.LogLevel.*; public class AsynchronServiceLinkProvider { diff --git a/src/org/hwo/servicelink/ServiceLink.java b/src/org/hwo/servicelink/ServiceLink.java index 86bf4a5..c59f645 100644 --- a/src/org/hwo/servicelink/ServiceLink.java +++ b/src/org/hwo/servicelink/ServiceLink.java @@ -2,17 +2,13 @@ package org.hwo.servicelink; import static org.hwo.logging.Logging.log; -import java.awt.DisplayMode; import java.io.IOException; -import java.nio.channels.ShutdownChannelGroupException; import java.util.Hashtable; import java.util.LinkedList; import java.util.List; -import org.hwo.ByteArrayHelper; import org.hwo.ByteArrayHexlifier; import org.hwo.Smoother; -import org.hwo.StringHelper; import org.hwo.io.NewSerialPort.NewSerialPort; import org.hwo.io.NewSerialPort.NewSerialPortListener; import org.hwo.servicelink.exceptions.ServiceLinkException; diff --git a/src/org/hwo/servicelink/ServiceLinkTelegram.java b/src/org/hwo/servicelink/ServiceLinkTelegram.java index 001409b..f4a9e63 100644 --- a/src/org/hwo/servicelink/ServiceLinkTelegram.java +++ b/src/org/hwo/servicelink/ServiceLinkTelegram.java @@ -3,9 +3,6 @@ package org.hwo.servicelink; import java.nio.ByteBuffer; import java.nio.ByteOrder; import java.io.InputStream; -import java.lang.Thread.State; -import static org.hwo.logging.LogLevel.*; -import static org.hwo.logging.Logging.*; public abstract class ServiceLinkTelegram { diff --git a/src/org/hwo/servicelink/ServiceLinkV1Telegram.java b/src/org/hwo/servicelink/ServiceLinkV1Telegram.java index 2a27c4e..84f3db3 100644 --- a/src/org/hwo/servicelink/ServiceLinkV1Telegram.java +++ b/src/org/hwo/servicelink/ServiceLinkV1Telegram.java @@ -4,11 +4,6 @@ import java.io.IOException; import java.io.InputStream; import java.nio.ByteBuffer; import java.nio.ByteOrder; -import java.util.Arrays; -import java.util.zip.CRC32; - -import javax.management.RuntimeErrorException; - import org.hwo.ByteArrayHexlifier; import org.hwo.ChkSum; import org.hwo.servicelink.exceptions.CRCFailedException; diff --git a/src/org/hwo/servicelink/ServiceLinkV2Telegram.java b/src/org/hwo/servicelink/ServiceLinkV2Telegram.java index 16b0e56..8c6e59a 100644 --- a/src/org/hwo/servicelink/ServiceLinkV2Telegram.java +++ b/src/org/hwo/servicelink/ServiceLinkV2Telegram.java @@ -4,14 +4,7 @@ import java.io.IOException; import java.io.InputStream; import java.nio.ByteBuffer; import java.nio.ByteOrder; -import java.util.Arrays; -import java.util.zip.CRC32; - import org.hwo.ByteArrayHexlifier; -import org.hwo.ChkSum; -import org.hwo.servicelink.exceptions.CRCFailedException; -import org.hwo.servicelink.exceptions.ServiceLinkException; - import static org.hwo.logging.Logging.*; import static org.hwo.logging.LogLevel.*; diff --git a/src/org/hwo/servicelink/ServiceRegisterCache.java b/src/org/hwo/servicelink/ServiceRegisterCache.java index e621280..b262eb2 100644 --- a/src/org/hwo/servicelink/ServiceRegisterCache.java +++ b/src/org/hwo/servicelink/ServiceRegisterCache.java @@ -1,6 +1,5 @@ package org.hwo.servicelink; -import java.io.IOException; import java.util.Hashtable; import static org.hwo.logging.Logging.*; import static org.hwo.logging.LogLevel.*; diff --git a/src/org/hwo/servicelink/exceptions/CRCFailedException.java b/src/org/hwo/servicelink/exceptions/CRCFailedException.java index c87ccd3..b355afc 100644 --- a/src/org/hwo/servicelink/exceptions/CRCFailedException.java +++ b/src/org/hwo/servicelink/exceptions/CRCFailedException.java @@ -1,8 +1,6 @@ package org.hwo.servicelink.exceptions; -import org.hwo.ByteArrayHelper; import org.hwo.ByteArrayHexlifier; -import org.hwo.StringHelper; public class CRCFailedException extends ServiceLinkException { diff --git a/src/org/hwo/servicelink/exceptions/ServiceLinkException.java b/src/org/hwo/servicelink/exceptions/ServiceLinkException.java index 58dc613..30b76fa 100644 --- a/src/org/hwo/servicelink/exceptions/ServiceLinkException.java +++ b/src/org/hwo/servicelink/exceptions/ServiceLinkException.java @@ -1,9 +1,5 @@ package org.hwo.servicelink.exceptions; -import java.io.IOException; - -import javax.xml.ws.handler.MessageContext; - import org.hwo.exceptions.ExtendedExceptionBase; public class ServiceLinkException extends ExtendedExceptionBase { diff --git a/src/org/hwo/servicelink/register/RegisterType.java b/src/org/hwo/servicelink/register/RegisterType.java index af33351..7d7f01d 100644 --- a/src/org/hwo/servicelink/register/RegisterType.java +++ b/src/org/hwo/servicelink/register/RegisterType.java @@ -4,7 +4,6 @@ import javax.xml.xpath.XPath; import javax.xml.xpath.XPathConstants; import javax.xml.xpath.XPathFactory; -import org.w3c.dom.Element; import org.w3c.dom.Node; public class RegisterType implements Cloneable{ diff --git a/src/org/hwo/servicelink/register/basetypes/BitField.java b/src/org/hwo/servicelink/register/basetypes/BitField.java index c08e6a4..42ac6ca 100644 --- a/src/org/hwo/servicelink/register/basetypes/BitField.java +++ b/src/org/hwo/servicelink/register/basetypes/BitField.java @@ -1,13 +1,9 @@ package org.hwo.servicelink.register.basetypes; -import javax.xml.xpath.XPath; import javax.xml.xpath.XPathConstants; -import javax.xml.xpath.XPathFactory; - import org.hwo.servicelink.register.RegisterType; import org.hwo.servicelink.register.ServiceRegisterList; import org.w3c.dom.Node; -import org.w3c.dom.NodeList; public class BitField extends RegisterType{ diff --git a/src/org/hwo/ui/servicelink/register/FloatRegisterEditor.java b/src/org/hwo/ui/servicelink/register/FloatRegisterEditor.java index 118696e..cbfff37 100644 --- a/src/org/hwo/ui/servicelink/register/FloatRegisterEditor.java +++ b/src/org/hwo/ui/servicelink/register/FloatRegisterEditor.java @@ -1,13 +1,9 @@ package org.hwo.ui.servicelink.register; import java.awt.Component; -import java.awt.event.FocusEvent; -import java.awt.event.FocusListener; - import javax.swing.JPanel; import javax.swing.JTextField; -import org.hwo.servicelink.ServiceLink; import java.awt.GridBagLayout; import java.awt.GridBagConstraints; diff --git a/src/org/hwo/ui/servicelink/register/IndexedListRegisterEditor.java b/src/org/hwo/ui/servicelink/register/IndexedListRegisterEditor.java index c0e3cfd..d734e40 100644 --- a/src/org/hwo/ui/servicelink/register/IndexedListRegisterEditor.java +++ b/src/org/hwo/ui/servicelink/register/IndexedListRegisterEditor.java @@ -1,17 +1,7 @@ package org.hwo.ui.servicelink.register; import java.awt.Component; -import java.awt.event.FocusEvent; -import java.awt.event.FocusListener; -import java.math.BigInteger; -import java.util.Hashtable; - -import javax.swing.JComboBox; -import javax.swing.JComponent; import javax.swing.JPanel; -import javax.swing.JTextField; - -import org.hwo.servicelink.ServiceLink; import org.hwo.ui.JComboBoxEx; import java.awt.GridBagLayout; diff --git a/src/org/hwo/ui/servicelink/register/IndexedListServiceRegister.java b/src/org/hwo/ui/servicelink/register/IndexedListServiceRegister.java index be6a9b3..0e8dac7 100644 --- a/src/org/hwo/ui/servicelink/register/IndexedListServiceRegister.java +++ b/src/org/hwo/ui/servicelink/register/IndexedListServiceRegister.java @@ -1,12 +1,10 @@ package org.hwo.ui.servicelink.register; -import java.util.HashSet; import java.util.Hashtable; import java.util.LinkedList; import javax.swing.JComponent; -import org.hwo.bitfields.BitField; import org.hwo.servicelink.ServiceLink; import org.hwo.ui.servicelink.register.IndexedListRegisterEditor.IndexedItem; import org.hwo.xml.NodeListIterator; diff --git a/src/org/hwo/ui/servicelink/register/IntegerRegisterEditor.java b/src/org/hwo/ui/servicelink/register/IntegerRegisterEditor.java index 8952f83..cb11a25 100644 --- a/src/org/hwo/ui/servicelink/register/IntegerRegisterEditor.java +++ b/src/org/hwo/ui/servicelink/register/IntegerRegisterEditor.java @@ -1,14 +1,9 @@ package org.hwo.ui.servicelink.register; import java.awt.Component; -import java.awt.event.FocusEvent; -import java.awt.event.FocusListener; -import java.math.BigInteger; - import javax.swing.JPanel; import javax.swing.JTextField; -import org.hwo.servicelink.ServiceLink; import java.awt.GridBagLayout; import java.awt.GridBagConstraints; diff --git a/src/org/hwo/ui/servicelink/register/JServiceRegisterSourceEditor.java b/src/org/hwo/ui/servicelink/register/JServiceRegisterSourceEditor.java index cc9ed84..ab3b1b3 100644 --- a/src/org/hwo/ui/servicelink/register/JServiceRegisterSourceEditor.java +++ b/src/org/hwo/ui/servicelink/register/JServiceRegisterSourceEditor.java @@ -17,7 +17,6 @@ import java.util.LinkedList; import java.util.List; import javax.swing.SpinnerNumberModel; -import javax.swing.JCheckBox; import javax.swing.event.ChangeListener; import javax.swing.event.ChangeEvent; diff --git a/src/org/hwo/ui/servicelink/register/ServiceRegister.java b/src/org/hwo/ui/servicelink/register/ServiceRegister.java index bb9b1aa..9e17e12 100644 --- a/src/org/hwo/ui/servicelink/register/ServiceRegister.java +++ b/src/org/hwo/ui/servicelink/register/ServiceRegister.java @@ -1,12 +1,8 @@ package org.hwo.ui.servicelink.register; -import java.awt.Component; import java.io.IOException; import java.lang.reflect.InvocationTargetException; import java.util.HashMap; -import java.util.HashSet; -import java.util.Hashtable; - import javax.swing.JComponent; import org.hwo.i18n.Messages; @@ -16,9 +12,7 @@ import org.hwo.servicelink.ServiceRegisterListener; import org.hwo.servicelink.exceptions.ServiceLinkException; import org.hwo.servicelink.exceptions.ServiceLinkRequestFailedException; import org.hwo.models.TableMapper.TableColumn; -import org.hwo.ui.servicelink.register.bitfield.BitFieldEditor; import org.w3c.dom.Element; -import org.w3c.dom.Node; @InteractiveObject(editor=ServiceRegisterEditorDialog.class) public abstract class ServiceRegister implements ServiceRegisterListener { diff --git a/src/org/hwo/ui/servicelink/register/ServiceRegisterControl.java b/src/org/hwo/ui/servicelink/register/ServiceRegisterControl.java index 3ee0d91..7d9d8ad 100644 --- a/src/org/hwo/ui/servicelink/register/ServiceRegisterControl.java +++ b/src/org/hwo/ui/servicelink/register/ServiceRegisterControl.java @@ -2,10 +2,6 @@ package org.hwo.ui.servicelink.register; import java.awt.Component; -import javax.tools.JavaCompiler; - -import org.hwo.servicelink.ServiceLink; - public interface ServiceRegisterControl { public boolean requestFocusInWindow(); diff --git a/src/org/hwo/ui/servicelink/register/bitfield/BitFieldEditor.java b/src/org/hwo/ui/servicelink/register/bitfield/BitFieldEditor.java index 09b2d45..46a35d9 100644 --- a/src/org/hwo/ui/servicelink/register/bitfield/BitFieldEditor.java +++ b/src/org/hwo/ui/servicelink/register/bitfield/BitFieldEditor.java @@ -2,22 +2,16 @@ package org.hwo.ui.servicelink.register.bitfield; import java.awt.Component; import java.util.ArrayList; -import java.util.Arrays; -import java.util.Iterator; import java.util.List; import javax.swing.JCheckBox; import javax.swing.JPanel; -import org.hwo.servicelink.ServiceLink; import org.hwo.ui.servicelink.register.ServiceRegister; import org.hwo.ui.servicelink.register.ServiceRegisterControl; -import java.awt.FlowLayout; - import javax.swing.JScrollPane; -import java.awt.Checkbox; import java.awt.GridBagLayout; import java.awt.GridBagConstraints;