Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ public void addListener() {

@Override
public void edgeClicked(
final SingleDiffEdge egde, final MouseEvent event, final double x, final double y) {}
final SingleDiffEdge edge, final MouseEvent event, final double x, final double y) {}

@Override
public void edgeLabelEntered(final EdgeLabel label, final MouseEvent event) {}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,10 @@ public class GraphSearcher {
private List<Object> objectResults = new ArrayList<>();

private List<ZyGraphEdge<?, ?, ?>> filterValidEdgesNodes(
final List<? extends ZyGraphEdge<?, ?, ?>> egdes) {
final List<? extends ZyGraphEdge<?, ?, ?>> edges) {
final List<ZyGraphEdge<?, ?, ?>> validEdges = new ArrayList<>();

for (final ZyGraphEdge<?, ?, ?> edge : egdes) {
for (final ZyGraphEdge<?, ?, ?> edge : edges) {
if (edge instanceof SingleDiffEdge
|| edge instanceof CombinedDiffEdge
|| edge instanceof SuperDiffEdge) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -150,11 +150,11 @@ private File getImageFile(final String fileName) {
}

private String selectDirectory(final Window parent) {
final DirectoryChooser selecter = new DirectoryChooser("Choose Destination Directory");
selecter.setCurrentDirectory(new File(destinationChooserPanel.getText()));
final DirectoryChooser selector = new DirectoryChooser("Choose Destination Directory");
selector.setCurrentDirectory(new File(destinationChooserPanel.getText()));

if (selecter.showOpenDialog(parent) == DirectoryChooser.APPROVE_OPTION) {
return selecter.getSelectedFile().getAbsolutePath();
if (selector.showOpenDialog(parent) == DirectoryChooser.APPROVE_OPTION) {
return selector.getSelectedFile().getAbsolutePath();
}

return null;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -190,17 +190,17 @@ private class InternalActionListener implements ActionListener {
@Override
public void actionPerformed(final ActionEvent event) {
if (event.getSource() == workspaceDirectoryPanel.getButton()) {
final DirectoryChooser selecter = new DirectoryChooser("Select workspace location");
selecter.setSelectedFile(new File(workspaceDirectoryPanel.getText()));
final DirectoryChooser selector = new DirectoryChooser("Select workspace location");
selector.setSelectedFile(new File(workspaceDirectoryPanel.getText()));

if (selecter.showOpenDialog(NewWorkspaceDialog.this) == DirectoryChooser.APPROVE_OPTION) {
final File workspaceDir = selecter.getSelectedFile();
if (selector.showOpenDialog(NewWorkspaceDialog.this) == DirectoryChooser.APPROVE_OPTION) {
final File workspaceDir = selector.getSelectedFile();

if (workspaceDir.exists()) {
workspaceDirectoryPanel.setText(selecter.getSelectedFile().getAbsolutePath());
workspaceDirectoryPanel.setText(selector.getSelectedFile().getAbsolutePath());
} else {
CMessageBox.showError(
selecter, "Workspace directory does not exist. Please choose a valid one.");
selector, "Workspace directory does not exist. Please choose a valid one.");
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -69,9 +69,9 @@ public CriteriaDialog(final Window owner, final CriteriaFactory conditionFactory

final ConditionBox selectionBox = new ConditionBox(criteria);

final AddConditionButtonListener addConditionButtonListner =
final AddConditionButtonListener addConditionButtonListener =
new AddConditionButtonListener(jtree, selectionBox, actionProvider);
final JButton addConditionButton = new JButton(addConditionButtonListner);
final JButton addConditionButton = new JButton(addConditionButtonListener);

final CPanelTwoButtons okCancelPanel =
new CPanelTwoButtons(new InternalOkCancelButtonListener(), "Execute", "Cancel");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
import com.google.security.zynamics.bindiff.gui.dialogs.criteriadialog.conditions.recursion.RecursionCriterionCreator;
import com.google.security.zynamics.bindiff.gui.dialogs.criteriadialog.conditions.selection.SelectionCriterionCreator;
import com.google.security.zynamics.bindiff.gui.dialogs.criteriadialog.conditions.text.TextCriterionCreator;
import com.google.security.zynamics.bindiff.gui.dialogs.criteriadialog.conditions.visibillity.VisibilityCriterionCreator;
import com.google.security.zynamics.bindiff.gui.dialogs.criteriadialog.conditions.visibility.VisibilityCriterionCreator;
import com.google.security.zynamics.bindiff.gui.dialogs.criteriadialog.criterion.CriterionCreator;
import java.util.ArrayList;
import java.util.List;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.

package com.google.security.zynamics.bindiff.gui.dialogs.criteriadialog.conditions.visibillity;
package com.google.security.zynamics.bindiff.gui.dialogs.criteriadialog.conditions.visibility;

import com.google.security.zynamics.bindiff.gui.dialogs.criteriadialog.conditions.ConditionCriterion;
import com.google.security.zynamics.bindiff.utils.ResourceUtils;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.

package com.google.security.zynamics.bindiff.gui.dialogs.criteriadialog.conditions.visibillity;
package com.google.security.zynamics.bindiff.gui.dialogs.criteriadialog.conditions.visibility;

import com.google.security.zynamics.bindiff.gui.dialogs.criteriadialog.criterion.Criterion;
import com.google.security.zynamics.bindiff.gui.dialogs.criteriadialog.criterion.CriterionCreator;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.

package com.google.security.zynamics.bindiff.gui.dialogs.criteriadialog.conditions.visibillity;
package com.google.security.zynamics.bindiff.gui.dialogs.criteriadialog.conditions.visibility;

import java.awt.BorderLayout;
import java.awt.event.ActionEvent;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.

package com.google.security.zynamics.bindiff.gui.dialogs.criteriadialog.conditions.visibillity;
package com.google.security.zynamics.bindiff.gui.dialogs.criteriadialog.conditions.visibility;

public enum VisibilityState {
VISIBLE,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ public class SearchingTabPanel extends JPanel {
private final JCheckBox secondarySideCheckBox;

private final JCheckBox useTempResultsCheckBox;
private final JCheckBox hightlightGraphNodesCheckBox;
private final JCheckBox highlightGraphNodesCheckBox;

private boolean initialRegEx;

Expand All @@ -52,7 +52,7 @@ public SearchingTabPanel(final boolean isCombinedView) {
secondarySideCheckBox = new JCheckBox("Secondary Side");

useTempResultsCheckBox = new JCheckBox("Search in last temporary Results");
hightlightGraphNodesCheckBox = new JCheckBox("Highlight Graph Nodes");
highlightGraphNodesCheckBox = new JCheckBox("Highlight Graph Nodes");

add(createPanel(isCombinedView), BorderLayout.CENTER);

Expand All @@ -79,7 +79,7 @@ private JPanel createPanel(final boolean isCombinedView) {
final JPanel gridPanel_2 = new JPanel(new GridLayout(2, 1));
gridPanel_2.setBorder(new TitledBorder("Result options"));
gridPanel_2.add(useTempResultsCheckBox);
gridPanel_2.add(hightlightGraphNodesCheckBox);
gridPanel_2.add(highlightGraphNodesCheckBox);

searchOptionsPanel.add(gridPanel_1, BorderLayout.NORTH);
resultOptionsPanel.add(gridPanel_2, BorderLayout.NORTH);
Expand All @@ -95,7 +95,7 @@ public boolean getCaseSensitive() {
}

public boolean getHighlightGraphNodes() {
return hightlightGraphNodesCheckBox.isSelected();
return highlightGraphNodesCheckBox.isSelected();
}

public boolean getPrimarySide() {
Expand All @@ -120,7 +120,7 @@ public void restoreInitialSettings() {
primarySideCheckBox.setSelected(initialPrimarySide);
secondarySideCheckBox.setSelected(initialSecondarySide);

hightlightGraphNodesCheckBox.setSelected(initialHighlightGraphNode);
highlightGraphNodesCheckBox.setSelected(initialHighlightGraphNode);
useTempResultsCheckBox.setSelected(initialUseTempResults);
}

Expand All @@ -130,7 +130,7 @@ public void setDefaults() {
primarySideCheckBox.setSelected(true);
secondarySideCheckBox.setSelected(true);

hightlightGraphNodesCheckBox.setSelected(true);
highlightGraphNodesCheckBox.setSelected(true);
useTempResultsCheckBox.setSelected(false);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ public class PercentageTwoBarIcon implements Icon {

private final boolean selected;

private boolean showAdditionalPercetageValues = false;
private boolean showAdditionalPercentageValues = false;

public PercentageTwoBarIcon(
final PercentageTwoBarCellData data,
Expand Down Expand Up @@ -85,7 +85,7 @@ public PercentageTwoBarIcon(
private void buildTexts() {
leftText = Integer.toString(leftValue);
rightText = Integer.toString(rightValue);
if (showAdditionalPercetageValues && leftValue + rightValue > 0) {
if (showAdditionalPercentageValues && leftValue + rightValue > 0) {
final double pl = leftValue / (double) (leftValue + rightValue) * 100.;
final double pr = 100. - pl;
leftText += String.format(" (%.1f%s)", pl, "%");
Expand Down Expand Up @@ -225,8 +225,8 @@ public void setWidth(final int width) {
this.width = width;
}

public void showAdditionalPercetageValues(final boolean show) {
showAdditionalPercetageValues = show;
public void showAdditionalPercentageValues(final boolean show) {
showAdditionalPercentageValues = show;

buildTexts();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ public PercentageTwoBarLabel(
1,
labelHeight - 1);

matchBarIcon.showAdditionalPercetageValues(true);
matchBarIcon.showAdditionalPercentageValues(true);
setIcon(matchBarIcon);
setBorder(new LineBorder(Color.black));
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,14 +53,14 @@ public Component getTableCellRendererComponent(
setFont(!isBoldFont(table, row) ? NORMAL_FONT : BOLD_FONT);

if (value instanceof EFunctionType) {
final boolean accessable = !value.toString().equals(EFunctionType.UNKNOWN.toString());
final boolean accessible = !value.toString().equals(EFunctionType.UNKNOWN.toString());

setIcon(
new BackgroundIcon(
accessable ? value.toString() : NON_ACCESSIBLE_TEXT,
accessible ? value.toString() : NON_ACCESSIBLE_TEXT,
SwingConstants.CENTER,
Colors.GRAY32,
accessable ? calcColor((EFunctionType) value) : NON_ACCESSIBLE_COLOR,
accessible ? calcColor((EFunctionType) value) : NON_ACCESSIBLE_COLOR,
table.getSelectionBackground(),
selected,
0 - 1,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ public Component getTreeCellRendererComponent(

if (!treeNode.isRoot()) {
int countAll = 0;
int countVisbleSelected = 0;
int countVisibleSelected = 0;
int countVisibleUnselected = 0;
int countInvisible = 0;

Expand All @@ -83,7 +83,7 @@ public Component getTreeCellRendererComponent(

if (graphNode.isVisible()) {
if (graphNode.isSelected()) {
countVisbleSelected++;
countVisibleSelected++;
} else {
countVisibleUnselected++;
}
Expand All @@ -93,7 +93,7 @@ public Component getTreeCellRendererComponent(
}
}

if (countAll == countVisbleSelected) {
if (countAll == countVisibleSelected) {
setForeground(SELECTED_FONT_COLOR);
} else if (countAll == countVisibleUnselected) {
setForeground(NORMAL_FONT_COLOR);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
import java.util.zip.ZipOutputStream;

public class IoWriterUtils {
public static void writeByteArrary(final OutputStream stream, final byte[] bytes)
public static void writeByteArray(final OutputStream stream, final byte[] bytes)
throws IOException {
stream.write(bytes);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
import com.google.security.zynamics.zylib.gui.zygraph.realizers.KeyBehaviours.CSelectAllKeyBehavior;
import com.google.security.zynamics.zylib.gui.zygraph.realizers.KeyBehaviours.CTabKeyBehavior;
import com.google.security.zynamics.zylib.gui.zygraph.realizers.KeyBehaviours.CUndoKeyBehavior;
import com.google.security.zynamics.zylib.gui.zygraph.realizers.KeyBehaviours.UndoHistroy.CUndoManager;
import com.google.security.zynamics.zylib.gui.zygraph.realizers.KeyBehaviours.UndoHistory.CUndoManager;
import com.google.security.zynamics.zylib.gui.zygraph.realizers.ZyCaret;
import com.google.security.zynamics.zylib.gui.zygraph.realizers.ZyLabelContent;
import com.google.security.zynamics.zylib.yfileswrap.gui.zygraph.AbstractZyGraph;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
package com.google.security.zynamics.zylib.gui.zygraph.realizers;

public interface IZyLineEditor {
void recreateLabelLines(ZyLabelContent labelContent, Object persistantModel);
void recreateLabelLines(ZyLabelContent labelContent, Object persistentModel);

void refreshSize(ZyLabelContent labelContent, Object persistantModel);
void refreshSize(ZyLabelContent labelContent, Object persistentModel);
}
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
import com.google.security.zynamics.zylib.general.ClipboardHelpers;
import com.google.security.zynamics.zylib.gui.zygraph.realizers.ECommentPlacement;
import com.google.security.zynamics.zylib.gui.zygraph.realizers.IZyEditableObject;
import com.google.security.zynamics.zylib.gui.zygraph.realizers.KeyBehaviours.UndoHistroy.CUndoManager;
import com.google.security.zynamics.zylib.gui.zygraph.realizers.KeyBehaviours.UndoHistory.CUndoManager;
import com.google.security.zynamics.zylib.gui.zygraph.realizers.ZyCaret;
import com.google.security.zynamics.zylib.gui.zygraph.realizers.ZyLabelContent;
import com.google.security.zynamics.zylib.gui.zygraph.realizers.ZyLineContent;
Expand Down Expand Up @@ -698,9 +698,9 @@ protected void setCaret(
mouseReleased_Y);
}

protected void udpateUndolist(
protected void updateUndolist(
final ZyLabelContent labelContent,
final Object persistantModel,
final Object persistentModel,
final IZyEditableObject editableObject,
final String changedText,
final boolean isAboveLineComment,
Expand All @@ -714,7 +714,7 @@ protected void udpateUndolist(
final int caretMouseReleasedY) {
m_undoManager.addUndoState(
labelContent,
persistantModel,
persistentModel,
editableObject,
changedText,
isAboveLineComment,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

import com.google.security.zynamics.zylib.gui.zygraph.realizers.ECommentPlacement;
import com.google.security.zynamics.zylib.gui.zygraph.realizers.IZyEditableObject;
import com.google.security.zynamics.zylib.gui.zygraph.realizers.KeyBehaviours.UndoHistroy.CUndoManager;
import com.google.security.zynamics.zylib.gui.zygraph.realizers.KeyBehaviours.UndoHistory.CUndoManager;
import com.google.security.zynamics.zylib.gui.zygraph.realizers.ZyLineContent;
import java.util.List;

Expand Down Expand Up @@ -200,7 +200,7 @@ protected void initUndoHistory() {
text = getMultiLineComment(y);
}

udpateUndolist(
updateUndolist(
getLabelContent(),
m_lineModel.getPersistentModel(),
m_editableObject,
Expand Down Expand Up @@ -293,7 +293,7 @@ protected void updateUndoHistory() {
text = getMultiLineComment(y);
}

udpateUndolist(
updateUndolist(
getLabelContent(),
m_lineModel.getPersistentModel(),
m_lineModel,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

import com.google.security.zynamics.zylib.gui.zygraph.realizers.ECommentPlacement;
import com.google.security.zynamics.zylib.gui.zygraph.realizers.IZyEditableObject;
import com.google.security.zynamics.zylib.gui.zygraph.realizers.KeyBehaviours.UndoHistroy.CUndoManager;
import com.google.security.zynamics.zylib.gui.zygraph.realizers.KeyBehaviours.UndoHistory.CUndoManager;
import com.google.security.zynamics.zylib.gui.zygraph.realizers.ZyLineContent;

public class CCharKeyBehavior extends CAbstractKeyBehavior {
Expand Down Expand Up @@ -69,7 +69,7 @@ protected void initUndoHistory() {
}
}

udpateUndolist(
updateUndolist(
getLabelContent(),
lineContent.getLineObject().getPersistentModel(),
editableObject,
Expand Down Expand Up @@ -193,7 +193,7 @@ protected void updateUndoHistory() {
text = getMultiLineComment(y);
}

udpateUndolist(
updateUndolist(
getLabelContent(),
lineContent.getLineObject().getPersistentModel(),
editableObject,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
package com.google.security.zynamics.zylib.gui.zygraph.realizers.KeyBehaviours;

import com.google.security.zynamics.zylib.general.ClipboardHelpers;
import com.google.security.zynamics.zylib.gui.zygraph.realizers.KeyBehaviours.UndoHistroy.CUndoManager;
import com.google.security.zynamics.zylib.gui.zygraph.realizers.KeyBehaviours.UndoHistory.CUndoManager;

public class CCopyKeyBehavior extends CAbstractKeyBehavior {
public CCopyKeyBehavior(final CUndoManager undoManager) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

package com.google.security.zynamics.zylib.gui.zygraph.realizers.KeyBehaviours;

import com.google.security.zynamics.zylib.gui.zygraph.realizers.KeyBehaviours.UndoHistroy.CUndoManager;
import com.google.security.zynamics.zylib.gui.zygraph.realizers.KeyBehaviours.UndoHistory.CUndoManager;
import com.google.security.zynamics.zylib.gui.zygraph.realizers.ZyLabelContent;
import com.google.security.zynamics.zylib.gui.zygraph.realizers.ZyLineContent;
import java.awt.event.KeyEvent;
Expand Down
Loading
Loading