Merge remote-tracking branch 'origin/GP-4151_ghidragon_fixing_wizard--SQUASHED'

Ghidra/Features/Base/certification.manifest

@@ -312,11 +312,11 @@ src/main/help/help/topics/FrontEndPlugin/images/SelectSharedProjectType.png||GHI
 src/main/help/help/topics/FrontEndPlugin/images/ServerInfo.png||GHIDRA||||END|
 src/main/help/help/topics/FrontEndPlugin/images/SharedProjectInfo.png||GHIDRA||||END|
 src/main/help/help/topics/FrontEndPlugin/images/UsersPanel.png||GHIDRA||||END|
-src/main/help/help/topics/FrontEndPlugin/images/UsersPanelMini.png||GHIDRA||||END|
 src/main/help/help/topics/FrontEndPlugin/images/VersionedFileCOnoServer.png||GHIDRA||||END|
 src/main/help/help/topics/FrontEndPlugin/images/VersionedFileCOwithServer.png||GHIDRA||||END|
 src/main/help/help/topics/FrontEndPlugin/images/VersionedFileIcon.png||GHIDRA||||END|
 src/main/help/help/topics/FrontEndPlugin/images/ViewOtherProjects.png||GHIDRA||||END|
+src/main/help/help/topics/FrontEndPlugin/images/ViewProjectAccessPanel.png||GHIDRA||||END|
 src/main/help/help/topics/FrontEndPlugin/images/hijack_file.png||GHIDRA||||END|
 src/main/help/help/topics/FunctionComparison/FunctionComparison.htm||GHIDRA||||END|
 src/main/help/help/topics/FunctionComparison/images/AddFunctionsPanel.png||GHIDRA||||END|

Ghidra/Features/Base/src/main/help/help/topics/FrontEndPlugin/Ghidra_Front_end.htm

@@ -917,7 +917,7 @@
       "help/shared/arrow.gif" border="0">View Project Access List</B> will be enabled, which will display
       the following dialog and allow the user to view the project users and their current access privileges only.</P>
       
-      <P align="center"><IMG src="images/UsersPanelMini.png" border="0"></P>
+      <P align="center"><IMG src="images/ViewProjectAccessPanel.png" border="0"></P>
       
     </BLOCKQUOTE>
 

Ghidra/Features/Base/src/main/java/ghidra/features/base/codecompare/listing/ListingCodeComparisonPanel.java

