svn commit: r1378037 - in /incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings: app/quartz/scheduler/TestSetupCleanupJob.java app/remote/red5/ScopeApplicationAdapter.java utils/OmFileHelper.java

[solomax]

Author: solomax
Date: Tue Aug 28 09:26:38 2012
New Revision: 1378037

URL: http://svn.apache.org/viewvc?rev=1378037&view=rev
Log:
Redundant method to retrieve streams/files is removed from the code

Modified:
    
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/quartz/scheduler/TestSetupCleanupJob.java
    
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/red5/ScopeApplicationAdapter.java
    
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/utils/OmFileHelper.java

Modified: 
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/quartz/scheduler/TestSetupCleanupJob.java
URL: 
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/quartz/scheduler/TestSetupCleanupJob.java?rev=1378037&r1=1378036&r2=1378037&view=diff
==============================================================================
--- 
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/quartz/scheduler/TestSetupCleanupJob.java
 (original)
+++ 
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/quartz/scheduler/TestSetupCleanupJob.java
 Tue Aug 28 09:26:38 2012
@@ -34,7 +34,7 @@ public class TestSetupCleanupJob {
                log.debug("TestSetupClearJob.execute");
                try {
                        //FIXME need to move all these staff to helper
-                       File[] folders = 
OmFileHelper.getStreamsFilesDir().listFiles();
+                       File[] folders = 
OmFileHelper.getStreamsDir().listFiles();
                        if (folders != null) {
                                for (File folder : folders) {
                                        if (folder.isDirectory()) {

Modified: 
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/red5/ScopeApplicationAdapter.java
URL: 
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/red5/ScopeApplicationAdapter.java?rev=1378037&r1=1378036&r2=1378037&view=diff
==============================================================================
--- 
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/red5/ScopeApplicationAdapter.java
 (original)
+++ 
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/red5/ScopeApplicationAdapter.java
 Tue Aug 28 09:26:38 2012
@@ -117,7 +117,6 @@ public class ScopeApplicationAdapter ext
                        
OmFileHelper.setOmHome(scope.getResource("/").getFile());
 
                        log.debug("webAppPath : " + OmFileHelper.getOmHome());
-                       log.debug("batchFileFir : " + 
OmFileHelper.getStreamsFilesDir());
 
                        // Only load this Class one time
                        // Initially this value might by empty, because the DB 
is empty yet

Modified: 
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/utils/OmFileHelper.java
URL: 
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/utils/OmFileHelper.java?rev=1378037&r1=1378036&r2=1378037&view=diff
==============================================================================
--- 
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/utils/OmFileHelper.java
 (original)
+++ 
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/utils/OmFileHelper.java
 Tue Aug 28 09:26:38 2012
@@ -142,10 +142,6 @@ public class OmFileHelper {
                return new File(OmFileHelper.OM_HOME, STREAMS_DIR);
        }
        
-       public static File getStreamsFilesDir() {
-               return getDir(getStreamsDir(), FILES_DIR);
-       }
-       
        public static File getStreamsHibernateDir() {
                return getDir(getStreamsDir(), HIBERNATE_DIR);
        }