[cp-patches] [generics] FYI: Implement MemoryType enum

[Andrew John Hughes]

This adds the MemoryType enum to the generics branch,
and corrects the appropriate methods imported from HEAD.

Changelog:

2006-07-23  Andrew John Hughes  <[EMAIL PROTECTED]>

        * gnu/java/lang/management/MemoryPoolMXBeanImpl.java,
        * java/lang/management/MemoryPoolMXBean.java:
        (getType()): Changed return type to MemoryType.
        * java/lang/management/MemoryType.java:
        New file.

-- 
Andrew :-)

Escape the Java Trap with GNU Classpath!
http://www.gnu.org/philosophy/java-trap.html
public class gcj extends Freedom implements Java { ... }

Index: gnu/java/lang/management/MemoryPoolMXBeanImpl.java
===================================================================
RCS file: 
/cvsroot/classpath/classpath/gnu/java/lang/management/MemoryPoolMXBeanImpl.java,v
retrieving revision 1.1.4.2
diff -u -3 -p -u -r1.1.4.2 MemoryPoolMXBeanImpl.java
--- gnu/java/lang/management/MemoryPoolMXBeanImpl.java  23 Jul 2006 21:28:34 
-0000      1.1.4.2
+++ gnu/java/lang/management/MemoryPoolMXBeanImpl.java  23 Jul 2006 21:45:44 
-0000
@@ -40,6 +40,7 @@ package gnu.java.lang.management;
 import gnu.classpath.SystemProperties;
 
 import java.lang.management.MemoryPoolMXBean;
+import java.lang.management.MemoryType;
 import java.lang.management.MemoryUsage;
 
 /**
@@ -125,9 +126,10 @@ public final class MemoryPoolMXBeanImpl
       return null;
   }
 
-  public String getType()
+  public MemoryType getType()
   {
-    return VMMemoryPoolMXBeanImpl.getType(name);
+    return 
+      MemoryType.valueOf(VMMemoryPoolMXBeanImpl.getType(name));
   }
 
   public MemoryUsage getUsage()
Index: java/lang/management/MemoryPoolMXBean.java
===================================================================
RCS file: 
/cvsroot/classpath/classpath/java/lang/management/MemoryPoolMXBean.java,v
retrieving revision 1.1.4.2
diff -u -3 -p -u -r1.1.4.2 MemoryPoolMXBean.java
--- java/lang/management/MemoryPoolMXBean.java  23 Jul 2006 21:28:35 -0000      
1.1.4.2
+++ java/lang/management/MemoryPoolMXBean.java  23 Jul 2006 21:45:44 -0000
@@ -162,7 +162,7 @@ public interface MemoryPoolMXBean
    *
    * @return the type of this pool.
    */
-  String getType();
+  MemoryType getType();
 
   /**
    * Returns memory usage statistics for the current memory usage
Index: java/lang/management/MemoryType.java
===================================================================
RCS file: java/lang/management/MemoryType.java
diff -N java/lang/management/MemoryType.java
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ java/lang/management/MemoryType.java        23 Jul 2006 21:45:44 -0000
@@ -0,0 +1,51 @@
+/* MemoryType.java - Enumeration of the types of memory pools.
+   Copyright (C) 2006 Free Software Foundation
+
+This file is part of GNU Classpath.
+
+GNU Classpath is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+GNU Classpath 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 for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package java.lang.management;
+
+/**
+ * Enumerates the possible types of memory pools.  A value of this
+ * type is returned by [EMAIL PROTECTED] MemoryPoolMXBean#getMemoryType()}.
+ *
+ * @author Andrew John Hughes ([EMAIL PROTECTED])
+ * @since 1.5
+ */
+public enum MemoryType
+{
+  HEAP, NON_HEAP;
+}
+

signature.asc
Description: Digital signature