De-emphasize zynamics branding, update bug-tracker URL, add revision …

…string
google · Aug 24, 2015 · bc69529 · bc69529
1 parent ba66242
commit bc69529
Show file tree

Hide file tree

Showing 87 changed files with 385 additions and 573 deletions.
diff --git a/src/main/java/com/google/security/zynamics/binnavi/CMain.java b/src/main/java/com/google/security/zynamics/binnavi/CMain.java
@@ -93,8 +93,7 @@ public static void main(final String[] args) {
     // ESCA-JAVA0266:
     // ATTENTION: DO NOT MOVE THE LINE BELOW ABOVE THE CONFIG FILE STUFF
     // Don't remove this line, it actually works from inside JAR files
-    System.out.printf("Starting %s %s Build: %s/%s%n", Constants.PROJECT_NAME,
-        Constants.PROJECT_VERSION, Constants.BUILD_ID, Constants.REVISION_NUMBER);
+    System.out.printf("Starting %s%n", Constants.PROJECT_NAME_VERSION_BUILD);
 
     CGraphPanelExtender.extend();
 

diff --git a/src/main/java/com/google/security/zynamics/binnavi/Database/CDatabaseLoader.java b/src/main/java/com/google/security/zynamics/binnavi/Database/CDatabaseLoader.java
@@ -33,10 +33,10 @@
 import com.google.security.zynamics.binnavi.Database.Interfaces.IDatabaseListener;
 import com.google.security.zynamics.binnavi.Database.PostgreSQL.PostgreSQLErrorCodes;
 import com.google.security.zynamics.binnavi.Gui.Database.implementations.CDatabaseCreator;
-import com.google.security.zynamics.binnavi.Gui.ErrorDialog.CNaviErrorDialog;
 import com.google.security.zynamics.binnavi.Gui.Progress.CDefaultProgressOperation;
 import com.google.security.zynamics.binnavi.Gui.Progress.CGlobalProgressManager;
 import com.google.security.zynamics.binnavi.Gui.Progress.IProgressOperation;
+import com.google.security.zynamics.binnavi.Gui.errordialog.NaviErrorDialog;
 import com.google.security.zynamics.zylib.gui.CMessageBox;
 import com.google.security.zynamics.zylib.gui.ProgressDialogs.CProgressPanel;
 
@@ -80,7 +80,7 @@ public static void loadDatabase(final Window parent, final IDatabase database) {
               new String[] {"BinNavi can not load data from the given database until the "
                   + "problem is resolved."});
 
-      CNaviErrorDialog.show(parent, message, description, exception);
+      NaviErrorDialog.show(parent, message, description, exception);
     } catch (final CouldntLoadDataException exception) {
       final String message = "E00014: " + "Could not load data from the database";
       final String description =
@@ -91,7 +91,7 @@ public static void loadDatabase(final Window parent, final IDatabase database) {
               new String[] {"Close the database and open it again. Maybe close and re-start "
                   + "BinNavi too. If the program persists, please contact the BinNavi support."});
 
-      CNaviErrorDialog.show(parent, message, description, exception);
+      NaviErrorDialog.show(parent, message, description, exception);
     } catch (final InvalidDatabaseException exception) {
       final String message = "E00015: " + "Database is in an inconsistent state";
       final String description =
@@ -106,7 +106,7 @@ public static void loadDatabase(final Window parent, final IDatabase database) {
                   + "BinNavi. If the database already contains data please contact the BinNavi "
                   + "support."});
 
-      CNaviErrorDialog.show(parent, message, description, exception);
+      NaviErrorDialog.show(parent, message, description, exception);
     } catch (final CouldntInitializeDatabaseException exception) {
       final String message = "E00016: Database could not be initialized";
       final String description =
@@ -119,7 +119,7 @@ public static void loadDatabase(final Window parent, final IDatabase database) {
                   + "fresh database. If you do not want to do this please contact the BinNavi "
                   + "support to find out what other options exist for you."});
 
