warning cleanup

RvonMassow · Jan 13, 2015 · c44819c · c44819c
1 parent b8d48d1
commit c44819c
Show file tree

Hide file tree

Showing 14 changed files with 56 additions and 37 deletions.
diff --git a/org.eclipse.xtext.xdoc.tests/src/org/eclipse/xtext/xdoc/EclipseHelpGeneratorTest.xtend b/org.eclipse.xtext.xdoc.tests/src/org/eclipse/xtext/xdoc/EclipseHelpGeneratorTest.xtend
@@ -17,7 +17,7 @@ import org.junit.runner.RunWith
 import static org.eclipse.xtext.xdoc.util.GeneratorTestConstants.*
 import static org.eclipse.xtext.xdoc.util.ParserTestConstants.*
 
-import static extension junit.framework.Assert.*
+import static extension org.junit.Assert.*
 
 @RunWith(typeof(XtextRunner))
 @InjectWith(typeof(XdocUiInjectorProvider))

diff --git a/org.eclipse.xtext.xdoc.tests/src/org/eclipse/xtext/xdoc/tests/AbstractXdocGeneratorTest.java b/org.eclipse.xtext.xdoc.tests/src/org/eclipse/xtext/xdoc/tests/AbstractXdocGeneratorTest.java
@@ -23,7 +23,6 @@
 import org.eclipse.xtext.resource.XtextResource;
 import org.eclipse.xtext.resource.XtextResourceSet;
 import org.eclipse.xtext.xdoc.XdocInjectorProvider;
-import org.eclipse.xtext.xdoc.generator.Outlets;
 import org.eclipse.xtext.xdoc.xdoc.AbstractSection;
 import org.eclipse.xtext.xdoc.xdoc.Chapter;
 import org.eclipse.xtext.xdoc.xdoc.Document;
