--- old/agent/src/share/classes/sun/jvm/hotspot/gc_implementation/parallelScavenge/ParallelScavengeHeap.java	2015-05-12 11:53:18.371918517 +0200
+++ /dev/null	2015-03-18 17:10:38.111854831 +0100
@@ -1,97 +0,0 @@
-/*
- * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-
-package sun.jvm.hotspot.gc_implementation.parallelScavenge;
-
-import java.io.*;
-import java.util.*;
-
-import sun.jvm.hotspot.debugger.*;
-import sun.jvm.hotspot.gc_interface.*;
-import sun.jvm.hotspot.runtime.*;
-import sun.jvm.hotspot.types.*;
-
-public class ParallelScavengeHeap extends CollectedHeap {
-   static {
-      VM.registerVMInitializedObserver(new Observer() {
-         public void update(Observable o, Object data) {
-            initialize(VM.getVM().getTypeDataBase());
-         }
-      });
-   }
-
-   private static synchronized void initialize(TypeDataBase db) {
-      Type type = db.lookupType("ParallelScavengeHeap");
-      youngGenField = type.getAddressField("_young_gen");
-      oldGenField    = type.getAddressField("_old_gen");
-   }
-
-   public ParallelScavengeHeap(Address addr) {
-      super(addr);
-   }
-
-   // Fields
-   private static AddressField youngGenField;
-   private static AddressField oldGenField;
-
-   // Accessors
-   public PSYoungGen youngGen() {
-      return (PSYoungGen) VMObjectFactory.newObject(PSYoungGen.class, youngGenField.getValue());
-   }
-
-   public PSOldGen oldGen() {
-      return (PSOldGen) VMObjectFactory.newObject(PSOldGen.class, oldGenField.getValue());
-   }
-
-   public long capacity() {
-      return youngGen().capacity() + oldGen().capacity();
-   }
-
-   public long used() {
-      return youngGen().used() + oldGen().used();
-   }
-
-   public boolean isIn(Address a) {
-      if (youngGen().isIn(a)) {
-         return true;
-      }
-
-      if (oldGen().isIn(a)) {
-         return true;
-      }
-
-      return false;
-   }
-
-   public CollectedHeapName kind() {
-      return CollectedHeapName.PARALLEL_SCAVENGE_HEAP;
-   }
-
-   public void printOn(PrintStream tty) {
-      tty.print("ParallelScavengeHeap [ ");
-      youngGen().printOn(tty);
-      oldGen().printOn(tty);
-      tty.print(" ] ");
-   }
-}
--- /dev/null	2015-03-18 17:10:38.111854831 +0100
+++ new/agent/src/share/classes/sun/jvm/hotspot/gc/parallel/ParallelScavengeHeap.java	2015-05-12 11:53:18.175910323 +0200
@@ -0,0 +1,97 @@
+/*
+ * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+package sun.jvm.hotspot.gc.parallel;
+
+import java.io.*;
+import java.util.*;
+
+import sun.jvm.hotspot.debugger.*;
+import sun.jvm.hotspot.gc.shared.*;
+import sun.jvm.hotspot.runtime.*;
+import sun.jvm.hotspot.types.*;
+
+public class ParallelScavengeHeap extends CollectedHeap {
+   static {
+      VM.registerVMInitializedObserver(new Observer() {
+         public void update(Observable o, Object data) {
+            initialize(VM.getVM().getTypeDataBase());
+         }
+      });
+   }
+
+   private static synchronized void initialize(TypeDataBase db) {
+      Type type = db.lookupType("ParallelScavengeHeap");
+      youngGenField = type.getAddressField("_young_gen");
+      oldGenField    = type.getAddressField("_old_gen");
+   }
+
+   public ParallelScavengeHeap(Address addr) {
+      super(addr);
+   }
+
+   // Fields
+   private static AddressField youngGenField;
+   private static AddressField oldGenField;
+
+   // Accessors
+   public PSYoungGen youngGen() {
+      return (PSYoungGen) VMObjectFactory.newObject(PSYoungGen.class, youngGenField.getValue());
+   }
+
+   public PSOldGen oldGen() {
+      return (PSOldGen) VMObjectFactory.newObject(PSOldGen.class, oldGenField.getValue());
+   }
+
+   public long capacity() {
+      return youngGen().capacity() + oldGen().capacity();
+   }
+
+   public long used() {
+      return youngGen().used() + oldGen().used();
+   }
+
+   public boolean isIn(Address a) {
+      if (youngGen().isIn(a)) {
+         return true;
+      }
+
+      if (oldGen().isIn(a)) {
+         return true;
+      }
+
+      return false;
+   }
+
+   public CollectedHeapName kind() {
+      return CollectedHeapName.PARALLEL_SCAVENGE_HEAP;
+   }
+
+   public void printOn(PrintStream tty) {
+      tty.print("ParallelScavengeHeap [ ");
+      youngGen().printOn(tty);
+      oldGen().printOn(tty);
+      tty.print(" ] ");
+   }
+}