[380600] Resave Heap Dump without Unreachable Objects

Allow export HPROF to be run as a command line report.
Make sure report is packaged.

Change-Id: I93d8fd1c05db4751d38ddb300498dab4acfd4d29

2 files changed, 4 insertions, 3 deletions

diff --git a/plugins/org.eclipse.mat.hprof/build.properties b/plugins/org.eclipse.mat.hprof/build.properties
index c87b7431..a26c7469 100644
--- a/plugins/org.eclipse.mat.hprof/build.properties
+++ b/plugins/org.eclipse.mat.hprof/build.properties
@@ -17,4 +17,5 @@ bin.includes = META-INF/,\
                plugin.properties,\

                schema/,\

                .options,\

-               icons/

+               icons/,\

+               reports/

diff --git a/plugins/org.eclipse.mat.ui/src/org/eclipse/mat/ui/snapshot/panes/oql/contentAssist/ClassNameExtractor.java b/plugins/org.eclipse.mat.ui/src/org/eclipse/mat/ui/snapshot/panes/oql/contentAssist/ClassNameExtractor.java
index d962749f..8bc6508a 100644
--- a/plugins/org.eclipse.mat.ui/src/org/eclipse/mat/ui/snapshot/panes/oql/contentAssist/ClassNameExtractor.java
+++ b/plugins/org.eclipse.mat.ui/src/org/eclipse/mat/ui/snapshot/panes/oql/contentAssist/ClassNameExtractor.java
@@ -45,9 +45,9 @@ public class ClassNameExtractor implements ContextExtractor
                     readChar = doc.getChar(pos);

                     pos--;

                 }

-                while (pos >= 0 && readChar != ' ' && readChar != '\n');

+                while (pos >= 0 && readChar != ' ' && readChar != '\n' && readChar != '\r');

 

-                if (readChar == ' ' || readChar == '\n')

+                if (readChar == ' ' || readChar == '\n' || readChar == '\r')

                     pos++;

                 return doc.get(pos + 1, currentPosition - 1 - pos);