-      CNaviErrorDialog.show(parent, message, description, exception);
+      NaviErrorDialog.show(parent, message, description, exception);
     } catch (final InvalidExporterDatabaseFormatException exception) {
       final String message = "E00017: " + "Database has invalid exporter tables";
       final String description =
@@ -131,7 +131,7 @@ public static void loadDatabase(final Window parent, final IDatabase database) {
                   + "BinNavi. If you do not want to do this please contact the BinNavi support "
                   + "to find out what other options exist for you."});
 
-      CNaviErrorDialog.show(parent, message, description, exception);
+      NaviErrorDialog.show(parent, message, description, exception);
     } catch (final InvalidDatabaseVersionException exception) {
       if (!exception.getVersion().getString().equals("4.0.0")
           || !exception.getVersion().getString().equals("5.0.0")) {
@@ -177,7 +177,7 @@ public static void loadDatabase(final Window parent, final IDatabase database) {
                         + "works with the database in its current state, partial or total "
                         + "data loss could happen."});
 
-            CNaviErrorDialog.show(parent, message, description, exception);
+            NaviErrorDialog.show(parent, message, description, exception);
           } finally {
             updateOperation.stop();
           }
@@ -215,7 +215,7 @@ public static void loadDatabase(final Window parent, final IDatabase database) {
                 new String[] {"BinNavi can not load data from the given database until the "
                     + "problem is resolved."});
 
-        CNaviErrorDialog.show(parent, message, description, exception);
+        NaviErrorDialog.show(parent, message, description, exception);
       }
     } catch (final LoadCancelledException exception) {
       // We do not signal to the user that he cancelled loading.

diff --git a/...com/google/security/zynamics/binnavi/Gui/Database/implementations/CDatabaseConnector.java b/...com/google/security/zynamics/binnavi/Gui/Database/implementations/CDatabaseConnector.java
@@ -21,7 +21,7 @@
 import com.google.security.zynamics.binnavi.Database.Exceptions.CouldntConnectException;
 import com.google.security.zynamics.binnavi.Database.Exceptions.CouldntLoadDriverException;
 import com.google.security.zynamics.binnavi.Database.PostgreSQL.PostgreSQLErrorCodes;
-import com.google.security.zynamics.binnavi.Gui.ErrorDialog.CNaviErrorDialog;
+import com.google.security.zynamics.binnavi.Gui.errordialog.NaviErrorDialog;
 import com.google.security.zynamics.zylib.gui.CMessageBox;
 
 import java.awt.Window;
@@ -149,7 +149,7 @@ public static void testConnection(
           "The database driver file could not be found."}, new String[] {
           "BinNavi can not load data from the given database until the " + "problem is resolved."});
 
-      CNaviErrorDialog.show(parent, message, description, exception);
+      NaviErrorDialog.show(parent, message, description, exception);
     } catch (final CouldntConnectException exception) {
       if (exception.getSqlState().equalsIgnoreCase(PostgreSQLErrorCodes.INVALID_PASSWORD)) {
         CMessageBox.showInformation(parent, String.format(
@@ -171,7 +171,7 @@ public static void testConnection(
                 "BinNavi can not load data from the given database until the "
                 + "problem is resolved."});
 
-        CNaviErrorDialog.show(parent, message, description, exception);
+        NaviErrorDialog.show(parent, message, description, exception);
       }
     }
   }

diff --git a/...a/com/google/security/zynamics/binnavi/Gui/Database/implementations/CDatabaseCreator.java b/...a/com/google/security/zynamics/binnavi/Gui/Database/implementations/CDatabaseCreator.java
@@ -23,9 +23,9 @@
 import com.google.security.zynamics.binnavi.Database.Exceptions.CouldntConnectException;
 import com.google.security.zynamics.binnavi.Database.Exceptions.CouldntLoadDriverException;
 import com.google.security.zynamics.binnavi.Database.PostgreSQL.PostgreSQLErrorCodes;
-import com.google.security.zynamics.binnavi.Gui.ErrorDialog.CNaviErrorDialog;
 import com.google.security.zynamics.binnavi.Gui.Progress.CGlobalProgressManager;
 import com.google.security.zynamics.binnavi.Gui.Progress.IProgressOperation;
