Merge branch 'develop' of https://github.com/sleuthkit/autopsy into kws_open_core_error_handling

Core/src/org/sleuthkit/autopsy/events/MessageServiceConnectionInfo.java

@@ -53,7 +53,9 @@ public final class MessageServiceConnectionInfo {
      *                 a host name or an IP address.
      * @param port     The port number to use for a message service connection.
      * @param userName The user name to use for a message service connection.
-     * @param password The password to use for a message service connection.
+     *                 May be the empty string.
+     * @param password The password to use for a message service connection. May
+     *                 be the empty string.
      *
      */
     public MessageServiceConnectionInfo(String host, int port, String userName, String password) {
@@ -66,7 +68,7 @@ public final class MessageServiceConnectionInfo {
     /**
      * Gets the user name to use for a message service connection.
      *
-     * @return The user name as a string.
+     * @return The user name as a string. May be empty.
      */
     public String getUserName() {
         return userName;
@@ -75,7 +77,7 @@ public final class MessageServiceConnectionInfo {
     /**
      * Gets the password to use for a message service connection.
      *
-     * @return The password as a string.
+     * @return The password as a string. May be empty.
      */
     public String getPassword() {
         return password;
@@ -126,9 +128,9 @@ public final class MessageServiceConnectionInfo {
     public void tryConnect() throws MessageServiceException {
         if (host == null || host.isEmpty()) {
             throw new MessageServiceException(NbBundle.getMessage(MessageServiceConnectionInfo.class, "MessageServiceConnectionInfo.MissingHostname")); //NON-NLS
-        } else if (userName == null || userName.isEmpty()) {
+        } else if (userName == null) {
             throw new MessageServiceException(NbBundle.getMessage(MessageServiceConnectionInfo.class, "MessageServiceConnectionInfo.MissingUsername")); //NON-NLS
-        } else if (password == null || password.isEmpty()) {
+        } else if (password == null) {
             throw new MessageServiceException(NbBundle.getMessage(MessageServiceConnectionInfo.class, "MessageServiceConnectionInfo.MissingPassword")); //NON-NLS
         }
         try {

Core/src/org/sleuthkit/autopsy/timeline/db/EventsRepository.java

@@ -454,7 +454,7 @@ public class EventsRepository {
         }
 
         @Override
-        @NbBundle.Messages({"progressWindow.msg.populateMacEventsFiles=populating mac events for files:",
+        @NbBundle.Messages({"progressWindow.msg.populateMacEventsFiles=Populating MAC time events for files:",
             "progressWindow.msg.reinit_db=(re)initializing events database",
             "progressWindow.msg.commitingDb=committing events db"})
         protected Void doInBackground() throws Exception {
@@ -587,7 +587,7 @@ public class EventsRepository {
          * @param trans   the db transaction to use
          * @param skCase  a reference to the sleuthkit case
          */
-        @NbBundle.Messages({"# {0} - event type ", "progressWindow.populatingXevents=populating {0} events"})
+        @NbBundle.Messages({"# {0} - event type ", "progressWindow.populatingXevents=Populating {0} events"})
         private void populateEventType(final ArtifactEventType type, EventDB.EventTransaction trans) {
             try {
                 //get all the blackboard artifacts corresponding to the given event sub_type

ImageGallery/src/org/sleuthkit/autopsy/imagegallery/actions/OpenHelpAction.java

@@ -43,7 +43,7 @@ public final class OpenHelpAction implements ActionListener {
     @Override
     public void actionPerformed(ActionEvent e) {
         try {
-            Desktop.getDesktop().browse(URI.create("http://sleuthkit.org/autopsy/docs/user-docs/"));
+            Desktop.getDesktop().browse(URI.create("http://sleuthkit.org/autopsy/docs/user-docs/4.0/image_gallery_page.html"));
         } catch (IOException ex) {
             Exceptions.printStackTrace(ex);
         }

branding/core/core.jar/org/netbeans/core/startup/Bundle.properties

@@ -1,5 +1,5 @@
 #Updated by build script
-#Fri, 23 Oct 2015 09:28:23 -0400
+#Mon, 26 Oct 2015 09:54:05 -0400
 LBL_splash_window_title=Starting Autopsy
 SPLASH_HEIGHT=314
 SPLASH_WIDTH=538
@@ -8,4 +8,4 @@ SplashRunningTextBounds=0,289,538,18
 SplashRunningTextColor=0x0
 SplashRunningTextFontSize=19
 
-currentVersion=Autopsy 3.1.3
+currentVersion=Autopsy 4.0.0

branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/view/ui/Bundle.properties

@@ -1,4 +1,4 @@
 #Updated by build script
-#Fri, 23 Oct 2015 09:28:23 -0400
-CTL_MainWindow_Title=Autopsy 3.1.3
-CTL_MainWindow_Title_No_Project=Autopsy 3.1.3
+#Mon, 26 Oct 2015 09:54:05 -0400
+CTL_MainWindow_Title=Autopsy 4.0.0
+CTL_MainWindow_Title_No_Project=Autopsy 4.0.0