diff --git a/.classpath b/.classpath index 34382c4..520551c 100644 --- a/.classpath +++ b/.classpath @@ -4,7 +4,7 @@ - + @@ -14,5 +14,18 @@ + + + + + + + + + + + + + diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs index 54e493c..ace45ce 100644 --- a/.settings/org.eclipse.jdt.core.prefs +++ b/.settings/org.eclipse.jdt.core.prefs @@ -1,11 +1,12 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 +org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.compiler.compliance=1.8 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.6 +org.eclipse.jdt.core.compiler.source=1.8 diff --git a/lib/JGit/JavaEWAH-1.1.6.jar b/lib/JGit/JavaEWAH-1.1.6.jar new file mode 100755 index 0000000..e9ce089 Binary files /dev/null and b/lib/JGit/JavaEWAH-1.1.6.jar differ diff --git a/lib/JGit/commons-codec-1.6.jar b/lib/JGit/commons-codec-1.6.jar new file mode 100755 index 0000000..ee1bc49 Binary files /dev/null and b/lib/JGit/commons-codec-1.6.jar differ diff --git a/lib/JGit/commons-logging-1.1.3.jar b/lib/JGit/commons-logging-1.1.3.jar new file mode 100755 index 0000000..ab51254 Binary files /dev/null and b/lib/JGit/commons-logging-1.1.3.jar differ diff --git a/lib/JGit/httpclient-4.3.6.jar b/lib/JGit/httpclient-4.3.6.jar new file mode 100755 index 0000000..091498c Binary files /dev/null and b/lib/JGit/httpclient-4.3.6.jar differ diff --git a/lib/JGit/httpcore-4.3.3.jar b/lib/JGit/httpcore-4.3.3.jar new file mode 100755 index 0000000..a8747b0 Binary files /dev/null and b/lib/JGit/httpcore-4.3.3.jar differ diff --git a/lib/JGit/jsch-0.1.54.jar b/lib/JGit/jsch-0.1.54.jar new file mode 100755 index 0000000..426332e Binary files /dev/null and b/lib/JGit/jsch-0.1.54.jar differ diff --git a/lib/JGit/jzlib-1.0.7.jar b/lib/JGit/jzlib-1.0.7.jar new file mode 100755 index 0000000..112d4fd Binary files /dev/null and b/lib/JGit/jzlib-1.0.7.jar differ diff --git a/lib/JGit/org.eclipse.jgit-4.9.0.201710071750-r-javadoc.jar b/lib/JGit/org.eclipse.jgit-4.9.0.201710071750-r-javadoc.jar new file mode 100755 index 0000000..4b95ec5 Binary files /dev/null and b/lib/JGit/org.eclipse.jgit-4.9.0.201710071750-r-javadoc.jar differ diff --git a/lib/JGit/org.eclipse.jgit-4.9.0.201710071750-r.jar b/lib/JGit/org.eclipse.jgit-4.9.0.201710071750-r.jar new file mode 100755 index 0000000..b7c133e Binary files /dev/null and b/lib/JGit/org.eclipse.jgit-4.9.0.201710071750-r.jar differ diff --git a/lib/JGit/slf4j-api-1.7.2.jar b/lib/JGit/slf4j-api-1.7.2.jar new file mode 100755 index 0000000..1a88708 Binary files /dev/null and b/lib/JGit/slf4j-api-1.7.2.jar differ diff --git a/src/com/gpl/rpg/atcontentstudio/ATContentStudio.java b/src/com/gpl/rpg/atcontentstudio/ATContentStudio.java index fd6e69c..3965439 100644 --- a/src/com/gpl/rpg/atcontentstudio/ATContentStudio.java +++ b/src/com/gpl/rpg/atcontentstudio/ATContentStudio.java @@ -32,6 +32,17 @@ import javax.swing.event.HyperlinkEvent; import javax.swing.event.HyperlinkListener; import javax.swing.plaf.FontUIResource; +import org.eclipse.jgit.api.Git; +import org.eclipse.jgit.api.errors.GitAPIException; +import org.eclipse.jgit.attributes.AttributesNodeProvider; +import org.eclipse.jgit.internal.storage.file.FileRepository; +import org.eclipse.jgit.lib.ObjectDatabase; +import org.eclipse.jgit.lib.Ref; +import org.eclipse.jgit.lib.RefDatabase; +import org.eclipse.jgit.lib.ReflogReader; +import org.eclipse.jgit.lib.Repository; +import org.eclipse.jgit.lib.StoredConfig; + import com.gpl.rpg.atcontentstudio.model.Workspace; import com.gpl.rpg.atcontentstudio.ui.StudioFrame; import com.gpl.rpg.atcontentstudio.ui.WorkerDialog; @@ -73,6 +84,19 @@ public class ATContentStudio { } } +// try { +// Git git = new Git(new FileRepository("/home/xxx/git_repos/andors-trail/.git/")); +// List branches = git.branchList().call(); +// for (Ref branch : branches) { +// System.out.println(branch.getName()); +// } +// } catch (IOException e1) { +// e1.printStackTrace(); +// } catch (GitAPIException e1) { +// e1.printStackTrace(); +// } + + ConfigCache.init(); try {