@@ -80,23 +79,30 @@ public void setUp() throws Exception {
 	abstract protected void generate(EObject eObject);
 
 	protected void validate(String expected, String result) throws Exception {
-		FileChannel expF = new FileInputStream(expected).getChannel();
-		FileChannel resultF = new FileInputStream(result).getChannel();
-		ByteBuffer bExp = ByteBuffer.allocateDirect((int) expF.size());
-		ByteBuffer bResult = ByteBuffer.allocateDirect((int) resultF.size());
-		assertEquals(bExp.capacity(), bResult.capacity());
-		expF.read(bExp);
-		bExp.rewind();
-		resultF.read(bResult);
-		bResult.rewind();
-		if (bExp.compareTo(bResult) != 0) {
-			for (int i = 0; bExp.hasRemaining() || bResult.hasRemaining(); i++) {
-				char a = (char) bExp.get();
-				char b = (char) bResult.get();
-				if (a != b) {
-					fail("Expected " + a + " but was " + b + " at position " + bExp.position());
+		FileInputStream fileInputStream = new FileInputStream(expected);
+		FileInputStream fileInputStream2 = new FileInputStream(result);
+		try {
+			FileChannel expF = fileInputStream.getChannel();
+			FileChannel resultF = fileInputStream2.getChannel();
+			ByteBuffer bExp = ByteBuffer.allocateDirect((int) expF.size());
+			ByteBuffer bResult = ByteBuffer.allocateDirect((int) resultF.size());
+			assertEquals(bExp.capacity(), bResult.capacity());
+			expF.read(bExp);
+			bExp.rewind();
+			resultF.read(bResult);
+			bResult.rewind();
+			if (bExp.compareTo(bResult) != 0) {
+				while (bExp.hasRemaining() || bResult.hasRemaining()) {
+					char a = (char) bExp.get();
+					char b = (char) bResult.get();
+					if (a != b) {
+						fail("Expected " + a + " but was " + b + " at position " + bExp.position());
+					}
 				}
 			}
+		} finally {
+			fileInputStream.close();
+			fileInputStream2.close();
 		}
 	}
 

diff --git a/org.eclipse.xtext.xdoc.tests/src/org/eclipse/xtext/xdoc/tests/HTMLGeneratorTest.java b/org.eclipse.xtext.xdoc.tests/src/org/eclipse/xtext/xdoc/tests/HTMLGeneratorTest.java
@@ -6,7 +6,6 @@
 import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.xtext.generator.AbstractFileSystemAccess;
 import org.eclipse.xtext.generator.JavaIoFileSystemAccess;
 import org.eclipse.xtext.junit4.InjectWith;
 import org.eclipse.xtext.resource.XtextResource;

diff --git a/org.eclipse.xtext.xdoc.tests/src/org/eclipse/xtext/xdoc/tests/LatexGeneratorTest.java b/org.eclipse.xtext.xdoc.tests/src/org/eclipse/xtext/xdoc/tests/LatexGeneratorTest.java
@@ -3,7 +3,6 @@
 import java.io.File;
 
 import org.eclipse.emf.ecore.EObject;
-import org.eclipse.xtext.generator.AbstractFileSystemAccess;
 import org.eclipse.xtext.generator.JavaIoFileSystemAccess;
 import org.eclipse.xtext.junit4.InjectWith;
 import org.eclipse.xtext.xdoc.XdocInjectorProvider;

diff --git a/....xtext.xdoc.tests/src/org/eclipse/xtext/xdoc/tests/generator/util/GitExtensionsTest.xtend b/....xtext.xdoc.tests/src/org/eclipse/xtext/xdoc/tests/generator/util/GitExtensionsTest.xtend
@@ -1,10 +1,10 @@
 package org.eclipse.xtext.xdoc.tests.generator.util
 
+import java.net.URL
 import org.eclipse.xtext.xdoc.generator.util.GitExtensions
 import org.junit.Test
 
 import static org.junit.Assert.*
-import java.net.URL
 
 class GitExtensionsTest {
 

diff --git a/org.eclipse.xtext.xdoc.tests/xtend-gen/org/eclipse/xtext/xdoc/EclipseHelpGeneratorTest.java b/org.eclipse.xtext.xdoc.tests/xtend-gen/org/eclipse/xtext/xdoc/EclipseHelpGeneratorTest.java
@@ -2,7 +2,6 @@
 
 import java.io.File;
 import javax.inject.Inject;
-import junit.framework.Assert;
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.xtext.generator.JavaIoFileSystemAccess;
 import org.eclipse.xtext.junit4.InjectWith;
@@ -18,6 +17,7 @@
 import org.eclipse.xtext.xdoc.xdoc.AbstractSection;
 import org.eclipse.xtext.xdoc.xdoc.Document;
 import org.eclipse.xtext.xdoc.xdoc.XdocFile;
+import org.junit.Assert;
 import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;

diff --git a/....xtext.xdoc.ui/src/org/eclipse/xtext/xdoc/ui/coloring/SemanticHighlightingCalculator.java b/....xtext.xdoc.ui/src/org/eclipse/xtext/xdoc/ui/coloring/SemanticHighlightingCalculator.java
@@ -8,6 +8,18 @@
  *******************************************************************************/
 package org.eclipse.xtext.xdoc.ui.coloring;
 
+import static com.google.common.collect.Sets.newHashSet;
+import static org.eclipse.xtext.xdoc.xdoc.XdocPackage.Literals.ABSTRACT_SECTION__TITLE;
+import static org.eclipse.xtext.xdoc.xdoc.XdocPackage.Literals.CHAPTER;
+import static org.eclipse.xtext.xdoc.xdoc.XdocPackage.Literals.CODE_BLOCK;
+import static org.eclipse.xtext.xdoc.xdoc.XdocPackage.Literals.CODE_BLOCK__CONTENTS;
+import static org.eclipse.xtext.xdoc.xdoc.XdocPackage.Literals.EMPHASIZE;
+import static org.eclipse.xtext.xdoc.xdoc.XdocPackage.Literals.EMPHASIZE__CONTENTS;
+import static org.eclipse.xtext.xdoc.xdoc.XdocPackage.Literals.SECTION;
+import static org.eclipse.xtext.xdoc.xdoc.XdocPackage.Literals.SECTION2;
+import static org.eclipse.xtext.xdoc.xdoc.XdocPackage.Literals.SECTION3;
+import static org.eclipse.xtext.xdoc.xdoc.XdocPackage.Literals.SECTION4;
+
 import java.util.List;
 import java.util.Set;
 
@@ -35,9 +47,6 @@
 import org.eclipse.xtext.xdoc.xdoc.Section3;
 import org.eclipse.xtext.xdoc.xdoc.Section4;
 
-import static com.google.common.collect.Sets.*;
-import static org.eclipse.xtext.xdoc.xdoc.XdocPackage.Literals.*;
-
 public class SemanticHighlightingCalculator implements ISemanticHighlightingCalculator {
 
 	public void provideHighlightingFor(final XtextResource resource, IHighlightedPositionAcceptor acceptor) {

diff --git a/...e.xtext.xdoc.ui/src/org/eclipse/xtext/xdoc/ui/editor/model/XdocPartitionTokenScanner.java b/...e.xtext.xdoc.ui/src/org/eclipse/xtext/xdoc/ui/editor/model/XdocPartitionTokenScanner.java
@@ -1,8 +1,9 @@
 package org.eclipse.xtext.xdoc.ui.editor.model;
 
-import org.eclipse.xtext.ui.editor.model.PartitionTokenScanner;
 import static org.eclipse.xtext.xdoc.ui.editor.model.XdocTerminalsTokenTypeToPartitionMapper.TEXT_PARTITION;
 
+import org.eclipse.xtext.ui.editor.model.PartitionTokenScanner;
+
 public class XdocPartitionTokenScanner extends PartitionTokenScanner {
 	@Override
 	protected boolean shouldMergePartitions(String contentType) {

diff --git a/....xdoc.ui/src/org/eclipse/xtext/xdoc/ui/editor/spelling/XdocSpellingReconcileStrategy.java b/....xdoc.ui/src/org/eclipse/xtext/xdoc/ui/editor/spelling/XdocSpellingReconcileStrategy.java
@@ -1,11 +1,11 @@
 package org.eclipse.xtext.xdoc.ui.editor.spelling;
 
+import static org.eclipse.xtext.xdoc.ui.editor.model.XdocTerminalsTokenTypeToPartitionMapper.TEXT_PARTITION;
+
 import org.eclipse.jface.text.ITypedRegion;
 import org.eclipse.jface.text.source.ISourceViewer;
 import org.eclipse.xtext.ui.editor.reconciler.XtextSpellingReconcileStrategy;
 
-import static org.eclipse.xtext.xdoc.ui.editor.model.XdocTerminalsTokenTypeToPartitionMapper.TEXT_PARTITION;
-
 public class XdocSpellingReconcileStrategy extends
 		XtextSpellingReconcileStrategy {
 

diff --git a/org.eclipse.xtext.xdoc/src/org/eclipse/xtext/xdoc/XdocUtil.java b/org.eclipse.xtext.xdoc/src/org/eclipse/xtext/xdoc/XdocUtil.java
@@ -2,6 +2,7 @@
 
 import java.util.Collection;
 import java.util.Hashtable;
+
 import org.apache.log4j.Logger;
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.EObject;

diff --git a/org.eclipse.xtext.xdoc/src/org/eclipse/xtext/xdoc/generator/XdocGeneratorComponent.java b/org.eclipse.xtext.xdoc/src/org/eclipse/xtext/xdoc/generator/XdocGeneratorComponent.java
@@ -1,6 +1,6 @@
 package org.eclipse.xtext.xdoc.generator;
 
-import static com.google.common.collect.Lists.*;
+import static com.google.common.collect.Lists.newArrayList;
 import static com.google.common.collect.Maps.newHashMap;
 
 import java.util.List;
@@ -15,6 +15,7 @@
 import org.eclipse.xtext.generator.IFileSystemAccess;
 import org.eclipse.xtext.generator.JavaIoFileSystemAccess;
 import org.eclipse.xtext.xdoc.generator.config.Config;
+
 import com.google.inject.Injector;
 
 public class XdocGeneratorComponent extends GeneratorComponent{

diff --git a/...ipse.xtext.xdoc/src/org/eclipse/xtext/xdoc/generator/XdocOutputConfigurationProvider.java b/...ipse.xtext.xdoc/src/org/eclipse/xtext/xdoc/generator/XdocOutputConfigurationProvider.java
@@ -1,12 +1,12 @@
 package org.eclipse.xtext.xdoc.generator;
 
+import static com.google.common.collect.Sets.newHashSet;
+
 import java.util.Set;
 
 import org.eclipse.xtext.generator.OutputConfiguration;
 import org.eclipse.xtext.generator.OutputConfigurationProvider;
 
-import static com.google.common.collect.Sets.*;
-
 public class XdocOutputConfigurationProvider extends
 		OutputConfigurationProvider {
 

diff --git a/org.eclipse.xtext.xdoc/src/org/eclipse/xtext/xdoc/generator/util/lexer/Common.java b/org.eclipse.xtext.xdoc/src/org/eclipse/xtext/xdoc/generator/util/lexer/Common.java
@@ -2,14 +2,17 @@
 
 package org.eclipse.xtext.xdoc.generator.util.lexer;
 
+import org.antlr.runtime.BaseRecognizer;
+import org.antlr.runtime.CharStream;
+import org.antlr.runtime.DFA;
+import org.antlr.runtime.EarlyExitException;
+import org.antlr.runtime.IntStream;
+import org.antlr.runtime.MismatchedSetException;
+import org.antlr.runtime.NoViableAltException;
+import org.antlr.runtime.RecognitionException;
+import org.antlr.runtime.RecognizerSharedState;
 import org.eclipse.xtext.parser.antlr.Lexer;
 
-
-import org.antlr.runtime.*;
-import java.util.Stack;
-import java.util.List;
-import java.util.ArrayList;
-
 public class Common extends Lexer {
     public static final int RICH_TEXT=5;
     public static final int INT=12;

diff --git a/...clipse.xtext.xdoc/src/org/eclipse/xtext/xdoc/resource/XdocResourceDescriptionManager.java b/...clipse.xtext.xdoc/src/org/eclipse/xtext/xdoc/resource/XdocResourceDescriptionManager.java
@@ -12,8 +12,8 @@
 import org.eclipse.xtext.resource.IEObjectDescription;
 import org.eclipse.xtext.resource.IReferenceDescription;
 import org.eclipse.xtext.resource.IResourceDescription;
-import org.eclipse.xtext.resource.IResourceDescriptions;
 import org.eclipse.xtext.resource.IResourceDescription.Delta;
+import org.eclipse.xtext.resource.IResourceDescriptions;
 import org.eclipse.xtext.resource.impl.DefaultResourceDescriptionManager;
 import org.eclipse.xtext.xdoc.xdoc.XdocPackage;