From 9458fbe12bd35f475594098f738094ac0c0554f4 Mon Sep 17 00:00:00 2001 From: Richard Cordovano Date: Mon, 27 Jan 2014 15:44:45 -0500 Subject: [PATCH 1/2] Restored public access to NoTabsTabDisplayerUI class --- .../sleuthkit/autopsy/corecomponents/NoTabsTabDisplayerUI.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Core/src/org/sleuthkit/autopsy/corecomponents/NoTabsTabDisplayerUI.java b/Core/src/org/sleuthkit/autopsy/corecomponents/NoTabsTabDisplayerUI.java index 67d114ecc6..1db15285d8 100644 --- a/Core/src/org/sleuthkit/autopsy/corecomponents/NoTabsTabDisplayerUI.java +++ b/Core/src/org/sleuthkit/autopsy/corecomponents/NoTabsTabDisplayerUI.java @@ -33,7 +33,7 @@ import org.netbeans.swing.tabcontrol.TabDisplayerUI; * * @author dfickling */ - class NoTabsTabDisplayerUI extends TabDisplayerUI { +public class NoTabsTabDisplayerUI extends TabDisplayerUI { /** Creates a new instance of NoTabsTabDisplayerUI */ public NoTabsTabDisplayerUI(TabDisplayer displayer) { From e8c3eb81a350807e512e545378dd424a162b4854 Mon Sep 17 00:00:00 2001 From: alexjacks92 Date: Mon, 27 Jan 2014 16:14:11 -0500 Subject: [PATCH 2/2] Added reset command before checkout. --- test/script/srcupdater.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/test/script/srcupdater.py b/test/script/srcupdater.py index c444be2346..168bc7da7c 100755 --- a/test/script/srcupdater.py +++ b/test/script/srcupdater.py @@ -78,6 +78,9 @@ def gitPull(TskOrAutopsy, branch): ccwd = os.path.join("..", "..", "..", "sleuthkit") else: ccwd = os.path.join("..", "..") + print("Resetting " + TskOrAutopsy) + call = ["git", "reset", "--hard"] + subprocess.call(call, stdout=sys.stdout, cwd=ccwd) print("Checking out " + branch) call = ["git", "checkout", branch] subprocess.call(call, stdout=sys.stdout, cwd=ccwd)