Browse Source

Cleanup: Organize imports

Change-Id: I6065e59519bc42bd18f5cc5ee3ec5210764ab03c
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
stable-4.9
Matthias Sohn 7 years ago
parent
commit
e9fb111182
  1. 6
      org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Describe.java
  2. 2
      org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Fetch.java
  3. 2
      org.eclipse.jgit.test/tst/org/eclipse/jgit/attributes/merge/MergeGitAttributeTest.java
  4. 1
      org.eclipse.jgit.test/tst/org/eclipse/jgit/gitrepo/RepoCommandSymlinkTest.java
  5. 16
      org.eclipse.jgit.test/tst/org/eclipse/jgit/treewalk/filter/PathFilterLogicTest.java
  6. 2
      org.eclipse.jgit/src/org/eclipse/jgit/events/WorkingTreeModifiedEvent.java
  7. 1
      org.eclipse.jgit/src/org/eclipse/jgit/gitrepo/RepoCommand.java
  8. 2
      org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/GC.java
  9. 12
      org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/GcLog.java
  10. 2
      org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/reftable/ReftableCompactor.java

6
org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Describe.java

@ -42,6 +42,9 @@
*/
package org.eclipse.jgit.pgm;
import java.util.ArrayList;
import java.util.List;
import org.eclipse.jgit.api.DescribeCommand;
import org.eclipse.jgit.api.Git;
import org.eclipse.jgit.api.errors.RefNotFoundException;
@ -50,9 +53,6 @@ import org.eclipse.jgit.pgm.internal.CLIText;
import org.kohsuke.args4j.Argument;
import org.kohsuke.args4j.Option;
import java.util.ArrayList;
import java.util.List;
@Command(common = true, usage = "usage_Describe")
class Describe extends TextBuiltin {

2
org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Fetch.java

@ -53,8 +53,8 @@ import org.eclipse.jgit.api.FetchCommand;
import org.eclipse.jgit.api.Git;
import org.eclipse.jgit.lib.Constants;
import org.eclipse.jgit.lib.SubmoduleConfig.FetchRecurseSubmodulesMode;
import org.eclipse.jgit.pgm.internal.CLIText;
import org.eclipse.jgit.lib.TextProgressMonitor;
import org.eclipse.jgit.pgm.internal.CLIText;
import org.eclipse.jgit.transport.FetchResult;
import org.eclipse.jgit.transport.RefSpec;
import org.eclipse.jgit.transport.TagOpt;

2
org.eclipse.jgit.test/tst/org/eclipse/jgit/attributes/merge/MergeGitAttributeTest.java

@ -43,10 +43,10 @@
package org.eclipse.jgit.attributes.merge;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.assertFalse;
import java.io.BufferedInputStream;
import java.io.File;

1
org.eclipse.jgit.test/tst/org/eclipse/jgit/gitrepo/RepoCommandSymlinkTest.java

@ -47,6 +47,7 @@ import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import java.io.File;
import org.eclipse.jgit.api.Git;
import org.eclipse.jgit.junit.JGitTestUtil;
import org.eclipse.jgit.junit.RepositoryTestCase;

16
org.eclipse.jgit.test/tst/org/eclipse/jgit/treewalk/filter/PathFilterLogicTest.java

@ -42,6 +42,14 @@
*/
package org.eclipse.jgit.treewalk.filter;
import static org.junit.Assert.assertEquals;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import org.eclipse.jgit.dircache.DirCache;
import org.eclipse.jgit.dircache.DirCacheBuilder;
import org.eclipse.jgit.dircache.DirCacheEntry;
@ -53,14 +61,6 @@ import org.eclipse.jgit.treewalk.TreeWalk;
import org.junit.Before;
import org.junit.Test;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import static org.junit.Assert.assertEquals;
public class PathFilterLogicTest extends RepositoryTestCase {
private ObjectId treeId;

2
org.eclipse.jgit/src/org/eclipse/jgit/events/WorkingTreeModifiedEvent.java

@ -42,8 +42,8 @@
*/
package org.eclipse.jgit.events;
import java.util.Collections;
import java.util.Collection;
import java.util.Collections;
import org.eclipse.jgit.annotations.NonNull;

1
org.eclipse.jgit/src/org/eclipse/jgit/gitrepo/RepoCommand.java

@ -49,7 +49,6 @@ import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.lang.UnsupportedOperationException;
import java.net.URI;
import java.text.MessageFormat;
import java.util.ArrayList;

2
org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/GC.java

@ -106,10 +106,10 @@ import org.eclipse.jgit.lib.ObjectReader;
import org.eclipse.jgit.lib.ProgressMonitor;
import org.eclipse.jgit.lib.Ref;
import org.eclipse.jgit.lib.Ref.Storage;
import org.eclipse.jgit.lib.internal.WorkQueue;
import org.eclipse.jgit.lib.RefDatabase;
import org.eclipse.jgit.lib.ReflogEntry;
import org.eclipse.jgit.lib.ReflogReader;
import org.eclipse.jgit.lib.internal.WorkQueue;
import org.eclipse.jgit.revwalk.ObjectWalk;
import org.eclipse.jgit.revwalk.RevObject;
import org.eclipse.jgit.revwalk.RevWalk;

12
org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/GcLog.java

@ -43,12 +43,6 @@
package org.eclipse.jgit.internal.storage.file;
import org.eclipse.jgit.api.errors.JGitInternalException;
import org.eclipse.jgit.internal.JGitText;
import org.eclipse.jgit.lib.ConfigConstants;
import org.eclipse.jgit.util.GitDateParser;
import org.eclipse.jgit.util.SystemReader;
import static java.nio.charset.StandardCharsets.UTF_8;
import java.io.BufferedReader;
@ -61,6 +55,12 @@ import java.text.MessageFormat;
import java.text.ParseException;
import java.time.Instant;
import org.eclipse.jgit.api.errors.JGitInternalException;
import org.eclipse.jgit.internal.JGitText;
import org.eclipse.jgit.lib.ConfigConstants;
import org.eclipse.jgit.util.GitDateParser;
import org.eclipse.jgit.util.SystemReader;
/**
* This class manages the gc.log file for a {@link FileRepository}.
*/

2
org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/reftable/ReftableCompactor.java

@ -49,8 +49,8 @@ import java.util.ArrayDeque;
import java.util.ArrayList;
import java.util.List;
import org.eclipse.jgit.lib.PersonIdent;
import org.eclipse.jgit.internal.storage.reftable.ReftableWriter.Stats;
import org.eclipse.jgit.lib.PersonIdent;
import org.eclipse.jgit.lib.ReflogEntry;
/**

Loading…
Cancel
Save