You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by sn...@apache.org on 2006/01/02 15:29:39 UTC
svn commit: r365351 - in /incubator/roller/trunk/src/org/roller: model/
presentation/bookmarks/actions/ presentation/planet/
presentation/weblog/actions/ presentation/website/actions/
presentation/website/tags/
Author: snoopdave
Date: Mon Jan 2 06:29:30 2006
New Revision: 365351
URL: http://svn.apache.org/viewcvs?rev=365351&view=rev
Log:
Compiles under JDK 1.5 without warnings
Modified:
incubator/roller/trunk/src/org/roller/model/RollerFactory.java
incubator/roller/trunk/src/org/roller/presentation/bookmarks/actions/BookmarksAction.java
incubator/roller/trunk/src/org/roller/presentation/planet/PlanetSubscriptionsAction.java
incubator/roller/trunk/src/org/roller/presentation/weblog/actions/CategoriesAction.java
incubator/roller/trunk/src/org/roller/presentation/website/actions/UserAdminAction.java
incubator/roller/trunk/src/org/roller/presentation/website/tags/FileUploadTag.java
Modified: incubator/roller/trunk/src/org/roller/model/RollerFactory.java
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/roller/model/RollerFactory.java?rev=365351&r1=365350&r2=365351&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/roller/model/RollerFactory.java (original)
+++ incubator/roller/trunk/src/org/roller/model/RollerFactory.java Mon Jan 2 06:29:30 2006
@@ -84,7 +84,7 @@
// do the invocation
rollerInstance = (Roller)
- instanceMethod.invoke(rollerClass, (Class[])null);
+ instanceMethod.invoke(rollerClass, (Object[])null);
mLogger.info("Using Roller Impl: " + roller_classname);
}
@@ -105,7 +105,7 @@
// do the invocation
rollerInstance = (Roller)
- instanceMethod.invoke(rollerClass, (Class[])null);
+ instanceMethod.invoke(rollerClass, (Object[])null);
}
else
{
@@ -123,9 +123,9 @@
}
- /**
- * Set Roller to be returned by factory.
- */
+ /**
+ * Set Roller to be returned by factory.
+ */
public static void setRoller(Roller roller)
{
if (roller != null) rollerInstance = roller;
Modified: incubator/roller/trunk/src/org/roller/presentation/bookmarks/actions/BookmarksAction.java
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/roller/presentation/bookmarks/actions/BookmarksAction.java?rev=365351&r1=365350&r2=365351&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/roller/presentation/bookmarks/actions/BookmarksAction.java (original)
+++ incubator/roller/trunk/src/org/roller/presentation/bookmarks/actions/BookmarksAction.java Mon Jan 2 06:29:30 2006
@@ -335,7 +335,7 @@
{
return MessageFormat.format(
bundle.getString("bookmarksForm.folderTitle"),
- new String[] {folder.getName()});
+ new Object[] {folder.getName()});
}
}
public List getFolderPath()
Modified: incubator/roller/trunk/src/org/roller/presentation/planet/PlanetSubscriptionsAction.java
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/roller/presentation/planet/PlanetSubscriptionsAction.java?rev=365351&r1=365350&r2=365351&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/roller/presentation/planet/PlanetSubscriptionsAction.java (original)
+++ incubator/roller/trunk/src/org/roller/presentation/planet/PlanetSubscriptionsAction.java Mon Jan 2 06:29:30 2006
@@ -379,7 +379,7 @@
{
return MessageFormat.format(
bundle.getString("planetSubscriptions.titleGroup"),
- new String[] {form.getGroupHandle()});
+ new Object[] {form.getGroupHandle()});
}
else
{
Modified: incubator/roller/trunk/src/org/roller/presentation/weblog/actions/CategoriesAction.java
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/roller/presentation/weblog/actions/CategoriesAction.java?rev=365351&r1=365350&r2=365351&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/roller/presentation/weblog/actions/CategoriesAction.java (original)
+++ incubator/roller/trunk/src/org/roller/presentation/weblog/actions/CategoriesAction.java Mon Jan 2 06:29:30 2006
@@ -256,7 +256,7 @@
{
return MessageFormat.format(
bundle.getString("categoriesForm.parent"),
- new String[] {cat.getName()});
+ new Object[] {cat.getName()});
}
}
}
Modified: incubator/roller/trunk/src/org/roller/presentation/website/actions/UserAdminAction.java
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/roller/presentation/website/actions/UserAdminAction.java?rev=365351&r1=365350&r2=365351&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/roller/presentation/website/actions/UserAdminAction.java (original)
+++ incubator/roller/trunk/src/org/roller/presentation/website/actions/UserAdminAction.java Mon Jan 2 06:29:30 2006
@@ -353,7 +353,7 @@
}
return MessageFormat.format(
bundle.getString("userAdmin.title.editUser"),
- new String[] { userAdminForm.getUserName() } );
+ new Object[] { userAdminForm.getUserName() } );
}
public List getPermissions()
{
Modified: incubator/roller/trunk/src/org/roller/presentation/website/tags/FileUploadTag.java
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/roller/presentation/website/tags/FileUploadTag.java?rev=365351&r1=365350&r2=365351&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/roller/presentation/website/tags/FileUploadTag.java (original)
+++ incubator/roller/trunk/src/org/roller/presentation/website/tags/FileUploadTag.java Mon Jan 2 06:29:30 2006
@@ -122,7 +122,7 @@
+ website.getHandle() + "\" /><br /><br />");
pw.println(MessageFormat.format(
bundle.getString("uploadFiles.quotaNote"),
- new String[] {maxFileMB.toString(), maxDirMB.toString()}));
+ new Object[] {maxFileMB.toString(), maxDirMB.toString()}));
pw.println("</form>");
}
}