r1419 - in xwiki/trunk/core/src/main/java/com/xpn/xwiki: doc plugin/userdirectory render

[Artem Melentev]

Author: amelentev
Date: 2006-10-20 12:54:15 +0200 (Fri, 20 Oct 2006)
New Revision: 1419

Modified:
   xwiki/trunk/core/src/main/java/com/xpn/xwiki/doc/XWikiDocument.java
   xwiki/trunk/core/src/main/java/com/xpn/xwiki/plugin/userdirectory/Group.java
   xwiki/trunk/core/src/main/java/com/xpn/xwiki/render/XWikiRenderingEngine.java
Log:
missing Integer.valueOf(int) & String.contains() in Java 1.4 classlib.
rewrited to "new Integer(int)" & "String.indexOf()>=0"

Modified: xwiki/trunk/core/src/main/java/com/xpn/xwiki/doc/XWikiDocument.java
===================================================================
--- xwiki/trunk/core/src/main/java/com/xpn/xwiki/doc/XWikiDocument.java	2006-10-20 09:26:07 UTC (rev 1418)
+++ xwiki/trunk/core/src/main/java/com/xpn/xwiki/doc/XWikiDocument.java	2006-10-20 10:54:15 UTC (rev 1419)
@@ -2683,8 +2683,8 @@
                 int pos = name.indexOf("_", start.length() + 1);
                 String prefix = name.substring(0, pos);
                 int num = Integer.decode(prefix.substring(prefix.lastIndexOf("_") + 1)).intValue();
-                if (!objectsNumberDone.contains(Integer.valueOf(num))){
-                    objectsNumberDone.add(Integer.valueOf(num));
+                if (!objectsNumberDone.contains(new Integer(num))){
+                    objectsNumberDone.add(new Integer(num));
                     objects.add(addObjectFromRequest(className, num, context));
                 }
             }

Modified: xwiki/trunk/core/src/main/java/com/xpn/xwiki/plugin/userdirectory/Group.java
===================================================================
--- xwiki/trunk/core/src/main/java/com/xpn/xwiki/plugin/userdirectory/Group.java	2006-10-20 09:26:07 UTC (rev 1418)
+++ xwiki/trunk/core/src/main/java/com/xpn/xwiki/plugin/userdirectory/Group.java	2006-10-20 10:54:15 UTC (rev 1419)
@@ -388,7 +388,7 @@
     }
 
     public Group getGroup(String name, XWikiContext context) throws XWikiException {
-        if (name.contains("."))
+        if (name.indexOf('.')>=0)
         {
             String[] grp = name.split("\\.");
             return getGroup(grp[0], grp[1], context);

Modified: xwiki/trunk/core/src/main/java/com/xpn/xwiki/render/XWikiRenderingEngine.java
===================================================================
--- xwiki/trunk/core/src/main/java/com/xpn/xwiki/render/XWikiRenderingEngine.java	2006-10-20 09:26:07 UTC (rev 1418)
+++ xwiki/trunk/core/src/main/java/com/xpn/xwiki/render/XWikiRenderingEngine.java	2006-10-20 10:54:15 UTC (rev 1419)
@@ -250,7 +250,7 @@
 
     private boolean isRendered(XWikiDocument doc, String rendererName, XWikiContext context){
         try{
-            if (rendererName.contains(".")){
+            if (rendererName.indexOf('.')>=0){
                 rendererName = rendererName.substring(rendererName.lastIndexOf(".") + 1);
             }
             String render = context.getWiki().getWebPreference("render" + rendererName, context);