remove warnings, cleanup code

Author: mibo-fdc

Dandelion/.project

@@ -29,6 +29,5 @@
 	<natures>
 		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>net.sourceforge.metrics.nature</nature>
 	</natures>
 </projectDescription>

Dandelion/src/de/defmacro/dandelion/internal/core/connection/ConnectionException.java

@@ -27,6 +27,8 @@
 public class ConnectionException 
 extends Exception
 {
+	private static final long serialVersionUID = 6933635872248287284L;
+
 	public ConnectionException() {
 		super();
 	}

Dandelion/src/de/defmacro/dandelion/internal/core/connection/EvaluationJob.java

@@ -114,7 +114,7 @@ public JobType getType() {
 	 * @sse {@link AbstractJob#run0(IProgressMonitor)}
 	 */
 	@Override
-	@SuppressWarnings("NP") //Rueckgabe von non-null Wert wird über Methoden-Contract geregelt
+	@SuppressWarnings("NP") //Rueckgabe von non-null Wert wird �ber Methoden-Contract geregelt
 	protected IStatus run0(final IProgressMonitor monitor)
 	throws Exception
 	{	
@@ -178,12 +178,9 @@ private void abort()
 	{
 		IEvaluation eval = fConnection.getEvaluation();
 
-		int cnt = 0;
 		eval.getConnection().getProtocolWriter().writeAbortRestart();
 		eval.resetOutputState();
-		while(eval.nextOutputLine() != null) {
-			cnt++;
-		}
+		while(eval.nextOutputLine() != null) {}
 		eval.getConnection().getProtocolReader().readSuccess();
 	}
 

Dandelion/src/de/defmacro/dandelion/internal/core/connection/ManagementException.java

@@ -26,6 +26,8 @@
 public class ManagementException 
 extends Exception 
 {
+	private static final long serialVersionUID = 8991595138063953675L;
+
 	public ManagementException() {
 		super();
 	}

Dandelion/src/de/defmacro/dandelion/internal/core/connection/StartupJob.java

@@ -147,18 +147,4 @@ private void addServerParameters(final List<String> commands, final IEnvironment
 			commands.add("OFF");
 		}
 	}
-	
-	private String normalizePath(final String path)
-	{
-		String separator = System.getProperty("file.separator");
-		if(!path.endsWith(separator)) {
-			return path + separator;
-		}
-		return path;
-	}
-	
-	private String makeLogFile(final String path, final IEnvironment server)
-	{	
-		return normalizePath(path) + server.getName() +"_"+server.getVersion()+".html";
-	}
 }

Dandelion/src/de/defmacro/dandelion/internal/core/connection/protocol/ProtocolException.java

@@ -28,6 +28,8 @@
 public class ProtocolException 
 extends ConnectionException
 {
+	private static final long serialVersionUID = 5283741161443482840L;
+
 	public ProtocolException() {
 		super();
 	}

Dandelion/src/de/defmacro/dandelion/internal/core/dom/parse/ParseException.java

@@ -29,6 +29,8 @@
 public class ParseException 
 extends Exception
 {
+	private static final long serialVersionUID = -4260396209981978829L;
+	
 	private ISyntacticalMalformation fMalformation;
 
 	public ParseException(ISyntacticalMalformation malformation)

Dandelion/src/de/defmacro/dandelion/internal/ui/dialogs/EvalFailureDialog.java

@@ -263,10 +263,10 @@ public void dispose()
 		//nichts zu entsorgen
 	}
 
-	@SuppressWarnings("unchecked") //cast auf List<IRestart> sinnlos
+	@SuppressWarnings("unchecked")
 	public void inputChanged(Viewer viewer, Object oldInput, Object newInput) 
 	{
-		this.fRestarts = (List)newInput;
+		this.fRestarts = (List<IRestart>)newInput;
 	}
 
 	public Object[] getElements(Object inputElement) 

Dandelion/src/de/defmacro/dandelion/internal/ui/editor/LispEditor.java

@@ -200,8 +200,9 @@ public synchronized void setSourceViewerConfiguration(final SourceViewerConfigur
 	 * Liefert die Outline fuer den Editor.
 	 * @see IAdaptable#getAdapter(Class)
 	 */
+	@SuppressWarnings("unchecked")
 	@Override
-	public synchronized Object getAdapter(final Class required) 
+    public synchronized Object getAdapter(@SuppressWarnings("rawtypes") final Class required) 
 	{
 		//Adapter fuer Projektionsupport
 		if( fProjectionSupport != null ) {
@@ -374,8 +375,8 @@ protected void updateAnnotations()
 
 	private void removeAnnotations(final IAnnotationModel annotationModel) 
 	{
-		for(Iterator iter = annotationModel.getAnnotationIterator(); iter.hasNext();) {
-			Annotation annotation = (Annotation)iter.next();
+		for(Iterator<Annotation> iter = annotationModel.getAnnotationIterator(); iter.hasNext();) {
+			Annotation annotation = iter.next();
 			annotationModel.removeAnnotation(annotation);
 		}
 	}
@@ -397,8 +398,8 @@ protected void updateMarkers(final IAnnotationModel annotationModel)
 			boolean hasErrors = false;
 			boolean hasWarnings = false;
 
-			for(Iterator iter = annotationModel.getAnnotationIterator(); iter.hasNext(); ) {
-				Annotation annotation = (Annotation)iter.next();
+			for(Iterator<Annotation> iter = annotationModel.getAnnotationIterator(); iter.hasNext(); ) {
+				Annotation annotation = iter.next();
 				String type = annotation.getType();
 				int severity = 0;
 				if(type.equals(ERROR_ANNOTATION)) {

Dandelion/src/de/defmacro/dandelion/internal/ui/text/StructureException.java

@@ -30,6 +30,8 @@
 public class StructureException 
 extends Exception
 {
+	private static final long serialVersionUID = 7135739900105179040L;
+	
 	private Position fAtPosition;
 
 	public StructureException(final Position position) {

Dandelion/src/de/defmacro/dandelion/internal/ui/text/presentation/LispAnnotationHover.java

@@ -55,7 +55,6 @@ public String getHoverInfo(ISourceViewer sourceViewer, int lineNumber)
 		return null;
 	}
 
-	@SuppressWarnings("unchecked") //model.getAnnotationIterator() - Eclipse API nicht generic
 	private Annotation findAnnotation(int lineNumber, ISourceViewer viewer) 
 	throws BadLocationException
 	{

Dandelion/src/de/defmacro/dandelion/internal/ui/text/presentation/LispSourceEditConfiguration.java

@@ -105,7 +105,6 @@ public IContentAssistant getContentAssistant(final ISourceViewer sourceViewer)
 		assistant.setAutoActivationDelay(500);
 		assistant.enableAutoActivation(true);
 		assistant.enablePrefixCompletion(true);
-		//assistant.setShowEmptyList(true);
 		assistant.setInformationControlCreator(new IInformationControlCreator() {
 			public IInformationControl createInformationControl(Shell parent) {
 				return new DefaultInformationControl(parent, SWT.WRAP,  new LispAdditionalInformationPresenter());

Dandelion/src/de/defmacro/dandelion/internal/ui/text/presentation/TopLevelFormFoldingStructureProvider.java

@@ -103,7 +103,6 @@ private void copyTopLevelModelPositions(ISexpModel sexpModel, List<Position> top
 		}
 	}
 
-	@SuppressWarnings("unchecked") //Schnittstelle zu Eclipse nicht generisch
 	private void copyAnnotationPositions(ProjectionAnnotationModel annotationModel, Map<Annotation, Position> annotationModelPositions) 
 	{
 		Iterator<Annotation> iter = annotationModel.getAnnotationIterator();

Dandelion/test/de/defmacro/dandelion/internal/core/dom/TestSExpressionPositionComparator.java

@@ -5,8 +5,6 @@
 import org.eclipse.jface.text.Position;
 import org.junit.*;
 
-import de.defmacro.dandelion.internal.core.dom.SExpression;
-
 import edu.umd.cs.findbugs.annotations.SuppressWarnings;
 import static org.junit.Assert.*;
 

Dandelion/test/de/defmacro/dandelion/internal/core/dom/TestSexpModelContainsError.java

@@ -5,7 +5,6 @@
 import org.junit.*;
 import static org.junit.Assert.*;
 
-import de.defmacro.dandelion.internal.core.dom.ISexpModel;
 import de.defmacro.dandelion.testutils.TestProject;
 
 public class TestSexpModelContainsError 

Dandelion/test/de/defmacro/dandelion/internal/core/dom/TestSymbol.java

@@ -6,8 +6,6 @@
 import org.eclipse.jface.text.Position;
 import org.junit.Test;
 
-import de.defmacro.dandelion.internal.core.dom.Symbol;
-
 public class TestSymbol {
 
 	@Test

Dandelion/test/de/defmacro/dandelion/internal/core/dom/parse/TestDestructuredSymbol.java

@@ -4,8 +4,6 @@
 
 import org.junit.Test;
 
-import de.defmacro.dandelion.internal.core.dom.parse.DestructuredSymbol;
-
 public class TestDestructuredSymbol {
 
 	@Test

Dandelion/test/de/defmacro/dandelion/internal/ui/text/TestSourceUtilities.java

@@ -3,7 +3,6 @@
 import org.eclipse.jface.text.*;
 import org.junit.*;
 
-import de.defmacro.dandelion.internal.ui.text.SourceUtilities;
 import de.defmacro.dandelion.internal.ui.text.partition.LispPartitionConstants;
 import de.defmacro.dandelion.testutils.TestProject;
 import edu.umd.cs.findbugs.annotations.SuppressWarnings;

Dandelion/test/de/defmacro/dandelion/internal/ui/text/TestVisitableDocument.java

@@ -3,7 +3,6 @@
 import org.eclipse.jface.text.IDocument;
 import org.junit.*;
 
-import de.defmacro.dandelion.internal.ui.text.VisitableDocument;
 import de.defmacro.dandelion.testutils.*;
 import edu.umd.cs.findbugs.annotations.SuppressWarnings;
 import static org.junit.Assert.*;

PluginEnvironmentClispMacIntel/src/de/defmacro/dandelion/env/clisp/mac/intel/Configuration.java

@@ -23,7 +23,6 @@
 import java.util.List;
 
 import de.defmacro.dandelion.core.connection.*;
-import de.defmacro.dandelion.env.clisp.mac.intel.Activator;
 
 public class Configuration 
 extends AbstractConfigurationFactory

PluginEnvironmentClispMacPPC/src/de/defmacro/dandelion/env/clisp/mac/ppc/Configuration.java

@@ -23,7 +23,6 @@
 import java.util.List;
 
 import de.defmacro.dandelion.core.connection.*;
-import de.defmacro.dandelion.env.clisp.mac.ppc.Activator;
 
 public class Configuration 
 extends AbstractConfigurationFactory

PluginEnvironmentSBCLMacIntel/src/de/defmacro/dandelion/env/sbcl/mac/intel/Configuration.java

@@ -23,7 +23,6 @@
 import java.util.List;
 
 import de.defmacro.dandelion.core.connection.*;
-import de.defmacro.dandelion.env.sbcl.mac.intel.Activator;
 
 public class Configuration 
 extends AbstractConfigurationFactory