[kaffe] CVS kaffe (robilad): Resynced with GNU Classpath: cleanups

Kaffe CVS cvs-commits at kaffe.org
Sat Jun 11 14:29:30 PDT 2005


PatchSet 6631 
Date: 2005/06/11 21:25:20
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
Resynced with GNU Classpath: cleanups

Members: 
	ChangeLog:1.4157->1.4158 
	libraries/javalib/java/lang/Class.java:1.54->1.55 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.4157 kaffe/ChangeLog:1.4158
--- kaffe/ChangeLog:1.4157	Sat Jun 11 21:09:29 2005
+++ kaffe/ChangeLog	Sat Jun 11 21:25:20 2005
@@ -2,6 +2,14 @@
 
 	Resynced with GNU Classpath.
 	
+	2005-06-05  Tom Tromey  <tromey at redhat.com>
+
+	* java/lang/Class.java (resourcePath): Reindented.
+
+2005-06-11  Dalibor Topic  <robilad at kaffe.org>
+
+	Resynced with GNU Classpath.
+	
 	2005-06-06  Sven de Marothy <sven at physto.se>
 
 	* gnu/java/awt/peer/gtk/GtkImage.java
Index: kaffe/libraries/javalib/java/lang/Class.java
diff -u kaffe/libraries/javalib/java/lang/Class.java:1.54 kaffe/libraries/javalib/java/lang/Class.java:1.55
--- kaffe/libraries/javalib/java/lang/Class.java:1.54	Mon May 30 21:16:08 2005
+++ kaffe/libraries/javalib/java/lang/Class.java	Sat Jun 11 21:25:21 2005
@@ -944,18 +944,18 @@
   private String resourcePath(String resourceName)
   {
     if (resourceName.length() > 0)
-    {
-      if (resourceName.charAt(0) != '/')
       {
-        String pkg = getPackagePortion(getName());
-        if (pkg.length() > 0)
-          resourceName = pkg.replace('.','/') + '/' + resourceName;
+	if (resourceName.charAt(0) != '/')
+	  {
+	    String pkg = getPackagePortion(getName());
+	    if (pkg.length() > 0)
+	      resourceName = pkg.replace('.','/') + '/' + resourceName;
+	  }
+	else
+	  {
+	    resourceName = resourceName.substring(1);
+	  }
       }
-      else
-      {
-        resourceName = resourceName.substring(1);
-      }
-    }
     return resourceName;
   }
 




More information about the kaffe mailing list