@@ -601,6 +601,8 @@ public class ListingCodeComparisonPanel
 	private void updateProgramViews() {
 		displays.get(LEFT).setProgramView(getProgram(LEFT), getAddresses(LEFT), "listing1");
 		displays.get(RIGHT).setProgramView(getProgram(RIGHT), getAddresses(RIGHT), "listing2");
+		displays.get(LEFT).goTo(comparisonData.get(LEFT).getInitialLocation());
+		displays.get(RIGHT).goTo(comparisonData.get(LEFT).getInitialLocation());
 	}
 
 	private void nextAreaDiff(boolean forward) {

Ghidra/Features/Base/src/main/java/ghidra/features/base/codecompare/listing/ListingDisplay.java

@@ -4,9 +4,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -174,10 +174,6 @@ public class ListingDisplay implements ListingDiffChangeListener {
 		markerManager.getOverviewProvider().setProgram(program, indexMap);
 		listingPanel.setBackgroundColorModel(
 			new MarkerServiceBackgroundColorModel(markerManager, program, indexMap));
-		setUpAreaMarkerSets(program, name);
-		if (!view.isEmpty()) {
-			goTo(new ProgramLocation(program, view.getMinAddress()));
-		}
 		repaint();
 	}
 
@@ -189,8 +185,9 @@ public class ListingDisplay implements ListingDiffChangeListener {
 		Color unmatchedColor = comparisonOptions.getUnmatchedCodeUnitsBackgroundColor();
 
 		AddressIndexMap indexMap = listingPanel.getAddressIndexMap();
-		listingPanel.getFieldPanel().setBackgroundColorModel(new MarkerServiceBackgroundColorModel(
+		listingPanel.getFieldPanel()
-			markerManager, program, indexMap));
+				.setBackgroundColorModel(new MarkerServiceBackgroundColorModel(
+					markerManager, program, indexMap));
 
 		unmatchedMarkers = markerManager.createAreaMarker(name + " Unmatched Code",
 			"Instructions that are not matched to an instruction in the other function.",
@@ -307,8 +304,9 @@ public class ListingDisplay implements ListingDiffChangeListener {
 	}
 
 	public void setViewerPosition(ViewerPosition position) {
-		listingPanel.getFieldPanel().setViewerPosition(position.getIndex(), position.getXOffset(),
+		listingPanel.getFieldPanel()
-			position.getYOffset());
+				.setViewerPosition(position.getIndex(), position.getXOffset(),
+					position.getYOffset());
 	}
 
 	public void setMouseNavigationEnabled(boolean enabled) {

Ghidra/Features/Base/src/main/java/ghidra/features/base/codecompare/panel/AddressSetComparisonData.java

@@ -4,9 +4,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -21,6 +21,7 @@ import ghidra.program.model.address.Address;
 import ghidra.program.model.address.AddressSetView;
 import ghidra.program.model.listing.Function;
 import ghidra.program.model.listing.Program;
+import ghidra.program.util.ProgramLocation;
 import ghidra.util.HTMLUtilities;
 
 /**
@@ -77,4 +78,9 @@ public class AddressSetComparisonData implements ComparisonData {
 	public boolean isEmpty() {
 		return addresses.isEmpty();
 	}
+
+	@Override
+	public ProgramLocation getInitialLocation() {
+		return new ProgramLocation(program, addresses.getMinAddress());
+	}
 }

Ghidra/Features/Base/src/main/java/ghidra/features/base/codecompare/panel/ComparisonData.java

@@ -4,9 +4,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -21,6 +21,7 @@ import generic.theme.GThemeDefaults.Colors.Palette;
 import ghidra.program.model.address.AddressSetView;
 import ghidra.program.model.listing.Function;
 import ghidra.program.model.listing.Program;
+import ghidra.program.util.ProgramLocation;
 
 /**
  * ComparisonData is an abstract of items that can be compared in a {@link CodeComparisonPanel}. 
@@ -68,4 +69,9 @@ public interface ComparisonData {
 	 */
 	public boolean isEmpty();
 
+	/**
+	 * Returns the initial program location to put the cursor when the panel is first displayed
+	 */
+	public ProgramLocation getInitialLocation();
+
 }

Ghidra/Features/Base/src/main/java/ghidra/features/base/codecompare/panel/DataComparisonData.java

@@ -4,9 +4,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -20,6 +20,7 @@ import java.util.Objects;
 import ghidra.program.model.address.*;
 import ghidra.program.model.listing.*;
 import ghidra.program.model.mem.MemoryBlock;
+import ghidra.program.util.ProgramLocation;
 import ghidra.util.HTMLUtilities;
 
 /**
@@ -108,4 +109,9 @@ public class DataComparisonData implements ComparisonData {
 		}
 		return endAddress;
 	}
+
+	@Override
+	public ProgramLocation getInitialLocation() {
+		return new ProgramLocation(data.getProgram(), data.getMinAddress());
+	}
 }

Ghidra/Features/Base/src/main/java/ghidra/features/base/codecompare/panel/EmptyComparisonData.java

@@ -4,9 +4,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -19,6 +19,7 @@ import ghidra.program.model.address.AddressSet;
 import ghidra.program.model.address.AddressSetView;
 import ghidra.program.model.listing.Function;
 import ghidra.program.model.listing.Program;
+import ghidra.program.util.ProgramLocation;
 
 public class EmptyComparisonData implements ComparisonData {
 
@@ -51,4 +52,9 @@ public class EmptyComparisonData implements ComparisonData {
 	public boolean isEmpty() {
 		return true;
 	}
+
+	@Override
+	public ProgramLocation getInitialLocation() {
+		return null;
+	}
 }

Ghidra/Features/Base/src/main/java/ghidra/features/base/codecompare/panel/FunctionComparisonData.java

@@ -4,9 +4,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -21,6 +21,8 @@ import ghidra.program.model.address.AddressSet;
 import ghidra.program.model.address.AddressSetView;
 import ghidra.program.model.listing.Function;
 import ghidra.program.model.listing.Program;
+import ghidra.program.util.FunctionSignatureFieldLocation;
+import ghidra.program.util.ProgramLocation;
 import ghidra.util.HTMLUtilities;
 
 /**
@@ -84,4 +86,9 @@ public class FunctionComparisonData implements ComparisonData {
 		return false;
 	}
 
+	@Override
+	public ProgramLocation getInitialLocation() {
+		return new FunctionSignatureFieldLocation(function.getProgram(), function.getEntryPoint());
+	}
+
 }