Author: bdube Date: Mon Apr 25 06:22:03 2011 New Revision: 1096415 URL: http://svn.apache.org/viewvc?rev=1096415&view=rev Log: Changes needed to compile with Java 5 on Ubuntu
Modified: forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.log/src/java/org/apache/forrest/log/service/LogWriter.java forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.plugin.api/src/java/org/apache/forrest/plugin/api/ForrestStreamSource.java forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.servlet/src/java/org/apache/forrest/http/ForrestServletPlugin.java forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.util/src/java/org/apache/forrest/util/ContentType.java Modified: forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.log/src/java/org/apache/forrest/log/service/LogWriter.java URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.log/src/java/org/apache/forrest/log/service/LogWriter.java?rev=1096415&r1=1096414&r2=1096415&view=diff ============================================================================== --- forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.log/src/java/org/apache/forrest/log/service/LogWriter.java (original) +++ forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.log/src/java/org/apache/forrest/log/service/LogWriter.java Mon Apr 25 06:22:03 2011 @@ -29,7 +29,7 @@ public class LogWriter implements LogLis private static final Logger sLogger = LoggerFactory.getLogger(LogWriter.class); - @Override + // @Override public void logged(LogEntry entry) { int level = entry.getLevel(); Modified: forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.plugin.api/src/java/org/apache/forrest/plugin/api/ForrestStreamSource.java URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.plugin.api/src/java/org/apache/forrest/plugin/api/ForrestStreamSource.java?rev=1096415&r1=1096414&r2=1096415&view=diff ============================================================================== --- forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.plugin.api/src/java/org/apache/forrest/plugin/api/ForrestStreamSource.java (original) +++ forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.plugin.api/src/java/org/apache/forrest/plugin/api/ForrestStreamSource.java Mon Apr 25 06:22:03 2011 @@ -31,12 +31,12 @@ public class ForrestStreamSource impleme mRawInputStream = input; } - @Override + // @Override public InputStream getInputStream() { return mRawInputStream; } - @Override + // @Override public String getSourceAsString() { if (null != mRawInputStream) { StringBuilder inputString = new StringBuilder(); @@ -59,7 +59,7 @@ public class ForrestStreamSource impleme return new String(); } - @Override + // @Override public String getInternalRepresentationAsString() { if (null != mInternalString) { return mInternalString; @@ -68,7 +68,7 @@ public class ForrestStreamSource impleme return new String(); } - @Override + // @Override public void setInternalRepresentation(String internal) { mInternalString = internal; } Modified: forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.servlet/src/java/org/apache/forrest/http/ForrestServletPlugin.java URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.servlet/src/java/org/apache/forrest/http/ForrestServletPlugin.java?rev=1096415&r1=1096414&r2=1096415&view=diff ============================================================================== --- forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.servlet/src/java/org/apache/forrest/http/ForrestServletPlugin.java (original) +++ forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.servlet/src/java/org/apache/forrest/http/ForrestServletPlugin.java Mon Apr 25 06:22:03 2011 @@ -33,7 +33,7 @@ public class ForrestServletPlugin implem private ServiceTracker mHttpTracker; private ForrestServlet mServlet; - @Override + // @Override public void start(final BundleContext context) throws Exception { LogPlugin.getDefault().getLogService().log(LogService.LOG_DEBUG, "http activator"); @@ -69,7 +69,7 @@ public class ForrestServletPlugin implem } } - @Override + // @Override public void stop(BundleContext context) throws Exception { mHttpTracker.close(); } Modified: forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.util/src/java/org/apache/forrest/util/ContentType.java URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.util/src/java/org/apache/forrest/util/ContentType.java?rev=1096415&r1=1096414&r2=1096415&view=diff ============================================================================== --- forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.util/src/java/org/apache/forrest/util/ContentType.java (original) +++ forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.util/src/java/org/apache/forrest/util/ContentType.java Mon Apr 25 06:22:03 2011 @@ -25,7 +25,7 @@ public class ContentType { private static final Map<String, String> sContentTypeMap; public static String getExtensionByName(String name) { - if (null == name || name.isEmpty()) { + if (null == name || name.length() == 0) { throw new IllegalArgumentException("Argument must not be null or empty"); } @@ -39,7 +39,7 @@ public class ContentType { } public static String getContentTypeByName(String path) { - if (null == path || path.isEmpty()) { + if (null == path || path.length() == 0) { throw new IllegalArgumentException("Argument must not be null or empty"); } @@ -47,7 +47,7 @@ public class ContentType { } public static String getContentTypeByName(File file) { - if (null == file || file.getName().isEmpty()) { + if (null == file || file.getName().length() == 0) { throw new IllegalArgumentException("Argument must not be null or empty"); }