From d512fd4beaab90dbf8b5c109c282d09ea77e3872 Mon Sep 17 00:00:00 2001 From: Murray Cumming Date: Thu, 19 Jul 2012 19:53:43 +0200 Subject: [PATCH] Avoid another code warning in Eclipse Juno. * src/main/java/org/glom/web/server/OnlineGlomServiceImpl.java: Do instanceof checks on the FileUtils.listFiles() result and its items. --- ChangeLog | 8 ++++++++ .../java/org/glom/web/server/OnlineGlomServiceImpl.java | 17 ++++++++++++++--- 2 files changed, 22 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 862532f..46dc150 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2012-07-19 Murray Cumming + + Avoid another code warning in Eclipse Juno. + + * src/main/java/org/glom/web/server/OnlineGlomServiceImpl.java: + Do instanceof checks on the FileUtils.listFiles() result and its + items. + 2012-07-13 Murray Cumming Avoid some code warnings in Eclipse Juno diff --git a/src/main/java/org/glom/web/server/OnlineGlomServiceImpl.java b/src/main/java/org/glom/web/server/OnlineGlomServiceImpl.java index ae49723..bdfaac1 100644 --- a/src/main/java/org/glom/web/server/OnlineGlomServiceImpl.java +++ b/src/main/java/org/glom/web/server/OnlineGlomServiceImpl.java @@ -24,6 +24,7 @@ import java.io.InputStream; import java.sql.Connection; import java.sql.SQLException; import java.util.ArrayList; +import java.util.Collection; import java.util.Hashtable; import java.util.List; @@ -434,8 +435,12 @@ public class OnlineGlomServiceImpl extends RemoteServiceServlet implements Onlin // get and check the glom files in the specified directory // TODO: Test this: final String[] extensions = { GLOM_FILE_EXTENSION }; - final List glomFiles = (List) FileUtils - .listFiles(documentDir, extensions, true /* recursive */); + final Collection glomFiles = FileUtils.listFiles(documentDir, extensions, true /* recursive */); + if(!(glomFiles instanceof List)) { + final String errorMessage = "onlineglom.properties: listFiles() failed."; + Log.fatal(errorMessage); + throw new Exception(errorMessage); + } // don't continue if there aren't any Glom files to configure if (glomFiles.size() <= 0) { @@ -450,7 +455,13 @@ public class OnlineGlomServiceImpl extends RemoteServiceServlet implements Onlin // for table titles, field titles, etc: final String globalLocaleID = StringUtils.defaultString(config.getGlobalLocale()); - for (final File glomFile : glomFiles) { + for (final Object objGlomFile : glomFiles) { + if(!(objGlomFile instanceof File)) { + continue; + } + + final File glomFile = (File)objGlomFile; + final Document document = new Document(); document.setFileURI("file://" + glomFile.getAbsolutePath()); final boolean retval = document.load(); -- 2.1.4