+import com.google.security.zynamics.binnavi.Gui.errordialog.NaviErrorDialog;
 import com.google.security.zynamics.zylib.gui.CMessageBox;
 import com.google.security.zynamics.zylib.gui.ProgressDialogs.CProgressPanel;
 
@@ -66,7 +66,7 @@ private static void createDatabaseInternal(final Window parent,
               new String[] {"BinNavi can not load data from the given database until "
                   + "the problem is resolved."});
 
-      CNaviErrorDialog.show(parent, message, description, exception);
+      NaviErrorDialog.show(parent, message, description, exception);
     } catch (final CouldntConnectException exception) {
       if (exception.getSqlState().equalsIgnoreCase(PostgreSQLErrorCodes.INVALID_PASSWORD)) {
         CMessageBox.showInformation(
@@ -83,7 +83,7 @@ private static void createDatabaseInternal(final Window parent,
               new String[] {"BinNavi can not load data from the given database until the "
                   + "problem is resolved."});
 
-      CNaviErrorDialog.show(parent, message, description, exception);
+      NaviErrorDialog.show(parent, message, description, exception);
     } catch (final SQLException exception) {
       final String message = "E00049: " + "Database could not be created";
       final String description =
@@ -94,7 +94,7 @@ private static void createDatabaseInternal(final Window parent,
                   "The database was not created. Please try creating the database again or "
                       + "create it manually if necessary."});
 
-      CNaviErrorDialog.show(parent, message, description, exception);
+      NaviErrorDialog.show(parent, message, description, exception);
     }
   }
 

diff --git a/...ity/zynamics/binnavi/Gui/Debug/EventLists/Implementations/CTraceCombinationFunctions.java b/...ity/zynamics/binnavi/Gui/Debug/EventLists/Implementations/CTraceCombinationFunctions.java
@@ -25,8 +25,8 @@
 import com.google.common.collect.Lists;
 import com.google.security.zynamics.binnavi.CUtilityFunctions;
 import com.google.security.zynamics.binnavi.Database.Exceptions.CouldntSaveDataException;
-import com.google.security.zynamics.binnavi.Gui.ErrorDialog.CNaviErrorDialog;
 import com.google.security.zynamics.binnavi.Gui.Progress.CDefaultProgressOperation;
+import com.google.security.zynamics.binnavi.Gui.errordialog.NaviErrorDialog;
 import com.google.security.zynamics.binnavi.debug.models.breakpoints.BreakpointAddress;
 import com.google.security.zynamics.binnavi.debug.models.trace.TraceList;
 import com.google.security.zynamics.binnavi.debug.models.trace.interfaces.ITraceEvent;
@@ -209,7 +209,7 @@ public void run() {
               new String[] {"There was a problem with the database connection."}, new String[] {
                   "The trace list was not created. You could try to combine the lists again once the connection problem was resolved."});
 
-          CNaviErrorDialog.show(parent, innerMessage, innerDescription, e);
+          NaviErrorDialog.show(parent, innerMessage, innerDescription, e);
         }
       }
     }.start();
@@ -255,7 +255,7 @@ public void run() {
               new String[] {"There was a problem with the database connection."}, new String[] {
                   "The trace list was not created. You could try to combine the lists again once the connection problem was resolved."});
 
-          CNaviErrorDialog.show(parent, innerMessage, innerDescription, e);
+          NaviErrorDialog.show(parent, innerMessage, innerDescription, e);
         }
       }
     }.start();
@@ -301,7 +301,7 @@ public void run() {
               new String[] {"There was a problem with the database connection."}, new String[] {
                   "The trace list was not created. You could try to combine the lists again once the connection problem was resolved."});
 
-          CNaviErrorDialog.show(parent, innerMessage, innerDescription, e);
+          NaviErrorDialog.show(parent, innerMessage, innerDescription, e);
         }
       }
     }.start();

diff --git a/...oogle/security/zynamics/binnavi/Gui/Debug/EventLists/Implementations/CTraceFunctions.java b/...oogle/security/zynamics/binnavi/Gui/Debug/EventLists/Implementations/CTraceFunctions.java
@@ -28,11 +28,11 @@
 import com.google.security.zynamics.binnavi.CUtilityFunctions;
 import com.google.security.zynamics.binnavi.Database.Exceptions.CouldntDeleteException;
 import com.google.security.zynamics.binnavi.Database.Exceptions.CouldntSaveDataException;
