Changeset 1509 for FCKeditor.Java/branches/2.4/src/main/java/net/fckeditor/handlers/ConfigurationHandler.java

Timestamp:

2008-02-13 23:08:27 (9 months ago)

Author:

mosipov

Message:

rewrite of FileType to ResourceType and more

Files:

• FCKeditor.Java/branches/2.4/src/main/java/net/fckeditor/handlers/ConfigurationHandler.java (modified) (6 diffs)

FCKeditor.Java/branches/2.4/src/main/java/net/fckeditor/handlers/ConfigurationHandler.java

@@ -48 +48 @@
  * Something special is {@link ISessionData}. The implemented class provides some session based data.
  * See {@link ISessionData} for additional informations. For example, to get a user based base dir,
- * for each request {@link #getBaseDir(HttpServletRequest)} is calling. If 'sessionData' is set,
+ * for each request {@link #getUserFilesPath(HttpServletRequest)} is calling. If 'sessionData' is set,
  * {@link ISessionData#getBaseDir(HttpServletRequest)} will be returned, otherwise the default base
  * dir.
@@ -58 +58 @@
 
         private static Properties defaultProperties = new Properties();
-        private static String baseDir;
+        private static String userFilesPath;
         private static ISessionData sessionData = null;
-        private static String fckEditorDir;
+        private static String basePath;
         private static String fckEditorHeight;
         private static String fckEditorWidth;
@@ -82 +82 @@
                         throw new RuntimeException("Can't load default properties!", e);
                 }
-                baseDir = defaultProperties.getProperty("fckeditor.basedir");
-                fckEditorDir = defaultProperties.getProperty("fckeditor.dir");
+                userFilesPath = defaultProperties.getProperty("connector.userFilesPath");
+                basePath = defaultProperties.getProperty("fckeditor.basePath");
                 fckEditorWidth = defaultProperties.getProperty("fckeditor.width");
                 fckEditorHeight = defaultProperties.getProperty("fckeditor.height");
-                fckEditorToolbarSet = defaultProperties.getProperty("fckeditor.toolbarset");
+                fckEditorToolbarSet = defaultProperties.getProperty("fckeditor.toolbarSet");
                 forceSingleExtension = Boolean.valueOf(defaultProperties
-                        .getProperty("fckeditor.forcesingleextension"));
+                        .getProperty("connector.forceSingleExtension"));
 
                 logger.info("Default properties loaded and initialized successfully.");
@@ -99 +99 @@
          *         {@link ISessionData}} isn't set.
          */
-        public static String getBaseDir(final HttpServletRequest servletRequest) {
+        public static String getUserFilesPath(final HttpServletRequest servletRequest) {
                 if (sessionData == null || sessionData.getBaseDir(servletRequest) == null)
-                        return getDefaultBaseDir();
+                        return getDefaultUserFilesPath();
                 return sessionData.getBaseDir(servletRequest);
         }
 
         /**
-         * Getter for the default baseDir.
+         * Getter for the default userFilesPath.
          * 
          * @return
          */
-        public static String getDefaultBaseDir() {
-                return baseDir;
-        }
-
-        /**
-         * Setter for the base dir (using for user files). If param 'baseDir' is empty, the property
+        public static String getDefaultUserFilesPath() {
+                return userFilesPath;
+        }
+
+        /**
+         * Setter for the base dir (using for user files). If param 'userFilesPath' is empty, the property
          * leaves untouched.
          * 
-         * @param baseDir
+         * @param userFilesPath
          *            relative to the context root (no leading or ending /).
          */
-        public static void setBaseDir(final String baseDir) {
-                if (Utils.isNotEmpty(baseDir))
-                        ConfigurationHandler.baseDir = baseDir;
+        public static void setUserFilesPath(final String userFilesPath) {
+                if (Utils.isNotEmpty(userFilesPath))
+                        ConfigurationHandler.userFilesPath = userFilesPath;
         }
 
@@ -154 +154 @@
          * @return Dir of the fckeditor relative to the context root.
          */
-        public static String getFckEditorDir() {
-                return fckEditorDir;
+        public static String getBasePath() {
+                return basePath;
         }
 
@@ -161 +161 @@
          * Setter for the dir of the fckeditor.
          * 
-         * @param fckEditorDir
+         * @param basePath
          *            relative to the context root (no leading or ending /).
          */
         public static void setFckEditorDir(final String fckEditorDir) {
-                ConfigurationHandler.fckEditorDir = fckEditorDir;
+                ConfigurationHandler.basePath = fckEditorDir;
         }