-import com.google.security.zynamics.binnavi.Gui.ErrorDialog.CNaviErrorDialog;
 import com.google.security.zynamics.binnavi.Gui.GraphWindows.NodeTaggingTree.Implementations.CTaggingFunctions;
 import com.google.security.zynamics.binnavi.Gui.GraphWindows.Panels.CDebugPerspectiveModel;
 import com.google.security.zynamics.binnavi.Gui.MainWindow.Implementations.CNameListGenerators;
 import com.google.security.zynamics.binnavi.Gui.Progress.CDefaultProgressOperation;
+import com.google.security.zynamics.binnavi.Gui.errordialog.NaviErrorDialog;
 import com.google.security.zynamics.binnavi.Tagging.CTag;
 import com.google.security.zynamics.binnavi.debug.debugger.interfaces.IDebugger;
 import com.google.security.zynamics.binnavi.debug.models.breakpoints.BreakpointAddress;
@@ -108,7 +108,7 @@ public void run() {
                       "There was a problem with the database connection."}, new String[] {
                       "The trace list was not deleted. You could try to delete the list again once the connection problem was resolved."});
 
-              CNaviErrorDialog.show(parent, innerMessage, innerDescription, e);
+              NaviErrorDialog.show(parent, innerMessage, innerDescription, e);
             } finally {
               operation.stop();
             }
@@ -184,7 +184,7 @@ public static void setTraceDescription(
           new String[] {
               "The trace list keeps its old description. You could try changing the description again once the connection problem was resolved."});
 
-      CNaviErrorDialog.show(parent, innerMessage, innerDescription, e);
+      NaviErrorDialog.show(parent, innerMessage, innerDescription, e);
     }
   }
 
@@ -211,7 +211,7 @@ public static void setTraceName(
           new String[] {"There was a problem with the database connection."}, new String[] {
               "The trace list keeps its old name. You could try changing the name again once the connection problem was resolved."});
 
-      CNaviErrorDialog.show(parent, innerMessage, innerDescription, e);
+      NaviErrorDialog.show(parent, innerMessage, innerDescription, e);
     }
   }
 

diff --git a/...gle/security/zynamics/binnavi/Gui/Debug/MemoryPanel/Implementations/CMemoryFunctions.java b/...gle/security/zynamics/binnavi/Gui/Debug/MemoryPanel/Implementations/CMemoryFunctions.java
@@ -22,8 +22,8 @@
 import com.google.security.zynamics.binnavi.Gui.Debug.Goto.CGotoDialog;
 import com.google.security.zynamics.binnavi.Gui.Debug.MemoryPanel.CMemoryViewer;
 import com.google.security.zynamics.binnavi.Gui.Debug.SearchMemory.CSearchDialog;
-import com.google.security.zynamics.binnavi.Gui.ErrorDialog.CNaviErrorDialog;
 import com.google.security.zynamics.binnavi.Gui.GraphWindows.Panels.CDebugPerspectiveModel;
+import com.google.security.zynamics.binnavi.Gui.errordialog.NaviErrorDialog;
 import com.google.security.zynamics.binnavi.debug.connection.packets.replies.SearchReply;
 import com.google.security.zynamics.binnavi.debug.debugger.interfaces.IDebugger;
 import com.google.security.zynamics.binnavi.debug.models.processmanager.TargetProcessThread;
@@ -130,7 +130,7 @@ public static void dumpMemoryRange(final JFrame parent, final IDebugger debugger
               "Another program locks the selected file.", "The disk is full."},
               new String[] {"The memory data was not written to the file."});
 
-          CNaviErrorDialog.show(parent, innerMessage, innerDescription, e);
+          NaviErrorDialog.show(parent, innerMessage, innerDescription, e);
         }
       } else {
         final String innerMessage = "E00152: " + "Could not read memory";
@@ -139,7 +139,7 @@ public static void dumpMemoryRange(final JFrame parent, final IDebugger debugger
             new String[] {"There was a problem with the database connection."}, new String[] {
                 "The memory data could not be read and the output file was not written."});
 
-        CNaviErrorDialog.show(parent, innerMessage, innerDescription);
+        NaviErrorDialog.show(parent, innerMessage, innerDescription);
       }
     }
   }
@@ -218,7 +218,7 @@ public static void loadAll(
           new String[] {"There was a problem with the connection to the debug client."},
           new String[] {"The memory data was not loaded."});
 
-      CNaviErrorDialog.show(parent, innerMessage, innerDescription, waiter.getException());
+      NaviErrorDialog.show(parent, innerMessage, innerDescription, waiter.getException());
     }
   }
 
@@ -286,7 +286,7 @@ public static void searchMemory(
             new String[] {"There was a problem with the connection to the debug client."},
             new String[] {"The search operation could not be started."});
 
-        CNaviErrorDialog.show(parent, innerMessage, innerDescription, waiter.getException());
+        NaviErrorDialog.show(parent, innerMessage, innerDescription, waiter.getException());
       }
     }
   }

diff --git a/...mics/binnavi/Gui/Debug/MemoryRefreshButton/Implementations/CMemorySelectionFunctions.java b/...mics/binnavi/Gui/Debug/MemoryRefreshButton/Implementations/CMemorySelectionFunctions.java
@@ -23,8 +23,8 @@
 import com.google.common.base.Preconditions;
 import com.google.security.zynamics.binnavi.CUtilityFunctions;
 import com.google.security.zynamics.binnavi.Gui.Debug.MemRangeDialog.CMemoryRangeDialog;
-import com.google.security.zynamics.binnavi.Gui.ErrorDialog.CNaviErrorDialog;
 import com.google.security.zynamics.binnavi.Gui.GraphWindows.Panels.CDebugPerspectiveModel;
+import com.google.security.zynamics.binnavi.Gui.errordialog.NaviErrorDialog;
 import com.google.security.zynamics.binnavi.debug.debugger.DebugExceptionWrapper;
 import com.google.security.zynamics.binnavi.debug.debugger.interfaces.IDebugger;
 import com.google.security.zynamics.binnavi.debug.models.processmanager.MemoryMap;
@@ -116,7 +116,7 @@ public static void refreshMemory(
           new String[] {"There was a problem with the connection to the debug client."},
           new String[] {"The memory data was not refreshed."});
 
-      CNaviErrorDialog.show(parent, innerMessage, innerDescription, exception);
+      NaviErrorDialog.show(parent, innerMessage, innerDescription, exception);
     }
   }
 }
diff --git a/...urity/zynamics/binnavi/Gui/Debug/ModulesPanel/Implementations/CModulesPanelFunctions.java b/...urity/zynamics/binnavi/Gui/Debug/ModulesPanel/Implementations/CModulesPanelFunctions.java
@@ -19,8 +19,8 @@
 
 import com.google.common.base.Preconditions;
 import com.google.security.zynamics.binnavi.Gui.Debug.MemoryPanel.Implementations.CMemoryFunctions;
-import com.google.security.zynamics.binnavi.Gui.ErrorDialog.CNaviErrorDialog;
 import com.google.security.zynamics.binnavi.Gui.GraphWindows.Panels.CDebugPerspectiveModel;
+import com.google.security.zynamics.binnavi.Gui.errordialog.NaviErrorDialog;
 import com.google.security.zynamics.binnavi.debug.debugger.interfaces.IDebugger;
 import com.google.security.zynamics.binnavi.debug.models.processmanager.MemoryMap;
 import com.google.security.zynamics.binnavi.debug.models.processmanager.MemoryModule;
@@ -74,7 +74,7 @@ public static void gotoModule(final Window parent,
               + "Try refreshing the memory map to fix this issue.", module.getName(),
               module.getBaseAddress());
 
-      CNaviErrorDialog.show(parent, message, description);
+      NaviErrorDialog.show(parent, message, description);
     } else {
       CMemoryFunctions
           .gotoOffset(debugPerspectiveModel, module.getBaseAddress().getAddress(), true);